/*
This file is part of GNUnet
- (C) 2008--2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2008--2013 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.
*/
/**
/**
* The task for calling the continuation callback
*/
- GNUNET_SCHEDULER_TaskIdentifier call_completion_task_id;
-
+ struct GNUNET_SCHEDULER_Task * call_completion_task_id;
+
/**
* The number of peers present in the peers array. This number also
* represents the number of service connect operations in the ops array
/**
* Task to mark the statistics service connect operation as done
*/
- GNUNET_SCHEDULER_TaskIdentifier op_done_task_id;
+ struct GNUNET_SCHEDULER_Task * op_done_task_id;
/**
* The index of this peer in the peers array of GetStatsContext
* get_statistics operation.
*
* @param cls the GetStatsContext
- * @param tc the scheduler task context
*/
static void
-call_completion_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+call_completion_task (void *cls)
{
struct GetStatsContext *sc = cls;
- GNUNET_assert (sc->call_completion_task_id != GNUNET_SCHEDULER_NO_TASK);
- sc->call_completion_task_id = GNUNET_SCHEDULER_NO_TASK;
+ GNUNET_assert (sc->call_completion_task_id != NULL);
+ sc->call_completion_task_id = NULL;
LOG_DEBUG ("Calling get_statistics() continuation callback\n");
sc->cont (sc->cb_cls, sc->main_op, NULL);
}
* as we cannot destroy the statistics handle in iteration_completion_cb()
*
* @param cls the PeerGetStatsContext
- * @param tc the scheduler task context
*/
static void
-op_done_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+op_done_task (void *cls)
{
struct PeerGetStatsContext *peer_sc = cls;
struct GetStatsContext *sc;
struct GNUNET_TESTBED_Operation **op;
sc = peer_sc->sc;
- peer_sc->op_done_task_id = GNUNET_SCHEDULER_NO_TASK;
- op = &sc->ops[peer_sc->peer_index];
+ peer_sc->op_done_task_id = NULL;
+ op = &sc->ops[peer_sc->peer_index];
GNUNET_assert (NULL != *op);
GNUNET_TESTBED_operation_done (*op);
*op = NULL;
GNUNET_break (GNUNET_OK == success);
sc = peer_sc->sc;
- peer_sc->get_handle = NULL;
+ peer_sc->get_handle = NULL;
sc->num_completed++;
peer_sc->op_done_task_id = GNUNET_SCHEDULER_add_now (&op_done_task, peer_sc);
if (sc->num_completed == sc->num_peers)
LOG_DEBUG ("Peer %u: [%s,%s] -> %lu\n", peer_sc->peer_index,
subsystem, name, (unsigned long) value);
ret = sc->proc (sc->cb_cls, peer,
- subsystem, name, value, is_persistent);
+ subsystem, name, value, is_persistent);
if (GNUNET_SYSERR == ret)
LOG_DEBUG ("Aborting iteration for peer %u\n", peer_sc->peer_index);
return ret;
* from GNUNET_TESTBED_service_connect()
* @return service handle to return in 'op_result', NULL on error
*/
-static void *
+static void *
statistics_ca (void *cls, const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct PeerGetStatsContext *peer_sc = cls;
-
+
LOG_DEBUG ("Connecting to statistics service of peer %u\n",
peer_sc->peer_index);
return GNUNET_STATISTICS_create ("<testbed-api>", cfg);
* @param cls the PeerGetStatsContext
* @param op_result service handle returned from the connect adapter
*/
-static void
+static void
statistics_da (void *cls, void *op_result)
{
struct PeerGetStatsContext *peer_sc = cls;
peer_sc->get_handle = NULL;
}
GNUNET_STATISTICS_destroy (sh, GNUNET_NO);
- if (GNUNET_SCHEDULER_NO_TASK != peer_sc->op_done_task_id)
+ if (NULL != peer_sc->op_done_task_id)
GNUNET_SCHEDULER_cancel (peer_sc->op_done_task_id);
GNUNET_free (peer_sc);
}
unsigned int peer;
LOG_DEBUG ("Starting get_statistics operation\n");
- sc->ops = GNUNET_malloc (sc->num_peers *
+ sc->ops = GNUNET_malloc (sc->num_peers *
sizeof (struct GNUNET_TESTBED_Operation *));
for (peer = 0; peer < sc->num_peers; peer++)
{
GNUNET_break (0);
continue;
}
- peer_sc = GNUNET_malloc (sizeof (struct PeerGetStatsContext));
+ peer_sc = GNUNET_new (struct PeerGetStatsContext);
peer_sc->sc = sc;
peer_sc->peer_index = peer;
- sc->ops[peer] =
+ sc->ops[peer] =
GNUNET_TESTBED_service_connect (sc, sc->peers[peer], "statistics",
&service_connect_comp,
peer_sc,
{
struct GetStatsContext *sc = cls;
unsigned int peer;
-
+
LOG_DEBUG ("Cleaning up get_statistics operation\n");
- if (GNUNET_SCHEDULER_NO_TASK != sc->call_completion_task_id)
+ if (NULL != sc->call_completion_task_id)
GNUNET_SCHEDULER_cancel (sc->call_completion_task_id);
if (NULL != sc->ops)
{
GNUNET_free_non_null (sc->subsystem);
GNUNET_free_non_null (sc->name);
GNUNET_free (sc);
- if (GNUNET_YES ==
+ if (GNUNET_YES ==
GNUNET_TESTBED_operation_queue_destroy_empty_ (no_wait_queue))
no_wait_queue = NULL;
}
GNUNET_assert (NULL != proc);
GNUNET_assert (NULL != cont);
if (NULL == no_wait_queue)
- no_wait_queue = GNUNET_TESTBED_operation_queue_create_
+ no_wait_queue = GNUNET_TESTBED_operation_queue_create_
(OPERATION_QUEUE_TYPE_FIXED, UINT_MAX);
- sc = GNUNET_malloc (sizeof (struct GetStatsContext));
+ sc = GNUNET_new (struct GetStatsContext);
sc->peers = peers;
sc->subsystem = (NULL == subsystem) ? NULL : GNUNET_strdup (subsystem);
sc->name = (NULL == name) ? NULL : GNUNET_strdup (name);