[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21207 - gnunet/src/lockmanager
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21207 - gnunet/src/lockmanager |
Date: |
Sat, 28 Apr 2012 15:18:36 +0200 |
Author: harsha
Date: 2012-04-28 15:18:36 +0200 (Sat, 28 Apr 2012)
New Revision: 21207
Modified:
gnunet/src/lockmanager/lockmanager_api.c
gnunet/src/lockmanager/test_lockmanager_api.c
Log:
-lock success callback
Modified: gnunet/src/lockmanager/lockmanager_api.c
===================================================================
--- gnunet/src/lockmanager/lockmanager_api.c 2012-04-28 13:09:31 UTC (rev
21206)
+++ gnunet/src/lockmanager/lockmanager_api.c 2012-04-28 13:18:36 UTC (rev
21207)
@@ -207,7 +207,7 @@
{
struct GNUNET_LOCKMANAGER_LockingRequest *r = value;
- if ( !((0 != strcmp (domain, r->domain))
+ if ( !((0 == strcmp (domain, r->domain))
&& (lock == r->lock)))
return GNUNET_YES;
@@ -403,6 +403,8 @@
r->lock = lock;
r->domain = GNUNET_malloc (r->domain_name_length);
r->status = GNUNET_LOCKMANAGER_RELEASE;
+ r->status_cb = status_cb;
+ r->status_cb_cls = status_cb_cls;
memcpy (r->domain, domain_name, r->domain_name_length);
msg_size = sizeof (struct GNUNET_LOCKMANAGER_Message) +
r->domain_name_length;
Modified: gnunet/src/lockmanager/test_lockmanager_api.c
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api.c 2012-04-28 13:09:31 UTC
(rev 21206)
+++ gnunet/src/lockmanager/test_lockmanager_api.c 2012-04-28 13:18:36 UTC
(rev 21207)
@@ -64,6 +64,11 @@
static struct GNUNET_LOCKMANAGER_LockingRequest *request;
/**
+ * Abort task identifier
+ */
+static GNUNET_SCHEDULER_TaskIdentifier abort_task_id;
+
+/**
* Shutdown nicely
*
* @param cls
@@ -72,6 +77,12 @@
static void
do_shutdown (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ if (GNUNET_SCHEDULER_NO_TASK != abort_task_id)
+ {
+ GNUNET_SCHEDULER_cancel (abort_task_id);
+ abort_task_id = GNUNET_SCHEDULER_NO_TASK;
+ }
+
if (NULL != request)
{
GNUNET_LOCKMANAGER_cancel_request (request);
@@ -99,6 +110,7 @@
static void
do_abort (void *cls, const const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ abort_task_id = GNUNET_SCHEDULER_NO_TASK;
result = GNUNET_SYSERR;
do_shutdown (cls, tc);
}
@@ -144,9 +156,9 @@
99,
&status_cb,
NULL);
- GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (10),
- &do_abort,
- NULL);
+ abort_task_id = GNUNET_SCHEDULER_add_delayed (TIME_REL_SECONDS (10),
+ &do_abort,
+ NULL);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21207 - gnunet/src/lockmanager,
gnunet <=