Changeset 1207:043b894b0511 in freeDiameter for libfdcore/p_sr.c

Timestamp:

Jun 14, 2013, 6:30:42 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Cleanups in failover situation to avoid deadlocks and corrupt messages ids. Tested OK now.

File:

• libfdcore/p_sr.c (modified) (6 diffs)

libfdcore/p_sr.c

@@ -38 +38 @@
 /* Structure to store a sent request */
 struct sentreq {
-        struct fd_list  chain;  /* the "o" field points directly to the hop-by-hop of the request (uint32_t *)  */
+        struct fd_list  chain;  /* the "o" field points directly to the (new) hop-by-hop of the request (uint32_t *)  */
         struct msg      *req;   /* A request that was sent and not yet answered. */
-        uint32_t        prevhbh;/* The value to set in the hbh header when the message is retrieved */
+        uint32_t        prevhbh;/* The value to set back in the hbh header when the message is retrieved */
         struct fd_list  expire; /* the list of expiring requests */
         struct timespec added_on; /* the time the request was added */
@@ -66 +66 @@
         struct timespec now;
         
-        if (!TRACE_BOOL(ANNOYING))
-                return;
-        
-        fd_log_debug("%sSentReq list @%p:", text, srlist);
+        LOG_D("%sSentReq list @%p:", text, srlist);
         
         CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &now), );
@@ -77 +74 @@
                 uint32_t * nexthbh = li->o;
                 
-                fd_log_debug(" - Next req (hbh:%x): [since %ld.%06ld sec]", *nexthbh, 
+                LOG_D(" - Next req (hbh:0x%x, prev:0x%x): [since %ld.%06ld sec]", *nexthbh, sr->prevhbh,
                         (long)((now.tv_nsec >= sr->added_on.tv_nsec) ? (now.tv_sec - sr->added_on.tv_sec) : (now.tv_sec - sr->added_on.tv_sec - 1)),
                         (long)((now.tv_nsec >= sr->added_on.tv_nsec) ? ((now.tv_nsec - sr->added_on.tv_nsec) / 1000) : ((now.tv_nsec - sr->added_on.tv_nsec + 1000000000) / 1000)));
@@ -225 +222 @@
         next = find_or_next(&srlist->srs, *hbhloc, &match);
         if (match) {
-                TRACE_DEBUG(INFO, "A request with the same hop-by-hop Id was already sent: error");
+                TRACE_DEBUG(INFO, "A request with the same hop-by-hop Id (0x%x) was already sent: error", *hbhloc);
                 free(sr);
+                srl_dump("Current list of SR: ", &srlist->srs);
                 CHECK_POSIX_DO( pthread_mutex_unlock(&srlist->mtx), /* ignore */ );
                 return EINVAL;
@@ -235 +233 @@
         fd_list_insert_before(next, &sr->chain);
         srlist->cnt++;
-        srl_dump("Saved new request, ", &srlist->srs);
         
         /* In case of request with a timeout, also store in the timeout list */
@@ -280 +277 @@
         /* Search the request in the list */
         CHECK_POSIX( pthread_mutex_lock(&srlist->mtx) );
-        srl_dump("Fetching a request, ", &srlist->srs);
         sr = (struct sentreq *)find_or_next(&srlist->srs, hbh, &match);
         if (!match) {
                 TRACE_DEBUG(INFO, "There is no saved request with this hop-by-hop id (%x)", hbh);
+                srl_dump("Current list of SR: ", &srlist->srs);
                 *req = NULL;
         } else {