Changeset 43:2db15632a63d in freeDiameter for libfreeDiameter/fifo.c

Timestamp:

Nov 25, 2009, 7:07:09 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added a large part of connection establishment logic, to test

File:

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

libfreeDiameter/fifo.c

@@ -183 +183 @@
 }
 
-/* Move the content of old into new, and update loc_update atomically */
-int fd_fifo_move ( struct fifo ** old, struct fifo * new, struct fifo ** loc_update )
+/* Move the content of old into new, and update loc_update atomically. We leave the old queue empty but valid */
+int fd_fifo_move ( struct fifo * old, struct fifo * new, struct fifo ** loc_update )
 {
         struct fifo * q;
@@ -190 +190 @@
         
         TRACE_ENTRY("%p %p %p", old, new, loc_update);
-        CHECK_PARAMS( old && CHECK_FIFO( *old ) && CHECK_FIFO( new ));
-        
-        q = *old;
-        CHECK_PARAMS( ! q->data );
+        CHECK_PARAMS( CHECK_FIFO( old ) && CHECK_FIFO( new ));
+        
+        CHECK_PARAMS( ! old->data );
         if (new->high) {
                 TODO("Implement support for thresholds in fd_fifo_move...");
@@ -199 +198 @@
         
         /* Update loc_update */
-        *old = NULL;
         if (loc_update)
                 *loc_update = new;
         
         /* Lock the queues */
-        CHECK_POSIX(  pthread_mutex_lock( &q->mtx )  );
+        CHECK_POSIX(  pthread_mutex_lock( &old->mtx )  );
         CHECK_POSIX(  pthread_mutex_lock( &new->mtx )  );
         
         /* Any waiting thread on the old queue returns an error */
-        q->eyec = 0xdead;
-        while (q->thrs) {
-                CHECK_POSIX(  pthread_cond_signal(&q->cond)  );
-                CHECK_POSIX(  pthread_mutex_unlock( &q->mtx ));
+        old->eyec = 0xdead;
+        while (old->thrs) {
+                CHECK_POSIX(  pthread_cond_signal(&old->cond)  );
+                CHECK_POSIX(  pthread_mutex_unlock( &old->mtx ));
                 pthread_yield();
-                CHECK_POSIX(  pthread_mutex_lock( &q->mtx )  );
+                CHECK_POSIX(  pthread_mutex_lock( &old->mtx )  );
                 ASSERT( ++loops < 10 ); /* detect infinite loops */
         }
         
         /* Move all data from old to new */
-        fd_list_move_end( &new->list, &q->list );
-        if (q->count && (!new->count)) {
+        fd_list_move_end( &new->list, &old->list );
+        if (old->count && (!new->count)) {
                 CHECK_POSIX(  pthread_cond_signal(&new->cond)  );
         }
-        new->count += q->count;
-        
-        /* Destroy old */
-        CHECK_POSIX(  pthread_mutex_unlock( &q->mtx )  );
-        CHECK_POSIX(  pthread_cond_destroy( &q->cond )  );
-        CHECK_POSIX(  pthread_mutex_destroy( &q->mtx )  );
-        free(q);
-        
-        /* Unlock new, we're done */
+        new->count += old->count;
+        
+        /* Reset old */
+        old->count = 0;
+        old->eyec = FIFO_EYEC;
+        
+        /* Unlock, we're done */
         CHECK_POSIX(  pthread_mutex_unlock( &new->mtx )  );
+        CHECK_POSIX(  pthread_mutex_unlock( &old->mtx )  );
         
         return 0;