Changeset 556:8c9028ec02bf in freeDiameter

Timestamp:

Sep 15, 2010, 5:27:07 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Preparing for bugfix release 1.0.1

File:

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

libfreeDiameter/sessions.c

@@ -94 +94 @@
         uint32_t        hash;   /* computed hash of sid */
         struct fd_list  chain_h;/* chaining in the hash table of sessions. */
+        int             rc;     /* Reference counter on this object, freed only when it reaches 0. */
         
         struct timespec timeout;/* Timeout date for the session */
@@ -100 +101 @@
         pthread_mutex_t stlock; /* A lock to protect the list of states associated with this session */
         struct fd_list  states; /* Sentinel for the list of states of this session. */
-        int             msg_cnt;/* Reference counter for the messages pointing to this session */
 };
 
 /* Sessions hash table, to allow fast sid to session retrieval */
 static struct {
-        struct fd_list  sentinel;       /* sentinel element for this sublist */
-        pthread_mutex_t lock;           /* the mutex for this sublist -- we might probably change it to rwlock for a little optimization */
+        struct fd_list   sentinel;      /* sentinel element for this sublist */
+        pthread_rwlock_t rwlock;        /* the rwlock for this sublist */
 } sess_hash [ 1 << SESS_HASH_SIZE ] ;
 #define H_MASK( __hash ) ((__hash) & (( 1 << SESS_HASH_SIZE ) - 1))
-#define H_LIST( _hash ) (&(sess_hash[H_MASK(_hash)].sentinel))
-#define H_LOCK( _hash ) (&(sess_hash[H_MASK(_hash)].lock    ))
+#define H_LIST( _hash )   (&(sess_hash[H_MASK(_hash)].sentinel))
+#define H_RWLOCK( _hash ) (&(sess_hash[H_MASK(_hash)].rwlock  ))
 
 /* The following are used to generate sid values that are eternaly unique */
@@ -127 +127 @@
  * i.e. state lock can be taken while holding the hash lock, but not while holding the expiry lock.
  * As well, the hash lock cannot be taken while holding a state lock.
+ * Never try to take another lock while holding the expiry one.
  */
 
@@ -147 +148 @@
         sess->hash = fd_hash(sid, sidlen);
         fd_list_init(&sess->chain_h, sess);
+        sess->rc   = 0;
         
         CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &sess->timeout), return NULL );