[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33146 - gnunet/src/ats
From: |
gnunet |
Subject: |
[GNUnet-SVN] r33146 - gnunet/src/ats |
Date: |
Tue, 29 Apr 2014 15:17:46 +0200 |
Author: wachs
Date: 2014-04-29 15:17:46 +0200 (Tue, 29 Apr 2014)
New Revision: 33146
Modified:
gnunet/src/ats/gnunet-ats-solver-eval.c
gnunet/src/ats/gnunet-ats-solver-eval.h
Log:
optional timestamp
Modified: gnunet/src/ats/gnunet-ats-solver-eval.c
===================================================================
--- gnunet/src/ats/gnunet-ats-solver-eval.c 2014-04-28 15:28:19 UTC (rev
33145)
+++ gnunet/src/ats/gnunet-ats-solver-eval.c 2014-04-29 13:17:46 UTC (rev
33146)
@@ -286,7 +286,8 @@
}
void
-GNUNET_ATS_solver_logging_write_to_disk (struct LoggingHandle *l)
+GNUNET_ATS_solver_logging_write_to_disk (struct LoggingHandle *l, int
add_time_stamp,
+ char *output_dir)
{
struct LoggingTimeStep *lts;
struct LoggingPeer *log_p;
@@ -326,8 +327,14 @@
cur->aid = log_a->aid;
cur->pid = log_p->id;
- GNUNET_asprintf (&filename, "%s_%s_%u_%u_%llu.log", e->log_prefix,
opt_solver,
- cur->aid, cur->pid, l->head->timestamp.abs_value_us);
+ if (GNUNET_YES == add_time_stamp)
+ GNUNET_asprintf (&filename, "%s_%s_%u_%u_%llu.log",
+ e->log_prefix, opt_solver,
+ cur->aid, cur->pid, l->head->timestamp.abs_value_us);
+ else
+ GNUNET_asprintf (&filename, "%s_%s_%u_%u.log",
+ e->log_prefix, opt_solver,
+ cur->aid, cur->pid);
fprintf (stderr, "Add writing log data for %i %i to file `%s'\n",
cur->pid, cur->aid, filename);
@@ -2476,6 +2483,23 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Experiment logging prefix: `%s'\n",
e->log_prefix);
+ if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string(cfg, "experiment",
+ "log_output_dir", &e->log_output_dir))
+ {
+ e->log_output_dir = NULL;
+ }
+ else
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Experiment logging output directory:
`%s'\n",
+ e->log_output_dir);
+
+
+ if (GNUNET_SYSERR == (e->log_append_time_stamp =
GNUNET_CONFIGURATION_get_value_yesno(cfg,
+ "experiment", "log_append_time_stamp")))
+ e->log_append_time_stamp = GNUNET_NO;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Experiment logging output directory:
`%s'\n",
+ (GNUNET_YES == e->log_append_time_stamp) ? "yes" : "no");
+
+
if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_filename (cfg,
"experiment",
"cfg_file", &e->cfg_file))
{
@@ -2987,7 +3011,8 @@
if (opt_save)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "== Saving log information \n");
- GNUNET_ATS_solver_logging_write_to_disk (l);
+ GNUNET_ATS_solver_logging_write_to_disk (l, e->log_append_time_stamp,
+ e->log_output_dir);
}
if (NULL != l)
Modified: gnunet/src/ats/gnunet-ats-solver-eval.h
===================================================================
--- gnunet/src/ats/gnunet-ats-solver-eval.h 2014-04-28 15:28:19 UTC (rev
33145)
+++ gnunet/src/ats/gnunet-ats-solver-eval.h 2014-04-29 13:17:46 UTC (rev
33146)
@@ -236,6 +236,9 @@
char *name;
char *log_prefix;
char *cfg_file;
+ char *log_output_dir;
+ int log_append_time_stamp;
+
struct GNUNET_TIME_Relative log_freq;
struct GNUNET_TIME_Relative max_duration;
struct GNUNET_TIME_Relative total_duration;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33146 - gnunet/src/ats,
gnunet <=