소스 검색

optimize contended normal mutex case; add int compare-and-swap atomic

Rich Felker 14 년 전
부모
커밋
e914f8b7ec
3개의 변경된 파일15개의 추가작업 그리고 1개의 파일을 삭제
  1. 7 0
      arch/i386/atomic.h
  2. 7 0
      arch/x86_64/atomic.h
  3. 1 1
      src/thread/pthread_mutex_trylock.c

+ 7 - 0
arch/i386/atomic.h

@@ -49,6 +49,13 @@ static inline long a_cas_l(volatile void *p, long t, long s)
 	return t;
 }
 
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	__asm__( "lock ; cmpxchg %3, %1"
+		: "=a"(t), "=m"(*p) : "a"(t), "r"(s) : "memory" );
+	return t;
+}
+
 static inline void *a_swap_p(void *volatile *x, void *v)
 {
 	__asm__( "xchg %0, %1" : "=r"(v), "=m"(*(void **)x) : "0"(v) : "memory" );

+ 7 - 0
arch/x86_64/atomic.h

@@ -48,6 +48,13 @@ static inline long a_cas_l(volatile void *p, long t, long s)
 	return t;
 }
 
+static inline int a_cas(volatile int *p, int t, int s)
+{
+	__asm__( "lock ; cmpxchgl %3, %1"
+		: "=a"(t), "=m"(*p) : "a"(t), "r"(s) : "memory" );
+	return t;
+}
+
 static inline void *a_swap_p(void *volatile *x, void *v)
 {
 	__asm__( "xchg %0, %1" : "=r"(v), "=m"(*(void **)x) : "0"(v) : "memory" );

+ 1 - 1
src/thread/pthread_mutex_trylock.c

@@ -5,7 +5,7 @@ int pthread_mutex_trylock(pthread_mutex_t *m)
 	int tid;
 
 	if (m->_m_type == PTHREAD_MUTEX_NORMAL)
-		return -a_xchg(&m->_m_lock, 1) & EBUSY;
+		return (m->_m_lock || a_swap(&m->_m_lock, 1)) ? EBUSY : 0;
 
 	tid = pthread_self()->tid;