[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29409 - gnunet/src/ats-tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29409 - gnunet/src/ats-tests |
Date: |
Thu, 19 Sep 2013 10:40:25 +0200 |
Author: wachs
Date: 2013-09-19 10:40:25 +0200 (Thu, 19 Sep 2013)
New Revision: 29409
Modified:
gnunet/src/ats-tests/perf_ats.c
gnunet/src/ats-tests/perf_ats_logging.c
Log:
logging done
Modified: gnunet/src/ats-tests/perf_ats.c
===================================================================
--- gnunet/src/ats-tests/perf_ats.c 2013-09-19 08:13:33 UTC (rev 29408)
+++ gnunet/src/ats-tests/perf_ats.c 2013-09-19 08:40:25 UTC (rev 29409)
@@ -31,7 +31,7 @@
#include "perf_ats.h"
#define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
10)
-#define BENCHMARK_DURATION GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 5)
+#define BENCHMARK_DURATION GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 2)
#define TESTNAME_PREFIX "perf_ats_"
#define DEFAULT_SLAVES_NUM 3
#define DEFAULT_MASTERS_NUM 1
Modified: gnunet/src/ats-tests/perf_ats_logging.c
===================================================================
--- gnunet/src/ats-tests/perf_ats_logging.c 2013-09-19 08:13:33 UTC (rev
29408)
+++ gnunet/src/ats-tests/perf_ats_logging.c 2013-09-19 08:40:25 UTC (rev
29409)
@@ -39,6 +39,7 @@
* Reference to perf_ats' masters
*/
static int num_peers;
+static int running;
static char *name;
/**
@@ -157,6 +158,8 @@
struct GNUNET_DISK_FileHandle *f;
char * filename;
char *data;
+ char *slave_string;
+ char *slave_string_tmp;
struct PeerLoggingTimestep *cur_lt;
struct PartnerLoggingTimestep *plt;
int c_m;
@@ -167,20 +170,22 @@
unsigned int throughput_send_slave;
double mult;
- GNUNET_asprintf (&filename, "%llu_%s.data",
GNUNET_TIME_absolute_get().abs_value_us,name);
-
- f = GNUNET_DISK_file_open (filename,
- GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_CREATE,
- GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
- if (NULL == f)
+ for (c_m = 0; c_m < num_peers; c_m++)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot open log file `%s'\n",
filename);
- GNUNET_free (filename);
- return;
- }
+ GNUNET_asprintf (&filename, "%llu_master_[%u]_%s _%s.data",
GNUNET_TIME_absolute_get().abs_value_us,
+ lp[c_m].peer->no, GNUNET_i2s(&lp[c_m].peer->id), name);
- for (c_m = 0; c_m < num_peers; c_m++)
- {
+ f = GNUNET_DISK_file_open (filename,
+ GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_CREATE,
+ GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
+ if (NULL == f)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot open log file `%s'\n",
filename);
+ GNUNET_free (filename);
+ return;
+ }
+
+
for (cur_lt = lp[c_m].head; NULL != cur_lt; cur_lt = cur_lt->next)
{
mult = (1.0 * 1000 * 1000) / (LOGGING_FREQUENCY.rel_value_us);
@@ -204,6 +209,7 @@
cur_lt->total_messages_sent, cur_lt->total_bytes_sent,
throughput_send,
cur_lt->total_messages_received, cur_lt->total_bytes_received,
throughput_recv);
+ slave_string = GNUNET_strdup (";");
for (c_s = 0; c_s < lp[c_m].peer->num_partners; c_s++)
{
/* Log partners */
@@ -225,29 +231,37 @@
"\t Slave [%u]: %u %u %u ; %u %u %u \n", plt->slave->no,
plt->total_messages_sent, plt->total_bytes_sent,
throughput_send_slave,
plt->total_messages_received, plt->total_bytes_received,
throughput_recv_slave);
+
+
+ GNUNET_asprintf(&slave_string_tmp, "%s%u;%u;%u;%u;%u;%u;",slave_string,
+ plt->total_messages_sent, plt->total_bytes_sent,
throughput_send_slave,
+ plt->total_messages_received, plt->total_bytes_received,
throughput_recv_slave);
+ GNUNET_free (slave_string);
+ slave_string = slave_string_tmp;
}
- GNUNET_asprintf (&data, "%llu;%llu;%u;%u;%u;%u;%u;%u\n",
+ GNUNET_asprintf (&data, "%llu;%llu;%u;%u;%u;%u;%u;%u%s\n",
cur_lt->timestamp,
GNUNET_TIME_absolute_get_difference(lp[c_m].start,cur_lt->timestamp).rel_value_us
/ 1000,
cur_lt->total_messages_sent, cur_lt->total_bytes_sent,
throughput_send,
- cur_lt->total_messages_received, cur_lt->total_bytes_received,
throughput_recv);
+ cur_lt->total_messages_received, cur_lt->total_bytes_received,
throughput_recv,
+ slave_string);
+ GNUNET_free (slave_string);
if (GNUNET_SYSERR == GNUNET_DISK_file_write(f, data, strlen(data)))
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot write data to log file
`%s'\n", filename);
GNUNET_free (data);
}
- }
+ if (GNUNET_SYSERR == GNUNET_DISK_file_close(f))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot close log file `%s'\n",
filename);
+ GNUNET_free (filename);
+ return;
+ }
- if (GNUNET_SYSERR == GNUNET_DISK_file_close(f))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot close log file `%s'\n",
filename);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Data file successfully written to log
file `%s'\n", filename);
GNUNET_free (filename);
- return;
}
-
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Data file successfully written to log
file `%s'\n", filename);
- GNUNET_free (filename);
}
static void
@@ -286,9 +300,9 @@
slt->total_bytes_received = p->dest->total_bytes_received;
slt->total_messages_received = p->dest->total_messages_received;
- GNUNET_log(GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
"Master [%u]: slave [%u]\n",
- lp->peer->no, p->dest->no);
+ lp[c_m].peer->no, p->dest->no);
}
}
@@ -307,6 +321,9 @@
struct GNUNET_SCHEDULER_TaskContext tc;
struct PeerLoggingTimestep *cur;
+ if (GNUNET_YES!= running)
+ return;
+
if (GNUNET_SCHEDULER_NO_TASK != log_task)
GNUNET_SCHEDULER_cancel (log_task);
log_task = GNUNET_SCHEDULER_NO_TASK;
@@ -351,6 +368,7 @@
/* Schedule logging task */
log_task = GNUNET_SCHEDULER_add_now (&collect_log_task, NULL);
+ running = GNUNET_YES;
}
/* end of file perf_ats_logging.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29409 - gnunet/src/ats-tests,
gnunet <=