Changeset 21:bef197f6826f in freeDiameter for libfreeDiameter/fifo.c

Timestamp:

Oct 8, 2009, 8:05:16 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Backup before week-end, cnxctx and server in progress

File:

• libfreeDiameter/fifo.c (modified) (3 diffs)

libfreeDiameter/fifo.c

@@ -136 +136 @@
 }
 
-/* Delete a queue. It must be unused. */ 
+/* Delete a queue. It must be empty. */ 
 int fd_fifo_del ( struct fifo  ** queue )
 {
         struct fifo * q;
+        int loops = 0;
         
         TRACE_ENTRY( "%p", queue );
@@ -149 +150 @@
         CHECK_POSIX(  pthread_mutex_lock( &q->mtx )  );
         
-        if ((q->count != 0) || (q->thrs != 0) || (q->data != NULL)) {
-                TRACE_DEBUG(INFO, "The queue cannot be destroyed (%d, %d, %p)", q->count, q->thrs, q->data);
+        /* Ok, now invalidate the queue */
+        q->eyec = 0xdead;
+        
+        if ((q->count != 0) || (q->data != NULL)) {
+                TRACE_DEBUG(INFO, "The queue cannot be destroyed (%d, %p)", q->count, q->data);
                 CHECK_POSIX_DO(  pthread_mutex_unlock( &q->mtx ), /* no fallback */  );
                 return EINVAL;
         }
         
+        while (q->thrs) {
+                CHECK_POSIX(  pthread_cond_signal(&q->cond)  );
+                CHECK_POSIX(  pthread_mutex_unlock( &q->mtx ));
+                pthread_yield();
+                CHECK_POSIX(  pthread_mutex_lock( &q->mtx )  );
+                ASSERT( ++loops < 10 ); /* detect infinite loops */
+        }
+        
         /* sanity check */
         ASSERT(FD_IS_LIST_EMPTY(&q->list));
-        
-        /* Ok, now invalidate the queue */
-        q->eyec = 0xdead;
         
         /* And destroy it */
@@ -379 +388 @@
 awaken:
         /* Check queue status */
+        if (!CHECK_FIFO( queue )) {
+                /* The queue is being destroyed */
+                CHECK_POSIX(  pthread_mutex_unlock( &queue->mtx )  );
+                TRACE_DEBUG(FULL, "The queue is being destroyed -> EPIPE");
+                return EPIPE;
+        }
+                
         if (queue->count > 0) {
                 /* There are items in the queue, so pick the first one */