[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28346 - gnunet/src/experimentation
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r28346 - gnunet/src/experimentation |
|
Date: |
Thu, 1 Aug 2013 10:51:44 +0200 |
Author: wachs
Date: 2013-08-01 10:51:43 +0200 (Thu, 01 Aug 2013)
New Revision: 28346
Modified:
gnunet/src/experimentation/gnunet-daemon-experimentation.c
gnunet/src/experimentation/gnunet-daemon-experimentation.h
gnunet/src/experimentation/gnunet-daemon-experimentation_capabilities.c
gnunet/src/experimentation/gnunet-daemon-experimentation_experiments.c
gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
gnunet/src/experimentation/gnunet-daemon-experimentation_scheduler.c
Log:
renaming stats and cfg
Modified: gnunet/src/experimentation/gnunet-daemon-experimentation.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation.c 2013-08-01
08:50:53 UTC (rev 28345)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation.c 2013-08-01
08:51:43 UTC (rev 28346)
@@ -35,13 +35,13 @@
/**
* Statistics handle shared between components
*/
-struct GNUNET_STATISTICS_Handle *GSE_stats;
+struct GNUNET_STATISTICS_Handle *GED_stats;
/**
* Configuration handle shared between components
*/
-struct GNUNET_CONFIGURATION_Handle *GSE_cfg;
+struct GNUNET_CONFIGURATION_Handle *GED_cfg;
/**
@@ -77,9 +77,9 @@
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("Experimentation daemon starting
...\n"));
- GSE_cfg = (struct GNUNET_CONFIGURATION_Handle *) cfg;
- GSE_stats = GNUNET_STATISTICS_create ("experimentation", cfg);
- if (NULL == GSE_stats)
+ GED_cfg = (struct GNUNET_CONFIGURATION_Handle *) cfg;
+ GED_stats = GNUNET_STATISTICS_create ("experimentation", cfg);
+ if (NULL == GED_stats)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Failed to create
statistics!\n"));
return;
Modified: gnunet/src/experimentation/gnunet-daemon-experimentation.h
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation.h 2013-08-01
08:50:53 UTC (rev 28345)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation.h 2013-08-01
08:51:43 UTC (rev 28346)
@@ -49,13 +49,13 @@
/**
* Statistics handle shared between components
*/
-extern struct GNUNET_STATISTICS_Handle *GSE_stats;
+extern struct GNUNET_STATISTICS_Handle *GED_stats;
/**
* Configuration handle shared between components
*/
-extern struct GNUNET_CONFIGURATION_Handle *GSE_cfg;
+extern struct GNUNET_CONFIGURATION_Handle *GED_cfg;
/**
Modified:
gnunet/src/experimentation/gnunet-daemon-experimentation_capabilities.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation_capabilities.c
2013-08-01 08:50:53 UTC (rev 28345)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation_capabilities.c
2013-08-01 08:51:43 UTC (rev 28346)
@@ -112,7 +112,7 @@
/* Plugins configured */
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (GSE_cfg,
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (GED_cfg,
"TRANSPORT", "PLUGINS", &plugins))
{
for (pos = strtok (plugins, " "); pos != NULL; pos = strtok (NULL, "
"))
@@ -139,12 +139,12 @@
/* IPv6 enabled
* FIXE: just having it not enabled is not really sufficient */
- if (GNUNET_NO == GNUNET_CONFIGURATION_get_value_yesno (GSE_cfg,
+ if (GNUNET_NO == GNUNET_CONFIGURATION_get_value_yesno (GED_cfg,
"NAT", "DISABLEV6"))
GSE_node_capabilities |= HAVE_IPV6;
/* Behind NAT */
- if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (GSE_cfg,
+ if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_yesno (GED_cfg,
"NAT", "BEHIND_NAT"))
GSE_node_capabilities |= BEHIND_NAT;
Modified: gnunet/src/experimentation/gnunet-daemon-experimentation_experiments.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation_experiments.c
2013-08-01 08:50:53 UTC (rev 28345)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation_experiments.c
2013-08-01 08:51:43 UTC (rev 28346)
@@ -228,7 +228,7 @@
(long long unsigned int) frequency.rel_value / 1000,
(long long unsigned int) duration.rel_value / 1000);
GNUNET_CONTAINER_multihashmap_put (experiments, &e->issuer.hashPubKey,
e, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- GNUNET_STATISTICS_set (GSE_stats, "# experiments",
GNUNET_CONTAINER_multihashmap_size (experiments), GNUNET_NO);
+ GNUNET_STATISTICS_set (GED_stats, "# experiments",
GNUNET_CONTAINER_multihashmap_size (experiments), GNUNET_NO);
return GNUNET_OK;
}
@@ -367,7 +367,7 @@
struct GNUNET_HashCode hash;
/* Load valid issuer */
- if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (GSE_cfg,
"EXPERIMENTATION", "ISSUERS", &issuers))
+ if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (GED_cfg,
"EXPERIMENTATION", "ISSUERS", &issuers))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("No valid
experiment issuers configured! Set value to peer id of issuer! Exit...\n"));
return GNUNET_SYSERR;
@@ -398,9 +398,9 @@
GED_experiments_stop ();
return GNUNET_SYSERR;
}
- GNUNET_STATISTICS_set (GSE_stats, "# issuer",
GNUNET_CONTAINER_multihashmap_size (valid_issuers), GNUNET_NO);
+ GNUNET_STATISTICS_set (GED_stats, "# issuer",
GNUNET_CONTAINER_multihashmap_size (valid_issuers), GNUNET_NO);
- if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (GSE_cfg,
"EXPERIMENTATION", "PUBKEY", &pubkey))
+ if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_string (GED_cfg,
"EXPERIMENTATION", "PUBKEY", &pubkey))
{
if (GNUNET_OK !=
GNUNET_CRYPTO_ecc_public_key_from_string(pubkey, strlen (pubkey), &pub))
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, _("Invalid public
key `%s'\n"), pubkey);
@@ -425,7 +425,7 @@
experiments = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
/* Load experiments from file */
- if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (GSE_cfg,
"EXPERIMENTATION", "EXPERIMENTS", &file))
+ if (GNUNET_SYSERR == GNUNET_CONFIGURATION_get_value_string (GED_cfg,
"EXPERIMENTATION", "EXPERIMENTS", &file))
return GNUNET_OK;
if (GNUNET_YES != GNUNET_DISK_file_test (file))
Modified: gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
2013-08-01 08:50:53 UTC (rev 28345)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
2013-08-01 08:51:43 UTC (rev 28346)
@@ -71,21 +71,21 @@
static void update_stats (struct GNUNET_CONTAINER_MultiHashMap *m)
{
GNUNET_assert (NULL != m);
- GNUNET_assert (NULL != GSE_stats);
+ GNUNET_assert (NULL != GED_stats);
if (m == nodes_active)
{
- GNUNET_STATISTICS_set (GSE_stats, "# nodes active",
+ GNUNET_STATISTICS_set (GED_stats, "# nodes active",
GNUNET_CONTAINER_multihashmap_size(m),
GNUNET_NO);
}
else if (m == nodes_inactive)
{
- GNUNET_STATISTICS_set (GSE_stats, "# nodes inactive",
+ GNUNET_STATISTICS_set (GED_stats, "# nodes inactive",
GNUNET_CONTAINER_multihashmap_size(m),
GNUNET_NO);
}
else if (m == nodes_requested)
{
- GNUNET_STATISTICS_set (GSE_stats, "# nodes requested",
+ GNUNET_STATISTICS_set (GED_stats, "# nodes requested",
GNUNET_CONTAINER_multihashmap_size(m),
GNUNET_NO);
}
else
@@ -763,7 +763,7 @@
GED_nodes_start ()
{
/* Connecting to core service to find partners */
- ch = GNUNET_CORE_connect (GSE_cfg, NULL,
+ ch = GNUNET_CORE_connect (GED_cfg, NULL,
&core_startup_handler,
&core_connect_handler,
&core_disconnect_handler,
Modified: gnunet/src/experimentation/gnunet-daemon-experimentation_scheduler.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation_scheduler.c
2013-08-01 08:50:53 UTC (rev 28345)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation_scheduler.c
2013-08-01 08:51:43 UTC (rev 28346)
@@ -93,7 +93,7 @@
GNUNET_assert (experiments_requested > 0);
experiments_requested --;
- GNUNET_STATISTICS_set (GSE_stats, "# experiments requested",
experiments_requested, GNUNET_NO);
+ GNUNET_STATISTICS_set (GED_stats, "# experiments requested",
experiments_requested, GNUNET_NO);
}
static void start_experiment (void *cls,const struct
GNUNET_SCHEDULER_TaskContext* tc)
@@ -127,7 +127,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Sending start
request to peer `%s' for `%s'\n",
GNUNET_i2s (&se->n->id), se->e->name);
experiments_requested ++;
- GNUNET_STATISTICS_set (GSE_stats, "# experiments
requested", experiments_requested, GNUNET_NO);
+ GNUNET_STATISTICS_set (GED_stats, "# experiments
requested", experiments_requested, GNUNET_NO);
return;
}
else if (REQUESTED == se->state)
@@ -230,7 +230,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Added experiment `%s' for node to
be scheduled\n",
e->name, GNUNET_i2s(&se->n->id));
experiments_scheduled ++;
- GNUNET_STATISTICS_set (GSE_stats, "# experiments scheduled",
experiments_scheduled, GNUNET_NO);
+ GNUNET_STATISTICS_set (GED_stats, "# experiments scheduled",
experiments_scheduled, GNUNET_NO);
}
/**
@@ -266,7 +266,7 @@
GNUNET_free (cur);
GNUNET_assert (experiments_scheduled > 0);
experiments_scheduled --;
- GNUNET_STATISTICS_set (GSE_stats, "# experiments
scheduled", experiments_scheduled, GNUNET_NO);
+ GNUNET_STATISTICS_set (GED_stats, "# experiments
scheduled", experiments_scheduled, GNUNET_NO);
}
next = running_head;
@@ -282,7 +282,7 @@
GNUNET_free (cur);
GNUNET_assert (experiments_running > 0);
experiments_running --;
- GNUNET_STATISTICS_set (GSE_stats, "# experiments
running", experiments_running, GNUNET_NO);
+ GNUNET_STATISTICS_set (GED_stats, "# experiments
running", experiments_running, GNUNET_NO);
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28346 - gnunet/src/experimentation,
gnunet <=