From 7137a0aaac2e218ad3d0bf2ce6fcb69c9da088f7 Mon Sep 17 00:00:00 2001 From: Sree Harsha Totakura Date: Wed, 16 May 2012 13:55:02 +0000 Subject: -valgrind checks --- src/lockmanager/gnunet-service-lockmanager.c | 4 +++- src/lockmanager/test_lockmanager_api.c | 2 +- src/lockmanager/test_lockmanager_api.conf | 2 +- src/lockmanager/test_lockmanager_api_lockrelease.c | 4 ++-- src/lockmanager/test_lockmanager_api_servercrash.c | 4 ++-- 5 files changed, 9 insertions(+), 7 deletions(-) (limited to 'src') 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) { struct ClientList *cl_entry; struct LockList *ll_entry; + struct Lock *lock; if (NULL == client) return; @@ -782,8 +783,9 @@ client_disconnect_cb (void *cls, struct GNUNET_SERVER_Client *client) 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); } 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, "-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); } 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 @@ [lockmanager] DEBUG = YES -AUTOSTART = YES +AUTOSTART = NO PORT = 12112 ACCEPT_FROM = 127.0.0.1; 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) &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 @@ run (void *cls, char *const *args, const char *cfgfile, "-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); } 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) &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 @@ run (void *cls, char *const *args, const char *cfgfile, "-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); } -- cgit v1.2.3