Date: Wed, 23 Sep 2009 17:12:31 GMT From: Stanislav Sedov <stas@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 168829 for review Message-ID: <200909231712.n8NHCVMC071433@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=168829 Change 168829 by stas@stas_yandex on 2009/09/23 17:12:03 - Fix pthread functions redirection. This also need to be tweaked to support libkse as well. Affected files ... .. //depot/projects/valgrind/helgrind/hg_intercepts.c#5 edit .. //depot/projects/valgrind/include/pub_tool_redir.h#4 edit Differences ... ==== //depot/projects/valgrind/helgrind/hg_intercepts.c#5 (text+ko) ==== @@ -256,7 +256,7 @@ return pthread_create_WRK(thread, attr, start, arg); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZucreateZAZa, // pthread_create@* + PTH_FUNC(int, pthreadZucreate, // pthread_create pthread_t *thread, const pthread_attr_t *attr, void *(*start) (void *), void *arg) { return pthread_create_WRK(thread, attr, start, arg); @@ -314,7 +314,7 @@ return pthread_join_WRK(thread, value_pointer); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZujoinZAZa, // pthread_join@* + PTH_FUNC(int, pthreadZujoin, // pthread_join pthread_t thread, void** value_pointer) { return pthread_join_WRK(thread, value_pointer); } @@ -686,7 +686,7 @@ return pthread_cond_wait_WRK(cond, mutex); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZucondZuwaitZAZa, // pthread_cond_wait@* + PTH_FUNC(int, pthreadZucondZuwait, // pthread_cond_wait pthread_cond_t* cond, pthread_mutex_t* mutex) { return pthread_cond_wait_WRK(cond, mutex); } @@ -771,7 +771,7 @@ return pthread_cond_timedwait_WRK(cond, mutex, abstime); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZucondZutimedwaitZAZa, // pthread_cond_timedwait@* + PTH_FUNC(int, pthreadZucondZutimedwait, // pthread_cond_timedwait pthread_cond_t* cond, pthread_mutex_t* mutex, struct timespec* abstime) { return pthread_cond_timedwait_WRK(cond, mutex, abstime); @@ -836,7 +836,7 @@ return pthread_cond_signal_WRK(cond); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZucondZusignalZAZa, // pthread_cond_signal@* + PTH_FUNC(int, pthreadZucondZusignal, // pthread_cond_signal pthread_cond_t* cond) { return pthread_cond_signal_WRK(cond); } @@ -892,7 +892,7 @@ return pthread_cond_broadcast_WRK(cond); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZucondZubroadcastZAZa, // pthread_cond_broadcast@* + PTH_FUNC(int, pthreadZucondZubroadcast, // pthread_cond_broadcast pthread_cond_t* cond) { return pthread_cond_broadcast_WRK(cond); } @@ -945,7 +945,7 @@ return pthread_cond_destroy_WRK(cond); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZucondZudestroyZAZa, // pthread_cond_destroy@* + PTH_FUNC(int, pthreadZucondZudestroy, // pthread_cond_destroy pthread_cond_t* cond) { return pthread_cond_destroy_WRK(cond); } @@ -1141,7 +1141,7 @@ return pthread_spin_init_or_unlock_WRK(lock, 0/*pshared*/); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZuspinZuinitZAZa, // pthread_spin_init@* + PTH_FUNC(int, pthreadZuspinZuinit, // pthread_spin_init pthread_spinlock_t* lock, int pshared) { return pthread_spin_init_or_unlock_WRK(lock, pshared); } @@ -1337,7 +1337,7 @@ return pthread_rwlock_init_WRK(rwl, attr); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZuinitZAZa, // pthread_rwlock_init@* + PTH_FUNC(int, pthreadZurwlockZuinit, // pthread_rwlock_init pthread_rwlock_t *rwl, pthread_rwlockattr_t* attr) { return pthread_rwlock_init_WRK(rwl, attr); @@ -1387,7 +1387,7 @@ return pthread_rwlock_destroy_WRK(rwl); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZudestroyZAZa, // pthread_rwlock_destroy@* + PTH_FUNC(int, pthreadZurwlockZudestroy, // pthread_rwlock_destroy pthread_rwlock_t *rwl) { return pthread_rwlock_destroy_WRK(rwl); } @@ -1439,7 +1439,7 @@ return pthread_rwlock_wrlock_WRK(rwlock); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZuwrlockZAZa, // pthread_rwlock_wrlock@* + PTH_FUNC(int, pthreadZurwlockZuwrlock, // pthread_rwlock_wrlock pthread_rwlock_t* rwlock) { return pthread_rwlock_wrlock_WRK(rwlock); } @@ -1491,7 +1491,7 @@ return pthread_rwlock_rdlock_WRK(rwlock); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZurdlockZAZa, // pthread_rwlock_rdlock@* + PTH_FUNC(int, pthreadZurwlockZurdlock, // pthread_rwlock_rdlock pthread_rwlock_t* rwlock) { return pthread_rwlock_rdlock_WRK(rwlock); } @@ -1549,7 +1549,7 @@ return pthread_rwlock_trywrlock_WRK(rwlock); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZutrywrlockZAZa, // pthread_rwlock_trywrlock@* + PTH_FUNC(int, pthreadZurwlockZutrywrlock, // pthread_rwlock_trywrlock pthread_rwlock_t* rwlock) { return pthread_rwlock_trywrlock_WRK(rwlock); } @@ -1607,7 +1607,7 @@ return pthread_rwlock_tryrdlock_WRK(rwlock); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZutryrdlockZAZa, // pthread_rwlock_tryrdlock + PTH_FUNC(int, pthreadZurwlockZutryrdlock, // pthread_rwlock_tryrdlock pthread_rwlock_t* rwlock) { return pthread_rwlock_tryrdlock_WRK(rwlock); } @@ -1657,7 +1657,7 @@ return pthread_rwlock_unlock_WRK(rwlock); } #elif defined(VGO_freebsd) - PTH_FUNC(int, pthreadZurwlockZuunlockZAZa, // pthread_rwlock_unlock@* + PTH_FUNC(int, pthreadZurwlockZuunlock, // pthread_rwlock_unlock pthread_rwlock_t* rwlock) { return pthread_rwlock_unlock_WRK(rwlock); } @@ -1735,7 +1735,7 @@ return sem_init_WRK(sem, pshared, value); } #elif defined(VGO_freebsd) - PTH_FUNC(int, semZuinitZAZa, // sem_init@* + PTH_FUNC(int, semZuinit, // sem_init sem_t* sem, int pshared, unsigned long value) { return sem_init_WRK(sem, pshared, value); } @@ -1786,7 +1786,7 @@ return sem_destroy_WRK(sem); } #elif defined(VGO_freebsd) - PTH_FUNC(int, semZudestroyZAZa, // sem_destroy* + PTH_FUNC(int, semZudestroy, // sem_destroy sem_t* sem) { return sem_destroy_WRK(sem); } @@ -1843,7 +1843,7 @@ return sem_wait_WRK(sem); } #elif defined(VGO_freebsd) - PTH_FUNC(int, semZuwaitZAZa, sem_t* sem) { /* sem_wait@* */ + PTH_FUNC(int, semZuwait, sem_t* sem) { /* sem_wait */ return sem_wait_WRK(sem); } #elif defined(VGO_darwin) @@ -1900,7 +1900,7 @@ return sem_post_WRK(sem); } #elif defined(VGO_freebsd) - PTH_FUNC(int, semZupostZAZa, sem_t* sem) { /* sem_post@* */ + PTH_FUNC(int, semZupost, sem_t* sem) { /* sem_post */ return sem_post_WRK(sem); } #elif defined(VGO_darwin) ==== //depot/projects/valgrind/include/pub_tool_redir.h#4 (text+ko) ==== @@ -203,8 +203,10 @@ /* --- Soname of the pthreads library. --- */ -#if defined(VGO_linux) || defined(VGO_aix5) || defined(VGO_freebsd) +#if defined(VGO_linux) || defined(VGO_aix5) # define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0 +#elif defined(VGO_freebsd) +# define VG_Z_LIBPTHREAD_SONAME libthrZdsoZa // libthr.so* #elif defined(VGO_darwin) # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib #else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909231712.n8NHCVMC071433>