[GNUnet-SVN] r9089 - in gnunet/src: include util

[gnunet]

Author: grothoff
Date: 2009-10-03 12:46:00 -0600 (Sat, 03 Oct 2009)
New Revision: 9089

Modified:
   gnunet/src/include/gnunet_container_lib.h
   gnunet/src/util/container_slist.c
   gnunet/src/util/network.c
   gnunet/src/util/test_container_slist.c
Log:
use enum

Modified: gnunet/src/include/gnunet_container_lib.h
===================================================================
--- gnunet/src/include/gnunet_container_lib.h   2009-10-03 18:30:06 UTC (rev 
9088)
+++ gnunet/src/include/gnunet_container_lib.h   2009-10-03 18:46:00 UTC (rev 
9089)
@@ -42,10 +42,6 @@
 #endif
 
 
-#define GNUNET_MEM_DISP_TRANSIENT    0
-#define GNUNET_MEM_DISP_STATIC       2
-#define GNUNET_MEM_DISP_DYNAMIC      4
-
 /* ******************* bloomfilter ***************** */
 
 /**
@@ -877,6 +873,30 @@
 /* ******************** Singly linked list *************** */
 
 /**
+ * Possible ways for how data stored in the linked list
+ * might be allocated.
+ */ 
+enum GNUNET_CONTAINER_SListDisposition
+  {
+    /**
+     * Single-linked list must copy the buffer.
+     */
+    GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT = 0,
+
+    /**
+     * Data is static, no need to copy or free.
+     */
+    GNUNET_CONTAINER_SLIST_DISPOSITION_STATIC = 2,
+
+    /**
+     * Data is dynamic, do not copy but free when done.
+     */
+    GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC = 4
+  };
+
+
+
+/**
  * Handle to a singly linked list  
  */
 struct GNUNET_CONTAINER_SList;
@@ -894,7 +914,9 @@
  * @param buf payload buffer
  * @param len length of the buffer
  */
-void GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l, int disp, 
const void *buf, size_t len);
+void GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l, 
+                                enum GNUNET_CONTAINER_SListDisposition disp,
+                                const void *buf, size_t len);
 
 
 /**
@@ -960,7 +982,10 @@
  * @param buf payload buffer
  * @param len length of the payload
  */
-void GNUNET_CONTAINER_slist_insert (struct GNUNET_CONTAINER_SList_Iterator 
*before, int disp, const void *buf, size_t len);
+void GNUNET_CONTAINER_slist_insert (struct GNUNET_CONTAINER_SList_Iterator 
*before,
+                                   enum GNUNET_CONTAINER_SListDisposition disp,
+                                   const void *buf, 
+                                   size_t len);
 
 
 /**

Modified: gnunet/src/util/container_slist.c
===================================================================
--- gnunet/src/util/container_slist.c   2009-10-03 18:30:06 UTC (rev 9088)
+++ gnunet/src/util/container_slist.c   2009-10-03 18:46:00 UTC (rev 9089)
@@ -27,24 +27,68 @@
 #include "platform.h"
 #include "gnunet_container_lib.h"
 
+/**
+ * Element in our linked list.
+ */
 struct GNUNET_CONTAINER_SList_Elem
 {
+  /**
+   * This is a linked list.
+   */ 
   struct GNUNET_CONTAINER_SList_Elem *next;
-  const void *elem;
+
+  /**
+   * Application data stored at this element.
+   */
+  void *elem;
+
+  /**
+   * Number of bytes stored in elem.
+   */
   size_t len;
-  int disp;
+
+  /**
+   * Disposition of the element.
+   */
+  enum GNUNET_CONTAINER_SListDisposition disp;
 };
 
+
+/**
+ * Handle to a singly linked list  
+ */
 struct GNUNET_CONTAINER_SList
 {
+  /**
+   * Head of the linked list.
+   */
   struct GNUNET_CONTAINER_SList_Elem *head;
+
+  /**
+   * Number of elements in the list.
+   */
   unsigned int length;
 };
 
+
+/**
+ * Handle to a singly linked list iterator 
+ */
 struct GNUNET_CONTAINER_SList_Iterator
 {
+  /**
+   * Linked list that we are iterating over.
+   */
   struct GNUNET_CONTAINER_SList *list;
+
+  /**
+   * Last element accessed.
+   */
   struct GNUNET_CONTAINER_SList_Elem *last;
+
+  /**
+   * Current list element.
+   */
   struct GNUNET_CONTAINER_SList_Elem *elem;
 };
 
@@ -57,20 +101,22 @@
  * @return a new element
  */
 static struct GNUNET_CONTAINER_SList_Elem *
-create_elem (int disp, const void *buf, size_t len)
+create_elem (enum GNUNET_CONTAINER_SListDisposition disp, 
+            const void *buf, 
+            size_t len)
 {
   struct GNUNET_CONTAINER_SList_Elem *e;
 
-  if (disp == GNUNET_MEM_DISP_TRANSIENT)
+  if (disp == GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT)
     {
       e = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Elem) + len);
       memcpy (&e[1], buf, len);
-      e->elem = (const void*) &e[1];
+      e->elem = (void*) &e[1];
     }
   else
     {
       e = GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList_Elem));
-      e->elem = buf;
+      e->elem = (void*) buf;
     }
   e->disp = disp;
   e->len = len;
@@ -86,7 +132,8 @@
  * @param len length of the buffer
  */
 void
-GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l, int disp,
+GNUNET_CONTAINER_slist_add (struct GNUNET_CONTAINER_SList *l, 
+                           enum GNUNET_CONTAINER_SListDisposition disp, 
                             const void *buf, size_t len)
 {
   struct GNUNET_CONTAINER_SList_Elem *e;
@@ -108,6 +155,7 @@
   return GNUNET_malloc (sizeof (struct GNUNET_CONTAINER_SList));
 }
 
+
 /**
  * Destroy a singly linked list
  * @param l the list to be destroyed
@@ -151,6 +199,8 @@
   while (e != NULL)
     {
       n = e->next;
+      if (e->disp == GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC)
+       GNUNET_free (e->elem);
       GNUNET_free (e);
       e = n;
     }
@@ -207,6 +257,8 @@
     i->last->next = next;
   else
     i->list->head = next;
+  if (i->elem->disp == GNUNET_CONTAINER_SLIST_DISPOSITION_DYNAMIC)
+    GNUNET_free (i->elem->elem);
   GNUNET_free (i->elem);
   i->list->length--;
   i->elem = next;
@@ -222,7 +274,8 @@
  */
 void
 GNUNET_CONTAINER_slist_insert (struct GNUNET_CONTAINER_SList_Iterator *before,
-                               int disp, const void *buf, size_t len)
+                               enum GNUNET_CONTAINER_SListDisposition disp, 
+                              const void *buf, size_t len)
 {
   struct GNUNET_CONTAINER_SList_Elem *e;
 

Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c   2009-10-03 18:30:06 UTC (rev 9088)
+++ gnunet/src/util/network.c   2009-10-03 18:46:00 UTC (rev 9089)
@@ -496,7 +496,7 @@
       size_t len;
 
       handle = GNUNET_CONTAINER_slist_get (iter, &len);
-      GNUNET_CONTAINER_slist_add (to->handles, GNUNET_MEM_DISP_TRANSIENT, 
handle, len);
+      GNUNET_CONTAINER_slist_add (to->handles, 
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, handle, len);
     }
 #endif
 }

Modified: gnunet/src/util/test_container_slist.c
===================================================================
--- gnunet/src/util/test_container_slist.c      2009-10-03 18:30:06 UTC (rev 
9088)
+++ gnunet/src/util/test_container_slist.c      2009-10-03 18:46:00 UTC (rev 
9089)
@@ -46,7 +46,7 @@
   CHECK (GNUNET_CONTAINER_slist_count (l) == 0);
 
   for (i = 0; i < 100; i++)
-    GNUNET_CONTAINER_slist_add (l, GNUNET_MEM_DISP_TRANSIENT, &i, sizeof (i));
+    GNUNET_CONTAINER_slist_add (l, 
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, &i, sizeof (i));
   CHECK (GNUNET_CONTAINER_slist_count (l) == 100);
 
   for (it = GNUNET_CONTAINER_slist_begin (l), i = 99;
@@ -60,7 +60,7 @@
       CHECK (s == sizeof (i));
 
       j *= 2;
-      GNUNET_CONTAINER_slist_insert (it, GNUNET_MEM_DISP_TRANSIENT, &j,
+      GNUNET_CONTAINER_slist_insert (it, 
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, &j,
                                      sizeof (j));
     }
   GNUNET_free (it);
@@ -99,7 +99,7 @@
   CHECK (GNUNET_CONTAINER_slist_count (l) == 0);
 
   for (i = 0; i < 100; i++)
-    GNUNET_CONTAINER_slist_add (l, GNUNET_MEM_DISP_TRANSIENT, &i, sizeof (i));
+    GNUNET_CONTAINER_slist_add (l, 
GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, &i, sizeof (i));
 
   GNUNET_CONTAINER_slist_destroy (l);