OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

2003-06-19  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/ia64/sem_post.c: Move to...
	* sysdeps/unix/sysv/linux/sem_post.c: ...here.

	* sysdeps/unix/sysv/linux/sem_post.c: Move to...
	* sysdeps/unix/sysv/linux/powerpc/sem_post.c: ... here.  Pass nr + 1
	instead of nr to lll_futex_wake.  Only set errno and return -1
	if err < 0.

	* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h (lll_futex_wait,
	lll_futex_timed_wait, lll_futex_wake, lll_futex_requeue): On success
	return actual return value from the syscall, not 0.

	compat_timer_getoverrun.
This commit is contained in:
Ulrich Drepper 2003-06-19 19:53:12 +00:00
parent 4e502c601d
commit 9bdabb94da
4 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nptl/ChangeLog
View File

@ -1,3 +1,17 @@
2003-06-19 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/sem_post.c: Move to...
* sysdeps/unix/sysv/linux/sem_post.c: ...here.
* sysdeps/unix/sysv/linux/sem_post.c: Move to...
* sysdeps/unix/sysv/linux/powerpc/sem_post.c: ... here. Pass nr + 1
instead of nr to lll_futex_wake. Only set errno and return -1
if err < 0.
* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h (lll_futex_wait,
lll_futex_timed_wait, lll_futex_wake, lll_futex_requeue): On success
return actual return value from the syscall, not 0.
2003-06-18 Ulrich Drepper <drepper@redhat.com>
* tst-cancel4.c (tf_msgsnd): Don't always use 100 as the type,
@ -10,7 +24,7 @@
* sysdeps/unix/sysv/linux/timer_gettime.c: Add prototype for
compat_timer_gettime.
* sysdeps/unix/sysv/linux/timer_getoverr.c: Add prototype for
compat_timer_getoverrun.o
compat_timer_getoverrun.
* sysdeps/unix/sysv/linux/timer_delete.c: Add prototype for
compat_timer_delete.

8
nptl/sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
View File

@ -41,7 +41,7 @@
\
__ret = INTERNAL_SYSCALL (futex, __err, 4, \
(futexp), FUTEX_WAIT, (val), 0); \
INTERNAL_SYSCALL_ERROR_P (__ret, __err)? -__ret: 0; \
INTERNAL_SYSCALL_ERROR_P (__ret, __err) ? -__ret : __ret; \
})
#define lll_futex_timed_wait(futexp, val, timespec) \
@ -51,7 +51,7 @@
\
__ret = INTERNAL_SYSCALL (futex, __err, 4, \
(futexp), FUTEX_WAIT, (val), (timespec)); \
INTERNAL_SYSCALL_ERROR_P (__ret, __err)? -__ret: 0; \
INTERNAL_SYSCALL_ERROR_P (__ret, __err) ? -__ret : __ret; \
})
#define lll_futex_wake(futexp, nr) \
@ -61,7 +61,7 @@
\
__ret = INTERNAL_SYSCALL (futex, __err, 4, \
(futexp), FUTEX_WAKE, (nr), 0); \
INTERNAL_SYSCALL_ERROR_P (__ret, __err)? -__ret: 0; \
INTERNAL_SYSCALL_ERROR_P (__ret, __err) ? -__ret : __ret; \
})
#define lll_futex_requeue(futexp, nr_wake, nr_move, mutex) \
@ -72,7 +72,7 @@
__ret = INTERNAL_SYSCALL (futex, __err, 5, \
(futexp), FUTEX_REQUEUE, (nr_wake), (nr_move), \
(mutex)); \
INTERNAL_SYSCALL_ERROR_P (__ret, __err)? -__ret: 0; \
INTERNAL_SYSCALL_ERROR_P (__ret, __err) ? -__ret : __ret; \
})
#ifdef UP

5
nptl/sysdeps/unix/sysv/linux/ia64/sem_post.c → nptl/sysdeps/unix/sysv/linux/powerpc/sem_post.c
View File

@ -1,7 +1,7 @@
/* sem_post -- post to a POSIX semaphore. IA-64 version.
/* sem_post -- post to a POSIX semaphore. Powerpc version.
Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@ -32,6 +32,7 @@ __new_sem_post (sem_t *sem)
int *futex = (int *) sem;
int err, nr;
__asm __volatile (__lll_rel_instr ::: "memory");
nr = atomic_exchange_and_add (futex, 1);
err = lll_futex_wake (futex, nr + 1);
if (__builtin_expect (err, 0) < 0)

15
nptl/sysdeps/unix/sysv/linux/sem_post.c
View File

@ -1,7 +1,7 @@
/* sem_post -- post to a POSIX semaphore. Generic futex-using version.
Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@ -32,13 +32,14 @@ __new_sem_post (sem_t *sem)
int *futex = (int *) sem;
int err, nr;
__asm __volatile (__lll_rel_instr ::: "memory");
nr = atomic_exchange_and_add (futex, 1);
err = lll_futex_wake (futex, nr);
if (err == 0)
return 0;
__set_errno (-err);
return -1;
err = lll_futex_wake (futex, nr + 1);
if (__builtin_expect (err, 0) < 0)
{
__set_errno (-err);
return -1;
}
return 0;
}
versioned_symbol (libpthread, __new_sem_post, sem_post, GLIBC_2_1);
#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)