[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28337 - gnunet/src/experimentation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28337 - gnunet/src/experimentation |
Date: |
Tue, 30 Jul 2013 14:22:58 +0200 |
Author: wachs
Date: 2013-07-30 14:22:57 +0200 (Tue, 30 Jul 2013)
New Revision: 28337
Modified:
gnunet/src/experimentation/gnunet-daemon-experimentation.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:
updated code
Modified: gnunet/src/experimentation/gnunet-daemon-experimentation.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation.c 2013-07-29
14:21:24 UTC (rev 28336)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation.c 2013-07-30
12:22:57 UTC (rev 28337)
@@ -86,15 +86,19 @@
}
GNUNET_EXPERIMENTATION_capabilities_start ();
+
GNUNET_EXPERIMENTATION_storage_start ();
+
if (GNUNET_SYSERR == GNUNET_EXPERIMENTATION_experiments_start ())
{
GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
return;
}
+
GNUNET_EXPERIMENTATION_nodes_start ();
+ /*
GNUNET_EXPERIMENTATION_scheduler_start ();
-
+*/
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task,
NULL);
}
@@ -116,7 +120,7 @@
return (GNUNET_OK ==
GNUNET_PROGRAM_run (argc, argv, "experimentation",
-
_("GNUnet hostlist server and client"), options,
+
_("GNUnet experimentation daemon"), options,
&run, NULL)) ? 0 : 1;
}
Modified: gnunet/src/experimentation/gnunet-daemon-experimentation_experiments.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation_experiments.c
2013-07-29 14:21:24 UTC (rev 28336)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation_experiments.c
2013-07-30 12:22:57 UTC (rev 28337)
@@ -56,6 +56,11 @@
uint32_t GSE_my_issuer_count;
+/**
+ * Valid experiment issuer for this daemon
+ *
+ * Array Experimentation_Issuer with GSE_my_issuer_count elements
+ */
struct Experimentation_Issuer *GSE_my_issuer;
Modified: gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
2013-07-29 14:21:24 UTC (rev 28336)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation_nodes.c
2013-07-30 12:22:57 UTC (rev 28337)
@@ -199,7 +199,7 @@
* @param buf the buffer to copy to
* @return bytes passed
*/
-size_t send_request_cb (void *cls, size_t bufsize, void *buf)
+size_t send_experimentation_request_cb (void *cls, size_t bufsize, void *buf)
{
struct Node *n = cls;
struct Experimentation_Request msg;
@@ -234,11 +234,11 @@
/**
- * Send request
+ * Send request to peer to start add him to to the set of experimentation nodes
*
* @param peer the peer to send to
*/
-static void send_request (const struct GNUNET_PeerIdentity *peer)
+static void send_experimentation_request (const struct GNUNET_PeerIdentity
*peer)
{
struct Node *n;
size_t size;
@@ -254,7 +254,7 @@
n->capabilities = NONE;
n->cth = GNUNET_CORE_notify_transmit_ready(ch, GNUNET_NO, 0,
GNUNET_TIME_relative_get_forever_(),
- peer, size,
send_request_cb, n);
+ peer, size,
send_experimentation_request_cb, n);
GNUNET_assert (GNUNET_OK == GNUNET_CONTAINER_multihashmap_put
(nodes_requested,
&peer->hashPubKey, n,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST));
@@ -315,9 +315,8 @@
e->name,
GNUNET_i2s (&n->id));
- /* Request experiment */
+ /* Tell the scheduler to add a node with an experiment */
GNUNET_EXPERIMENTATION_scheduler_add (n, e);
-
counter ++;
}
@@ -571,7 +570,7 @@
if (GNUNET_YES == GNUNET_CONTAINER_multihashmap_contains
(nodes_inactive, &peer->hashPubKey))
return; /* This peer is known as inactive */
- send_request (peer);
+ send_experimentation_request (peer);
}
Modified: gnunet/src/experimentation/gnunet-daemon-experimentation_scheduler.c
===================================================================
--- gnunet/src/experimentation/gnunet-daemon-experimentation_scheduler.c
2013-07-29 14:21:24 UTC (rev 28336)
+++ gnunet/src/experimentation/gnunet-daemon-experimentation_scheduler.c
2013-07-30 12:22:57 UTC (rev 28337)
@@ -74,7 +74,7 @@
GNUNET_STATISTICS_set (GSE_stats, "# experiments requested",
experiments_requested, GNUNET_NO);
}
-static void run (void *cls,const struct GNUNET_SCHEDULER_TaskContext* tc)
+static void start_experiment (void *cls,const struct
GNUNET_SCHEDULER_TaskContext* tc)
{
struct ScheduledExperiment *se = cls;
struct GNUNET_TIME_Relative end;
@@ -114,7 +114,7 @@
se->state = STOPPED;
return; /* End of experiment is reached */
}
- se->task = GNUNET_SCHEDULER_add_delayed (se->e->frequency,
&run, se);
+ se->task = GNUNET_SCHEDULER_add_delayed (se->e->frequency,
&start_experiment, se);
}
else if (STOPPED == se->state)
@@ -145,9 +145,9 @@
se->e = e;
se->n = n;
if (0 == start.rel_value)
- se->task = GNUNET_SCHEDULER_add_now (&run, se);
+ se->task = GNUNET_SCHEDULER_add_now (&start_experiment,
se);
else
- se->task = GNUNET_SCHEDULER_add_delayed (start, &run,
se);
+ se->task = GNUNET_SCHEDULER_add_delayed (start,
&start_experiment, se);
GNUNET_CONTAINER_DLL_insert (list_head, list_tail, se);
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Added experiment `%s' for node to
be scheduled\n",
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28337 - gnunet/src/experimentation,
gnunet <=