Changeset 706:4ffbc9f1e922 in freeDiameter for libfdcore/p_sr.c

Timestamp:

Feb 9, 2011, 3:26:58 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Large UNTESTED commit with the following changes:

• Improved DiameterIdentity? handling (esp. interationalization issues), and improve efficiency of some string operations in peers, sessions, and dictionary modules (closes #7)
• Cleanup in the session module to free only unreferenced sessions (#16)
• Removed fd_cpu_flush_cache(), replaced by more robust alternatives.
• Improved peer state machine algorithm to counter SCTP multistream race condition.

File:

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

libfdcore/p_sr.c

@@ -36 +36 @@
 #include "fdcore-internal.h"
 
-#ifndef SR_DEBUG_LVL
-#define SR_DEBUG_LVL ANNOYING
-#endif /* SR_DEBUG_LVL */
-
 /* Structure to store a sent request */
 struct sentreq {
@@ -69 +65 @@
         struct fd_list * li;
         struct timespec now;
-        if (!TRACE_BOOL(SR_DEBUG_LVL))
+        
+        if (!TRACE_BOOL(ANNOYING))
                 return;
+        
+        fd_log_debug("%sSentReq list @%p:\n", text, srlist);
+        
         CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &now), );
-        fd_log_debug("%sSentReq list @%p:\n", text, srlist);
+        
         for (li = srlist->next; li != srlist; li = li->next) {
                 struct sentreq * sr = (struct sentreq *)li;
                 uint32_t * nexthbh = li->o;
-                fd_log_debug(" - Next req (%x): [since %ld.%06ld sec]\n", *nexthbh, 
+                
+                fd_log_debug(" - Next req (hbh:%x): [since %ld.%06ld sec]\n", *nexthbh, 
                         (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),
                         (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);
-                fd_msg_dump_one(SR_DEBUG_LVL + 1, sr->req);
+                
+                fd_msg_dump_one(ANNOYING + 1, sr->req);
         }
 }
@@ -117 +119 @@
 }
 
-/* thread that handles messages expiring. The thread is started / cancelled only when needed */
+/* thread that handles messages expiring. The thread is started only when needed */
 static void * sr_expiry_th(void * arg) {
         struct sr_list * srlist = arg;
@@ -129 +131 @@
         {
                 char buf[48];
-                sprintf(buf, "ReqExp/%.*s", (int)sizeof(buf) - 8, ((struct fd_peer *)(srlist->exp.o))->p_hdr.info.pi_diamid);
+                snprintf(buf, sizeof(buf), "ReqExp/%s", ((struct fd_peer *)(srlist->exp.o))->p_hdr.info.pi_diamid);
                 fd_log_threadname ( buf );
         }
@@ -313 +315 @@
                 } else {
                         /* Just free the request. */
-                        fd_msg_log( FD_MSG_LOG_DROPPED, sr->req, "Local message discarded during failover" );
+                        fd_msg_log( FD_MSG_LOG_DROPPED, sr->req, "Sent & unanswered local message discarded during failover." );
                         CHECK_FCT_DO(fd_msg_free(sr->req), /* Ignore */);
                 }