[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33736 - in gnunet/src: peerstore sensor sensor/sensors
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33736 - in gnunet/src: peerstore sensor sensor/sensors |
|
Date: |
Thu, 19 Jun 2014 21:52:09 +0200 |
Author: otarabai
Date: 2014-06-19 21:52:09 +0200 (Thu, 19 Jun 2014)
New Revision: 33736
Added:
gnunet/src/sensor/sensors/average-ping-rtt
gnunet/src/sensor/sensors/datacache-bytes-stored
gnunet/src/sensor/sensors/gnunet-version
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
Removed:
gnunet/src/sensor/sensors/averagepingrtt
gnunet/src/sensor/sensors/averagepingrtt-files/
gnunet/src/sensor/sensors/connectedpeers
gnunet/src/sensor/sensors/gnunetversion
Modified:
gnunet/src/peerstore/perf_peerstore_store.c
gnunet/src/peerstore/test_peerstore_api_iterate.c
gnunet/src/peerstore/test_peerstore_api_store.c
gnunet/src/peerstore/test_peerstore_api_watch.c
gnunet/src/sensor/gnunet-sensor.c
gnunet/src/sensor/gnunet-service-sensor.c
Log:
new sensors + fixes
Modified: gnunet/src/peerstore/perf_peerstore_store.c
===================================================================
--- gnunet/src/peerstore/perf_peerstore_store.c 2014-06-19 15:35:25 UTC (rev
33735)
+++ gnunet/src/peerstore/perf_peerstore_store.c 2014-06-19 19:52:09 UTC (rev
33736)
@@ -30,12 +30,12 @@
static int ok = 1;
-struct GNUNET_PEERSTORE_Handle *h;
+static struct GNUNET_PEERSTORE_Handle *h;
-char *ss = "test_peerstore_stress";
-struct GNUNET_PeerIdentity p;
-char *k = "test_peerstore_stress_key";
-char *v = "test_peerstore_stress_val";
+static char *ss = "test_peerstore_stress";
+static struct GNUNET_PeerIdentity p;
+static char *k = "test_peerstore_stress_key";
+static char *v = "test_peerstore_stress_val";
int count = 0;
Modified: gnunet/src/peerstore/test_peerstore_api_iterate.c
===================================================================
--- gnunet/src/peerstore/test_peerstore_api_iterate.c 2014-06-19 15:35:25 UTC
(rev 33735)
+++ gnunet/src/peerstore/test_peerstore_api_iterate.c 2014-06-19 19:52:09 UTC
(rev 33736)
@@ -28,16 +28,16 @@
static int ok = 1;
-struct GNUNET_PEERSTORE_Handle *h;
+static struct GNUNET_PEERSTORE_Handle *h;
-char *ss = "test_peerstore_api_iterate";
-struct GNUNET_PeerIdentity p1;
-struct GNUNET_PeerIdentity p2;
-char *k1 = "test_peerstore_api_iterate_key1";
-char *k2 = "test_peerstore_api_iterate_key2";
-char *k3 = "test_peerstore_api_iterate_key3";
-char *val = "test_peerstore_api_iterate_val";
-int count = 0;
+static char *ss = "test_peerstore_api_iterate";
+static struct GNUNET_PeerIdentity p1;
+static struct GNUNET_PeerIdentity p2;
+static char *k1 = "test_peerstore_api_iterate_key1";
+static char *k2 = "test_peerstore_api_iterate_key2";
+static char *k3 = "test_peerstore_api_iterate_key3";
+static char *val = "test_peerstore_api_iterate_val";
+static int count = 0;
static int
iter3_cb(void *cls,
Modified: gnunet/src/peerstore/test_peerstore_api_store.c
===================================================================
--- gnunet/src/peerstore/test_peerstore_api_store.c 2014-06-19 15:35:25 UTC
(rev 33735)
+++ gnunet/src/peerstore/test_peerstore_api_store.c 2014-06-19 19:52:09 UTC
(rev 33736)
@@ -28,14 +28,14 @@
static int ok = 1;
-struct GNUNET_PEERSTORE_Handle *h;
+static struct GNUNET_PEERSTORE_Handle *h;
-char *subsystem = "test_peerstore_api_store";
-struct GNUNET_PeerIdentity pid;
-char *key = "test_peerstore_api_store_key";
-char *val1 = "test_peerstore_api_store_val1";
-char *val2 = "test_peerstore_api_store_val2-";
-char *val3 = "test_peerstore_api_store_val3--";
+static char *subsystem = "test_peerstore_api_store";
+static struct GNUNET_PeerIdentity pid;
+static char *key = "test_peerstore_api_store_key";
+static char *val1 = "test_peerstore_api_store_val1";
+static char *val2 = "test_peerstore_api_store_val2-";
+static char *val3 = "test_peerstore_api_store_val3--";
int count = 0;
Modified: gnunet/src/peerstore/test_peerstore_api_watch.c
===================================================================
--- gnunet/src/peerstore/test_peerstore_api_watch.c 2014-06-19 15:35:25 UTC
(rev 33735)
+++ gnunet/src/peerstore/test_peerstore_api_watch.c 2014-06-19 19:52:09 UTC
(rev 33736)
@@ -28,12 +28,12 @@
static int ok = 1;
-struct GNUNET_PEERSTORE_Handle *h;
+static struct GNUNET_PEERSTORE_Handle *h;
-char *ss = "test_peerstore_api_watch";
-struct GNUNET_PeerIdentity p;
-char *k = "test_peerstore_api_watch_key";
-char *val = "test_peerstore_api_watch_val";
+static char *ss = "test_peerstore_api_watch";
+static struct GNUNET_PeerIdentity p;
+static char *k = "test_peerstore_api_watch_key";
+static char *val = "test_peerstore_api_watch_val";
static int
watch_cb(void *cls,
Modified: gnunet/src/sensor/gnunet-sensor.c
===================================================================
--- gnunet/src/sensor/gnunet-sensor.c 2014-06-19 15:35:25 UTC (rev 33735)
+++ gnunet/src/sensor/gnunet-sensor.c 2014-06-19 19:52:09 UTC (rev 33736)
@@ -42,7 +42,7 @@
/*
* Handle to sensor service
*/
-struct GNUNET_SENSOR_Handle *sensor_handle;
+static struct GNUNET_SENSOR_Handle *sensor_handle;
/**
* Run on shutdown
Modified: gnunet/src/sensor/gnunet-service-sensor.c
===================================================================
--- gnunet/src/sensor/gnunet-service-sensor.c 2014-06-19 15:35:25 UTC (rev
33735)
+++ gnunet/src/sensor/gnunet-service-sensor.c 2014-06-19 19:52:09 UTC (rev
33736)
@@ -143,6 +143,13 @@
struct GNUNET_OS_CommandHandle *ext_cmd;
/*
+ * Did we already receive a value
+ * from the currently running external
+ * proccess ? #GNUNET_YES / #GNUNET_NO
+ */
+ int ext_cmd_value_received;
+
+ /*
* The output datatype to be expected
*/
char *expected_datatype;
@@ -587,7 +594,7 @@
{
GNUNET_CONTAINER_multihashmap_remove(map, &key, existing); //remove the
old version
GNUNET_free(existing);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, _("Upgrading sensor `%s' to a newer
version\n"), sensor->name);
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Upgrading sensor `%s' to a newer
version\n", sensor->name);
}
}
if(GNUNET_SYSERR == GNUNET_CONTAINER_multihashmap_put(map, &key, sensor,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
@@ -843,7 +850,6 @@
struct GNUNET_TIME_Absolute expiry;
GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Received a value for sensor `%s': %"
PRIu64 "\n", sensorinfo->name, value);
- //FIXME: store first line, last line or all ??
expiry = GNUNET_TIME_relative_to_absolute(sensorinfo->interval);
GNUNET_PEERSTORE_store(peerstore,
subsystem,
@@ -855,7 +861,7 @@
GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
NULL,
NULL);
- return GNUNET_OK;
+ return GNUNET_SYSERR; /* We only want one value */
}
/**
@@ -874,6 +880,55 @@
}
/**
+ * Tries to parse a received sensor value to its
+ * expected datatype
+ *
+ * @param value the string value received, should be null terminated
+ * @param sensor sensor information struct
+ * @param ret pointer to parsed value
+ * @return size of new parsed value, 0 for error
+ */
+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))
+ {
+ 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)
+ return 0;
+ *ret = dval;
+ return sizeof(double);
+ }
+ if(0 == strcmp("string", sensor->expected_datatype))
+ {
+ *ret = GNUNET_strdup(value);
+ return strlen(value) + 1;
+ }
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ _("Unknown value type expected by sensor, this should not happen.\n"));
+ return 0;
+}
+
+/**
* Callback for output of executed sensor process
*
* @param cls 'struct SensorInfo *'
@@ -882,29 +937,43 @@
void sensor_process_callback (void *cls, const char *line)
{
struct SensorInfo *sensorinfo = cls;
+ void *value;
+ size_t valsize;
struct GNUNET_TIME_Absolute expiry;
- if(NULL == line) //end of output
+ if(NULL == line)
{
GNUNET_OS_command_stop(sensorinfo->ext_cmd);
sensorinfo->ext_cmd = NULL;
sensorinfo->running = GNUNET_NO;
+ sensorinfo->ext_cmd_value_received = GNUNET_NO;
return;
}
+ if(GNUNET_YES == sensorinfo->ext_cmd_value_received)
+ return; /* We only want one *valid* value */
GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Received a value for sensor `%s': %s\n",
sensorinfo->name, line);
- //FIXME: store first line, last line or all ??
- //FIXME: check and parse datatype
- expiry = GNUNET_TIME_relative_to_absolute(sensorinfo->interval);
- GNUNET_PEERSTORE_store(peerstore,
- subsystem,
- &peerid,
- sensorinfo->name,
- line,
- strlen(line) + 1,
- expiry,
- GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
- NULL,
- NULL);
+ valsize = parse_sensor_value(line, sensorinfo, &value);
+ if (valsize == 0) /* invalid value, FIXME: should we disable the sensor now?
*/
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Received an invalid value for sensor `%s': %s\n"),
+ sensorinfo->name, line);
+ }
+ else
+ {
+ sensorinfo->ext_cmd_value_received = GNUNET_YES;
+ expiry = GNUNET_TIME_relative_to_absolute(sensorinfo->interval);
+ GNUNET_PEERSTORE_store(peerstore,
+ subsystem,
+ &peerid,
+ sensorinfo->name,
+ value,
+ valsize,
+ expiry,
+ GNUNET_PEERSTORE_STOREOPTION_MULTIPLE,
+ NULL,
+ NULL);
+ }
}
/**
@@ -967,7 +1036,7 @@
if(GNUNET_YES == is_path(sensorinfo->ext_process))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Sensor `%s': External process should not be a path, disabling
sensor.\n",
+ _("Sensor `%s': External process should not be a path, disabling
sensor.\n"),
sensorinfo->name);
set_sensor_enabled(sensorinfo, GNUNET_NO);
return;
@@ -992,7 +1061,8 @@
}
if(GNUNET_SYSERR == check_result)
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Sensor `%s' process `%s' problem:
binary doesn't exist or not executable\n",
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ _("Sensor `%s' process `%s' problem: binary doesn't exist or not
executable\n"),
sensorinfo->name,
sensorinfo->ext_process);
set_sensor_enabled(sensorinfo, GNUNET_NO);
@@ -1000,6 +1070,7 @@
GNUNET_free(process_path);
return;
}
+ sensorinfo->ext_cmd_value_received = GNUNET_NO;
sensorinfo->ext_cmd = GNUNET_OS_command_run(&sensor_process_callback,
sensorinfo,
GNUNET_TIME_UNIT_FOREVER_REL,
@@ -1038,7 +1109,8 @@
sensorinfo->name, sensorinfo->interval.rel_value_us);
if(GNUNET_SCHEDULER_NO_TASK != sensorinfo->execution_task)
{
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Sensor `%s' execution task already
set, this should not happen\n", sensorinfo->name);
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ _("Sensor `%s' execution task already set, this should not happen\n"),
sensorinfo->name);
return GNUNET_NO;
}
sensorinfo->execution_task =
GNUNET_SCHEDULER_add_delayed(sensorinfo->interval, &sensor_run, sensorinfo);
Added: gnunet/src/sensor/sensors/average-ping-rtt
===================================================================
--- gnunet/src/sensor/sensors/average-ping-rtt (rev 0)
+++ gnunet/src/sensor/sensors/average-ping-rtt 2014-06-19 19:52:09 UTC (rev
33736)
@@ -0,0 +1,32 @@
+[average-ping-rtt]
+
+VERSION = 1.0
+DESCRIPTION = Calculate average ping latency to gnunet.org
+CATEGORY = Underlay
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME =
+#END_TIME =
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME =
+
+#CAPABILITIES =
+
+SOURCE = process
+
+#GNUNET_STAT_SERVICE =
+#GNUNET_STAT_NAME =
+
+EXT_PROCESS = avgping.sh
+#EXT_ARGS =
+
+EXPECTED_DATATYPE = double
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 7200
+
+P2P_REPORT = NO
+#P2P_INTERVAL =
Deleted: gnunet/src/sensor/sensors/averagepingrtt
===================================================================
--- gnunet/src/sensor/sensors/averagepingrtt 2014-06-19 15:35:25 UTC (rev
33735)
+++ gnunet/src/sensor/sensors/averagepingrtt 2014-06-19 19:52:09 UTC (rev
33736)
@@ -1,32 +0,0 @@
-[averagepingrtt]
-
-VERSION = 1.0
-DESCRIPTION = Calculate average ping latency to gnunet.org
-CATEGORY = Internet-Connectivity
-ENABLED = YES
-
-# Start and end time format: %Y-%m-%d %H:%M:%S
-#START_TIME =
-#END_TIME =
-#Interval in seconds
-INTERVAL = 30
-#LIFETIME =
-
-#CAPABILITIES =
-
-SOURCE = process
-
-#GNUNET_STAT_SERVICE =
-#GNUNET_STAT_NAME =
-
-EXT_PROCESS = avgping.sh
-#EXT_ARGS =
-
-EXPECTED_DATATYPE = double
-
-# Reporting mechanism
-COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
-COLLECTION_INTERVAL = 7200
-
-P2P_REPORT = NO
-#P2P_INTERVAL =
Deleted: gnunet/src/sensor/sensors/connectedpeers
===================================================================
--- gnunet/src/sensor/sensors/connectedpeers 2014-06-19 15:35:25 UTC (rev
33735)
+++ gnunet/src/sensor/sensors/connectedpeers 2014-06-19 19:52:09 UTC (rev
33736)
@@ -1,32 +0,0 @@
-[connectedpeers]
-
-VERSION = 1.0
-DESCRIPTION = Gets the number of connected peers from core
-CATEGORY = P2P-Connectivity
-ENABLED = YES
-
-# Start and end time format: %Y-%m-%d %H:%M:%S
-#START_TIME =
-#END_TIME =
-#Interval in seconds
-INTERVAL = 60
-#LIFETIME =
-
-#CAPABILITIES =
-
-SOURCE = gnunet-statistics
-
-GNUNET_STAT_SERVICE = core
-GNUNET_STAT_NAME = # peers connected
-
-#EXT_PROCESS =
-#EXT_ARGS =
-
-EXPECTED_DATATYPE = uint64
-
-# Reporting mechanism
-COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
-COLLECTION_INTERVAL = 120
-
-P2P_REPORT = NO
-#P2P_INTERVAL =
Added: gnunet/src/sensor/sensors/datacache-bytes-stored
===================================================================
--- gnunet/src/sensor/sensors/datacache-bytes-stored
(rev 0)
+++ gnunet/src/sensor/sensors/datacache-bytes-stored 2014-06-19 19:52:09 UTC
(rev 33736)
@@ -0,0 +1,32 @@
+[datacache-bytes-stored]
+
+VERSION = 1.0
+DESCRIPTION = Bytes stored by GNUnet datacache service
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME =
+#END_TIME =
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME =
+
+#CAPABILITIES =
+
+SOURCE = gnunet-statistics
+
+GNUNET_STAT_SERVICE = datacache
+GNUNET_STAT_NAME = # bytes stored
+
+#EXT_PROCESS =
+#EXT_ARGS =
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 120
+
+P2P_REPORT = NO
+#P2P_INTERVAL =
Added: gnunet/src/sensor/sensors/gnunet-version
===================================================================
--- gnunet/src/sensor/sensors/gnunet-version (rev 0)
+++ gnunet/src/sensor/sensors/gnunet-version 2014-06-19 19:52:09 UTC (rev
33736)
@@ -0,0 +1,32 @@
+[gnunet-version]
+
+VERSION = 1.0
+DESCRIPTION = Gets gnunet version number
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME =
+#END_TIME =
+#Interval in seconds
+INTERVAL = 86400
+LIFETIME = 30
+
+#CAPABILITIES =
+
+SOURCE = process
+
+#GNUNET_STAT_SERVICE =
+#GNUNET_STAT_NAME =
+
+EXT_PROCESS = gnunet-arm
+EXT_ARGS = -v
+
+EXPECTED_DATATYPE = string
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 86400
+
+P2P_REPORT = NO
+#P2P_INTERVAL =
Deleted: gnunet/src/sensor/sensors/gnunetversion
===================================================================
--- gnunet/src/sensor/sensors/gnunetversion 2014-06-19 15:35:25 UTC (rev
33735)
+++ gnunet/src/sensor/sensors/gnunetversion 2014-06-19 19:52:09 UTC (rev
33736)
@@ -1,32 +0,0 @@
-[gnunetversion]
-
-VERSION = 1.0
-DESCRIPTION = Gets gnunet version number
-CATEGORY = P2P-Software
-ENABLED = YES
-
-# Start and end time format: %Y-%m-%d %H:%M:%S
-#START_TIME =
-#END_TIME =
-#Interval in seconds
-INTERVAL = 30
-LIFETIME = 30
-
-#CAPABILITIES =
-
-SOURCE = process
-
-#GNUNET_STAT_SERVICE =
-#GNUNET_STAT_NAME =
-
-EXT_PROCESS = gnunet-arm
-EXT_ARGS = -v
-
-EXPECTED_DATATYPE = string
-
-# Reporting mechanism
-COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
-COLLECTION_INTERVAL = 86400
-
-P2P_REPORT = NO
-#P2P_INTERVAL =
Added: gnunet/src/sensor/sensors/known-peers
===================================================================
--- gnunet/src/sensor/sensors/known-peers (rev 0)
+++ gnunet/src/sensor/sensors/known-peers 2014-06-19 19:52:09 UTC (rev
33736)
@@ -0,0 +1,32 @@
+[known-peers]
+
+VERSION = 1.0
+DESCRIPTION = Gets the number of known peers
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME =
+#END_TIME =
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME =
+
+#CAPABILITIES =
+
+SOURCE = gnunet-statistics
+
+GNUNET_STAT_SERVICE = peerinfo
+GNUNET_STAT_NAME = # peers known
+
+#EXT_PROCESS =
+#EXT_ARGS =
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 120
+
+P2P_REPORT = NO
+#P2P_INTERVAL =
Added: gnunet/src/sensor/sensors/nse
===================================================================
--- gnunet/src/sensor/sensors/nse (rev 0)
+++ gnunet/src/sensor/sensors/nse 2014-06-19 19:52:09 UTC (rev 33736)
@@ -0,0 +1,32 @@
+[nse]
+
+VERSION = 1.0
+DESCRIPTION = GNUnet network size estimate
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME =
+#END_TIME =
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME =
+
+#CAPABILITIES =
+
+SOURCE = gnunet-statistics
+
+GNUNET_STAT_SERVICE = nse
+GNUNET_STAT_NAME = # nodes in the network (estimate)
+
+#EXT_PROCESS =
+#EXT_ARGS =
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 120
+
+P2P_REPORT = NO
+#P2P_INTERVAL =
Added: gnunet/src/sensor/sensors/peerstore-memory
===================================================================
--- gnunet/src/sensor/sensors/peerstore-memory (rev 0)
+++ gnunet/src/sensor/sensors/peerstore-memory 2014-06-19 19:52:09 UTC (rev
33736)
@@ -0,0 +1,32 @@
+[peerstore-memory]
+
+VERSION = 1.0
+DESCRIPTION = Memory consumption of GNUnet peerstore service
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME =
+#END_TIME =
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME =
+
+#CAPABILITIES =
+
+SOURCE = process
+
+#GNUNET_STAT_SERVICE =
+#GNUNET_STAT_NAME =
+
+EXT_PROCESS = peerstore-memory.sh
+#EXT_ARGS =
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 7200
+
+P2P_REPORT = NO
+#P2P_INTERVAL =
Added: gnunet/src/sensor/sensors/transport-bytes-received
===================================================================
--- gnunet/src/sensor/sensors/transport-bytes-received
(rev 0)
+++ gnunet/src/sensor/sensors/transport-bytes-received 2014-06-19 19:52:09 UTC
(rev 33736)
@@ -0,0 +1,32 @@
+[transport-bytes-received]
+
+VERSION = 1.0
+DESCRIPTION = Number of bytes received by GNUnet transport service
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME =
+#END_TIME =
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME =
+
+#CAPABILITIES =
+
+SOURCE = gnunet-statistics
+
+GNUNET_STAT_SERVICE = transport
+GNUNET_STAT_NAME = # bytes total received
+
+#EXT_PROCESS =
+#EXT_ARGS =
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 120
+
+P2P_REPORT = NO
+#P2P_INTERVAL =
Added: gnunet/src/sensor/sensors/transport-tcp-bytes-transmitted
===================================================================
--- gnunet/src/sensor/sensors/transport-tcp-bytes-transmitted
(rev 0)
+++ gnunet/src/sensor/sensors/transport-tcp-bytes-transmitted 2014-06-19
19:52:09 UTC (rev 33736)
@@ -0,0 +1,32 @@
+[transport-tcp-bytes-transmitted]
+
+VERSION = 1.0
+DESCRIPTION = Number of GNUnet transport service active TCP sessions
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME =
+#END_TIME =
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME =
+
+#CAPABILITIES =
+
+SOURCE = gnunet-statistics
+
+GNUNET_STAT_SERVICE = transport
+GNUNET_STAT_NAME = # bytes transmitted via TCP
+
+#EXT_PROCESS =
+#EXT_ARGS =
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 120
+
+P2P_REPORT = NO
+#P2P_INTERVAL =
Added: gnunet/src/sensor/sensors/transport-tcp-sessions-active
===================================================================
--- gnunet/src/sensor/sensors/transport-tcp-sessions-active
(rev 0)
+++ gnunet/src/sensor/sensors/transport-tcp-sessions-active 2014-06-19
19:52:09 UTC (rev 33736)
@@ -0,0 +1,32 @@
+[transport-tcp-sessions-active]
+
+VERSION = 1.0
+DESCRIPTION = Number of GNUnet transport service active TCP sessions
+CATEGORY = GNUnet
+ENABLED = YES
+
+# Start and end time format: %Y-%m-%d %H:%M:%S
+#START_TIME =
+#END_TIME =
+#Interval in seconds
+INTERVAL = 60
+#LIFETIME =
+
+#CAPABILITIES =
+
+SOURCE = gnunet-statistics
+
+GNUNET_STAT_SERVICE = transport
+GNUNET_STAT_NAME = # TCP sessions active
+
+#EXT_PROCESS =
+#EXT_ARGS =
+
+EXPECTED_DATATYPE = uint64
+
+# Reporting mechanism
+COLLECTION_POINT = JLAPIAOB2DJA4B4I676TCOCVU0DUIRMKKUSM71BLLGCV3OHMUQ80
+COLLECTION_INTERVAL = 120
+
+P2P_REPORT = NO
+#P2P_INTERVAL =
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33736 - in gnunet/src: peerstore sensor sensor/sensors,
gnunet <=