[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14904 - gnunet/src/transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r14904 - gnunet/src/transport |
Date: |
Wed, 6 Apr 2011 16:27:26 +0200 |
Author: wachs
Date: 2011-04-06 16:27:26 +0200 (Wed, 06 Apr 2011)
New Revision: 14904
Modified:
gnunet/src/transport/test_transport_ats.c
gnunet/src/transport/test_transport_ats.conf
Log:
changes
Modified: gnunet/src/transport/test_transport_ats.c
===================================================================
--- gnunet/src/transport/test_transport_ats.c 2011-04-06 14:05:45 UTC (rev
14903)
+++ gnunet/src/transport/test_transport_ats.c 2011-04-06 14:27:26 UTC (rev
14904)
@@ -41,7 +41,7 @@
static int failed_peers;
-static int measurement_started;
+static int measurement_started = GNUNET_NO;
static struct GNUNET_TESTING_PeerGroup *pg;
@@ -62,6 +62,7 @@
static int r_index;
//static int measurements;
+static int connected;
static int peers;
static struct TEST_result results[MEASUREMENTS];
@@ -136,6 +137,11 @@
GNUNET_STATISTICS_get_cancel(s_duration);
s_duration = NULL;
}
+ if (s_invalid != NULL)
+ {
+ GNUNET_STATISTICS_get_cancel(s_invalid);
+ s_invalid = NULL;
+ }
GNUNET_TESTING_daemons_stop (pg, TIMEOUT, &shutdown_callback, NULL);
}
@@ -180,7 +186,6 @@
uint64_t value,
int is_persistent)
{
-
if (0 == strcmp (name,"ATS invalid solutions"))
{
if (stats_task != GNUNET_SCHEDULER_NO_TASK)
@@ -193,7 +198,6 @@
return GNUNET_SYSERR;
}
-
if (0 == strcmp (name,"ATS solution"))
{
s_solution = NULL;
@@ -224,6 +228,7 @@
r_index = 0;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All %llu peers
connected\n", value);
}
+
if (measurement_started == GNUNET_YES)
{
// GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s == %llu\n", name
,value);
@@ -244,38 +249,37 @@
stats_task =
GNUNET_SCHEDULER_NO_TASK;
}
evaluate_measurements();
- return GNUNET_NO;
+ return GNUNET_SYSERR;
}
fprintf(stderr, "..");
results[r_index].timestamp = value;
- return GNUNET_SYSERR;
+ return GNUNET_OK;
}
- //GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "[%i] ATS
solution: %s %llu \n", r_index, name, value);
}
if (0 == strcmp (name,"ATS solution"))
{
results[r_index].solution = value;
- //GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "[%i] ATS
solution: %s %llu \n", r_index, name, value);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "[%i] ATS
solution: %s %llu \n", r_index, name, value);
}
if (0 == strcmp (name,"ATS peers"))
{
results[r_index].peers = value;
- // GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "[%i] ATS
peers: %s %llu \n", r_index, name, value);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "[%i] ATS peers:
%s %llu \n", r_index, name, value);
}
if (0 == strcmp (name,"ATS mechanisms"))
{
results[r_index].mechs = value;
- //GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "[%i] ATS
mechanisms: %s %llu \n", r_index, name, value);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "[%i] ATS
mechanisms: %s %llu \n", r_index, name, value);
}
if (0 == strcmp (name,"ATS duration"))
{
results[r_index].duration = value;
- // GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "[%i] ATS
duration: %s %llu \n", r_index, name, value);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "[%i] ATS
duration: %s %llu \n", r_index, name, value);
}
}
return GNUNET_OK;
@@ -295,7 +299,7 @@
s_duration = GNUNET_STATISTICS_get (stats, "transport","ATS duration",
TIMEOUT, NULL, &stats_cb, NULL);
s_peers = GNUNET_STATISTICS_get (stats, "transport", "ATS peers",
TIMEOUT, NULL, &stats_cb, NULL);
s_mechs = GNUNET_STATISTICS_get (stats, "transport", "ATS mechanisms",
TIMEOUT, NULL, &stats_cb, NULL);
- s_mechs = GNUNET_STATISTICS_get (stats, "transport", "ATS invalid
solutions", TIMEOUT, NULL, &stats_cb, NULL);
+ s_invalid = GNUNET_STATISTICS_get (stats, "transport", "ATS invalid
solutions", TIMEOUT, NULL, &stats_cb, NULL);
stats_task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 250), &stats_get_task, NULL);
@@ -333,7 +337,8 @@
{
char * firstc = strdup(GNUNET_i2s(first));
char * secondc = strdup(GNUNET_i2s(second));
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected peers `%s'<->`%s'\n",
firstc, secondc);
+ connected++;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected peers `%s'<->`%s'
(%i/%i)\n", firstc, secondc, connected, peers-1);
GNUNET_free(firstc);
GNUNET_free(secondc);
}
@@ -459,8 +464,6 @@
{
peers = atoi(argv[1]);
peers++;
- if(peers <1)
- peers = NUM_PEERS;
}
ret = check ();
/**
Modified: gnunet/src/transport/test_transport_ats.conf
===================================================================
--- gnunet/src/transport/test_transport_ats.conf 2011-04-06 14:05:45 UTC
(rev 14903)
+++ gnunet/src/transport/test_transport_ats.conf 2011-04-06 14:27:26 UTC
(rev 14904)
@@ -11,12 +11,12 @@
#DEBUG = YES
#PREFIX = xterm -e xterm -T transport -e gdb -x cmd --args
#PREFIX = valgrind --tool=memcheck --log-file=logs%p
-WAN_BW_LIMIT_DOWN = 100
-WAN_BW_LIMIT_UP = 10000
-LAN_BW_LIMIT_DOWN = 100
-LAN_BW_LIMIT_UP = 50000
-WLAN_ENERGY_DOWN_LIMIT = 0
-WLAN_ENERGY_UP_LIMIT = 30
+#WAN_BW_LIMIT_DOWN = 100
+#WAN_BW_LIMIT_UP = 1000000
+#LAN_BW_LIMIT_DOWN = 100
+#LAN_BW_LIMIT_UP = 100000000
+#WLAN_ENERGY_DOWN_LIMIT = 0
+#WLAN_ENERGY_UP_LIMIT = 30
[arm]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14904 - gnunet/src/transport,
gnunet <=