svn commit: r193911 - in stable/7/lib/libkse: . thread
Dag-Erling Smorgrav
des at FreeBSD.org
Wed Jun 10 12:54:37 UTC 2009
Author: des
Date: Wed Jun 10 12:54:36 2009
New Revision: 193911
URL: http://svn.freebsd.org/changeset/base/193911
Log:
merge r176060, r176071: add pthread_mutex_isowned_np() (already in libthr)
Modified:
stable/7/lib/libkse/ (props changed)
stable/7/lib/libkse/kse.map
stable/7/lib/libkse/thread/thr_mutex.c
Modified: stable/7/lib/libkse/kse.map
==============================================================================
--- stable/7/lib/libkse/kse.map Wed Jun 10 12:51:58 2009 (r193910)
+++ stable/7/lib/libkse/kse.map Wed Jun 10 12:54:36 2009 (r193911)
@@ -256,6 +256,7 @@ FBSDprivate_1.0 {
_pthread_mutex_getprioceiling;
_pthread_mutex_init;
_pthread_mutex_init_calloc_cb;
+ _pthread_mutex_isowned_np;
_pthread_mutex_lock;
_pthread_mutex_setprioceiling;
_pthread_mutex_timedlock;
@@ -360,3 +361,7 @@ FBSDprivate_1.0 {
_thread_state_running;
_thread_state_zoombie;
};
+
+FBSD_1.1 {
+ pthread_mutex_isowned_np;
+};
Modified: stable/7/lib/libkse/thread/thr_mutex.c
==============================================================================
--- stable/7/lib/libkse/thread/thr_mutex.c Wed Jun 10 12:51:58 2009 (r193910)
+++ stable/7/lib/libkse/thread/thr_mutex.c Wed Jun 10 12:54:36 2009 (r193911)
@@ -36,6 +36,7 @@
#include <sys/param.h>
#include <sys/queue.h>
#include <pthread.h>
+#include <pthread_np.h>
#include "un-namespace.h"
#include "thr_private.h"
@@ -127,6 +128,7 @@ __weak_reference(__pthread_mutex_trylock
/* No difference between libc and application usage of these: */
__weak_reference(_pthread_mutex_destroy, pthread_mutex_destroy);
__weak_reference(_pthread_mutex_unlock, pthread_mutex_unlock);
+__weak_reference(_pthread_mutex_isowned_np, pthread_mutex_isowned_np);
static int
thr_mutex_init(pthread_mutex_t *mutex,
@@ -1866,3 +1868,12 @@ mutex_queue_enq(pthread_mutex_t mutex, p
}
pthread->sflags |= THR_FLAGS_IN_SYNCQ;
}
+
+int
+_pthread_mutex_isowned_np(pthread_mutex_t *mutex)
+{
+ struct pthread *curthread = _get_curthread();
+
+ return ((*mutex)->m_owner == curthread);
+}
+
More information about the svn-src-stable-7
mailing list