Changeset 778:003df4a9ade2 in freeDiameter for libfdproto

Timestamp:

Jan 22, 2012, 12:11:34 AM (12 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added two new interfaces on Zach requests ​http://lists.freediameter.net/pipermail/help/2012-January/000312.html and ​http://lists.freediameter.net/pipermail/help/2012-January/000311.html

Location:

libfdproto

Files:

• dictionary.c (modified) (1 diff)
• sessions.c (modified) (4 diffs)

libfdproto/dictionary.c

@@ -1812 +1812 @@
 }
 
+
+int fd_dict_delete(struct dict_object * obj)
+{
+        int i;
+        struct dictionary * dict;
+        int ret=0;
+        
+        /* check params */
+        CHECK_PARAMS( verify_object(obj) && obj->dico);
+        dict = obj->dico;
+
+        /* Lock the dictionary for change */
+        CHECK_POSIX(  pthread_rwlock_wrlock(&dict->dict_lock)  );
+        
+        /* check the object is not sentinel for another list */
+        for (i=0; i<NB_LISTS_PER_OBJ; i++) {
+                if (!_OBINFO(obj).haslist[i] && !(FD_IS_LIST_EMPTY(&obj->list[i]))) {
+                        /* There are children, this is not good */
+                        ret = EINVAL;
+                        TRACE_DEBUG (FULL, "Cannot delete object, list %d not empty:", i);
+                        #if 0
+                        dump_list(&obj->list[i], 0,0,0);
+                        #endif
+                        break;
+                }
+        }
+        
+        /* ok, now destroy the object */
+        if (!ret)
+                destroy_object(obj);
+        
+        /* Unlock */
+        CHECK_POSIX(  pthread_rwlock_unlock(&dict->dict_lock)  );
+        
+        return ret;
+}
+
+
 int fd_dict_search ( struct dictionary * dict, enum dict_object_type type, int criteria, void * what, struct dict_object **result, int retval )
 {

libfdproto/sessions.c

@@ -115 +115 @@
 #define H_LOCK( _hash ) (&(sess_hash[H_MASK(_hash)].lock    ))
 
+static uint32_t         sess_cnt = 0; /* counts all active session (that are in the expiry list) */
+
 /* The following are used to generate sid values that are eternaly unique */
 static uint32_t         sid_h;  /* initialized to the current time in fd_sess_init */
@@ -485 +487 @@
         }
         fd_list_insert_after( li, &sess->expire );
+        sess_cnt++;
 
         /* We added a new expiring element, we must signal */
@@ -612 +615 @@
         /* Unlink from the expiry list */
         CHECK_POSIX_DO( pthread_mutex_lock( &exp_lock ), { ASSERT(0); /* otherwise cleanup handler is not pop'd */ } );
-        fd_list_unlink( &sess->expire ); /* no need to signal the condition here */
+        if (!FD_IS_LIST_EMPTY(&sess->expire)) {
+                sess_cnt--;
+                fd_list_unlink( &sess->expire ); /* no need to signal the condition here */
+        }
         CHECK_POSIX_DO( pthread_mutex_unlock( &exp_lock ), { ASSERT(0); /* otherwise cleanup handler is not pop'd */ } );
         
@@ -890 +896 @@
         fd_log_debug("\t  %*s -- end of handler @%p --\n", level, "", handler);
 }       
+
+int fd_sess_getcount(uint32_t *cnt)
+{
+        CHECK_PARAMS(cnt);
+        CHECK_POSIX( pthread_mutex_lock( &exp_lock ) );
+        *cnt = sess_cnt;
+        CHECK_POSIX( pthread_mutex_unlock( &exp_lock ) );
+        return 0;
+}