X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_common_logging_dummy.c;h=0d971eac575ab8713f1944882af3de0daf165f64;hb=82e765caeb53a1de54676738169dab98ca76c47e;hp=a1f479976c83ae0aa02a1bde7161e1070986a672;hpb=c7862e3f63acaa648653a30e567a875d42d6b4c2;p=oweals%2Fgnunet.git

diff --git a/src/util/test_common_logging_dummy.c b/src/util/test_common_logging_dummy.c
index a1f479976..0d971eac5 100644
--- a/src/util/test_common_logging_dummy.c
+++ b/src/util/test_common_logging_dummy.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2008 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2008-2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -28,14 +28,14 @@
 #undef GNUNET_EXTRA_LOGGING
 #define GNUNET_EXTRA_LOGGING GNUNET_YES
 
-#include "gnunet_common.h"
-#include "gnunet_time_lib.h"
-#include "gnunet_network_lib.h"
+#include "gnunet_util_lib.h"
 
 /**
- * Delay introduced between operations, useful for debugging.
+ * Artificial delay attached to each log call that is not skipped out.
+ * This must be long enough for us to not to mistake skipped log call
+ * on a slow machine for a non-skipped one.
  */
-#define OUTPUT_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 0)
+#define OUTPUT_DELAY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MICROSECONDS, 1000)
 
 static void
 my_log (void *ctx, enum GNUNET_ErrorType kind, const char *component,
@@ -59,7 +59,7 @@ expensive_func ()
   GNUNET_log (kind, "L%s %d\n", lvl, expensive_func());\
   t2 = GNUNET_TIME_absolute_get ();\
   printf ("1%s %llu\n", lvl,\
-          (unsigned long long) GNUNET_TIME_absolute_get_difference (t1, t2).rel_value); \
+          (unsigned long long) GNUNET_TIME_absolute_get_difference (t1, t2).rel_value_us); \
 }
 
 #define pr2(kind,lvl) {\
@@ -68,7 +68,7 @@ expensive_func ()
   GNUNET_log (kind, "L%s %d\n", lvl, expensive_func());\
   t2 = GNUNET_TIME_absolute_get ();\
   printf ("2%s %llu\n", lvl,\
-          (unsigned long long) GNUNET_TIME_absolute_get_difference (t1, t2).rel_value); \
+          (unsigned long long) GNUNET_TIME_absolute_get_difference (t1, t2).rel_value_us); \
 }
 
 int