Changeset 1328:81af4f5a517a in freeDiameter for libfdcore

Timestamp:

Nov 27, 2017, 11:22:42 PM (6 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Improve shutdown.

Should generate less messages that can not get sent out.

File:

• libfdcore/routing_dispatch.c (modified) (2 diffs)

libfdcore/routing_dispatch.c

@@ -1075 +1075 @@
                 struct msg * msg;
         
-                /* Test the current order */
-                {
-                        int must_stop;
-                        CHECK_POSIX_DO( pthread_mutex_lock(&order_state_lock), { ASSERT(0); } ); /* we lock to flush the caches */
-                        must_stop = (order_val == STOP);
-                        CHECK_POSIX_DO( pthread_mutex_unlock(&order_state_lock), { ASSERT(0); } );
-                        if (must_stop)
-                                goto end;
-                        
-                        pthread_testcancel();
-                }
-                
-                /* Ok, we are allowed to run */
-                
                 /* Get the next message from the queue */
                 {
@@ -1098 +1084 @@
                         
                         ret = fd_fifo_timedget ( queue, &msg, &ts );
-                        if (ret == ETIMEDOUT)
-                                /* loop, check if the thread must stop now */
+                        if (ret == ETIMEDOUT) {
+                                /* Test the current order */
+                                {
+                                        int must_stop;
+                                        CHECK_POSIX_DO( pthread_mutex_lock(&order_state_lock), { ASSERT(0); } ); /* we lock to flush the caches */
+                                        must_stop = (order_val == STOP);
+                                        CHECK_POSIX_DO( pthread_mutex_unlock(&order_state_lock), { ASSERT(0); } );
+                                        if (must_stop)
+                                                goto end;
+
+                                        pthread_testcancel();
+                                }
+                                /* Ok, we are allowed to continue */
                                 continue;
+                        }
                         if (ret == EPIPE)
                                 /* The queue was destroyed, we are probably exiting */