add sync probes in libdasync.c, not all ones(only using macros from da_sync.h)

diff --git a/probe_thread/libdasync.c b/probe_thread/libdasync.c
index 1b518d5..248adc9 100644 (file)
--- a/probe_thread/libdasync.c
+++ b/probe_thread/libdasync.c
@@ -47,11 +47,16 @@ int pthread_mutex_init(pthread_mutex_t *mutex,
 
        BEFORE_ORIGINAL_SYNC(pthread_mutex_init, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutex_init, LIBPTHREAD);
+
        ret = pthread_mutex_initp(mutex, attr);
 
        AFTER_ORIGINAL_SYNCVAL_RET(VT_INT, ret, mutex, SYNC_PTHREAD_MUTEX, 
                        SYNC_API_OTHER, "%p,%p", mutex, attr);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, mutex, SYNC_PTHREAD_MUTEX, 
+                       SYNC_API_OTHER, "pp", mutex, attr);
+
        return ret;
 }
 
@@ -60,11 +65,16 @@ int pthread_mutex_destroy(pthread_mutex_t *mutex) {
 
        BEFORE_ORIGINAL_SYNC(pthread_mutex_destroy, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutex_destroy, LIBPTHREAD);
+
        ret = pthread_mutex_destroyp(mutex);
 
        AFTER_ORIGINAL_SYNCVAL_RET(VT_INT, ret, mutex, SYNC_PTHREAD_MUTEX, 
                        SYNC_API_OTHER, "%p", mutex);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, mutex, SYNC_PTHREAD_MUTEX, 
+                       SYNC_API_OTHER, "p", mutex);
+
        return ret;
 }
 
@@ -173,10 +183,15 @@ int pthread_mutex_trylock(pthread_mutex_t *mutex) {
 
        BEFORE_ORIGINAL_SYNC(pthread_mutex_trylock, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutex_trylock, LIBPTHREAD);
+
        ret = pthread_mutex_trylockp(mutex);
 
        AFTER_ORIGINAL_SYNCVAL_RET(VT_INT, ret, mutex, SYNC_PTHREAD_MUTEX, 
                        SYNC_API_TRY_ACQUIRE, "%p", mutex);
+
+       AFTER_PACK_ORIGINAL_SYNC(ret, mutex, SYNC_PTHREAD_MUTEX, 
+                       SYNC_API_TRY_ACQUIRE, "p", mutex);
        
        return ret;
 }
@@ -194,10 +209,15 @@ int pthread_mutex_unlock(pthread_mutex_t *mutex) {
 
        BEFORE_ORIGINAL_SYNC(pthread_mutex_unlock, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutex_unlock, LIBPTHREAD);
+
        ret = pthread_mutex_unlockp(mutex);
 
        AFTER_ORIGINAL_SYNCVAL_RET(VT_INT, ret, mutex, SYNC_PTHREAD_MUTEX, 
                        SYNC_API_RELEASE, "%p", mutex);
+
+       AFTER_PACK_ORIGINAL_SYNC(ret, mutex, SYNC_PTHREAD_MUTEX, 
+                       SYNC_API_RELEASE, "p", mutex);
        
        return ret;
 }
@@ -207,11 +227,16 @@ int pthread_mutexattr_init(pthread_mutexattr_t *attr) {
 
        BEFORE_ORIGINAL_SYNC(pthread_mutexattr_init, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutexattr_init, LIBPTHREAD);
+
        ret = pthread_mutexattr_initp(attr);
 
        AFTER_ORIGINAL_NOSYNCVAL_RET(VT_INT, ret, SYNC_PTHREAD_MUTEX,
                        SYNC_API_OTHER, "%p", attr);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, 0, SYNC_PTHREAD_MUTEX,
+                       SYNC_API_OTHER, "p", attr);
+
        return ret;
 }
 
@@ -220,11 +245,16 @@ int pthread_mutexattr_destroy(pthread_mutexattr_t *attr) {
 
        BEFORE_ORIGINAL_SYNC(pthread_mutexattr_destroy, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutexattr_destroy, LIBPTHREAD);
+
        ret = pthread_mutexattr_destroyp(attr);
 
        AFTER_ORIGINAL_NOSYNCVAL_RET(VT_INT, ret, SYNC_PTHREAD_MUTEX,
                        SYNC_API_OTHER, "%p", attr);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, 0, SYNC_PTHREAD_MUTEX,
+                       SYNC_API_OTHER, "p", attr);
+
        return ret;
 }
 
@@ -235,11 +265,16 @@ int pthread_mutexattr_getprioceiling(const pthread_mutexattr_t *attr,
 
        BEFORE_ORIGINAL_SYNC(pthread_mutexattr_getprioceiling, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutexattr_getprioceiling, LIBPTHREAD);
+
        ret = pthread_mutexattr_getprioceilingp(attr, prioceiling);
 
        AFTER_ORIGINAL_NOSYNCVAL_RET(VT_INT, ret, SYNC_PTHREAD_MUTEX,
                        SYNC_API_OTHER, "%p,%p", attr, prioceiling);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, 0, SYNC_PTHREAD_MUTEX,
+                       SYNC_API_OTHER, "pp", attr, prioceiling);
+
        return ret;
 }
 
@@ -250,11 +285,16 @@ int pthread_mutexattr_setprioceiling(pthread_mutexattr_t *attr,
 
        BEFORE_ORIGINAL_SYNC(pthread_mutexattr_setprioceiling, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutexattr_setprioceiling, LIBPTHREAD);
+
        ret = pthread_mutexattr_setprioceilingp(attr, prioceiling);
 
        AFTER_ORIGINAL_NOSYNCVAL_RET(VT_INT, ret, SYNC_PTHREAD_MUTEX,
                        SYNC_API_OTHER, "%p,%d", attr, prioceiling);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, 0, SYNC_PTHREAD_MUTEX,
+                       SYNC_API_OTHER, "pd", attr, prioceiling);
+
        return ret;
 }
 
@@ -265,11 +305,16 @@ int pthread_mutexattr_getprotocol(const pthread_mutexattr_t *attr,
 
        BEFORE_ORIGINAL_SYNC(pthread_mutexattr_getprotocol, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutexattr_getprotocol, LIBPTHREAD);
+
        ret = pthread_mutexattr_getprotocolp(attr, protocol);
 
        AFTER_ORIGINAL_NOSYNCVAL_RET(VT_INT, ret, SYNC_PTHREAD_MUTEX,
                        SYNC_API_OTHER, "%p,%p", attr, protocol);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, 0, SYNC_PTHREAD_MUTEX,
+                       SYNC_API_OTHER, "pp", attr, protocol);
+
        return ret;
 }
 
@@ -280,11 +325,16 @@ int pthread_mutexattr_setprotocol(pthread_mutexattr_t *attr,
 
        BEFORE_ORIGINAL_SYNC(pthread_mutexattr_setprotocol, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutexattr_setprotocol, LIBPTHREAD);
+
        ret = pthread_mutexattr_setprotocolp(attr, protocol);
 
        AFTER_ORIGINAL_NOSYNCVAL_RET(VT_INT, ret, SYNC_PTHREAD_MUTEX,
                        SYNC_API_OTHER, "%p,%d", attr, protocol);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, 0, SYNC_PTHREAD_MUTEX,
+                       SYNC_API_OTHER, "pd", attr, protocol);
+
        return ret;
 }
 
@@ -295,11 +345,16 @@ int pthread_mutexattr_getpshared(const pthread_mutexattr_t *attr,
 
        BEFORE_ORIGINAL_SYNC(pthread_mutexattr_getpshared, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutexattr_getpshared, LIBPTHREAD);
+
        ret = pthread_mutexattr_getpsharedp(attr, pshared);
 
        AFTER_ORIGINAL_NOSYNCVAL_RET(VT_INT, ret, SYNC_PTHREAD_MUTEX,
                        SYNC_API_OTHER, "%p,%p", attr, pshared);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, 0, SYNC_PTHREAD_MUTEX,
+                       SYNC_API_OTHER, "pp", attr, pshared);
+
        return ret;
 }
 
@@ -310,11 +365,16 @@ int pthread_mutexattr_setpshared(pthread_mutexattr_t *attr,
 
        BEFORE_ORIGINAL_SYNC(pthread_mutexattr_setpshared, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutexattr_setpshared, LIBPTHREAD);
+
        ret = pthread_mutexattr_setpsharedp(attr, pshared);
 
        AFTER_ORIGINAL_NOSYNCVAL_RET(VT_INT, ret, SYNC_PTHREAD_MUTEX,
                        SYNC_API_OTHER, "%p,%d", attr, pshared);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, 0, SYNC_PTHREAD_MUTEX,
+                       SYNC_API_OTHER, "pd", attr, pshared);
+
        return ret;
 }
 
@@ -324,11 +384,16 @@ int pthread_mutexattr_gettype(const pthread_mutexattr_t *attr, int *type) {
 
        BEFORE_ORIGINAL_SYNC(pthread_mutexattr_gettype, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutexattr_gettype, LIBPTHREAD);
+
        ret = pthread_mutexattr_gettypep(attr, type);
 
        AFTER_ORIGINAL_NOSYNCVAL_RET(VT_INT, ret, SYNC_PTHREAD_MUTEX,
                        SYNC_API_OTHER, "%p,%p", attr, type);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, 0, SYNC_PTHREAD_MUTEX,
+                       SYNC_API_OTHER, "pp", attr, type);
+
        return ret;
 }
 
@@ -338,11 +403,16 @@ int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type) {
 
        BEFORE_ORIGINAL_SYNC(pthread_mutexattr_settype, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_mutexattr_settype, LIBPTHREAD);
+
        ret = pthread_mutexattr_settypep(attr, type);
 
        AFTER_ORIGINAL_NOSYNCVAL_RET(VT_INT, ret, SYNC_PTHREAD_MUTEX,
                        SYNC_API_OTHER, "%p,%d", attr, type);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, 0, SYNC_PTHREAD_MUTEX,
+                       SYNC_API_OTHER, "pd", attr, type);
+
        return ret;
 }
 
@@ -359,11 +429,16 @@ int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr) {
 
        BEFORE_ORIGINAL_SYNC(pthread_cond_init, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_cond_init, LIBPTHREAD);
+
        ret = pthread_cond_initp(cond, attr);
 
        AFTER_ORIGINAL_SYNCVAL_RET(VT_INT, ret, cond, SYNC_PTHREAD_COND_VARIABLE, 
                        SYNC_API_OTHER, "%p,%p", cond, attr);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, cond, SYNC_PTHREAD_COND_VARIABLE, 
+                       SYNC_API_OTHER, "pp", cond, attr);
+
        return ret;
 }
 
@@ -372,11 +447,16 @@ int pthread_cond_destroy(pthread_cond_t *cond) {
 
        BEFORE_ORIGINAL_SYNC(pthread_cond_destroy, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_cond_destroy, LIBPTHREAD);
+
        ret = pthread_cond_destroyp(cond);
 
        AFTER_ORIGINAL_SYNCVAL_RET(VT_INT, ret, cond, SYNC_PTHREAD_COND_VARIABLE, 
                        SYNC_API_OTHER, "%p", cond);
 
+       AFTER_PACK_ORIGINAL_SYNC(ret, cond, SYNC_PTHREAD_COND_VARIABLE, 
+                       SYNC_API_OTHER, "p", cond);
+
        return ret;
 }
 
@@ -472,10 +552,15 @@ int pthread_cond_signal(pthread_cond_t *cond) {
 
        BEFORE_ORIGINAL_SYNC(pthread_cond_signal, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_cond_signal, LIBPTHREAD);
+
        ret = pthread_cond_signalp(cond);
 
        AFTER_ORIGINAL_SYNCVAL_RET(VT_INT, ret, cond, SYNC_PTHREAD_COND_VARIABLE, 
                        SYNC_API_NOTIFY, "%p", cond);
+
+       AFTER_PACK_ORIGINAL_SYNC(ret, cond, SYNC_PTHREAD_COND_VARIABLE, 
+                       SYNC_API_NOTIFY, "p", cond);
        
        return ret;
 }
@@ -485,10 +570,15 @@ int pthread_cond_broadcast(pthread_cond_t *cond) {
 
        BEFORE_ORIGINAL_SYNC(pthread_cond_broadcast, LIBPTHREAD);
 
+       BEFORE_PACK_ORIGINAL_SYNC(pthread_cond_broadcast, LIBPTHREAD);
+
        ret = pthread_cond_broadcastp(cond);
 
        AFTER_ORIGINAL_SYNCVAL_RET(VT_INT, ret, cond, SYNC_PTHREAD_COND_VARIABLE, 
                        SYNC_API_NOTIFY_ALL, "%p", cond);
+
+       AFTER_PACK_ORIGINAL_SYNC(ret, cond, SYNC_PTHREAD_COND_VARIABLE, 
+                       SYNC_API_NOTIFY_ALL, "p", cond);
        
        return ret;
 }