[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21499 - gnunet/src/lockmanager
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21499 - gnunet/src/lockmanager |
Date: |
Tue, 15 May 2012 16:07:36 +0200 |
Author: harsha
Date: 2012-05-15 16:07:36 +0200 (Tue, 15 May 2012)
New Revision: 21499
Modified:
gnunet/src/lockmanager/
gnunet/src/lockmanager/lockmanager_api.c
gnunet/src/lockmanager/test_lockmanager_api.c
gnunet/src/lockmanager/test_lockmanager_api_servercrash.c
Log:
handling replies continuously from server
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
+ Makefile
Makefile.in
lockmanager.conf
gnunet-service-lockmanager
.deps
test-lockmanager-api
test-lockmanager-api-lockrelease
test-lockmanager-api-servercrash
Modified: gnunet/src/lockmanager/lockmanager_api.c
===================================================================
--- gnunet/src/lockmanager/lockmanager_api.c 2012-05-15 13:57:13 UTC (rev
21498)
+++ gnunet/src/lockmanager/lockmanager_api.c 2012-05-15 14:07:36 UTC (rev
21499)
@@ -290,6 +290,10 @@
handle);
return;
}
+ GNUNET_CLIENT_receive (handle->conn,
+ &handle_replies,
+ handle,
+ GNUNET_TIME_UNIT_FOREVER_REL);
if (GNUNET_MESSAGE_TYPE_LOCKMANAGER_SUCCESS != ntohs(msg->type))
{
GNUNET_break (0);
Modified: gnunet/src/lockmanager/test_lockmanager_api.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api.c 2012-05-15 13:57:13 UTC
(rev 21498)
+++ gnunet/src/lockmanager/test_lockmanager_api.c 2012-05-15 14:07:36 UTC
(rev 21499)
@@ -38,10 +38,26 @@
#define TIME_REL_SECONDS(min) \
GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, min)
+
/**
+ * Enumeration of testing steps
+ */
+enum Test
+ {
+ TEST_FAIL,
+
+ TEST_INIT,
+
+ LOCK1_ACQUIRE,
+
+ LOCK2_ACQUIRE
+ };
+
+
+/**
* The testing result
*/
-static int result;
+static enum Test result;
/**
* The process id of the GNUNET ARM process
@@ -64,6 +80,11 @@
static struct GNUNET_LOCKMANAGER_LockingRequest *request;
/**
+ * The second locking request
+ */
+static struct GNUNET_LOCKMANAGER_LockingRequest *request2;
+
+/**
* Abort task identifier
*/
static GNUNET_SCHEDULER_TaskIdentifier abort_task_id;
@@ -82,7 +103,10 @@
GNUNET_SCHEDULER_cancel (abort_task_id);
abort_task_id = GNUNET_SCHEDULER_NO_TASK;
}
-
+ if (NULL != request)
+ GNUNET_LOCKMANAGER_cancel_request (request);
+ if (NULL != request2)
+ GNUNET_LOCKMANAGER_cancel_request (request2);
GNUNET_LOCKMANAGER_disconnect (handle);
if (0 != GNUNET_OS_process_kill (arm_pid, SIGTERM))
{
@@ -94,9 +118,6 @@
if (NULL != config)
GNUNET_CONFIGURATION_destroy (config);
-
- if (GNUNET_SYSERR != result)
- result = GNUNET_OK;
}
@@ -111,7 +132,7 @@
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Aborting test...\n");
abort_task_id = GNUNET_SCHEDULER_NO_TASK;
- result = GNUNET_SYSERR;
+ result = TEST_FAIL;
do_shutdown (cls, tc);
}
@@ -136,14 +157,31 @@
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Status change callback called on lock: %d of domain: %s\n",
lock, domain_name);
- GNUNET_assert (GNUNET_LOCKMANAGER_SUCCESS == status);
- GNUNET_assert (NULL != request);
- GNUNET_LOCKMANAGER_cancel_request (request);
- request = NULL;
-
- GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1),
- &do_shutdown,
- NULL);
+ switch (result)
+ {
+ case LOCK1_ACQUIRE:
+ GNUNET_assert (GNUNET_LOCKMANAGER_SUCCESS == status);
+ GNUNET_assert (NULL != request);
+ //GNUNET_LOCKMANAGER_cancel_request (request);
+ //request = NULL;
+ result = LOCK2_ACQUIRE;
+ request2 = GNUNET_LOCKMANAGER_acquire_lock (handle,
+ "GNUNET_LOCKMANAGER_TESTING",
+ 100,
+ &status_cb,
+ NULL);
+ GNUNET_assert (NULL != request2);
+ break;
+ case LOCK2_ACQUIRE:
+ GNUNET_assert (GNUNET_LOCKMANAGER_SUCCESS == status);
+ GNUNET_assert (NULL != request);
+ GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (1),
+ &do_shutdown,
+ NULL);
+ break;
+ default:
+ GNUNET_break (0);
+ }
}
@@ -158,7 +196,7 @@
{
handle = GNUNET_LOCKMANAGER_connect (config);
GNUNET_assert (NULL != handle);
-
+ result = LOCK1_ACQUIRE;
request = GNUNET_LOCKMANAGER_acquire_lock (handle,
"GNUNET_LOCKMANAGER_TESTING",
99,
@@ -231,7 +269,7 @@
ret);
return 1;
}
- if (GNUNET_SYSERR == result)
+ if (TEST_FAIL == result)
{
LOG (GNUNET_ERROR_TYPE_WARNING, "test failed\n");
return 1;
Modified: gnunet/src/lockmanager/test_lockmanager_api_servercrash.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api_servercrash.c 2012-05-15
13:57:13 UTC (rev 21498)
+++ gnunet/src/lockmanager/test_lockmanager_api_servercrash.c 2012-05-15
14:07:36 UTC (rev 21499)
@@ -182,7 +182,6 @@
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Status change callback called on lock: %d of domain: %s\n",
lock, domain_name);
- GNUNET_assert (GNUNET_LOCKMANAGER_SUCCESS == status);
switch (result)
{
case TEST_INIT:
@@ -317,7 +316,7 @@
ret);
return 1;
}
- if (TEST_CLIENT2_LOCK_SUCCESS != result)
+ if (TEST_CLIENT2_SERVER_CRASH_SUCCESS != result)
{
LOG (GNUNET_ERROR_TYPE_WARNING, "test failed\n");
return 1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21499 - gnunet/src/lockmanager,
gnunet <=