/*
This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2011, 2012 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file dht/test_dht_monitor.c
/**
* Information we keep for each GET operation.
*/
-struct GetOperation
+struct GetOperation
{
/**
* DLL.
/**
* Array of the testbed's peers.
- */
+ */
static struct GNUNET_TESTBED_Peer **my_peers;
/**
/**
* Task called to disconnect peers.
*/
-static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+static struct GNUNET_SCHEDULER_Task *timeout_task;
/**
* Task to do DHT_puts
*/
-static GNUNET_SCHEDULER_TaskIdentifier put_task;
+static struct GNUNET_SCHEDULER_Task * put_task;
static struct GNUNET_DHT_MonitorHandle **monitors;
* Terminates active get operations and shuts down
* the testbed.
*
- * @param cls the 'struct GNUNET_DHT_TestContext'
- * @param tc scheduler context
- */
+ * @param cls the `struct GNUNET_DHT_TEST_Context`
+ */
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
struct GNUNET_DHT_TEST_Context *ctx = cls;
unsigned int i;
GNUNET_free (monitors);
GNUNET_SCHEDULER_cancel (put_task);
GNUNET_DHT_TEST_cleanup (ctx);
+ if (NULL != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = NULL;
+ }
+}
+
+
+/**
+ * Task run on success or timeout to clean up.
+ * Terminates active get operations and shuts down
+ * the testbed.
+ *
+ * @param cls NULL
+ */
+static void
+timeout_task_cb (void *cls)
+{
+ timeout_task = NULL;
+ GNUNET_SCHEDULER_shutdown ();
}
const struct GNUNET_PeerIdentity *get_path,
unsigned int get_path_length,
const struct GNUNET_PeerIdentity *put_path,
- unsigned int put_path_length, enum GNUNET_BLOCK_Type type,
+ unsigned int put_path_length,
+ enum GNUNET_BLOCK_Type type,
size_t size, const void *data)
{
struct GetOperation *get_op = cls;
struct GNUNET_HashCode want;
- struct GNUNET_DHT_TestContext *ctx;
if (sizeof (struct GNUNET_HashCode) != size)
{
GNUNET_break (0);
return;
}
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Get successful\n");
GNUNET_DHT_get_stop (get_op->get);
GNUNET_CONTAINER_DLL_remove (get_head,
return;
/* all DHT GET operations successful; terminate! */
ok = 0;
- ctx = GNUNET_SCHEDULER_cancel (timeout_task);
- timeout_task = GNUNET_SCHEDULER_add_now (&shutdown_task, ctx);
+ GNUNET_SCHEDULER_shutdown ();
}
/**
* Task to put the id of each peer into the DHT.
- *
+ *
* @param cls array with NUM_PEERS DHT handles
- * @param tc Task context
*/
static void
-do_puts (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_puts (void *cls)
{
struct GNUNET_DHT_Handle **hs = cls;
struct GNUNET_HashCode key;
struct GNUNET_HashCode value;
- unsigned int i;
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Putting values into DHT\n");
- for (i = 0; i < NUM_PEERS; i++)
+ for (unsigned int i = 0; i < NUM_PEERS; i++)
{
GNUNET_CRYPTO_hash (&i, sizeof (i), &key);
GNUNET_CRYPTO_hash (&key, sizeof (key), &value);
GNUNET_DHT_put (hs[i], &key, 10U,
GNUNET_DHT_RO_RECORD_ROUTE |
GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
- GNUNET_BLOCK_TYPE_TEST,
- sizeof (value), &value,
+ GNUNET_BLOCK_TYPE_TEST,
+ sizeof (value), &value,
GNUNET_TIME_UNIT_FOREVER_ABS,
- GNUNET_TIME_UNIT_FOREVER_REL,
NULL, NULL);
}
- put_task = GNUNET_SCHEDULER_add_delayed (PUT_FREQUENCY,
+ put_task = GNUNET_SCHEDULER_add_delayed (PUT_FREQUENCY,
&do_puts, hs);
}
i = (unsigned int) (long) cls;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"%u got a PUT message for key %s with %u bytes\n",
- i,
- GNUNET_h2s (key), size);
+ i,
+ GNUNET_h2s (key),
+ (unsigned int) size);
monitor_counter++;
}
i = (unsigned int) (long) cls;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"%u got a REPLY message for key %s with %u bytes\n",
- i,
- GNUNET_h2s (key), size);
+ i,
+ GNUNET_h2s (key),
+ (unsigned int) size);
monitor_counter++;
}
GNUNET_assert (NUM_PEERS == num_peers);
my_peers = peers;
- monitors = GNUNET_malloc (num_peers * sizeof (struct GNUNET_DHT_MonitorHandle *));
+ monitors = GNUNET_new_array (num_peers,
+ struct GNUNET_DHT_MonitorHandle *);
for (i = 0; i < num_peers; i++)
monitors[i] = GNUNET_DHT_monitor_start (dhts[i],
GNUNET_BLOCK_TYPE_ANY,
&monitor_res_cb,
&monitor_put_cb,
(void *)(long)i);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Peers setup, starting test\n");
put_task = GNUNET_SCHEDULER_add_now (&do_puts, dhts);
for (i=0;i<num_peers;i++)
GNUNET_CRYPTO_hash (&i, sizeof (i), &key);
for (j=0;j<num_peers;j++)
{
- get_op = GNUNET_malloc (sizeof (struct GetOperation));
+ get_op = GNUNET_new (struct GetOperation);
GNUNET_CONTAINER_DLL_insert (get_head,
get_tail,
get_op);
- get_op->get = GNUNET_DHT_get_start (dhts[j],
+ get_op->get = GNUNET_DHT_get_start (dhts[j],
GNUNET_BLOCK_TYPE_TEST, /* type */
&key, /*key to search */
4U, /* replication level */
&dht_get_handler, get_op);
}
}
- timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &shutdown_task, ctx);
+ timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
+ &timeout_task_cb,
+ NULL);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+ ctx);
}