add test case for 'GNUNET_SET_copy_lazy', fix bugs

1 files changed, 35 insertions, 1 deletions

diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h
index d23291c82..fb079d03f 100644
--- a/src/set/gnunet-service-set.h
+++ b/src/set/gnunet-service-set.h
@@ -437,6 +437,25 @@ struct SetContent
   struct GNUNET_CONTAINER_MultiHashMap *elements;
 
   unsigned int latest_generation;
+
+  /**
+   * Mutations requested by the client that we're
+   * unable to execute right now because we're iterating
+   * over the underlying hash map of elements.
+   */
+  struct PendingMutation *pending_mutations_head;
+
+  /**
+   * Mutations requested by the client that we're
+   * unable to execute right now because we're iterating
+   * over the underlying hash map of elements.
+   */
+  struct PendingMutation *pending_mutations_tail;
+
+  /**
+   * Number of concurrently active iterators.
+   */
+  int iterator_count;
 };
 
 
@@ -454,6 +473,22 @@ struct GenerationRange
 };
 
 
+struct PendingMutation
+{
+  struct PendingMutation *prev;
+  struct PendingMutation *next;
+
+  struct Set *set;
+
+  /**
+   * Message that describes the desired mutation.
+   * May only be a GNUNET_MESSAGE_TYPE_SET_ADD or
+   * GNUNET_MESSAGE_TYPE_SET_REMOVE.
+   */
+  struct GNUNET_MessageHeader *mutation_message;
+};
+
+
 /**
  * A set that supports a specific operation with other peers.
  */
@@ -540,7 +575,6 @@ struct Set
    * and thus reference counted.
    */
   struct SetContent *content;
-
 };