socsvn commit: r239449 - in soc2012/gmiller/locking-head: . include
lib/libwitness
gmiller at FreeBSD.org
gmiller at FreeBSD.org
Mon Jul 16 06:39:45 UTC 2012
Author: gmiller
Date: Mon Jul 16 06:39:42 2012
New Revision: 239449
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239449
Log:
r239480 at FreeBSD-dev: root | 2012-07-14 03:51:04 -0500
Declare the remaining libwitness support functions.
Modified:
soc2012/gmiller/locking-head/ (props changed)
soc2012/gmiller/locking-head/include/pthread_np.h
soc2012/gmiller/locking-head/lib/libwitness/logs.c
Modified: soc2012/gmiller/locking-head/include/pthread_np.h
==============================================================================
--- soc2012/gmiller/locking-head/include/pthread_np.h Mon Jul 16 02:10:26 2012 (r239448)
+++ soc2012/gmiller/locking-head/include/pthread_np.h Mon Jul 16 06:39:42 2012 (r239449)
@@ -60,12 +60,18 @@
struct _pthread_lor_private;
-struct pthread_lock_order_np {
+struct pthread_lor_np {
struct _pthread_lor_private *_pvt;
void *lock_first;
void *lock_second;
};
+struct _pthread_lockorder_private;
+
+struct pthread_lockorder_np {
+ struct _pthread_lockorder_private *_pvt;
+};
+
typedef void (*pthread_switch_routine_t)(pthread_t, pthread_t);
/*
@@ -97,10 +103,17 @@
int pthread_switch_add_np(pthread_switch_routine_t);
int pthread_switch_delete_np(pthread_switch_routine_t);
int pthread_timedjoin_np(pthread_t, void **, const struct timespec *);
-void pthread_lor_begin_np(struct pthread_lock_order_np *);
-int pthread_lor_next_np(struct pthread_lock_order_np *);
-void pthread_lor_end_np(struct pthread_lock_order_np *);
+void pthread_lor_begin_np(struct pthread_lor_np *);
+int pthread_lor_next_np(struct pthread_lor_np *);
+void pthread_lor_end_np(struct pthread_lor_np *);
void pthread_lor_clear_np(void);
+void pthread_lockorder_bless_np(void *, void *);
+void pthread_lockorder_set_np(void *first, void *second);
+void pthread_lockorder_reset_np(void);
+void 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 *);
+void pthread_setname_np(void *, const char *);
#ifdef LOCK_PROFILING
Modified: soc2012/gmiller/locking-head/lib/libwitness/logs.c
==============================================================================
--- soc2012/gmiller/locking-head/lib/libwitness/logs.c Mon Jul 16 02:10:26 2012 (r239448)
+++ soc2012/gmiller/locking-head/lib/libwitness/logs.c Mon Jul 16 06:39:42 2012 (r239449)
@@ -52,7 +52,7 @@
}
void
-pthread_lor_begin_np(struct pthread_lock_order_np *lor)
+pthread_lor_begin_np(struct pthread_lor_np *lor)
{
/*
The lock isn't needed to prevent races, but it is needed to ensure
@@ -68,7 +68,7 @@
}
int
-pthread_lor_next_np(struct pthread_lock_order_np *lor)
+pthread_lor_next_np(struct pthread_lor_np *lor)
{
int res = 0;
@@ -94,7 +94,7 @@
}
void
-pthread_lor_end_np(struct pthread_lock_order_np *lor)
+pthread_lor_end_np(struct pthread_lor_np *lor)
{
if (lor->_pvt != NULL) {
free(lor->_pvt);
More information about the svn-soc-all
mailing list