From: Kaz Kojima <kkojima@rr.iij4u.or.jp>
To: libc-hacker@sources.redhat.com
Subject: [PATCH] SH: nptl fixups
Date: Sun, 13 Jun 2004 06:16:00 -0000 [thread overview]
Message-ID: <20040613.151626.99851132.kkojima@rr.iij4u.or.jp> (raw)
Hi,
The appended patch updates SH port of nptl according to the recent
change by Jakub.
Regards,
kaz
--
2004-06-13 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h (pthread_cond_t):
Add __data.__futex field, reshuffle __data.__clock.
* sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
(__pthread_cond_signal): Increment __futex at the same time as
__wakeup_seq or __total_seq. Pass address of __futex instead of
address of low 32-bits of __wakeup_seq to futex syscall.
* sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
(__pthread_cond_wait): Likewise. Pass __futex value from before
releasing internal lock to FUTEX_WAIT.
* sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
(__pthread_cond_timedwait): Likewise.
* sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
(FUTEX_CMP_REQUEUE): Define.
(__pthread_cond_broadcast): Set __futex to 2 * __total_seq.
Use FUTEX_CMP_REQUEUE operation instead of FUTEX_REQUEUE.
Pass __futex value from before the unlock and __futex address instead
of address of low 32-bits of __wakeup_seq to futex syscall.
Fallback to FUTEX_WAKE all on any errors.
diff -u3prN ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h
--- ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h Fri Jun 4 07:29:33 2004
+++ LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h Sat Jun 12 13:24:40 2004
@@ -77,11 +77,12 @@ typedef union
struct
{
int __lock;
- int __clock;
+ unsigned int __futex;
unsigned long long int __total_seq;
unsigned long long int __wakeup_seq;
unsigned long long int __woken_seq;
void *__mutex;
+ int __clock;
unsigned int __broadcast_seq;
} __data;
char __size[__SIZEOF_PTHREAD_COND_T];
diff -u3prN ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S
--- ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S Fri Jun 4 07:29:33 2004
+++ LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_broadcast.S Sat Jun 12 18:44:42 2004
@@ -26,6 +26,7 @@
#define FUTEX_WAIT 0
#define FUTEX_WAKE 1
#define FUTEX_REQUEUE 3
+#define FUTEX_CMP_REQUEUE 4
#define EINVAL 22
@@ -36,6 +37,7 @@
.type __pthread_cond_broadcast, @function
.align 5
__pthread_cond_broadcast:
+ mov.l r10, @-r15
mov.l r9, @-r15
mov.l r8, @-r15
sts.l pr, @-r15
@@ -72,6 +74,9 @@ __pthread_cond_broadcast:
mov.l @(broadcast_seq,r8), r2
add #1, r2
mov.l r2, @(broadcast_seq,r8)
+ add r1, r1
+ mov r1, r10
+ mov.l r10, @(cond_futex,r8)
/* Get the address of the mutex used. */
mov.l @(dep_mutex,r8), r9
@@ -91,10 +96,10 @@ __pthread_cond_broadcast:
cmp/eq r0, r9
mov r8, r4
bt/s 9f
- add #wakeup_seq, r4
+ add #cond_futex, r4
/* Wake up all threads. */
- mov #FUTEX_REQUEUE, r5
+ mov #FUTEX_CMP_REQUEUE, r5
mov #1, r6
mov #-1, r7
shlr r7 /* r7 = 0x7fffffff */
@@ -102,17 +107,31 @@ __pthread_cond_broadcast:
# if MUTEX_FUTEX != 0
add #MUTEX_FUTEX, r0
# endif
+ mov r10, r1
mov #SYS_futex, r3
extu.b r3, r3
- trapa #0x15
+ trapa #0x16
SYSCALL_INST_PAD
+ /* For any kind of error, which mainly is EAGAIN, we try again
+ with WAKE. The general test also covers running on old
+ kernels. */
+ mov r0, r1
+ mov #-12, r2
+ shad r2, r1
+ not r1, r1
+ tst r1, r1
+ mov r8, r4
+ bt/s 9f
+ add #cond_futex, r4
+
10:
mov #0, r0
lds.l @r15+, pr
mov.l @r15+, r8
+ mov.l @r15+, r9
rts
- mov.l @r15+, r9
+ mov.l @r15+, r10
4:
/* Unlock. */
@@ -127,8 +146,9 @@ __pthread_cond_broadcast:
mov #0, r0
lds.l @r15+, pr
mov.l @r15+, r8
+ mov.l @r15+, r9
rts
- mov.l @r15+, r9
+ mov.l @r15+, r10
1:
/* Initial locking failed. */
diff -u3prN ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S
--- ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S Sat Mar 20 15:24:28 2004
+++ LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_signal.S Sat Jun 12 19:29:28 2004
@@ -72,10 +72,13 @@ __pthread_cond_signal:
addc r3, r1
mov.l r0,@(wakeup_seq,r8)
mov.l r1,@(wakeup_seq+4,r8)
+ mov.l @(cond_futex,r8),r0
+ add r2, r0
+ mov.l r0,@(cond_futex,r8)
/* Wake up one thread. */
mov r8, r4
- add #wakeup_seq, r4
+ add #cond_futex, r4
mov #FUTEX_WAKE, r5
mov #1, r6
mov #0, r7
diff -u3prN ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S
--- ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S Fri Jun 4 07:29:33 2004
+++ LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_timedwait.S Sat Jun 12 14:21:19 2004
@@ -110,6 +110,10 @@ __pthread_cond_timedwait:
addc r3, r1
mov.l r0,@(total_seq,r8)
mov.l r1,@(total_seq+4,r8)
+ mov.l @(cond_futex,r8), r0
+ add r2, r0
+ mov.l r0, @(cond_futex,r8)
+
/* Get and store current wakeup_seq value. */
mov.l @(wakeup_seq,r8), r10
@@ -150,6 +154,8 @@ __pthread_cond_timedwait:
/* Store relative timeout. */
mov.l r2, @(16,r15)
mov.l r3, @(20,r15)
+ mov.l @(cond_futex,r8), r1
+ mov.l r1, @(8,r15)
/* Unlock. */
#if cond_lock != 0
@@ -172,9 +178,9 @@ __pthread_cond_timedwait:
mov r15, r7
add #16, r7
mov #FUTEX_WAIT, r5
- mov r10, r6
+ mov.l @(8,r15), r6
mov r8, r4
- add #wakeup_seq, r4
+ add #cond_futex, r4
mov #SYS_futex, r3
extu.b r3, r3
trapa #0x14
@@ -232,6 +238,9 @@ __pthread_cond_timedwait:
addc r3, r1
mov.l r0,@(wakeup_seq,r8)
mov.l r1,@(wakeup_seq+4,r8)
+ mov.l @(cond_futex,r8),r0
+ add r2, r0
+ mov.l r0,@(cond_futex,r8)
mov #ETIMEDOUT, r0
bra 14f
mov.l r0, @(24,r15)
@@ -433,6 +442,9 @@ __condvar_tw_cleanup:
addc r3, r1
mov.l r0,@(wakeup_seq,r8)
mov.l r1,@(wakeup_seq+4,r8)
+ mov.l @(cond_futex,r8),r0
+ add r2, r0
+ mov.l r0,@(cond_futex,r8)
clrt
mov.l @(woken_seq,r8),r0
@@ -463,7 +475,7 @@ __condvar_tw_cleanup:
2:
/* Wake up all waiters to make sure no signal gets lost. */
mov r8, r4
- add #wakeup_seq, r4
+ add #cond_futex, r4
mov #FUTEX_WAKE, r5
mov #-1, r6
shlr r6 /* r6 = 0x7fffffff */
diff -u3prN ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S
--- ORIG/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S Fri Jun 4 07:29:33 2004
+++ LOCAL/libc/nptl/sysdeps/unix/sysv/linux/sh/pthread_cond_wait.S Sat Jun 12 14:26:14 2004
@@ -104,6 +104,9 @@ __pthread_cond_wait:
addc r3, r1
mov.l r0,@(total_seq,r8)
mov.l r1,@(total_seq+4,r8)
+ mov.l @(cond_futex,r8),r0
+ add r2, r0
+ mov.l r0,@(cond_futex,r8)
/* Get and store current wakeup_seq value. */
mov.l @(wakeup_seq,r8), r10
@@ -112,6 +115,9 @@ __pthread_cond_wait:
mov.l r0, @(4,r15)
8:
+ mov.l @(cond_futex,r8),r0
+ mov.l r0, @(8,r15)
+
/* Unlock. */
#if cond_lock != 0
DEC (@(cond_lock,r8), r2)
@@ -130,9 +136,9 @@ __pthread_cond_wait:
mov #0, r7
mov #FUTEX_WAIT, r5
- mov r10, r6
+ mov.l @(8,r15), r6
mov r8, r4
- add #wakeup_seq, r4
+ add #cond_futex, r4
mov #SYS_futex, r3
extu.b r3, r3
trapa #0x14
@@ -353,6 +359,9 @@ __condvar_w_cleanup:
addc r3, r1
mov.l r0,@(wakeup_seq,r8)
mov.l r1,@(wakeup_seq+4,r8)
+ mov.l @(cond_futex,r8),r0
+ add r2, r0
+ mov.l r0,@(cond_futex,r8)
clrt
mov.l @(woken_seq,r8),r0
@@ -383,7 +392,7 @@ __condvar_w_cleanup:
2:
/* Wake up all waiters to make sure no signal gets lost. */
mov r8, r4
- add #wakeup_seq, r4
+ add #cond_futex, r4
mov #FUTEX_WAKE, r5
mov #-1, r6
shlr r6 /* r6 = 0x7fffffff */
next reply other threads:[~2004-06-13 6:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-06-13 6:16 Kaz Kojima [this message]
2004-06-17 23:58 ` Ulrich Drepper
-- strict thread matches above, loose matches on Subject: below --
2008-01-21 14:27 Kaz Kojima
2006-09-12 22:28 Kaz Kojima
2006-09-17 6:02 ` Ulrich Drepper
2004-06-01 5:33 Kaz Kojima
2004-06-01 18:17 ` Ulrich Drepper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040613.151626.99851132.kkojima@rr.iij4u.or.jp \
--to=kkojima@rr.iij4u.or.jp \
--cc=libc-hacker@sources.redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).