[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22148 - gnunet/src/lockmanager
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22148 - gnunet/src/lockmanager |
Date: |
Wed, 20 Jun 2012 13:50:31 +0200 |
Author: harsha
Date: 2012-06-20 13:50:31 +0200 (Wed, 20 Jun 2012)
New Revision: 22148
Modified:
gnunet/src/lockmanager/
gnunet/src/lockmanager/Makefile.am
gnunet/src/lockmanager/lockmanager_api.c
gnunet/src/lockmanager/test_lockmanager_api_acquireretry.c
Log:
-lockmanager acquire retry
Property changes on: gnunet/src/lockmanager
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
lockmanager.conf
gnunet-service-lockmanager
.deps
test_lockmanager_api
test_lockmanager_api_lockrelease
test_lockmanager_api_servercrash
+ Makefile
Makefile.in
lockmanager.conf
gnunet-service-lockmanager
.deps
test_lockmanager_api
test_lockmanager_api_lockrelease
test_lockmanager_api_servercrash
test_lockmanager_api_acquireretry
Modified: gnunet/src/lockmanager/Makefile.am
===================================================================
--- gnunet/src/lockmanager/Makefile.am 2012-06-20 11:47:16 UTC (rev 22147)
+++ gnunet/src/lockmanager/Makefile.am 2012-06-20 11:50:31 UTC (rev 22148)
@@ -41,13 +41,14 @@
check_PROGRAMS = \
test_lockmanager_api \
test_lockmanager_api_lockrelease \
- test_lockmanager_api_servercrash
+ test_lockmanager_api_servercrash \
+ test_lockmanager_api_acquireretry
EXTRA_DIST = \
test_lockmanager_api.conf
if ENABLE_TEST_RUN
-TESTS = $(check_PROGRAMS)
+ TESTS = $(check_PROGRAMS)
endif
test_lockmanager_api_SOURCES = \
@@ -67,3 +68,9 @@
test_lockmanager_api_servercrash_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la \
libgnunetlockmanager.la
+
+test_lockmanager_api_acquireretry_SOURCES = \
+ test_lockmanager_api_acquireretry.c
+test_lockmanager_api_acquireretry_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ libgnunetlockmanager.la
\ No newline at end of file
Modified: gnunet/src/lockmanager/lockmanager_api.c
===================================================================
--- gnunet/src/lockmanager/lockmanager_api.c 2012-06-20 11:47:16 UTC (rev
22147)
+++ gnunet/src/lockmanager/lockmanager_api.c 2012-06-20 11:50:31 UTC (rev
22148)
@@ -418,6 +418,8 @@
struct GNUNET_LOCKMANAGER_Handle *h = cls;
struct GNUNET_LOCKMANAGER_Message *msg;
+ msg = generate_acquire_msg (r->domain, r->lock);
+ queue_message (h, msg);
if (GNUNET_LOCKMANAGER_RELEASE == r->status)
return GNUNET_YES;
if (NULL != r->status_cb)
@@ -429,10 +431,8 @@
r->status_cb (r->status_cb_cls,
r->domain,
r->lock,
- GNUNET_LOCKMANAGER_RELEASE);
+ GNUNET_LOCKMANAGER_RELEASE);
}
- msg = generate_acquire_msg (r->domain, r->lock);
- queue_message (h, msg);
return GNUNET_YES;
}
Modified: gnunet/src/lockmanager/test_lockmanager_api_acquireretry.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api_acquireretry.c 2012-06-20
11:47:16 UTC (rev 22147)
+++ gnunet/src/lockmanager/test_lockmanager_api_acquireretry.c 2012-06-20
11:50:31 UTC (rev 22148)
@@ -56,7 +56,7 @@
/**
* Client has successfully acquired the lock
*/
- TEST_CLIENT_LOCK_SUCESS,
+ TEST_CLIENT_LOCK_SUCCESS,
/**
* Client has lost the lock
@@ -77,7 +77,7 @@
/**
* Configuration Handle
*/
-static struct GNUNET_CONFIGURATION_Handle *config;
+static const struct GNUNET_CONFIGURATION_Handle *config;
/**
* The handle to the lockmanager service
@@ -126,8 +126,6 @@
GNUNET_OS_process_wait (arm_pid);
GNUNET_OS_process_destroy (arm_pid);
}
- if (NULL != config)
- GNUNET_CONFIGURATION_destroy (config);
}
/**
@@ -195,7 +193,7 @@
GNUNET_assert (NULL != arm_pid);
break;
case TEST_CLIENT_LOCK_RELEASE:
- GNUNET_asset (handle == cls);
+ GNUNET_assert (handle == cls);
GNUNET_assert (GNUNET_LOCKMANAGER_SUCCESS == status);
result = TEST_CLIENT_LOCK_AGAIN_SUCCESS;
GNUNET_LOCKMANAGER_cancel_request (request);
@@ -226,7 +224,7 @@
&status_cb,
handle);
GNUNET_assert (NULL != request);
- abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (10),
+ abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECS (30),
&do_abort,
NULL);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22148 - gnunet/src/lockmanager,
gnunet <=