gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

NSThread: Fix threadPriority and setThreadPriority: on Android by using setpriority instead of pthread (#436)

Browse source 
* Update Changelog

* Use {get, set}priority for -[NSThread setThreadPriority] on Android
This commit is contained in:
Hugo Melder 2024-08-13 19:59:56 +02:00 • committed by GitHub
parent 7cc7fc54e6
commit 162708f7ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 49 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2024-12-08 Hugo Melder <hugo@algoriddim.com>
* Source/NSThread.m:
Fix threadPriority and setThreadPriority: on Android.
2024-08-08 Richard Frith-Macdonald <rfm@gnu.org> 2024-08-08 Richard Frith-Macdonald <rfm@gnu.org>
* Tools/AGSHtml.m: * Tools/AGSHtml.m:

47
Source/NSThread.m
View file

@ -116,6 +116,11 @@ typedef struct {
# include <sys/file.h> # include <sys/file.h>
#endif #endif
#if defined(__ANDROID__)
# include <string.h> // For strerror
# include <sys/resource.h> // For getpriority and setpriority
#endif
#if defined(HAVE_SYS_FCNTL_H) #if defined(HAVE_SYS_FCNTL_H)
# include <sys/fcntl.h> # include <sys/fcntl.h>
#elif defined(HAVE_FCNTL_H) #elif defined(HAVE_FCNTL_H)
@ -1004,6 +1009,34 @@ unregisterActiveThread(NSThread *thread)
return NO; return NO;
} }
return YES; 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) #elif defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0)
int res; int res;
int policy; int policy;
@ -1097,6 +1130,18 @@ unregisterActiveThread(NSThread *thread)
NSLog(@"Unknown thread priority: %d", winPri); NSLog(@"Unknown thread priority: %d", winPri);
break; 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) #elif defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING > 0)
int res; int res;
int policy; int policy;
@ -1126,8 +1171,6 @@ unregisterActiveThread(NSThread *thread)
return pri; return pri;
} }
/* /*
* Thread instance methods. * Thread instance methods.
*/ */