tolerate additional IPv4 address now available for gnunet.org

[oweals/gnunet.git] / src / util / test_common_logging_dummy.c

diff --git a/src/util/test_common_logging_dummy.c b/src/util/test_common_logging_dummy.c
index 9f6756ff4bc6cc624078c6abe504fe8743bd6334..b8f2bef919b68dab4d2d66e2c54a24fac63f70e6 100644 (file)
--- a/src/util/test_common_logging_dummy.c
+++ b/src/util/test_common_logging_dummy.c
@@ -1,21 +1,21 @@
 /*
      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
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
+     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/>.
 
-     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.
+     SPDX-License-Identifier: AGPL3.0-or-later
 */
 
 /**
@@ -25,11 +25,17 @@
  * @author LRN
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_time_lib.h"
-#include "gnunet_network_lib.h"
+#undef GNUNET_EXTRA_LOGGING
+#define GNUNET_EXTRA_LOGGING GNUNET_YES
 
-#define MS200 GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 200)
+#include "gnunet_util_lib.h"
+
+/**
+ * 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_MICROSECONDS, 1000)
 
 static void
 my_log (void *ctx, enum GNUNET_ErrorType kind, const char *component,
@@ -41,11 +47,15 @@ my_log (void *ctx, enum GNUNET_ErrorType kind, const char *component,
   fflush (stdout);
 }
 
+
+#if !defined(GNUNET_CULL_LOGGING)
 static int
 expensive_func ()
 {
-  return GNUNET_NETWORK_socket_select (NULL, NULL, NULL, MS200);
+  return GNUNET_NETWORK_socket_select (NULL, NULL, NULL, OUTPUT_DELAY);
 }
+#endif
+
 
 #define pr(kind,lvl) {\
   struct GNUNET_TIME_Absolute t1, t2;\
@@ -53,7 +63,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) {\
@@ -62,7 +72,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