[GNUnet-SVN] r29382 - gnunet/src/ats-tests

[gnunet]

Author: wachs
Date: 2013-09-18 15:53:37 +0200 (Wed, 18 Sep 2013)
New Revision: 29382

Modified:
   gnunet/src/ats-tests/perf_ats.c
   gnunet/src/ats-tests/perf_ats.h
   gnunet/src/ats-tests/perf_ats_logging.c
Log:
basic log file writing functionality


Modified: gnunet/src/ats-tests/perf_ats.c
===================================================================
--- gnunet/src/ats-tests/perf_ats.c     2013-09-18 13:41:27 UTC (rev 29381)
+++ gnunet/src/ats-tests/perf_ats.c     2013-09-18 13:53:37 UTC (rev 29382)
@@ -119,6 +119,11 @@
 /**
  * Preference string
  */
+static char *testname;
+
+/**
+ * Preference string
+ */
 static char *pref_str;
 
 /**
@@ -451,7 +456,7 @@
       mps[c_m].ats_task = GNUNET_SCHEDULER_add_now (&ats_pref_task, &mps[c_m]);
   }
   if (GNUNET_YES == logging)
-    perf_logging_start (mps, num_masters);
+    perf_logging_start (testname, mps, num_masters);
 }
 
 static void
@@ -1207,6 +1212,7 @@
       logging = GNUNET_YES;
   }
 
+  GNUNET_asprintf (&testname, "%s_%s_%s",solver, comm_name, pref_str);
 
   if (num_slaves < num_masters)
   {
@@ -1240,6 +1246,7 @@
   GNUNET_free(pref_str);
   GNUNET_free(conf_name);
   GNUNET_free(test_name);
+  GNUNET_free(testname);
   GNUNET_free (comm_name);
   GNUNET_free(mps);
   GNUNET_free(sps);

Modified: gnunet/src/ats-tests/perf_ats.h
===================================================================
--- gnunet/src/ats-tests/perf_ats.h     2013-09-18 13:41:27 UTC (rev 29381)
+++ gnunet/src/ats-tests/perf_ats.h     2013-09-18 13:53:37 UTC (rev 29382)
@@ -218,7 +218,7 @@
 perf_logging_stop ();
 
 void
-perf_logging_start (struct BenchmarkPeer *masters, int num_masters);
+perf_logging_start (char * testname, struct BenchmarkPeer *masters, int 
num_masters);
 
 
 /* end of file perf_ats.h */

Modified: gnunet/src/ats-tests/perf_ats_logging.c
===================================================================
--- gnunet/src/ats-tests/perf_ats_logging.c     2013-09-18 13:41:27 UTC (rev 
29381)
+++ gnunet/src/ats-tests/perf_ats_logging.c     2013-09-18 13:53:37 UTC (rev 
29382)
@@ -33,11 +33,44 @@
 
 static struct BenchmarkPeer *peers;
 static int num_peers;
+static char *name;
 
+
 static void
 write_to_file ()
 {
+  struct GNUNET_DISK_FileHandle *f;
+  char * filename;
 
+
+  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)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot open log file `%s'\n", 
filename);
+    GNUNET_free (filename);
+    return;
+  }
+
+  if (GNUNET_SYSERR == GNUNET_DISK_file_write(f, "TEST", strlen("TEST")))
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot write data to 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_free (filename);
+    return;
+  }
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Data file successfully written to log 
file `%s'\n", filename);
+  GNUNET_free (filename);
 }
 
 static void
@@ -88,13 +121,14 @@
 }
 
 void
-perf_logging_start (struct BenchmarkPeer *masters, int num_masters)
+perf_logging_start (char * testname, struct BenchmarkPeer *masters, int 
num_masters)
 {
   GNUNET_log(GNUNET_ERROR_TYPE_INFO,
-      _("Start logging\n"));
+      _("Start logging `%s'\n"), testname);
 
   peers = masters;
   num_peers = num_masters;
+  name = testname;
 
   /* Schedule logging task */
   log_task = GNUNET_SCHEDULER_add_now (&collect_log_task, NULL);