/*
This file is part of GNUnet.
- Copyright (C) 2012 GNUnet e.V.
+ Copyright (C) 2012, 2016 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- 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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
+ Affero General Public License for more details.
*/
/**
* @file set/test_set_union_result_smmetric
* @brief testcase for symmetric result mode of the union set operation
+ * @author Florian Dold
+ * @author Christian Grothoff
*/
#include "platform.h"
#include "gnunet_util_lib.h"
static struct GNUNET_PeerIdentity local_id;
static struct GNUNET_HashCode app_id;
+
static struct GNUNET_SET_Handle *set1;
static struct GNUNET_SET_Handle *set2;
static const struct GNUNET_CONFIGURATION_Handle *config;
+static struct GNUNET_SET_OperationHandle *oh1;
+
+static struct GNUNET_SET_OperationHandle *oh2;
+
static int iter_count;
/**
*/
static unsigned int count_set2;
+/**
+ * Task that is run when the test times out.
+ */
+static struct GNUNET_SCHEDULER_Task *timeout_task;
+
static void
result_cb_set1 (void *cls,
const struct GNUNET_SET_Element *element,
+ uint64_t current_size,
enum GNUNET_SET_Status status)
{
switch (status)
case GNUNET_SET_STATUS_FAILURE:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"set 1: failure\n");
+ oh1 = NULL;
ret = 1;
+ if (NULL != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = NULL;
+ }
GNUNET_SCHEDULER_shutdown ();
break;
case GNUNET_SET_STATUS_DONE:
+ oh1 = NULL;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"set 1: done\n");
GNUNET_SET_destroy (set1);
set1 = NULL;
if (NULL == set2)
+ {
+ if (NULL != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = NULL;
+ }
GNUNET_SCHEDULER_shutdown ();
+ }
break;
case GNUNET_SET_STATUS_ADD_REMOTE:
break;
static void
result_cb_set2 (void *cls,
const struct GNUNET_SET_Element *element,
+ uint64_t current_size,
enum GNUNET_SET_Status status)
{
switch (status)
case GNUNET_SET_STATUS_FAILURE:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"set 2: failure\n");
+ oh2 = NULL;
ret = 1;
+ if (NULL != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = NULL;
+ }
GNUNET_SCHEDULER_shutdown ();
break;
case GNUNET_SET_STATUS_DONE:
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"set 2: done\n");
+ oh2 = NULL;
GNUNET_SET_destroy (set2);
set2 = NULL;
if (NULL == set1)
+ {
+ if (NULL != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = NULL;
+ }
GNUNET_SCHEDULER_shutdown ();
+ }
break;
case GNUNET_SET_STATUS_ADD_REMOTE:
break;
const struct GNUNET_MessageHeader *context_msg,
struct GNUNET_SET_Request *request)
{
- struct GNUNET_SET_OperationHandle *oh;
-
GNUNET_assert (NULL != context_msg);
- GNUNET_assert (ntohs (context_msg->type) == GNUNET_MESSAGE_TYPE_TEST);
+ GNUNET_assert (ntohs (context_msg->type) == GNUNET_MESSAGE_TYPE_DUMMY);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"listen cb called\n");
- GNUNET_SET_listen_cancel (listen_handle);
- oh = GNUNET_SET_accept (request,
- GNUNET_SET_RESULT_SYMMETRIC,
- &result_cb_set2,
- NULL);
- GNUNET_SET_commit (oh, set2);
+ oh2 = GNUNET_SET_accept (request,
+ GNUNET_SET_RESULT_SYMMETRIC,
+ (struct GNUNET_SET_Option[]) { 0 },
+ &result_cb_set2,
+ NULL);
+ GNUNET_SET_commit (oh2,
+ set2);
}
static void
start (void *cls)
{
- struct GNUNET_SET_OperationHandle *oh;
struct GNUNET_MessageHeader context_msg;
context_msg.size = htons (sizeof context_msg);
- context_msg.type = htons (GNUNET_MESSAGE_TYPE_TEST);
+ context_msg.type = htons (GNUNET_MESSAGE_TYPE_DUMMY);
listen_handle = GNUNET_SET_listen (config,
GNUNET_SET_OPERATION_UNION,
&app_id,
&listen_cb, NULL);
- oh = GNUNET_SET_prepare (&local_id,
- &app_id,
- &context_msg,
- GNUNET_SET_RESULT_SYMMETRIC,
- &result_cb_set1, NULL);
- GNUNET_SET_commit (oh, set1);
+ oh1 = GNUNET_SET_prepare (&local_id,
+ &app_id,
+ &context_msg,
+ GNUNET_SET_RESULT_SYMMETRIC,
+ (struct GNUNET_SET_Option[]) { 0 },
+ &result_cb_set1, NULL);
+ GNUNET_SET_commit (oh1, set1);
}
static void
timeout_fail (void *cls)
{
+ timeout_task = NULL;
GNUNET_SCHEDULER_shutdown ();
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"test timed out\n");
}
+/**
+ * Function run on shutdown.
+ *
+ * @param cls closure
+ */
+static void
+do_shutdown (void *cls)
+{
+ if (NULL != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_task);
+ timeout_task = NULL;
+ }
+ if (NULL != oh1)
+ {
+ GNUNET_SET_operation_cancel (oh1);
+ oh1 = NULL;
+ }
+ if (NULL != oh2)
+ {
+ GNUNET_SET_operation_cancel (oh2);
+ oh2 = NULL;
+ }
+ if (NULL != set1)
+ {
+ GNUNET_SET_destroy (set1);
+ set1 = NULL;
+ }
+ if (NULL != set2)
+ {
+ GNUNET_SET_destroy (set2);
+ set2 = NULL;
+ }
+ if (NULL != listen_handle)
+ {
+ GNUNET_SET_listen_cancel (listen_handle);
+ listen_handle = NULL;
+ }
+}
+
+
/**
* Signature of the 'main' function for a (single-peer) testcase that
* is run using 'GNUNET_TESTING_peer_run'.
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5),
- &timeout_fail,
- NULL);
-
+ timeout_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5),
+ &timeout_fail,
+ NULL);
+ GNUNET_SCHEDULER_add_shutdown (&do_shutdown,
+ NULL);
config = cfg;
GNUNET_TESTING_peer_get_identity (peer,
&local_id);
- test_iter ();
+ if (0)
+ test_iter ();
set1 = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
set2 = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
{
return 1;
}
- GNUNET_assert (2 == count_set1);
- GNUNET_assert (1 == count_set2);
+ GNUNET_break (2 == count_set1);
+ GNUNET_break (1 == count_set2);
return ret;
}