diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2012-05-16 13:55:02 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2012-05-16 13:55:02 +0000 |
commit | 7137a0aaac2e218ad3d0bf2ce6fcb69c9da088f7 (patch) | |
tree | 6266edd46715a4dd1a3147f281fb7a6955f29dfc | |
parent | 3230837d6c96247600030266a569f432b8ebbd68 (diff) | |
download | gnunet-7137a0aaac2e218ad3d0bf2ce6fcb69c9da088f7.tar.gz gnunet-7137a0aaac2e218ad3d0bf2ce6fcb69c9da088f7.zip |
-valgrind checks
-rw-r--r-- | src/lockmanager/gnunet-service-lockmanager.c | 4 | ||||
-rw-r--r-- | src/lockmanager/test_lockmanager_api.c | 2 | ||||
-rw-r--r-- | src/lockmanager/test_lockmanager_api.conf | 2 | ||||
-rw-r--r-- | src/lockmanager/test_lockmanager_api_lockrelease.c | 4 | ||||
-rw-r--r-- | src/lockmanager/test_lockmanager_api_servercrash.c | 4 |
5 files changed, 9 insertions, 7 deletions
diff --git a/src/lockmanager/gnunet-service-lockmanager.c b/src/lockmanager/gnunet-service-lockmanager.c index 828915e70..8ec988978 100644 --- a/src/lockmanager/gnunet-service-lockmanager.c +++ b/src/lockmanager/gnunet-service-lockmanager.c | |||
@@ -772,6 +772,7 @@ client_disconnect_cb (void *cls, struct GNUNET_SERVER_Client *client) | |||
772 | { | 772 | { |
773 | struct ClientList *cl_entry; | 773 | struct ClientList *cl_entry; |
774 | struct LockList *ll_entry; | 774 | struct LockList *ll_entry; |
775 | struct Lock *lock; | ||
775 | 776 | ||
776 | if (NULL == client) | 777 | if (NULL == client) |
777 | return; | 778 | return; |
@@ -782,8 +783,9 @@ client_disconnect_cb (void *cls, struct GNUNET_SERVER_Client *client) | |||
782 | return; | 783 | return; |
783 | while (NULL != (ll_entry = cl_entry->ll_head)) | 784 | while (NULL != (ll_entry = cl_entry->ll_head)) |
784 | { | 785 | { |
786 | lock = ll_entry->lock; | ||
785 | cl_ll_remove_lock (cl_entry, ll_entry); | 787 | cl_ll_remove_lock (cl_entry, ll_entry); |
786 | process_lock_release (ll_entry->lock); | 788 | process_lock_release (lock); |
787 | } | 789 | } |
788 | cl_remove_client (cl_entry); | 790 | cl_remove_client (cl_entry); |
789 | } | 791 | } |
diff --git a/src/lockmanager/test_lockmanager_api.c b/src/lockmanager/test_lockmanager_api.c index 9b6f311e4..e8d04128f 100644 --- a/src/lockmanager/test_lockmanager_api.c +++ b/src/lockmanager/test_lockmanager_api.c | |||
@@ -226,7 +226,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
226 | "-c", "test_lockmanager_api.conf", NULL); | 226 | "-c", "test_lockmanager_api.conf", NULL); |
227 | 227 | ||
228 | GNUNET_assert (NULL != arm_pid); | 228 | GNUNET_assert (NULL != arm_pid); |
229 | GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1), | 229 | GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (3), |
230 | &test, | 230 | &test, |
231 | NULL); | 231 | NULL); |
232 | } | 232 | } |
diff --git a/src/lockmanager/test_lockmanager_api.conf b/src/lockmanager/test_lockmanager_api.conf index aa13706cd..894f40908 100644 --- a/src/lockmanager/test_lockmanager_api.conf +++ b/src/lockmanager/test_lockmanager_api.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | [lockmanager] | 1 | [lockmanager] |
2 | DEBUG = YES | 2 | DEBUG = YES |
3 | AUTOSTART = YES | 3 | AUTOSTART = NO |
4 | PORT = 12112 | 4 | PORT = 12112 |
5 | ACCEPT_FROM = 127.0.0.1; | 5 | ACCEPT_FROM = 127.0.0.1; |
6 | HOSTNAME = localhost | 6 | HOSTNAME = localhost |
diff --git a/src/lockmanager/test_lockmanager_api_lockrelease.c b/src/lockmanager/test_lockmanager_api_lockrelease.c index 8eea5cc22..7e24d10ce 100644 --- a/src/lockmanager/test_lockmanager_api_lockrelease.c +++ b/src/lockmanager/test_lockmanager_api_lockrelease.c | |||
@@ -223,7 +223,7 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
223 | &status_cb, | 223 | &status_cb, |
224 | handle); | 224 | handle); |
225 | GNUNET_assert (NULL != request); | 225 | GNUNET_assert (NULL != request); |
226 | abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (60), | 226 | abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (10), |
227 | &do_abort, | 227 | &do_abort, |
228 | NULL); | 228 | NULL); |
229 | } | 229 | } |
@@ -247,7 +247,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
247 | "-c", "test_lockmanager_api.conf", NULL); | 247 | "-c", "test_lockmanager_api.conf", NULL); |
248 | 248 | ||
249 | GNUNET_assert (NULL != arm_pid); | 249 | GNUNET_assert (NULL != arm_pid); |
250 | GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1), | 250 | GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (3), |
251 | &test, | 251 | &test, |
252 | NULL); | 252 | NULL); |
253 | } | 253 | } |
diff --git a/src/lockmanager/test_lockmanager_api_servercrash.c b/src/lockmanager/test_lockmanager_api_servercrash.c index 4b9d9cbe4..3fa6418c8 100644 --- a/src/lockmanager/test_lockmanager_api_servercrash.c +++ b/src/lockmanager/test_lockmanager_api_servercrash.c | |||
@@ -248,7 +248,7 @@ test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
248 | &status_cb, | 248 | &status_cb, |
249 | handle); | 249 | handle); |
250 | GNUNET_assert (NULL != request); | 250 | GNUNET_assert (NULL != request); |
251 | abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (60), | 251 | abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (10), |
252 | &do_abort, | 252 | &do_abort, |
253 | NULL); | 253 | NULL); |
254 | } | 254 | } |
@@ -272,7 +272,7 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
272 | "-c", "test_lockmanager_api.conf", NULL); | 272 | "-c", "test_lockmanager_api.conf", NULL); |
273 | 273 | ||
274 | GNUNET_assert (NULL != arm_pid); | 274 | GNUNET_assert (NULL != arm_pid); |
275 | GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1), | 275 | GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (3), |
276 | &test, | 276 | &test, |
277 | NULL); | 277 | NULL); |
278 | } | 278 | } |