[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34257 - gnunet/src/sensor
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34257 - gnunet/src/sensor |
Date: |
Mon, 1 Sep 2014 20:04:41 +0200 |
Author: otarabai
Date: 2014-09-01 20:04:41 +0200 (Mon, 01 Sep 2014)
New Revision: 34257
Modified:
gnunet/src/sensor/gnunet-sensor-profiler.c
gnunet/src/sensor/sensor.conf.in
Log:
sensor: towards profiler
Modified: gnunet/src/sensor/gnunet-sensor-profiler.c
===================================================================
--- gnunet/src/sensor/gnunet-sensor-profiler.c 2014-09-01 17:35:43 UTC (rev
34256)
+++ gnunet/src/sensor/gnunet-sensor-profiler.c 2014-09-01 18:04:41 UTC (rev
34257)
@@ -70,6 +70,11 @@
static const char *sensor_dst_dir = "/tmp/gnunet-sensor-profiler";
/**
+ * GNUnet configuration
+ */
+struct GNUNET_CONFIGURATION_Handle *cfg;
+
+/**
* Return value of the program
*/
static int ok = 1;
@@ -150,6 +155,11 @@
int i;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down.\n");
+ if (NULL != cfg)
+ {
+ GNUNET_CONFIGURATION_destroy (cfg);
+ cfg = NULL;
+ }
if (NULL != sensor_names)
{
for (i = 0; i < sensor_names_size; i++)
@@ -252,8 +262,8 @@
GNUNET_CONFIGURATION_parse (sensor_cfg, filename));
GNUNET_CONFIGURATION_set_value_string (sensor_cfg, file_basename,
"COLLECTION_POINT",
- GNUNET_i2s_full (&all_peers_info[0].
- peer_id));
+ GNUNET_i2s_full (&all_peers_info
+ [0].peer_id));
if (sensors_interval > 0)
{
GNUNET_CONFIGURATION_set_value_number (sensor_cfg, file_basename,
@@ -418,7 +428,25 @@
static void
peers_ready (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ unsigned long long int training_points;
+ struct GNUNET_TIME_Relative training_period;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "All peers are ready.\n");
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_number (cfg,
+
"sensor-model-gaussian",
+ "TRAINING_WINDOW",
+ &training_points));
+ training_period =
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS,
+ (sensors_interval ==
+ 0) ? 60 : sensors_interval),
+ training_points);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sleeping for a training period of %s.\n",
+ GNUNET_STRINGS_relative_time_to_string (training_period,
+ GNUNET_NO));
//TODO
}
@@ -580,8 +608,6 @@
run (void *cls, char *const *args, const char *cf,
const struct GNUNET_CONFIGURATION_Handle *c)
{
- struct GNUNET_CONFIGURATION_Handle *cfg;
-
if (GNUNET_OK != verify_args ())
{
do_shutdown (NULL, NULL);
@@ -596,7 +622,6 @@
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &do_shutdown,
NULL);
GNUNET_TESTBED_run (NULL, cfg, num_peers, 0, NULL, NULL, &test_master, NULL);
- GNUNET_CONFIGURATION_destroy (cfg);
}
Modified: gnunet/src/sensor/sensor.conf.in
===================================================================
--- gnunet/src/sensor/sensor.conf.in 2014-09-01 17:35:43 UTC (rev 34256)
+++ gnunet/src/sensor/sensor.conf.in 2014-09-01 18:04:41 UTC (rev 34257)
@@ -22,7 +22,7 @@
CONFIRMATION_COUNT = 3
[sensor-model-gaussian]
-TRAINING_WINDOW = 1000
+TRAINING_WINDOW = 10
CONFIDENCE_INTERVAL = 3
[sensor-reporting]
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34257 - gnunet/src/sensor,
gnunet <=