socsvn commit: r240291 - in soc2012/gmiller/locking-head: . include
lib/libwitness tools/regression/lib/libwitness
gmiller at FreeBSD.org
gmiller at FreeBSD.org
Sun Aug 12 07:09:28 UTC 2012
Author: gmiller
Date: Sun Aug 12 07:09:25 2012
New Revision: 240291
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240291
Log:
r240358 at FreeBSD-dev: root | 2012-08-11 00:49:07 -0500
Replace pthread_setname_np() with pthread_mutex_setname_np(),
pthread_rwlock_setname_np(), and pthread_spin_setname_np().
Modified:
soc2012/gmiller/locking-head/ (props changed)
soc2012/gmiller/locking-head/include/pthread_np.h
soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c
soc2012/gmiller/locking-head/lib/libwitness/witness.h
soc2012/gmiller/locking-head/lib/libwitness/wrappers.c
soc2012/gmiller/locking-head/tools/regression/lib/libwitness/graph.c
soc2012/gmiller/locking-head/tools/regression/lib/libwitness/setname.c
soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.c
Modified: soc2012/gmiller/locking-head/include/pthread_np.h
==============================================================================
--- soc2012/gmiller/locking-head/include/pthread_np.h Sun Aug 12 04:50:26 2012 (r240290)
+++ soc2012/gmiller/locking-head/include/pthread_np.h Sun Aug 12 07:09:25 2012 (r240291)
@@ -116,7 +116,9 @@
int pthread_lockorder_begin_np(struct pthread_lockorder_np *);
int pthread_lockorder_next_np(struct pthread_lockorder_np *);
void pthread_lockorder_end_np(struct pthread_lockorder_np *);
-int pthread_setname_np(void *, const char *);
+int pthread_mutex_setname_np(pthread_mutex_t *, const char *);
+int pthread_rwlock_setname_np(pthread_rwlock_t *, const char *);
+int pthread_spin_setname_np(pthread_spinlock_t *, const char *);
#ifdef LOCK_PROFILING
Modified: soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c Sun Aug 12 04:50:26 2012 (r240290)
+++ soc2012/gmiller/locking-head/lib/libwitness/lockinfo.c Sun Aug 12 07:09:25 2012 (r240291)
@@ -188,7 +188,7 @@
}
int
-pthread_setname_np(void *lock, const char *name)
+set_lock_name(void *lock, const char *name)
{
struct lock_instance *inst;
Modified: soc2012/gmiller/locking-head/lib/libwitness/witness.h
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/witness.h Sun Aug 12 04:50:26 2012 (r240290)
+++ soc2012/gmiller/locking-head/lib/libwitness/witness.h Sun Aug 12 07:09:25 2012 (r240291)
@@ -69,6 +69,7 @@
int blessed(struct lock_info *first, struct lock_info *second);
void reset_lock_info(void);
void check_default_name(void *lock, const char *prefix);
+int set_lock_name(void *lock, const char *name);
const char *get_lock_name(struct lock_info *info);
struct lock_info *get_lock_info(struct lock_instance *lock);
void destroy_lock(void *lock);
Modified: soc2012/gmiller/locking-head/lib/libwitness/wrappers.c
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/wrappers.c Sun Aug 12 04:50:26 2012 (r240290)
+++ soc2012/gmiller/locking-head/lib/libwitness/wrappers.c Sun Aug 12 07:09:25 2012 (r240291)
@@ -426,3 +426,21 @@
_pthread_mutex_unlock(&witness_mtx);
}
+
+int
+pthread_mutex_setname_np(pthread_mutex_t *mutex, const char *name)
+{
+ return (set_lock_name(mutex, name));
+}
+
+int
+pthread_rwlock_setname_np(pthread_rwlock_t *rwlock, const char *name)
+{
+ return (set_lock_name(rwlock, name));
+}
+
+int
+pthread_spin_setname_np(pthread_spinlock_t *spin, const char *name)
+{
+ return (set_lock_name(spin, name));
+}
Modified: soc2012/gmiller/locking-head/tools/regression/lib/libwitness/graph.c
==============================================================================
--- soc2012/gmiller/locking-head/tools/regression/lib/libwitness/graph.c Sun Aug 12 04:50:26 2012 (r240290)
+++ soc2012/gmiller/locking-head/tools/regression/lib/libwitness/graph.c Sun Aug 12 07:09:25 2012 (r240291)
@@ -100,7 +100,7 @@
pthread_mutex_init(&lock_buffer[i], NULL);
sprintf(name, "%d", i + 1);
- pthread_setname_np(&lock_buffer[i], name);
+ pthread_mutex_setname_np(&lock_buffer[i], name);
}
graph_test(lock_buffer, lock_count, lock_set, 0, 0);
Modified: soc2012/gmiller/locking-head/tools/regression/lib/libwitness/setname.c
==============================================================================
--- soc2012/gmiller/locking-head/tools/regression/lib/libwitness/setname.c Sun Aug 12 04:50:26 2012 (r240290)
+++ soc2012/gmiller/locking-head/tools/regression/lib/libwitness/setname.c Sun Aug 12 07:09:25 2012 (r240291)
@@ -37,8 +37,8 @@
void
setname_test(void)
{
- pthread_setname_np(&mutex1, "mutex 1");
- pthread_setname_np(&mutex2, "mutex 2");
+ pthread_mutex_setname_np(&mutex1, "mutex 1");
+ pthread_mutex_setname_np(&mutex2, "mutex 2");
pthread_mutex_lock(&mutex1);
pthread_mutex_lock(&mutex2);
Modified: soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.c
==============================================================================
--- soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.c Sun Aug 12 04:50:26 2012 (r240290)
+++ soc2012/gmiller/locking-head/tools/regression/lib/libwitness/shared.c Sun Aug 12 07:09:25 2012 (r240291)
@@ -75,8 +75,8 @@
pthread_lor_clear_np();
- pthread_setname_np(&mutex1, "shared_mutex");
- pthread_setname_np(&mutex2, "shared_mutex");
+ pthread_mutex_setname_np(&mutex1, "shared_mutex");
+ pthread_mutex_setname_np(&mutex2, "shared_mutex");
pthread_mutex_lock(&mutex1);
pthread_mutex_lock(&mutex2);
More information about the svn-soc-all
mailing list