gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r33868 - in gnunet/src/sensor: . sensors


From: gnunet
Subject: [GNUnet-SVN] r33868 - in gnunet/src/sensor: . sensors
Date: Thu, 26 Jun 2014 16:15:56 +0200

Author: otarabai
Date: 2014-06-26 16:15:56 +0200 (Thu, 26 Jun 2014)
New Revision: 33868

Modified:
   gnunet/src/sensor/gnunet-service-sensor-analysis.c
   gnunet/src/sensor/gnunet-service-sensor.c
   gnunet/src/sensor/gnunet_sensor_model_plugin.h
   gnunet/src/sensor/plugin_sensor_model_gaussian.c
   gnunet/src/sensor/sensors/average-ping-rtt
   gnunet/src/sensor/sensors/datacache-bytes-stored
   gnunet/src/sensor/sensors/known-peers
   gnunet/src/sensor/sensors/nse
   gnunet/src/sensor/sensors/peerstore-memory
   gnunet/src/sensor/sensors/transport-bytes-received
   gnunet/src/sensor/sensors/transport-tcp-bytes-transmitted
   gnunet/src/sensor/sensors/transport-tcp-sessions-active
Log:
sensor: unified numeric datatypes


Modified: gnunet/src/sensor/gnunet-service-sensor-analysis.c
===================================================================
--- gnunet/src/sensor/gnunet-service-sensor-analysis.c  2014-06-26 14:09:46 UTC 
(rev 33867)
+++ gnunet/src/sensor/gnunet-service-sensor-analysis.c  2014-06-26 14:15:56 UTC 
(rev 33868)
@@ -80,11 +80,6 @@
 static struct GNUNET_PEERSTORE_Handle *peerstore;
 
 /*
- * Datatypes supported by the analysis component
- */
-static const char *analysis_datatypes[] = { "uint64", "double", NULL };
-
-/*
  * Head of DLL of created models
  */
 static struct SensorModel *models_head;
@@ -173,19 +168,8 @@
 {
   struct SensorInfo *sensor = value;
   struct SensorModel *sensor_model;
-  int is_numeric;
-  int i;
 
-  is_numeric = GNUNET_NO;
-  for (i = 0; NULL != analysis_datatypes[i]; i++)
-  {
-    if (0 == strcmp (analysis_datatypes[i], sensor->expected_datatype))
-    {
-      is_numeric = GNUNET_YES;
-      break;
-    }
-  }
-  if (GNUNET_NO == is_numeric)
+  if (0 != strcmp("numeric", sensor->expected_datatype))
     return GNUNET_YES;
   sensor_model = GNUNET_new(struct SensorModel);
   sensor_model->sensor = sensor;

Modified: gnunet/src/sensor/gnunet-service-sensor.c
===================================================================
--- gnunet/src/sensor/gnunet-service-sensor.c   2014-06-26 14:09:46 UTC (rev 
33867)
+++ gnunet/src/sensor/gnunet-service-sensor.c   2014-06-26 14:15:56 UTC (rev 
33868)
@@ -53,7 +53,7 @@
 /**
  * Supported datatypes of sensor information
  */
-static const char *datatypes[] = { "uint64", "double", "string", NULL };
+static const char *datatypes[] = { "numeric", "string", NULL };
 
 /**
  * Handle to statistics service
@@ -697,6 +697,7 @@
     int is_persistent)
 {
   struct SensorInfo *sensorinfo = cls;
+  double dvalue = (double)value;
   struct GNUNET_TIME_Absolute expiry;
 
   GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Received a value for sensor `%s': %" 
PRIu64 "\n", sensorinfo->name, value);
@@ -705,8 +706,8 @@
       subsystem,
       &peerid,
       sensorinfo->name,
-      &value,
-      sizeof(value),
+      &dvalue,
+      sizeof(dvalue),
       expiry,
       GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
       NULL,
@@ -741,26 +742,14 @@
 static size_t
 parse_sensor_value (const char *value, struct SensorInfo* sensor, void **ret)
 {
-  uint64_t *ullval;
   double *dval;
   char *endptr;
 
   *ret = NULL;
   if ('\0' == *value)
     return 0;
-  //"uint64", "double", "string"
-  if (0 == strcmp("uint64", sensor->expected_datatype))
+  if(0 == strcmp("numeric", sensor->expected_datatype))
   {
-    ullval = GNUNET_new(uint64_t);
-    *ullval = strtoull(value, &endptr, 10);
-    if ('\0' != *endptr &&
-        '\n' != *endptr) /* Invalid string */
-      return 0;
-    *ret = ullval;
-    return sizeof(uint64_t);
-  }
-  if(0 == strcmp("double", sensor->expected_datatype))
-  {
     dval = GNUNET_new(double);
     *dval = strtod(value, &endptr);
     if(value == endptr)

Modified: gnunet/src/sensor/gnunet_sensor_model_plugin.h
===================================================================
--- gnunet/src/sensor/gnunet_sensor_model_plugin.h      2014-06-26 14:09:46 UTC 
(rev 33867)
+++ gnunet/src/sensor/gnunet_sensor_model_plugin.h      2014-06-26 14:15:56 UTC 
(rev 33868)
@@ -48,6 +48,15 @@
    */
   void *cls;
 
+  /*
+   * Create a model instance
+   *
+   * @param cls closure (plugin state)
+   * @return model state to be used for later calls
+   */
+  void *
+  (*create_model) (void *cls);
+
 };
 
 

Modified: gnunet/src/sensor/plugin_sensor_model_gaussian.c
===================================================================
--- gnunet/src/sensor/plugin_sensor_model_gaussian.c    2014-06-26 14:09:46 UTC 
(rev 33867)
+++ gnunet/src/sensor/plugin_sensor_model_gaussian.c    2014-06-26 14:15:56 UTC 
(rev 33868)
@@ -45,6 +45,30 @@
 };
 
 /*
+ * State of single model instance
+ */
+struct Model
+{
+
+  /*
+   * Pointer to the plugin state
+   */
+  struct Plugin *plugin;
+
+};
+
+static void *
+sensor_gaussian_model_create_model (void *cls)
+{
+  struct Plugin *plugin = cls;
+  struct Model *model;
+
+  model = GNUNET_new(struct Model);
+  model->plugin = plugin;
+  return model;
+}
+
+/*
  * Entry point for the plugin.
  *
  * @param cls The struct GNUNET_CONFIGURATION_Handle.

Modified: gnunet/src/sensor/sensors/average-ping-rtt
===================================================================
--- gnunet/src/sensor/sensors/average-ping-rtt  2014-06-26 14:09:46 UTC (rev 
33867)
+++ gnunet/src/sensor/sensors/average-ping-rtt  2014-06-26 14:15:56 UTC (rev 
33868)
@@ -22,7 +22,7 @@
 EXT_PROCESS = avgping.sh
 #EXT_ARGS = 
 
-EXPECTED_DATATYPE = double
+EXPECTED_DATATYPE = numeric
 
 # Reporting mechanism
 COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80

Modified: gnunet/src/sensor/sensors/datacache-bytes-stored
===================================================================
--- gnunet/src/sensor/sensors/datacache-bytes-stored    2014-06-26 14:09:46 UTC 
(rev 33867)
+++ gnunet/src/sensor/sensors/datacache-bytes-stored    2014-06-26 14:15:56 UTC 
(rev 33868)
@@ -22,7 +22,7 @@
 #EXT_PROCESS = 
 #EXT_ARGS = 
 
-EXPECTED_DATATYPE = uint64
+EXPECTED_DATATYPE = numeric
 
 # Reporting mechanism
 COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80

Modified: gnunet/src/sensor/sensors/known-peers
===================================================================
--- gnunet/src/sensor/sensors/known-peers       2014-06-26 14:09:46 UTC (rev 
33867)
+++ gnunet/src/sensor/sensors/known-peers       2014-06-26 14:15:56 UTC (rev 
33868)
@@ -22,7 +22,7 @@
 #EXT_PROCESS = 
 #EXT_ARGS = 
 
-EXPECTED_DATATYPE = uint64
+EXPECTED_DATATYPE = numeric
 
 # Reporting mechanism
 COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80

Modified: gnunet/src/sensor/sensors/nse
===================================================================
--- gnunet/src/sensor/sensors/nse       2014-06-26 14:09:46 UTC (rev 33867)
+++ gnunet/src/sensor/sensors/nse       2014-06-26 14:15:56 UTC (rev 33868)
@@ -22,7 +22,7 @@
 #EXT_PROCESS = 
 #EXT_ARGS = 
 
-EXPECTED_DATATYPE = uint64
+EXPECTED_DATATYPE = numeric
 
 # Reporting mechanism
 COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80

Modified: gnunet/src/sensor/sensors/peerstore-memory
===================================================================
--- gnunet/src/sensor/sensors/peerstore-memory  2014-06-26 14:09:46 UTC (rev 
33867)
+++ gnunet/src/sensor/sensors/peerstore-memory  2014-06-26 14:15:56 UTC (rev 
33868)
@@ -22,7 +22,7 @@
 EXT_PROCESS = peerstore-memory.sh
 #EXT_ARGS = 
 
-EXPECTED_DATATYPE = uint64
+EXPECTED_DATATYPE = numeric
 
 # Reporting mechanism
 COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80

Modified: gnunet/src/sensor/sensors/transport-bytes-received
===================================================================
--- gnunet/src/sensor/sensors/transport-bytes-received  2014-06-26 14:09:46 UTC 
(rev 33867)
+++ gnunet/src/sensor/sensors/transport-bytes-received  2014-06-26 14:15:56 UTC 
(rev 33868)
@@ -22,7 +22,7 @@
 #EXT_PROCESS = 
 #EXT_ARGS = 
 
-EXPECTED_DATATYPE = uint64
+EXPECTED_DATATYPE = numeric
 
 # Reporting mechanism
 COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80

Modified: gnunet/src/sensor/sensors/transport-tcp-bytes-transmitted
===================================================================
--- gnunet/src/sensor/sensors/transport-tcp-bytes-transmitted   2014-06-26 
14:09:46 UTC (rev 33867)
+++ gnunet/src/sensor/sensors/transport-tcp-bytes-transmitted   2014-06-26 
14:15:56 UTC (rev 33868)
@@ -22,7 +22,7 @@
 #EXT_PROCESS = 
 #EXT_ARGS = 
 
-EXPECTED_DATATYPE = uint64
+EXPECTED_DATATYPE = numeric
 
 # Reporting mechanism
 COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80

Modified: gnunet/src/sensor/sensors/transport-tcp-sessions-active
===================================================================
--- gnunet/src/sensor/sensors/transport-tcp-sessions-active     2014-06-26 
14:09:46 UTC (rev 33867)
+++ gnunet/src/sensor/sensors/transport-tcp-sessions-active     2014-06-26 
14:15:56 UTC (rev 33868)
@@ -22,7 +22,7 @@
 #EXT_PROCESS = 
 #EXT_ARGS = 
 
-EXPECTED_DATATYPE = uint64
+EXPECTED_DATATYPE = numeric
 
 # Reporting mechanism
 COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80




reply via email to

[Prev in Thread] Current Thread [Next in Thread]