Merge branch 'master' of github.com:gnustep/libs-base

.github/workflows/main.yml

@@ -181,14 +181,6 @@ jobs:
  fail-fast: false
  matrix:
  include:
- - name: Windows x86 MinGW GCC
- allow-test-failures: true
- arch: i686
- msystem: MINGW32
- library-combo: gnu-gnu-gnu
- CC: gcc
- CXX: g++
-
  - name: Windows x64 MinGW GCC
  arch: x86_64
  msystem: MINGW64
@@ -283,6 +275,7 @@ jobs:
  if: env.CC == 'gcc'
  with:
  msystem: ${{ matrix.msystem }}
+ update: true
  install: >
  mingw-w64-${{matrix.arch}}-gcc-objc
 

ChangeLog

@@ -1,3 +1,7 @@
+2024-12-08 Hugo Melder <[email protected]>
+ * Source/NSThread.m:
+ Fix threadPriority and setThreadPriority: on Android.
+
 2024-08-08 Richard Frith-Macdonald <[email protected]>
 
  * Tools/AGSHtml.m:

Source/NSThread.m

@@ -116,6 +116,11 @@ int pthread_spin_destroy(pthread_spinlock_t *lock)
 # include <sys/file.h>
 #endif
 
+#if defined(__ANDROID__)
+# include <string.h> // For strerror
+# include <sys/resource.h> // For getpriority and setpriority
+#endif
+
 #if defined(HAVE_SYS_FCNTL_H)
 # include <sys/fcntl.h>
 #elif defined(HAVE_FCNTL_H)
@@ -1004,6 +1009,34 @@ + (BOOL) setThreadPriority: (double)pri
  return NO;
  }
  return YES;
+#elif defined(__ANDROID__)
+/* Android's pthread_setschedparam is currently broken, as it checks
+ * if the priority is in the range of the system's min and max
+ * priorities. The interval bounds are queried with `sched_get_priority_min`,
+ * and `sched_get_priority_max` which just return 0, regardless of the
+ * specified scheduling policy.
+ *
+ * The solution is to use `setpriority` to set the thread
+ * priority. This is possible because on Linux, it is not a per-process setting
+ * as specified by POSIX but a per-thread setting (See the `Bugs` section in `setpriority`).
+ *
+ * Android's internal implementation also relies on this behavior, so it
+ * is safe to use it here.
+ */
+
+ // Clamp pri into the required range.
+ if (pri > 1) { pri = 1; }
+ if (pri < 0) { pri = 0; }
+
+ // Convert [0.0, 1.0] to [-20, 19] range where -20 is the highest
+ // and 19 the lowest priority.
+ int priority = (int)(-20 + (1-pri) * 39);
+ if (setpriority(PRIO_PROCESS, 0, priority) == -1)
+ {
+ NSLog(@"Failed to set thread priority %d: %s", priority, strerror(errno));
+ return NO;
+ }
+ return YES;
 #elif defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0)
  int res;
  int policy;
@@ -1097,6 +1130,18 @@ + (double) threadPriority
  NSLog(@"Unknown thread priority: %d", winPri);
  break;
  }
+#elif defined(__ANDROID__)
+/* See notes in setThreadPriority
+ */
+ int priority = getpriority(PRIO_PROCESS, 0);
+ if (priority == -1)
+ {
+ NSLog(@"Failed to get thread priority: %s", strerror(errno));
+ return pri;
+ }
+
+ // Convert [-20, 19] to [0.0, 1.0] range
+ pri = 1 - (priority + 20) / 39.0;
 #elif defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0)
  int res;
  int policy;
@@ -1126,8 +1171,6 @@ + (double) threadPriority
  return pri;
 }
 
-
-
 /*
  * Thread instance methods.
  */

aclocal.m4

@@ -0,0 +1,23 @@
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_include([config/addlibrarypath.m4])
+m4_include([config/codeset.m4])
+m4_include([config/objc-con-autoload.m4])
+m4_include([config/objc-sys-dynamic.m4])
+m4_include([config/pathtls.m4])
+m4_include([config/pathxml.m4])
+m4_include([config/pkg.m4])
+m4_include([config/procfs-exe-link.m4])
+m4_include([config/procfs.m4])

config/objc-con-autoload.m4

@@ -1,4 +1,4 @@
-AC_DEFUN(OBJC_CON_AUTOLOAD,
+AC_DEFUN([OBJC_CON_AUTOLOAD],
 # Copyright (C) 2005 Free Software Foundation
 #
 # Copying and distribution of this file, with or without modification,

config/objc-sys-dynamic.m4

@@ -1,4 +1,4 @@
-AC_DEFUN(OBJC_SYS_DYNAMIC_LINKER,
+AC_DEFUN([OBJC_SYS_DYNAMIC_LINKER],
 [dnl
 AC_REQUIRE([OBJC_CON_AUTOLOAD])dnl
 # Copyright (C) 2005 Free Software Foundation

config/pathtls.m4

@@ -4,7 +4,7 @@ dnl Copying and distribution of this file, with or without modification,
 dnl are permitted in any medium without royalty provided the copyright
 dnl notice and this notice are preserved.
 dnl AM_PATH_TLS([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-AC_DEFUN(AM_PATH_TLS,[
+AC_DEFUN([AM_PATH_TLS],[
 AC_ARG_WITH(tls-prefix,
  [ --with-tls-prefix=PFX Prefix where libgnutls is installed (optional)],
  tls_config_prefix="$withval", tls_config_prefix="")

config/pathxml.m4

@@ -4,7 +4,7 @@ dnl Copying and distribution of this file, with or without modification,
 dnl are permitted in any medium without royalty provided the copyright
 dnl notice and this notice are preserved.
 dnl AM_PATH_XML([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-AC_DEFUN(AM_PATH_XML,[
+AC_DEFUN([AM_PATH_XML],[
 AC_ARG_WITH(xml-prefix,
  [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
  xml_config_prefix="$withval", xml_config_prefix="")

config/procfs-exe-link.m4

@@ -6,7 +6,7 @@ dnl Copyright (C) 2005 Free Software Foundation
 dnl Copying and distribution of this file, with or without modification,
 dnl are permitted in any medium without royalty provided the copyright
 dnl notice and this notice are preserved.
-AC_DEFUN(AC_SYS_PROCFS_EXE_LINK,
+AC_DEFUN([AC_SYS_PROCFS_EXE_LINK],
 [ AC_REQUIRE([AC_SYS_PROCFS])
 
  AC_CACHE_CHECK([link to exe of process in /proc], ac_cv_sys_procfs_exe_link,

config/procfs.m4

@@ -7,7 +7,7 @@ dnl
 dnl AC_SYS_PROCFS
 dnl This macro defines HAVE_PROCFS if either it finds a mounted /proc
 dnl or the user explicitly enables it for cross-compiles.
-AC_DEFUN(AC_SYS_PROCFS,
+AC_DEFUN([AC_SYS_PROCFS],
 [ AC_ARG_ENABLE(procfs,
  [ --enable-procfs Use /proc filesystem (default)],
  enable_procfs="$enableval", if test "$cross_compiling" = yes; then enable_procfs=cross; else enable_procfs=yes; fi;)
@@ -48,7 +48,7 @@ AC_DEFUN(AC_SYS_PROCFS,
 dnl AC_SYS_PROCFS_PSINFO
 dnl This macro defines HAVE_PROCFS_PSINFO if it can read the psinfo 
 dnl structure from the /proc/%pid% directory
-AC_DEFUN(AC_SYS_PROCFS_PSINFO,
+AC_DEFUN([AC_SYS_PROCFS_PSINFO],
 [ AC_ARG_ENABLE(procfs-psinfo,
  [ --enable-procfs-psinfo Use /proc/%pid% to get info],
  enable_procfs_psinfo="$enableval", if test "$cross_compiling" = yes; then enable_procfs_psinfo=cross; else enable_procfs_psinfo=yes; fi;)

configure

@@ -3720,59 +3720,45 @@ GNUSTEP_BASE_DOMAIN=$result
 #
 case "$target_os" in
  mingw*|windows)
- # TODO: Improve this hack.
- # According to Wikipedia, this is the default for Windows 2000,
- # Windows XP and Windows Server 2003. For Windows Vista this will
- # change to C:\Users. The directory name needs to be localized though
- # (and the disk may need changing as well ?).
- GNUSTEP_SYSTEM_USERS_DIR="C:\Documents and Settings"
- GNUSTEP_NETWORK_USERS_DIR="C:\Documents and Settings"
- GNUSTEP_LOCAL_USERS_DIR="C:\Documents and Settings"
-
- # TODO: It would be nice to use the 'short' output of
- # relative_path.sh, but older versions of relative_path.sh
- # did not support specifying the type of output and
- # would abort if they were given more than 2 parameters,
- # so we can not use the 'short' option if we want gnustep-base
- # to work with older versions of gnustep-make.
- # Once everyone has upgraded to gnustep-make >= 2.0.5 (I'd say
- # two years after it has been released ?), we could switch to the
- # 'short' output though.
- GNUSTEP_SYSTEM_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_APPS`
- GNUSTEP_SYSTEM_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_ADMIN_APPS`
- GNUSTEP_SYSTEM_WEB_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_WEB_APPS`
- GNUSTEP_SYSTEM_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_TOOLS`
- GNUSTEP_SYSTEM_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_ADMIN_TOOLS`
- GNUSTEP_SYSTEM_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_LIBRARY`
- GNUSTEP_SYSTEM_LIBRARIES=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_LIBRARIES`
- GNUSTEP_SYSTEM_HEADERS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_HEADERS`
- GNUSTEP_SYSTEM_DOC=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_DOC`
- GNUSTEP_SYSTEM_DOC_MAN=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_DOC_MAN`
- GNUSTEP_SYSTEM_DOC_INFO=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_DOC_INFO`
-
- GNUSTEP_NETWORK_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_APPS`
- GNUSTEP_NETWORK_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_ADMIN_APPS`
- GNUSTEP_NETWORK_WEB_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_WEB_APPS`
- GNUSTEP_NETWORK_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_TOOLS`
- GNUSTEP_NETWORK_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_ADMIN_TOOLS`
- GNUSTEP_NETWORK_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_LIBRARY`
- GNUSTEP_NETWORK_LIBRARIES=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_LIBRARIES`
- GNUSTEP_NETWORK_HEADERS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_HEADERS`
- GNUSTEP_NETWORK_DOC=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_DOC`
- GNUSTEP_NETWORK_DOC_MAN=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_DOC_MAN`
- GNUSTEP_NETWORK_DOC_INFO=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_DOC_INFO`
-
- GNUSTEP_LOCAL_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_APPS`
- GNUSTEP_LOCAL_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_ADMIN_APPS`
- GNUSTEP_LOCAL_WEB_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_WEB_APPS`
- GNUSTEP_LOCAL_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_TOOLS`
- GNUSTEP_LOCAL_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_ADMIN_TOOLS`
- GNUSTEP_LOCAL_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_LIBRARY`
- GNUSTEP_LOCAL_LIBRARIES=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_LIBRARIES`
- GNUSTEP_LOCAL_HEADERS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_HEADERS`
- GNUSTEP_LOCAL_DOC=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_DOC`
- GNUSTEP_LOCAL_DOC_MAN=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_DOC_MAN`
- GNUSTEP_LOCAL_DOC_INFO=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_DOC_INFO`
+ GNUSTEP_SYSTEM_USERS_DIR="C:\Users"
+ GNUSTEP_NETWORK_USERS_DIR="C:\Users"
+ GNUSTEP_LOCAL_USERS_DIR="C:\Users"
+
+ GNUSTEP_SYSTEM_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_APPS short`
+ GNUSTEP_SYSTEM_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_ADMIN_APPS short`
+ GNUSTEP_SYSTEM_WEB_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_WEB_APPS short`
+ GNUSTEP_SYSTEM_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_TOOLS short`
+ GNUSTEP_SYSTEM_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_ADMIN_TOOLS short`
+ GNUSTEP_SYSTEM_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_LIBRARY short`
+ GNUSTEP_SYSTEM_LIBRARIES=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_LIBRARIES short`
+ GNUSTEP_SYSTEM_HEADERS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_HEADERS short`
+ GNUSTEP_SYSTEM_DOC=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_DOC short`
+ GNUSTEP_SYSTEM_DOC_MAN=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_DOC_MAN short`
+ GNUSTEP_SYSTEM_DOC_INFO=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_SYSTEM_DOC_INFO short`
+
+ GNUSTEP_NETWORK_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_APPS short`
+ GNUSTEP_NETWORK_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_ADMIN_APPS short`
+ GNUSTEP_NETWORK_WEB_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_WEB_APPS short`
+ GNUSTEP_NETWORK_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_TOOLS short`
+ GNUSTEP_NETWORK_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_ADMIN_TOOLS short`
+ GNUSTEP_NETWORK_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_LIBRARY short`
+ GNUSTEP_NETWORK_LIBRARIES=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_LIBRARIES short`
+ GNUSTEP_NETWORK_HEADERS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_HEADERS short`
+ GNUSTEP_NETWORK_DOC=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_DOC short`
+ GNUSTEP_NETWORK_DOC_MAN=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_DOC_MAN short`
+ GNUSTEP_NETWORK_DOC_INFO=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_NETWORK_DOC_INFO short`
+
+ GNUSTEP_LOCAL_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_APPS short`
+ GNUSTEP_LOCAL_ADMIN_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_ADMIN_APPS short`
+ GNUSTEP_LOCAL_WEB_APPS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_WEB_APPS short`
+ GNUSTEP_LOCAL_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_TOOLS short`
+ GNUSTEP_LOCAL_ADMIN_TOOLS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_ADMIN_TOOLS short`
+ GNUSTEP_LOCAL_LIBRARY=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_LIBRARY short`
+ GNUSTEP_LOCAL_LIBRARIES=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_LIBRARIES short`
+ GNUSTEP_LOCAL_HEADERS=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_HEADERS short`
+ GNUSTEP_LOCAL_DOC=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_DOC short`
+ GNUSTEP_LOCAL_DOC_MAN=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_DOC_MAN short`
+ GNUSTEP_LOCAL_DOC_INFO=`$GNUSTEP_MAKEFILES/relative_path.sh $GNUSTEP_BASE_PATH $GNUSTEP_LOCAL_DOC_INFO short`
 # It would be nice to now store this stuff into a ./GNUstep.conf file
 # installed with gnustep-base.dll. This would clarify.
  ;;