[GNUnet-SVN] r22157 - gnunet/src/lockmanager

[gnunet]

Author: grothoff
Date: 2012-06-20 16:18:02 +0200 (Wed, 20 Jun 2012)
New Revision: 22157

Modified:
   gnunet/src/lockmanager/lockmanager_api.c
Log:
-ideas for stuff

Modified: gnunet/src/lockmanager/lockmanager_api.c
===================================================================
--- gnunet/src/lockmanager/lockmanager_api.c    2012-06-20 14:06:50 UTC (rev 
22156)
+++ gnunet/src/lockmanager/lockmanager_api.c    2012-06-20 14:18:02 UTC (rev 
22157)
@@ -68,6 +68,12 @@
    * The LOCKMANAGER Message
    */
   struct GNUNET_LOCKMANAGER_Message *msg;
+
+  /**
+   * If this is a AQUIRE_LOCK message, this is the
+   * affiliated locking request.
+   */
+  struct GNUNET_LOCKMANAGER_LockingRequest *lr;
 };
 
 
@@ -124,6 +130,12 @@
   GNUNET_LOCKMANAGER_StatusCallback status_cb;
 
   /**
+   * Entry in the request message queue for aquiring this
+   * lock; NULL after request has been sent.
+   */
+  struct MessageQueue *mqe;
+
+  /**
    * Closure for the status callback
    */
   void *status_cb_cls;
@@ -678,16 +690,16 @@
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Queueing ACQUIRE message\n");
   queue_message (handle, msg);
   get_key (r->domain, r->lock, &hash);
-  GNUNET_CONTAINER_multihashmap_put (r->handle->hashmap,
-                                     &hash,
-                                     r,
-                                     
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+  GNUNET_assert (GNUNET_OK == 
+                GNUNET_CONTAINER_multihashmap_put (r->handle->hashmap,
+                                                   &hash,
+                                                   r,
+                                                   
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE));
   LOG (GNUNET_ERROR_TYPE_DEBUG, "%s() END\n", __func__);
   return r;
 }
 
 
-
 /**
  * Function to cancel the locking request generated by
  * GNUNET_LOCKMANAGER_acquire_lock. If the lock is acquired by us then the lock