1 files changed, 252 insertions, 241 deletions

diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c
index 8da808760..f46776c8f 100644
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -11,12 +11,12 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
      SPDX-License-Identifier: AGPL3.0-or-later
-*/
+ */
 
 /**
  * @file util/test_common_logging_runtime_loglevels.c
@@ -32,13 +32,13 @@
  * How much time the child is allowed to waste on skipped log calls, at most.
  * Raspberry Pi takes 113 microseconds tops, this is 3x that value.
  */
-#define MAX_SKIP_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 400).rel_value_us
+#define MAX_SKIP_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MICROSECONDS, 400).rel_value_us
 
 /**
  * How much time non-skipped log call should take, at least.
  * Keep in sync with the value in the dummy!
  */
-#define OUTPUT_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 1000).rel_value_us
+#define OUTPUT_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MICROSECONDS, 1000).rel_value_us
 
 static int ok;
 
@@ -54,51 +54,51 @@ static struct GNUNET_SCHEDULER_Task * die_task;
 static struct GNUNET_SCHEDULER_Task * read_task;
 
 static void
-runone (void);
+runone(void);
 
 
 static void
-end_task (void *cls)
+end_task(void *cls)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending phase %d, ok is %d\n", phase,
-              ok);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Ending phase %d, ok is %d\n", phase,
+             ok);
   if (NULL != proc)
-  {
-    if (0 != GNUNET_OS_process_kill (proc, GNUNET_TERM_SIG))
     {
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+      if (0 != GNUNET_OS_process_kill(proc, GNUNET_TERM_SIG))
+        {
+          GNUNET_log_strerror(GNUNET_ERROR_TYPE_WARNING, "kill");
+        }
+      GNUNET_OS_process_wait(proc);
+      GNUNET_OS_process_destroy(proc);
+      proc = NULL;
     }
-    GNUNET_OS_process_wait (proc);
-    GNUNET_OS_process_destroy (proc);
-    proc = NULL;
-  }
   if (NULL != read_task)
-  {
-    GNUNET_SCHEDULER_cancel (read_task);
-    read_task = NULL;
-  }
-  GNUNET_DISK_pipe_close (pipe_stdout);
+    {
+      GNUNET_SCHEDULER_cancel(read_task);
+      read_task = NULL;
+    }
+  GNUNET_DISK_pipe_close(pipe_stdout);
   if (ok == 1)
-  {
-    if (phase < 9)
     {
-      phase += 1;
-      runone ();
+      if (phase < 9)
+        {
+          phase += 1;
+          runone();
+        }
+      else
+        ok = 0;
     }
-    else
-      ok = 0;
-  }
   else
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "failing\n");
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "failing\n");
 }
 
 
 static char *
-read_output_line (int phase_from1, int phase_to1, int phase_from2,
-                  int phase_to2, char c, const char *expect_level,
-                  long delay_morethan, long delay_lessthan, int phase,
-                  char *p,
-                  int *len, long *delay, char level[8])
+read_output_line(int phase_from1, int phase_to1, int phase_from2,
+                 int phase_to2, char c, const char *expect_level,
+                 long delay_morethan, long delay_lessthan, int phase,
+                 char *p,
+                 int *len, long *delay, char level[8])
 {
   char *r = p;
   char t[7];
@@ -115,61 +115,63 @@ read_output_line (int phase_from1, int phase_to1, int phase_from2,
       !(phase >= phase_from2 && phase <= phase_to2))
     return p;
 #if 0
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Trying to match '%c%s \\d\\r\\n' on %s\n", c, expect_level, p);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+             "Trying to match '%c%s \\d\\r\\n' on %s\n", c, expect_level, p);
 #endif
   for (i = 0; i < *len && !stop; i++)
-  {
-    switch (stage)
     {
-    case 0:                    /* read first char */
-      if (r[i] != c)
-      {
-        GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Expected '%c', but got '%c'\n", c,
-                    r[i]);
-        GNUNET_break (0);
-        return NULL;
-      }
-      stage += 1;
-      break;
-    case 1:                    /* read at most 7 char-long error level string, finished by ' ' */
-      if (r[i] == ' ')
-      {
-        level[j] = '\0';
-        stage += 1;
-        j = 0;
-      }
-      else if (i == 8)
-      {
-        GNUNET_break (0);
-        ok = 2;
-        return NULL;
-      }
-      else
-        level[j++] = r[i];
-      break;
-    case 2:                    /* read the delay, finished by '\n' */
-      t[j++] = r[i];
+      switch (stage)
+        {
+        case 0:                /* read first char */
+          if (r[i] != c)
+            {
+              GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Expected '%c', but got '%c'\n", c,
+                         r[i]);
+              GNUNET_break(0);
+              return NULL;
+            }
+          stage += 1;
+          break;
+
+        case 1:                /* read at most 7 char-long error level string, finished by ' ' */
+          if (r[i] == ' ')
+            {
+              level[j] = '\0';
+              stage += 1;
+              j = 0;
+            }
+          else if (i == 8)
+            {
+              GNUNET_break(0);
+              ok = 2;
+              return NULL;
+            }
+          else
+            level[j++] = r[i];
+          break;
+
+        case 2:                /* read the delay, finished by '\n' */
+          t[j++] = r[i];
 #if WINDOWS
-      if (r[i] == '\r' && r[i + 1] == '\n')
-      {
-        i += 1;
-        t[j - 1] = '\0';
-        *delay = strtol (t, NULL, 10);
-        stop = 1;
-      }
+          if (r[i] == '\r' && r[i + 1] == '\n')
+            {
+              i += 1;
+              t[j - 1] = '\0';
+              *delay = strtol(t, NULL, 10);
+              stop = 1;
+            }
 #else
-      if (r[i] == '\n')
-      {
-        t[j - 1] = '\0';
-        *delay = strtol (t, NULL, 10);
-        stop = 1;
-      }
+          if (r[i] == '\n')
+            {
+              t[j - 1] = '\0';
+              *delay = strtol(t, NULL, 10);
+              stop = 1;
+            }
 #endif
-      break;
+          break;
+        }
     }
-  }
-  level_matches = (strcmp (expect_level, level) == 0);
+  level_matches = (strcmp(expect_level, level) == 0);
   delay_is_sane = (*delay >= 0) && (*delay <= 1000000);
   delay_is_a_dummy = (c == 'L');
   /* Delay must be either less than 'lessthan' (log call is skipped)
@@ -179,22 +181,22 @@ read_output_line (int phase_from1, int phase_to1, int phase_from2,
   if (delay_is_a_dummy)
     delay_outside_of_range = 1;
 
-  if (! stop)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Wrong log format?\n");
-  if (! level_matches)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Wrong log level\n");
-  if (! delay_is_sane)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Delay %ld is insane\n",
-                *delay);
-  if (! delay_outside_of_range)
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Delay %ld is not outside of range (%ld ; %ld)\n",
-                *delay,
-                delay_lessthan,
-                delay_morethan);
+  if (!stop)
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+               "Wrong log format?\n");
+  if (!level_matches)
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+               "Wrong log level\n");
+  if (!delay_is_sane)
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+               "Delay %ld is insane\n",
+               *delay);
+  if (!delay_outside_of_range)
+    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+               "Delay %ld is not outside of range (%ld ; %ld)\n",
+               *delay,
+               delay_lessthan,
+               delay_morethan);
   if (!stop || !level_matches || !delay_is_sane || !delay_outside_of_range)
     return NULL;
   *len = *len - i;
@@ -221,7 +223,7 @@ static int bytes;
 
 
 static void
-read_call (void *cls)
+read_call(void *cls)
 {
   const struct GNUNET_DISK_FileHandle *stdout_read_handle = cls;
   char level[8];
@@ -230,24 +232,24 @@ read_call (void *cls)
   int rd;
 
   read_task = NULL;
-  rd = GNUNET_DISK_file_read (stdout_read_handle, buf_ptr,
-                              sizeof (buf) - bytes);
+  rd = GNUNET_DISK_file_read(stdout_read_handle, buf_ptr,
+                             sizeof(buf) - bytes);
   if (rd > 0)
-  {
-    buf_ptr += rd;
-    bytes += rd;
+    {
+      buf_ptr += rd;
+      bytes += rd;
 #if VERBOSE
-    fprintf (stderr, "got %d bytes, reading more\n", rd);
+      fprintf(stderr, "got %d bytes, reading more\n", rd);
 #endif
-    read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                                stdout_read_handle,
-                                                &read_call,
-                                                (void*) stdout_read_handle);
-    return;
-  }
+      read_task = GNUNET_SCHEDULER_add_read_file(GNUNET_TIME_UNIT_FOREVER_REL,
+                                                 stdout_read_handle,
+                                                 &read_call,
+                                                 (void*)stdout_read_handle);
+      return;
+    }
 
 #if VERBOSE
-  fprintf (stderr, "bytes is %d:%s\n", bytes, buf);
+  fprintf(stderr, "bytes is %d:%s\n", bytes, buf);
 #endif
 
   /* +------CHILD OUTPUT--
@@ -269,186 +271,195 @@ read_call (void *cls)
 
   if (bytes == LOG_BUFFER_SIZE ||
       !(p =
-        read_output_line (0, 3, 4, 9, 'L', "ERROR", -1,
-                          1, phase, p,
-                          &bytes, &delay, level)) ||
+          read_output_line(0, 3, 4, 9, 'L', "ERROR", -1,
+                           1, phase, p,
+                           &bytes, &delay, level)) ||
       !(p =
-        read_output_line (0, 3, 4, 9, '1', "ERROR", OUTPUT_DELAY,
-                          MAX_SKIP_DELAY, phase, p,
-                          &bytes, &delays[0], level)) ||
+          read_output_line(0, 3, 4, 9, '1', "ERROR", OUTPUT_DELAY,
+                           MAX_SKIP_DELAY, phase, p,
+                           &bytes, &delays[0], level)) ||
       !(p =
-        read_output_line (1, 3, 5, 9, 'L', "WARNING", -1,
-                          1, phase, p,
-                          &bytes, &delay, level)) ||
+          read_output_line(1, 3, 5, 9, 'L', "WARNING", -1,
+                           1, phase, p,
+                           &bytes, &delay, level)) ||
       !(p =
-        read_output_line (0, 3, 4, 9, '1', "WARNING", OUTPUT_DELAY,
-                          MAX_SKIP_DELAY, phase, p,
-                          &bytes, &delays[1], level)) ||
+          read_output_line(0, 3, 4, 9, '1', "WARNING", OUTPUT_DELAY,
+                           MAX_SKIP_DELAY, phase, p,
+                           &bytes, &delays[1], level)) ||
       !(p =
-        read_output_line (2, 3, 6, 7, 'L', "INFO", -1,
-                          1, phase, p,
-                          &bytes, &delay, level)) ||
+          read_output_line(2, 3, 6, 7, 'L', "INFO", -1,
+                           1, phase, p,
+                           &bytes, &delay, level)) ||
       !(p =
-        read_output_line (0, 3, 4, 9, '1', "INFO", OUTPUT_DELAY,
-                          MAX_SKIP_DELAY, phase, p,
-                          &bytes, &delays[2], level)) ||
+          read_output_line(0, 3, 4, 9, '1', "INFO", OUTPUT_DELAY,
+                           MAX_SKIP_DELAY, phase, p,
+                           &bytes, &delays[2], level)) ||
       !(p =
-        read_output_line (3, 3, 7, 7, 'L', "DEBUG", -1,
-                          1, phase, p,
-                          &bytes, &delay, level)) ||
+          read_output_line(3, 3, 7, 7, 'L', "DEBUG", -1,
+                           1, phase, p,
+                           &bytes, &delay, level)) ||
       !(p =
-        read_output_line (0, 3, 4, 9, '1', "DEBUG", OUTPUT_DELAY,
-                          MAX_SKIP_DELAY, phase, p,
-                          &bytes, &delays[3], level)) ||
+          read_output_line(0, 3, 4, 9, '1', "DEBUG", OUTPUT_DELAY,
+                           MAX_SKIP_DELAY, phase, p,
+                           &bytes, &delays[3], level)) ||
       !(p =
-        read_output_line (0, 3, 4, 9, 'L', "ERROR", -1,
-                          1, phase, p,
-                          &bytes, &delay, level)) ||
+          read_output_line(0, 3, 4, 9, 'L', "ERROR", -1,
+                           1, phase, p,
+                           &bytes, &delay, level)) ||
       !(p =
-        read_output_line (0, 3, 4, 9, '2', "ERROR", OUTPUT_DELAY,
-                          MAX_SKIP_DELAY, phase, p,
-                          &bytes, &delays[4], level)) ||
+          read_output_line(0, 3, 4, 9, '2', "ERROR", OUTPUT_DELAY,
+                           MAX_SKIP_DELAY, phase, p,
+                           &bytes, &delays[4], level)) ||
       !(p =
-        read_output_line (0, 3, 5, 9, 'L', "WARNING", -1,
-                          1, phase, p,
-                          &bytes, &delay, level)) ||
+          read_output_line(0, 3, 5, 9, 'L', "WARNING", -1,
+                           1, phase, p,
+                           &bytes, &delay, level)) ||
       !(p =
-        read_output_line (0, 3, 4, 9, '2', "WARNING", OUTPUT_DELAY,
-                          MAX_SKIP_DELAY, phase, p,
-                          &bytes, &delays[5], level)) ||
+          read_output_line(0, 3, 4, 9, '2', "WARNING", OUTPUT_DELAY,
+                           MAX_SKIP_DELAY, phase, p,
+                           &bytes, &delays[5], level)) ||
       !(p =
-        read_output_line (-1, -1, 6, 7, 'L', "INFO", -1,
-                          1, phase, p,
-                          &bytes, &delay, level)) ||
+          read_output_line(-1, -1, 6, 7, 'L', "INFO", -1,
+                           1, phase, p,
+                           &bytes, &delay, level)) ||
       !(p =
-        read_output_line (0, 3, 4, 9, '2', "INFO", OUTPUT_DELAY,
-                          MAX_SKIP_DELAY, phase, p,
-                          &bytes, &delays[6], level)) ||
+          read_output_line(0, 3, 4, 9, '2', "INFO", OUTPUT_DELAY,
+                           MAX_SKIP_DELAY, phase, p,
+                           &bytes, &delays[6], level)) ||
       !(p =
-        read_output_line (-1, -1, 7, 7, 'L', "DEBUG", -1,
-                          1, phase, p,
-                          &bytes, &delay, level)) ||
+          read_output_line(-1, -1, 7, 7, 'L', "DEBUG", -1,
+                           1, phase, p,
+                           &bytes, &delay, level)) ||
       !(p =
-        read_output_line (0, 3, 4, 9, '2', "DEBUG", OUTPUT_DELAY,
-                          MAX_SKIP_DELAY, phase, p,
-                          &bytes, &delays[7], level)))
-  {
-    if (bytes == LOG_BUFFER_SIZE)
-      fprintf (stderr, "%s",  "Ran out of buffer space!\n");
-    GNUNET_break (0);
-    ok = 2;
-    GNUNET_SCHEDULER_cancel (die_task);
-    GNUNET_SCHEDULER_add_now (&end_task, NULL);
-    return;
-  }
-
-  GNUNET_SCHEDULER_cancel (die_task);
-  GNUNET_SCHEDULER_add_now (&end_task, NULL);
+          read_output_line(0, 3, 4, 9, '2', "DEBUG", OUTPUT_DELAY,
+                           MAX_SKIP_DELAY, phase, p,
+                           &bytes, &delays[7], level)))
+    {
+      if (bytes == LOG_BUFFER_SIZE)
+        fprintf(stderr, "%s", "Ran out of buffer space!\n");
+      GNUNET_break(0);
+      ok = 2;
+      GNUNET_SCHEDULER_cancel(die_task);
+      GNUNET_SCHEDULER_add_now(&end_task, NULL);
+      return;
+    }
+
+  GNUNET_SCHEDULER_cancel(die_task);
+  GNUNET_SCHEDULER_add_now(&end_task, NULL);
 }
 
 
 static void
-runone ()
+runone()
 {
   const struct GNUNET_DISK_FileHandle *stdout_read_handle;
 
-  pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+  pipe_stdout = GNUNET_DISK_pipe(GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
 
   if (pipe_stdout == NULL)
-  {
-    GNUNET_break (0);
-    ok = 2;
-    return;
-  }
-
-  putenv ("GNUNET_LOG=");
-  putenv ("GNUNET_FORCE_LOG=");
-  putenv ("GNUNET_FORCE_LOGFILE=");
+    {
+      GNUNET_break(0);
+      ok = 2;
+      return;
+    }
+
+  putenv("GNUNET_LOG=");
+  putenv("GNUNET_FORCE_LOG=");
+  putenv("GNUNET_FORCE_LOGFILE=");
   switch (phase)
-  {
-  case 0:
-    putenv ("GNUNET_LOG=;;;;ERROR");
-    break;
-  case 1:
-    putenv ("GNUNET_LOG=;;;;WARNING");
-    break;
-  case 2:
-    putenv ("GNUNET_LOG=;;;;INFO");
-    break;
-  case 3:
-    putenv ("GNUNET_LOG=;;;;DEBUG");
-    break;
-  case 4:
-    putenv ("GNUNET_FORCE_LOG=;;;;ERROR");
-    break;
-  case 5:
-    putenv ("GNUNET_FORCE_LOG=;;;;WARNING");
-    break;
-  case 6:
-    putenv ("GNUNET_FORCE_LOG=;;;;INFO");
-    break;
-  case 7:
-    putenv ("GNUNET_FORCE_LOG=;;;;DEBUG");
-    break;
-  case 8:
-    putenv ("GNUNET_LOG=blah;;;;ERROR");
-    break;
-  case 9:
-    putenv ("GNUNET_FORCE_LOG=blah;;;;ERROR");
-    break;
-  }
-
-  proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                                  NULL, pipe_stdout, NULL,
+    {
+    case 0:
+      putenv("GNUNET_LOG=;;;;ERROR");
+      break;
+
+    case 1:
+      putenv("GNUNET_LOG=;;;;WARNING");
+      break;
+
+    case 2:
+      putenv("GNUNET_LOG=;;;;INFO");
+      break;
+
+    case 3:
+      putenv("GNUNET_LOG=;;;;DEBUG");
+      break;
+
+    case 4:
+      putenv("GNUNET_FORCE_LOG=;;;;ERROR");
+      break;
+
+    case 5:
+      putenv("GNUNET_FORCE_LOG=;;;;WARNING");
+      break;
+
+    case 6:
+      putenv("GNUNET_FORCE_LOG=;;;;INFO");
+      break;
+
+    case 7:
+      putenv("GNUNET_FORCE_LOG=;;;;DEBUG");
+      break;
+
+    case 8:
+      putenv("GNUNET_LOG=blah;;;;ERROR");
+      break;
+
+    case 9:
+      putenv("GNUNET_FORCE_LOG=blah;;;;ERROR");
+      break;
+    }
+
+  proc = GNUNET_OS_start_process(GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                 NULL, pipe_stdout, NULL,
 #if MINGW
-                                  "test_common_logging_dummy",
+                                 "test_common_logging_dummy",
 #else
-                                  "./test_common_logging_dummy",
+                                 "./test_common_logging_dummy",
 #endif
-                                  "test_common_logging_dummy", NULL);
-  GNUNET_assert (NULL != proc);
-  putenv ("GNUNET_FORCE_LOG=");
-  putenv ("GNUNET_LOG=");
+                                 "test_common_logging_dummy", NULL);
+  GNUNET_assert(NULL != proc);
+  putenv("GNUNET_FORCE_LOG=");
+  putenv("GNUNET_LOG=");
 
   /* Close the write end of the read pipe */
-  GNUNET_DISK_pipe_close_end (pipe_stdout, GNUNET_DISK_PIPE_END_WRITE);
+  GNUNET_DISK_pipe_close_end(pipe_stdout, GNUNET_DISK_PIPE_END_WRITE);
 
   stdout_read_handle =
-      GNUNET_DISK_pipe_handle (pipe_stdout, GNUNET_DISK_PIPE_END_READ);
+    GNUNET_DISK_pipe_handle(pipe_stdout, GNUNET_DISK_PIPE_END_READ);
 
   die_task =
-      GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
-                                    (GNUNET_TIME_UNIT_SECONDS, 10),
-                                    &end_task,
-                                    NULL);
+    GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply
+                                   (GNUNET_TIME_UNIT_SECONDS, 10),
+                                 &end_task,
+                                 NULL);
 
   bytes = 0;
   buf_ptr = buf;
-  memset (&buf, 0, sizeof (buf));
+  memset(&buf, 0, sizeof(buf));
 
-  read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
-                                              stdout_read_handle,
-                                              &read_call,
-                                              (void*) stdout_read_handle);
+  read_task = GNUNET_SCHEDULER_add_read_file(GNUNET_TIME_UNIT_FOREVER_REL,
+                                             stdout_read_handle,
+                                             &read_call,
+                                             (void*)stdout_read_handle);
 }
 
 
 static void
-task (void *cls)
+task(void *cls)
 {
   phase = 0;
-  runone ();
+  runone();
 }
 
 
 int
-main (int argc, char *argv[])
+main(int argc, char *argv[])
 {
-  GNUNET_log_setup ("test-common-logging-runtime-loglevels",
-                    "WARNING",
-                    NULL);
+  GNUNET_log_setup("test-common-logging-runtime-loglevels",
+                   "WARNING",
+                   NULL);
   ok = 1;
-  GNUNET_SCHEDULER_run (&task, &ok);
+  GNUNET_SCHEDULER_run(&task, &ok);
   return ok;
 }