-nicer logging

[oweals/gnunet.git] / src / ats-tests / perf_ats.h

diff --git a/src/ats-tests/perf_ats.h b/src/ats-tests/perf_ats.h
index cc9a99d69e849daf3005b8cf3b4b355dd69e5231..2c9936aeb7196fe5dcd257bf192c4cbe36c3a568 100644 (file)
--- a/src/ats-tests/perf_ats.h
+++ b/src/ats-tests/perf_ats.h
@@ -1,6 +1,6 @@
 /*
  This file is part of GNUnet.
- (C) 2010-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2013 Christian Grothoff (and other contributing authors)
 
  GNUnet is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published
@@ -28,12 +28,13 @@
 #include "gnunet_testbed_service.h"
 #include "gnunet_ats_service.h"
 #include "gnunet_core_service.h"
+#include "ats-testing.h"
 
-#define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 120)
 #define BENCHMARK_DURATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
 #define LOGGING_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 500)
 #define TESTNAME_PREFIX "perf_ats_"
-#define DEFAULT_SLAVES_NUM 3
+#define DEFAULT_SLAVES_NUM 2
 #define DEFAULT_MASTERS_NUM 1
 
 #define TEST_ATS_PREFRENCE_FREQUENCY GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
@@ -76,9 +77,9 @@ struct BenchmarkPartner
   struct GNUNET_TIME_Absolute last_message_sent;
 
   /**
-   * Accumulated delay for all messages
+   * Accumulated RTT for all messages
    */
-  unsigned int total_app_delay;
+  unsigned int total_app_rtt;
 
   /**
    * Number of messages sent to this partner
@@ -100,9 +101,27 @@ struct BenchmarkPartner
    */
   unsigned int bytes_received;
 
+  /* Current ATS properties */
 
+  uint32_t ats_distance;
 
+  uint32_t ats_delay;
 
+  uint32_t bandwidth_in;
+
+  uint32_t bandwidth_out;
+
+  uint32_t ats_utilization_up;
+
+  uint32_t ats_utilization_down;
+
+  uint32_t ats_network_type;
+
+  uint32_t ats_cost_wan;
+
+  uint32_t ats_cost_lan;
+
+  uint32_t ats_cost_wlan;
 };
 
 
@@ -177,7 +196,7 @@ struct BenchmarkPeer
    * Masters only
    * Progress task
    */
-  GNUNET_SCHEDULER_TaskIdentifier ats_task;
+  struct GNUNET_SCHEDULER_Task * ats_task;
 
   /**
    * Masters only
@@ -229,12 +248,4 @@ struct BenchmarkPeer
 };
 
 
-void
-perf_logging_stop ();
-
-void
-perf_logging_start (struct GNUNET_TIME_Relative log_frequency,
-    char * testname, struct BenchmarkPeer *masters, int num_masters);
-
-
 /* end of file perf_ats.h */