d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove vestiges of libthr's signal mangling past. This fixes that last

Browse Source 
known problem with mysql on libthr: not being able to kill mysqld.
This commit is contained in:
Mike Makonnen 2004-09-22 18:51:16 +00:00
parent bc710003ac
commit 2d79470f8a
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/libthr/thread/thr_mutex.c
View File

@ -285,8 +285,6 @@ _pthread_mutex_trylock(pthread_mutex_t *mutex)
{ {
int ret = 0; int ret = 0;
_thread_sigblock();
/* /*
* If the mutex is statically initialized, perform the dynamic * If the mutex is statically initialized, perform the dynamic
* initialization marking the mutex private (delete safe): * initialization marking the mutex private (delete safe):
@ -295,9 +293,6 @@ _pthread_mutex_trylock(pthread_mutex_t *mutex)
(ret = mutex_init(mutex, 1)) == 0) (ret = mutex_init(mutex, 1)) == 0)
ret = mutex_lock_common(mutex, 1, NULL); ret = mutex_lock_common(mutex, 1, NULL);
if (ret != 0)
_thread_sigunblock();
return (ret); return (ret);
} }
@ -529,8 +524,6 @@ _pthread_mutex_lock(pthread_mutex_t *mutex)
if (_thread_initial == NULL) if (_thread_initial == NULL)
_thread_init(); _thread_init();
_thread_sigblock();
/* /*
* If the mutex is statically initialized, perform the dynamic * If the mutex is statically initialized, perform the dynamic
* initialization marking it private (delete safe): * initialization marking it private (delete safe):
@ -539,9 +532,6 @@ _pthread_mutex_lock(pthread_mutex_t *mutex)
((ret = mutex_init(mutex, 1)) == 0)) ((ret = mutex_init(mutex, 1)) == 0))
ret = mutex_lock_common(mutex, 0, NULL); ret = mutex_lock_common(mutex, 0, NULL);
if (ret != 0)
_thread_sigunblock();
return (ret); return (ret);
} }
@ -577,10 +567,7 @@ __pthread_mutex_unlock(pthread_mutex_t * mutex)
int int
_pthread_mutex_unlock(pthread_mutex_t * mutex) _pthread_mutex_unlock(pthread_mutex_t * mutex)
{ {
int error; return (mutex_unlock_common(mutex, /* add reference */ 0));
if ((error = mutex_unlock_common(mutex, /* add reference */ 0)) == 0)
_thread_sigunblock();
return (error);
} }
int int