Changeset 14:14cf6daf716d in freeDiameter for libfreeDiameter/sessions.c

Timestamp:

Oct 1, 2009, 6:24:07 PM (15 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Some progress on peers module

File:

• libfreeDiameter/sessions.c (modified) (8 diffs)

libfreeDiameter/sessions.c

@@ -117 +117 @@
 
 /* Expiring sessions management */
-static struct fd_list   exp_sentinel;   /* list of sessions ordered by their timeout date */
+static struct fd_list   exp_sentinel = FD_LIST_INITIALIZER(exp_sentinel);       /* list of sessions ordered by their timeout date */
 static pthread_mutex_t  exp_lock = PTHREAD_MUTEX_INITIALIZER;   /* lock protecting the list. */
 static pthread_cond_t   exp_cond = PTHREAD_COND_INITIALIZER;    /* condvar used by the expiry mecahinsm. */
@@ -231 +231 @@
         }
         
-        /* Initialize expiry management */
-        fd_list_init( &exp_sentinel, NULL );
+        /* Start session garbage collector (expiry) */
         CHECK_POSIX(  pthread_create(&exp_thr, NULL, exp_fct, NULL)  );
         
@@ -266 +265 @@
 {
         struct session_handler * del;
-        struct fd_list deleted_states; /* Save the list of states to be cleaned up. We do it after finding them to avoid deadlocks. the "o" field becomes a copy of the sid. */
+        /* place to save the list of states to be cleaned up. We do it after finding them to avoid deadlocks. the "o" field becomes a copy of the sid. */
+        struct fd_list deleted_states = FD_LIST_INITIALIZER( deleted_states );
         int i;
         
@@ -274 +274 @@
         del = *handler;
         *handler = NULL;
-        fd_list_init(&deleted_states, NULL);
         
         del->eyec = 0xdead; /* The handler is not valid anymore for any other operation */
@@ -413 +412 @@
                 fd_list_insert_after( li, &sess->expire );
 
+                /* We added a new expiring element, we must signal */
+                if (li == &exp_sentinel) {
+                        CHECK_POSIX( pthread_cond_signal(&exp_cond) );
+                }
+                
                 #if 0
                 if (TRACE_BOOL(ANNOYING)) {     
@@ -424 +428 @@
                 #endif
                 
-                /* We added a new expiring element, we must signal */
-                CHECK_POSIX( pthread_cond_signal(&exp_cond) );
-                
                 /* We're done */
                 CHECK_POSIX( pthread_mutex_unlock( &exp_lock ) );
@@ -506 +507 @@
         fd_list_insert_before( li, &session->expire );
 
-        /* We added a new expiring element, we must signal */
-        CHECK_POSIX( pthread_cond_signal(&exp_cond) );
+        /* We added a new expiring element, we must signal if it was in first position */
+        if (session->expire.prev == &exp_sentinel) {
+                CHECK_POSIX( pthread_cond_signal(&exp_cond) );
+        }
 
         #if 0
@@ -588 +591 @@
 }
 
-
-
 /* Save a state information with a session */
 int fd_sess_state_store_internal ( struct session_handler * handler, struct session * session, session_state ** state )