[GNUnet-SVN] r21293 - gnunet/src/ats

[gnunet]

Author: grothoff
Date: 2012-05-06 14:59:09 +0200 (Sun, 06 May 2012)
New Revision: 21293

Modified:
   gnunet/src/ats/ats_api_scheduling.c
   gnunet/src/ats/perf_ats_mlp.c
   gnunet/src/ats/test_ats_api_bandwidth_consumption.c
   gnunet/src/ats/test_ats_api_scheduling.c
   gnunet/src/ats/test_ats_api_update_address.c
   gnunet/src/ats/test_ats_mlp.c
   gnunet/src/ats/test_ats_mlp_averaging.c
Log:
-eliminating legacy defines

Modified: gnunet/src/ats/ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/ats_api_scheduling.c 2012-05-06 12:26:00 UTC (rev 21292)
+++ gnunet/src/ats/ats_api_scheduling.c 2012-05-06 12:59:09 UTC (rev 21293)
@@ -847,25 +847,6 @@
   /* no local network found for this address, default: WAN */
   if (type == GNUNET_ATS_NET_UNSPECIFIED)
     type = GNUNET_ATS_NET_WAN;
-
-#if VERBOSE
-  const char * range;
-  switch (type) {
-    case GNUNET_ATS_NET_WAN:
-        range = "WAN";
-      break;
-    case GNUNET_ATS_NET_LAN:
-        range = "LAN";
-      break;
-    case GNUNET_ATS_NET_LOOPBACK:
-        range = "LOOPBACK";
-      break;
-    default:
-
-      break;
-  }
-#endif
-
   ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
   ats.value = htonl (type);
   return (const struct GNUNET_ATS_Information) ats;

Modified: gnunet/src/ats/perf_ats_mlp.c
===================================================================
--- gnunet/src/ats/perf_ats_mlp.c       2012-05-06 12:26:00 UTC (rev 21292)
+++ gnunet/src/ats/perf_ats_mlp.c       2012-05-06 12:59:09 UTC (rev 21293)
@@ -29,9 +29,6 @@
 #include "gnunet_statistics_service.h"
 #include "gnunet-service-ats_addresses_mlp.h"
 
-#define VERBOSE GNUNET_YES
-#define VERBOSE_ARM GNUNET_NO
-
 #define MLP_MAX_EXEC_DURATION   
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3)
 #define MLP_MAX_ITERATIONS      INT_MAX
 
@@ -54,9 +51,9 @@
 
 static int ret;
 
-struct GNUNET_CONTAINER_MultiHashMap * amap;
+static struct GNUNET_CONTAINER_MultiHashMap * amap;
 
-struct GAS_MLP_Handle *mlp;
+static struct GAS_MLP_Handle *mlp;
 
 
 

Modified: gnunet/src/ats/test_ats_api_bandwidth_consumption.c
===================================================================
--- gnunet/src/ats/test_ats_api_bandwidth_consumption.c 2012-05-06 12:26:00 UTC 
(rev 21292)
+++ gnunet/src/ats/test_ats_api_bandwidth_consumption.c 2012-05-06 12:59:09 UTC 
(rev 21293)
@@ -28,10 +28,6 @@
 #include "gnunet_ats_service.h"
 #include "ats.h"
 
-#define VERBOSE GNUNET_NO
-
-#define VERBOSE_ARM GNUNET_NO
-
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
@@ -201,9 +197,6 @@
   arm_proc =
       GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
                                "gnunet-service-arm",
-#if VERBOSE_ARM
-                               "-L", "DEBUG",
-#endif
                                "-c", cfgname, NULL);
 }
 
@@ -263,11 +256,7 @@
   static char *const argv2[] = { "test_ats_api_bandwidth_consumption",
     "-c",
     "test_ats_api.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#else
     "-L", "WARNING",
-#endif
     NULL
   };
 

Modified: gnunet/src/ats/test_ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/test_ats_api_scheduling.c    2012-05-06 12:26:00 UTC (rev 
21292)
+++ gnunet/src/ats/test_ats_api_scheduling.c    2012-05-06 12:59:09 UTC (rev 
21293)
@@ -34,10 +34,6 @@
 #include "gnunet_ats_service.h"
 #include "ats.h"
 
-#define VERBOSE GNUNET_NO
-
-#define VERBOSE_ARM GNUNET_NO
-
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
 
 static GNUNET_SCHEDULER_TaskIdentifier die_task;
@@ -158,9 +154,6 @@
   arm_proc =
     GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-arm",
                                "gnunet-service-arm",
-#if VERBOSE_ARM
-                               "-L", "DEBUG",
-#endif
                                "-c", cfgname, NULL);
 }
 
@@ -241,11 +234,7 @@
   static char *const argv2[] = { "test_ats_api_scheduling",
     "-c",
     "test_ats_api.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#else
     "-L", "WARNING",
-#endif
     NULL
   };
 

Modified: gnunet/src/ats/test_ats_api_update_address.c
===================================================================
--- gnunet/src/ats/test_ats_api_update_address.c        2012-05-06 12:26:00 UTC 
(rev 21292)
+++ gnunet/src/ats/test_ats_api_update_address.c        2012-05-06 12:59:09 UTC 
(rev 21293)
@@ -34,10 +34,6 @@
 #include "gnunet_ats_service.h"
 #include "gnunet_transport_service.h"
 
-#define VERBOSE GNUNET_NO
-
-#define VERBOSE_ARM GNUNET_NO
-
 #define START_ARM GNUNET_YES
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
@@ -277,11 +273,7 @@
   static char *const argv[] = { "test_ats_api_update_address",
     "-c",
     "test_ats_api.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#else
     "-L", "WARNING",
-#endif
     NULL
   };
 

Modified: gnunet/src/ats/test_ats_mlp.c
===================================================================
--- gnunet/src/ats/test_ats_mlp.c       2012-05-06 12:26:00 UTC (rev 21292)
+++ gnunet/src/ats/test_ats_mlp.c       2012-05-06 12:59:09 UTC (rev 21293)
@@ -30,9 +30,6 @@
 #include "gnunet_ats_service.h"
 #include "gnunet-service-ats_addresses_mlp.h"
 
-#define VERBOSE GNUNET_YES
-#define VERBOSE_ARM GNUNET_NO
-
 #define MLP_MAX_EXEC_DURATION   
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3)
 #define MLP_MAX_ITERATIONS      INT_MAX
 
@@ -179,11 +176,7 @@
   static char *const argv2[] = { "test_ats_mlp",
     "-c",
     "test_ats_api.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#else
     "-L", "WARNING",
-#endif
     NULL
   };
 

Modified: gnunet/src/ats/test_ats_mlp_averaging.c
===================================================================
--- gnunet/src/ats/test_ats_mlp_averaging.c     2012-05-06 12:26:00 UTC (rev 
21292)
+++ gnunet/src/ats/test_ats_mlp_averaging.c     2012-05-06 12:59:09 UTC (rev 
21293)
@@ -30,9 +30,6 @@
 #include "gnunet_ats_service.h"
 #include "gnunet-service-ats_addresses_mlp.h"
 
-#define VERBOSE GNUNET_YES
-#define VERBOSE_ARM GNUNET_NO
-
 #define MLP_MAX_EXEC_DURATION   
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3)
 #define MLP_MAX_ITERATIONS      INT_MAX
 
@@ -162,11 +159,7 @@
   static char *const argv2[] = { "test_ats_mlp",
     "-c",
     "test_ats_api.conf",
-#if VERBOSE
-    "-L", "DEBUG",
-#else
     "-L", "WARNING",
-#endif
     NULL
   };