[GNUnet-SVN] r21530 - gnunet/src/lockmanager

[gnunet]

Author: harsha
Date: 2012-05-16 15:55:02 +0200 (Wed, 16 May 2012)
New Revision: 21530

Modified:
   gnunet/src/lockmanager/gnunet-service-lockmanager.c
   gnunet/src/lockmanager/test_lockmanager_api.c
   gnunet/src/lockmanager/test_lockmanager_api.conf
   gnunet/src/lockmanager/test_lockmanager_api_lockrelease.c
   gnunet/src/lockmanager/test_lockmanager_api_servercrash.c
Log:
-valgrind checks

Modified: gnunet/src/lockmanager/gnunet-service-lockmanager.c
===================================================================
--- gnunet/src/lockmanager/gnunet-service-lockmanager.c 2012-05-16 13:51:21 UTC 
(rev 21529)
+++ gnunet/src/lockmanager/gnunet-service-lockmanager.c 2012-05-16 13:55:02 UTC 
(rev 21530)
@@ -772,6 +772,7 @@
 {
   struct ClientList *cl_entry;
   struct LockList *ll_entry;
+  struct Lock *lock;
 
   if (NULL == client)
     return;
@@ -782,8 +783,9 @@
     return;
   while (NULL != (ll_entry = cl_entry->ll_head))
   {
+    lock = ll_entry->lock;
     cl_ll_remove_lock (cl_entry, ll_entry);
-    process_lock_release (ll_entry->lock); 
+    process_lock_release (lock);
   }
   cl_remove_client (cl_entry);
 }

Modified: gnunet/src/lockmanager/test_lockmanager_api.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api.c       2012-05-16 13:51:21 UTC 
(rev 21529)
+++ gnunet/src/lockmanager/test_lockmanager_api.c       2012-05-16 13:55:02 UTC 
(rev 21530)
@@ -226,7 +226,7 @@
                              "-c", "test_lockmanager_api.conf", NULL);
 
   GNUNET_assert (NULL != arm_pid);
-  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1),
+  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (3),
                                 &test,
                                 NULL);
 }

Modified: gnunet/src/lockmanager/test_lockmanager_api.conf
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api.conf    2012-05-16 13:51:21 UTC 
(rev 21529)
+++ gnunet/src/lockmanager/test_lockmanager_api.conf    2012-05-16 13:55:02 UTC 
(rev 21530)
@@ -1,6 +1,6 @@
 [lockmanager]
 DEBUG = YES
-AUTOSTART = YES
+AUTOSTART = NO 
 PORT = 12112
 ACCEPT_FROM = 127.0.0.1;
 HOSTNAME = localhost

Modified: gnunet/src/lockmanager/test_lockmanager_api_lockrelease.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api_lockrelease.c   2012-05-16 
13:51:21 UTC (rev 21529)
+++ gnunet/src/lockmanager/test_lockmanager_api_lockrelease.c   2012-05-16 
13:55:02 UTC (rev 21530)
@@ -223,7 +223,7 @@
                                              &status_cb,
                                              handle);
   GNUNET_assert (NULL != request);
-  abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (60),
+  abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (10),
                                                 &do_abort,
                                                 NULL);
 }
@@ -247,7 +247,7 @@
                              "-c", "test_lockmanager_api.conf", NULL);
 
   GNUNET_assert (NULL != arm_pid);
-  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1),
+  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (3),
                                 &test,
                                 NULL);
 }

Modified: gnunet/src/lockmanager/test_lockmanager_api_servercrash.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api_servercrash.c   2012-05-16 
13:51:21 UTC (rev 21529)
+++ gnunet/src/lockmanager/test_lockmanager_api_servercrash.c   2012-05-16 
13:55:02 UTC (rev 21530)
@@ -248,7 +248,7 @@
                                              &status_cb,
                                              handle);
   GNUNET_assert (NULL != request);
-  abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (60),
+  abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (10),
                                                 &do_abort,
                                                 NULL);
 }
@@ -272,7 +272,7 @@
                              "-c", "test_lockmanager_api.conf", NULL);
 
   GNUNET_assert (NULL != arm_pid);
-  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1),
+  GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (3),
                                 &test,
                                 NULL);
 }