Changeset 124:cc42d8607114 in freeDiameter for freeDiameter/queues.c

Timestamp:

Dec 10, 2009, 2:15:04 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Completed cleanups of queues when the daemon is stopping

File:

• freeDiameter/queues.c (modified) (1 diff)

freeDiameter/queues.c

@@ -51 +51 @@
 }
 
-/* Destroy the routing message queues */
-int fd_queues_fini_rt(void)
+/* Destroy a queue after emptying it (and dumping the content) */
+int fd_queues_fini(struct fifo ** queue)
 {
-        TRACE_ENTRY();
+        struct msg * msg;
+        int ret = 0;
         
+        TRACE_ENTRY("%p", queue);
+        
+        /* Note : the threads that post into this queue should already been stopped before this !!! */
+
         /* Empty all contents */
-        TODO("Empty all contents (dump to log file ?)");
+        while (1) {
+                /* Check if there is a message in the queue */
+                ret = fd_fifo_tryget(*queue, &msg);
+                if (ret == EWOULDBLOCK)
+                        break;
+                CHECK_FCT(ret);
+                
+                /* We got one! */
+                fd_log_debug("The following message is lost because the daemon is stopping:\n");
+                fd_msg_dump_walk(NONE, msg);
+                fd_msg_free(msg);
+        }
         
-        /* Now, delete the queues */
-        CHECK_FCT( fd_fifo_del ( &fd_g_incoming ) );
-        CHECK_FCT( fd_fifo_del ( &fd_g_outgoing ) );
+        /* Now, delete the empty queue */
+        CHECK_FCT( fd_fifo_del ( queue ) );
         
         return 0;
 }
-
-/* Destroy the local message queue */
-int fd_queues_fini_disp(void)
-{
-        TRACE_ENTRY();
-        
-        /* Empty all contents */
-        TODO("Empty all contents (dump to log file ?)");
-        
-        CHECK_FCT( fd_fifo_del ( &fd_g_local ) );
-        
-        return 0;
-}