Merge branch 'master' into dev/t3ss/tng

3 files changed, 37 insertions, 75 deletions

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index a3a77073e..c3a0feccc 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -145,10 +145,8 @@ libgnunetutil_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   -version-info 14:0:0
 
-if HAVE_TESTING
-  GNUNET_ECC = gnunet-ecc
-  GNUNET_SCRYPT = gnunet-scrypt
-endif
+GNUNET_ECC = gnunet-ecc
+GNUNET_SCRYPT = gnunet-scrypt
 
 lib_LTLIBRARIES = libgnunetutil.la
 
diff --git a/src/util/child_management.c b/src/util/child_management.c
index 3afd682b9..832e05ece 100644
--- a/src/util/child_management.c
+++ b/src/util/child_management.c
@@ -19,7 +19,7 @@
  */
 
 /**
- * @file testing/child_management.c
+ * @file util/child_management.c
  * @brief Handling of child processes in GNUnet.
  * @author Christian Grothoff (ANASTASIS)
  * @author Dominik Meister (ANASTASIS)
@@ -91,15 +91,10 @@ maint_child_death (void *cls)
 
   (void) cls;
   sig_task = NULL;
-
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-              "Received SIGCHLD.\n");
-
   /* drain pipe */
   pr = GNUNET_DISK_pipe_handle (sigpipe,
                                 GNUNET_DISK_PIPE_END_READ);
   GNUNET_assert (! GNUNET_DISK_handle_invalid (pr));
-
   (void) GNUNET_DISK_file_read (pr,
                                 buf,
                                 sizeof(buf));
@@ -158,10 +153,11 @@ sighandler_child_death (void)
   errno = old_errno; /* restore errno */
 }
 
-
-// void __attribute__ ((constructor))
+/**
+ * Initializing the signal pipe for child handling.
+ */
 static void
-child_management_start ()
+child_management_start (void)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Trying to start child management.\n");
@@ -170,19 +166,24 @@ child_management_start ()
   sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
   GNUNET_assert (sigpipe != NULL);
   shc_chld =
-    GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, &sighandler_child_death);
+    GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD,
+                                   &sighandler_child_death);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Child management started.\n");
 }
 
+
 /**
  * Clean up.
  */
-// void __attribute__ ((destructor))
 static void
-child_management_done ()
+child_management_done (void)
 {
-  GNUNET_assert (NULL == sig_task);
+  if (NULL != sig_task)
+  {
+    GNUNET_SCHEDULER_cancel (sig_task);
+    sig_task = NULL;
+  }
   GNUNET_SIGNAL_handler_uninstall (shc_chld);
   shc_chld = NULL;
   GNUNET_DISK_pipe_close (sigpipe);
@@ -191,6 +192,15 @@ child_management_done ()
               "Child management stopped.\n");
 }
 
+
+/**
+ * Adding a child process to be monitored by the child management.
+ *
+ * @param proc The child process to be monitored.
+ * @param cp The callback to be called, when the child process completed.
+ * @param cb_cls The closure for the callback.
+ * @return An handle for the the child being monitored.
+ */
 struct GNUNET_ChildWaitHandle *
 GNUNET_wait_child (struct GNUNET_OS_Process *proc,
                    GNUNET_ChildCompletedCallback cb,
@@ -198,9 +208,6 @@ GNUNET_wait_child (struct GNUNET_OS_Process *proc,
 {
   struct GNUNET_ChildWaitHandle *cwh;
 
-  LOG (GNUNET_ERROR_TYPE_ERROR,
-       "Adding child!\n");
-
   child_management_start ();
   cwh = GNUNET_new (struct GNUNET_ChildWaitHandle);
   cwh->proc = proc;
@@ -221,23 +228,20 @@ GNUNET_wait_child (struct GNUNET_OS_Process *proc,
   return cwh;
 }
 
+
+/**
+ * Removing child handle.
+ *
+ * @param cwh The handle to be removed.
+ */
 void
 GNUNET_wait_child_cancel (struct GNUNET_ChildWaitHandle *cwh)
 {
-  if ((NULL != cwh_head))
-  {
-    GNUNET_CONTAINER_DLL_remove (cwh_head,
-                                 cwh_tail,
-                                 cwh);
-  }
-  if (NULL == cwh_head)
-  {
-    child_management_done ();
-  }
-  if (NULL != sig_task)
-  {
-    GNUNET_SCHEDULER_cancel (sig_task);
-    sig_task = NULL;
-  }
+  GNUNET_CONTAINER_DLL_remove (cwh_head,
+                               cwh_tail,
+                               cwh);
   GNUNET_free (cwh);
+  if (NULL != cwh_head)
+    return;
+  child_management_done ();
 }
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index 308488131..f48f87167 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -42,13 +42,6 @@
 #define INT_MAX 0x7FFFFFFF
 #endif
 
-#if 0
-#define W32_MEM_LIMIT 200000000
-#endif
-
-#ifdef W32_MEM_LIMIT
-static LONG mem_used = 0;
-#endif
 
 /**
  * Allocate memory. Checks the return value, aborts if no more
@@ -184,11 +177,6 @@ GNUNET_xmemdup_ (const void *buf,
   /* As a security precaution, we generally do not allow very large
    * allocations here */
   GNUNET_assert_at (size <= GNUNET_MAX_MALLOC_CHECKED, filename, linenumber);
-#ifdef W32_MEM_LIMIT
-  size += sizeof(size_t);
-  if (mem_used + size > W32_MEM_LIMIT)
-    return NULL;
-#endif
   GNUNET_assert_at (size < INT_MAX, filename, linenumber);
   ret = malloc (size);
   if (ret == NULL)
@@ -196,11 +184,6 @@ GNUNET_xmemdup_ (const void *buf,
     LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "malloc");
     GNUNET_assert (0);
   }
-#ifdef W32_MEM_LIMIT
-  *((size_t *) ret) = size;
-  ret = &((size_t *) ret)[1];
-  mem_used += size;
-#endif
   GNUNET_memcpy (ret, buf, size);
   return ret;
 }
@@ -222,23 +205,12 @@ GNUNET_xmalloc_unchecked_ (size_t size, const char *filename, int linenumber)
 
   (void) filename;
   (void) linenumber;
-#ifdef W32_MEM_LIMIT
-  size += sizeof(size_t);
-  if (mem_used + size > W32_MEM_LIMIT)
-    return NULL;
-#endif
 
   result = malloc (size);
   if (NULL == result)
     return NULL;
   memset (result, 0, size);
 
-#ifdef W32_MEM_LIMIT
-  *((size_t *) result) = size;
-  result = &((size_t *) result)[1];
-  mem_used += size;
-#endif
-
   return result;
 }
 
@@ -260,11 +232,6 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
   (void) filename;
   (void) linenumber;
 
-#ifdef W32_MEM_LIMIT
-  n += sizeof(size_t);
-  ptr = &((size_t *) ptr)[-1];
-  mem_used = mem_used - *((size_t *) ptr) + n;
-#endif
 #if defined(M_SIZE)
 #if ENABLE_POISONING
   {
@@ -295,9 +262,6 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
     LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "realloc");
     GNUNET_assert (0);
   }
-#ifdef W32_MEM_LIMIT
-  ptr = &((size_t *) ptr)[1];
-#endif
   return ptr;
 }
 
@@ -333,10 +297,6 @@ GNUNET_xfree_ (void *ptr,
 {
   if (NULL == ptr)
     return;
-#ifdef W32_MEM_LIMIT
-  ptr = &((size_t *) ptr)[-1];
-  mem_used -= *((size_t *) ptr);
-#endif
 #if defined(M_SIZE)
 #if ENABLE_POISONING
   {