Changeset 691:78b665400097 in freeDiameter for libfdcore/p_psm.c

Timestamp:

Jan 20, 2011, 7:44:27 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors

File:

• libfdcore/p_psm.c (modified) (1 diff)

libfdcore/p_psm.c

@@ -55 +55 @@
 static int fd_psm_waitstart()
 {
+        int ret = 0;
         TRACE_ENTRY("");
         CHECK_POSIX( pthread_mutex_lock(&started_mtx) );
 awake:  
-        if (! started) {
+        if (!ret && !started) {
                 pthread_cleanup_push( fd_cleanup_mutex, &started_mtx );
-                CHECK_POSIX( pthread_cond_wait(&started_cnd, &started_mtx) );
+                CHECK_POSIX_DO( ret = pthread_cond_wait(&started_cnd, &started_mtx), );
                 pthread_cleanup_pop( 0 );
                 goto awake;
         }
         CHECK_POSIX( pthread_mutex_unlock(&started_mtx) );
-        return 0;
+        return ret;
 }