summaryrefslogtreecommitdiff
path: root/src/interfaces/libpq/fe-connect.c
diff options
context:
space:
mode:
authorMagnus Hagander <magnus@hagander.net>2008-05-16 18:30:53 +0000
committerMagnus Hagander <magnus@hagander.net>2008-05-16 18:30:53 +0000
commit1d8902678844701c246063c7547bddb5071cdef5 (patch)
tree92823a2437ebab3a89b61aecf169b9de69eecb53 /src/interfaces/libpq/fe-connect.c
parent0ff81a525e43d4afbd8b57a99b646b3461d9849e (diff)
Implement error checking for pthreads calls in thread-safe mode. They really
should always succeed, but in the likely event of a failure we would previously fall through *without locking* - the new code will exit(1). Printing the error message on stderr will not work for all applications, but it's better than nothing at all - and our API doesn't provide a way to return the error to the caller.
Diffstat (limited to 'src/interfaces/libpq/fe-connect.c')
-rw-r--r--src/interfaces/libpq/fe-connect.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index dd6c988790b..ec9a9a570a5 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.357 2008/03/31 02:43:14 tgl Exp $
+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.358 2008/05/16 18:30:53 mha Exp $
*
*-------------------------------------------------------------------------
*/
@@ -3835,14 +3835,23 @@ default_threadlock(int acquire)
while (InterlockedExchange(&mutex_initlock, 1) == 1)
/* loop, another thread own the lock */ ;
if (singlethread_lock == NULL)
- pthread_mutex_init(&singlethread_lock, NULL);
+ {
+ if (pthread_mutex_init(&singlethread_lock, NULL))
+ PGTHREAD_ERROR("failed to initialize mutex");
+ }
InterlockedExchange(&mutex_initlock, 0);
}
#endif
if (acquire)
- pthread_mutex_lock(&singlethread_lock);
+ {
+ if (pthread_mutex_lock(&singlethread_lock))
+ PGTHREAD_ERROR("failed to lock mutex");
+ }
else
- pthread_mutex_unlock(&singlethread_lock);
+ {
+ if (pthread_mutex_unlock(&singlethread_lock))
+ PGTHREAD_ERROR("failed to unlock mutex");
+ }
#endif
}