Changeset 691:78b665400097 in freeDiameter for libfdcore/core.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/core.c (modified) (3 diffs)

libfdcore/core.c

@@ -241 +241 @@
 int fd_core_waitstartcomplete(void)
 {
+        int ret = 0;
+        
         TRACE_ENTRY("");
         
@@ -246 +248 @@
         pthread_cleanup_push( fd_cleanup_mutex, &is_ready_mtx );
         
-        while (!is_ready) {
-                CHECK_POSIX( pthread_cond_wait( &is_ready_cnd, &is_ready_mtx ) );
+        while (!ret && !is_ready) {
+                CHECK_POSIX_DO( ret = pthread_cond_wait( &is_ready_cnd, &is_ready_mtx ),  );
         }
         
@@ -253 +255 @@
         CHECK_POSIX( pthread_mutex_unlock( &is_ready_mtx ) );
         
-        return 0;
+        return ret;
 }