Changeset 1188:f40de74bd1c7 in freeDiameter

Timestamp:

Jun 10, 2013, 3:27:15 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Don't block PSM during failover

Files:

• include/freeDiameter/libfdproto.h (modified) (1 diff)
• libfdcore/p_sr.c (modified) (1 diff)
• libfdcore/peers.c (modified) (1 diff)
• libfdproto/fifo.c (modified) (4 diffs)

include/freeDiameter/libfdproto.h

@@ -3122 +3122 @@
         fd_fifo_post_int((queue), (void *)(item))
 
+/* Similar function but does not block. It can cause the number of items in the queue to exceed the maximum set. Do not use for normal operation,
+only for failure recovery for example. */
+int fd_fifo_post_noblock( struct fifo * queue, void ** item );
+
 /*
  * FUNCTION:    fd_fifo_get

libfdcore/p_sr.c

@@ -327 +327 @@
                         
                         /* Requeue for sending to another peer */
-                        CHECK_FCT_DO( ret = fd_fifo_post(fd_g_outgoing, &sr->req),
+                        CHECK_FCT_DO( ret = fd_fifo_post_noblock(fd_g_outgoing, (void *)&sr->req),
                                 {
                                         char buf[256];

libfdcore/peers.c

@@ -243 +243 @@
         while ( fd_fifo_tryget(peer->p_tosend, &m) == 0 ) {
                 fd_hook_call(HOOK_MESSAGE_FAILOVER, m, peer, NULL, fd_msg_pmdl_get(m));
-                CHECK_FCT_DO(fd_fifo_post(fd_g_outgoing, &m), 
+                CHECK_FCT_DO(fd_fifo_post_noblock(fd_g_outgoing, (void *)&m), 
                         {
                                 /* fallback: destroy the message */

libfdproto/fifo.c

@@ -377 +377 @@
 
 /* Post a new item in the queue */
-int fd_fifo_post_int ( struct fifo * queue, void ** item )
+int fd_fifo_post_internal ( struct fifo * queue, void ** item, int skip_max )
 {
         struct fifo_item * new;
@@ -383 +383 @@
         struct timespec posted_on, queued_on;
         
-        TRACE_ENTRY( "%p %p", queue, item );
-        
-        /* Check the parameters */
-        CHECK_PARAMS( CHECK_FIFO( queue ) && item && *item );
-        
         /* Get the timing of this call */
         CHECK_SYS(  clock_gettime(CLOCK_REALTIME, &posted_on)  );
@@ -394 +389 @@
         CHECK_POSIX(  pthread_mutex_lock( &queue->mtx )  );
         
-        if (queue->max) {
+        if ((!skip_max) && (queue->max)) {
                 while (queue->count >= queue->max) {
                         int ret = 0;
@@ -460 +455 @@
         /* Done */
         return 0;
+}
+
+/* Post a new item in the queue */
+int fd_fifo_post_int ( struct fifo * queue, void ** item )
+{
+        TRACE_ENTRY( "%p %p", queue, item );
+        
+        /* Check the parameters */
+        CHECK_PARAMS( CHECK_FIFO( queue ) && item && *item );
+        
+        return fd_fifo_post_internal ( queue,item, 0 );
+        
+}
+
+/* Post a new item in the queue, not blocking */
+int fd_fifo_post_noblock ( struct fifo * queue, void ** item )
+{
+        TRACE_ENTRY( "%p %p", queue, item );
+        
+        /* Check the parameters */
+        CHECK_PARAMS( CHECK_FIFO( queue ) && item && *item );
+        
+        return fd_fifo_post_internal ( queue,item, 1 );
+        
 }