diff options
| author | Rich Felker <dalias@aerifal.cx> | 2014-12-02 22:17:52 -0500 | 
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2014-12-02 22:17:52 -0500 | 
| commit | 66140b0c926ed097f2cb7474863523e4af351f5b (patch) | |
| tree | 6523a524359b317c728c0f263f8f467612ddf79c /src | |
| parent | a56e339419c1a90f8a85f86621f3c73945e07b23 (diff) | |
| download | musl-66140b0c926ed097f2cb7474863523e4af351f5b.tar.gz | |
fix return value of pthread_getaffinity_np and pthread_setaffinity_np
these functions are expected to return an error code rather than
setting errno and returning -1.
Diffstat (limited to 'src')
| -rw-r--r-- | src/sched/affinity.c | 19 | 
1 files changed, 11 insertions, 8 deletions
| diff --git a/src/sched/affinity.c b/src/sched/affinity.c index 737e41b5..948ece41 100644 --- a/src/sched/affinity.c +++ b/src/sched/affinity.c @@ -11,20 +11,23 @@ int sched_setaffinity(pid_t tid, size_t size, const cpu_set_t *set)  int pthread_setaffinity_np(pthread_t td, size_t size, const cpu_set_t *set)  { -	return syscall(SYS_sched_setaffinity, td->tid, size, set); +	return -__syscall(SYS_sched_setaffinity, td->tid, size, set);  } -int sched_getaffinity(pid_t tid, size_t size, cpu_set_t *set) +static int do_getaffinity(pid_t tid, size_t size, cpu_set_t *set)  {  	long ret = __syscall(SYS_sched_getaffinity, tid, size, set); -	if (ret > 0) { -		if (ret < size) memset((char *)set+ret, 0, size-ret); -		ret = 0; -	} -	return __syscall_ret(ret); +	if (ret < 0) return ret; +	if (ret < size) memset((char *)set+ret, 0, size-ret); +	return 0; +} + +int sched_getaffinity(pid_t tid, size_t size, cpu_set_t *set) +{ +	return __syscall_ret(do_getaffinity(tid, size, set));  }  int pthread_getaffinity_np(pthread_t td, size_t size, cpu_set_t *set)  { -	return sched_getaffinity(td->tid, size, set); +	return -do_getaffinity(td->tid, size, set);  } | 
