/*
This file is part of GNUnet
- (C) 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2013 Christian Grothoff (and other contributing authors)
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.
*/
/**
static unsigned int num_b = 5;
static unsigned int num_c = 20;
-static unsigned int salt = 42;
-
static char *op_str = "union";
const static struct GNUNET_CONFIGURATION_Handle *config;
int done;
} info1, info2;
-struct GNUNET_CONTAINER_MultiHashMap *common_sent;
+static struct GNUNET_CONTAINER_MultiHashMap *common_sent;
-struct GNUNET_HashCode app_id;
+static struct GNUNET_HashCode app_id;
-struct GNUNET_PeerIdentity local_peer;
+static struct GNUNET_PeerIdentity local_peer;
-struct GNUNET_SET_ListenHandle *set_listener;
+static struct GNUNET_SET_ListenHandle *set_listener;
static int
}
+
static void
check_all_done (void)
{
enum GNUNET_SET_Status status)
{
struct SetInfo *info = cls;
+ struct GNUNET_HashCode hash;
GNUNET_assert (GNUNET_NO == info->done);
switch (status)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "failure\n");
GNUNET_SCHEDULER_shutdown ();
return;
- case GNUNET_SET_STATUS_OK:
+ case GNUNET_SET_STATUS_ADD_LOCAL:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "set %s: local element\n", info->id);
break;
+ case GNUNET_SET_STATUS_ADD_REMOTE:
+ GNUNET_CRYPTO_hash (element->data, element->size, &hash);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "set %s: remote element %s\n", info->id,
+ GNUNET_h2s (&hash));
+ // XXX: record and check
+ return;
default:
GNUNET_assert (0);
}
if (element->size != sizeof (struct GNUNET_HashCode))
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "wrong element size: %u\n", element->size);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "wrong element size: %u, expected %u\n", element->size, sizeof (struct GNUNET_HashCode));
GNUNET_assert (0);
}
{
if (NULL == request)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "listener failed\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "listener failed\n");
return;
}
GNUNET_assert (NULL == info2.oh);
- GNUNET_log (GNUNET_ERROR_TYPE_INFO, "set listen cb called\n");
- info2.oh = GNUNET_SET_accept (request, GNUNET_SET_RESULT_ADDED,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "set listen cb called\n");
+ info2.oh = GNUNET_SET_accept (request, GNUNET_SET_RESULT_SYMMETRIC,
set_result_cb, &info2);
GNUNET_SET_commit (info2.oh, info2.set);
}
-
static int
set_insert_iterator (void *cls,
const struct GNUNET_HashCode *key,
struct GNUNET_SET_Handle *set = cls;
struct GNUNET_SET_Element *el;
- el = GNUNET_malloc (sizeof *el + sizeof *key);
- el->type = 0;
+ el = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) +
+ sizeof (struct GNUNET_HashCode));
+ el->element_type = 0;
memcpy (&el[1], key, sizeof *key);
el->data = &el[1];
el->size = sizeof *key;
handle_shutdown (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Shutting down set profiler\n");
if (NULL != set_listener)
{
GNUNET_SET_listen_cancel (set_listener);
}
}
+
static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg,
+ struct GNUNET_TESTING_Peer *peer)
{
unsigned int i;
struct GNUNET_HashCode hash;
+ struct GNUNET_HashCode hashhash;
config = cfg;
- if (GNUNET_OK != GNUNET_CRYPTO_get_host_identity (cfg, &local_peer))
+ if (GNUNET_OK != GNUNET_CRYPTO_get_peer_identity (cfg, &local_peer))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "could not retrieve host identity\n");
ret = 0;
info1.id = "a";
info2.id = "b";
-
+
info1.sent = GNUNET_CONTAINER_multihashmap_create (num_a+1, GNUNET_NO);
info2.sent = GNUNET_CONTAINER_multihashmap_create (num_b+1, GNUNET_NO);
common_sent = GNUNET_CONTAINER_multihashmap_create (num_c+1, GNUNET_NO);
for (i = 0; i < num_a; i++)
{
GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_STRONG, &hash);
+ GNUNET_CRYPTO_hash (&hash, sizeof (struct GNUNET_HashCode), &hashhash);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Set a: Created element %s\n",
+ GNUNET_h2s (&hashhash));
GNUNET_CONTAINER_multihashmap_put (info1.sent, &hash, NULL,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
}
for (i = 0; i < num_b; i++)
{
GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_STRONG, &hash);
+ GNUNET_CRYPTO_hash (&hash, sizeof (struct GNUNET_HashCode), &hashhash);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Set b: Created element %s\n",
+ GNUNET_h2s (&hashhash));
GNUNET_CONTAINER_multihashmap_put (info2.sent, &hash, NULL,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
}
for (i = 0; i < num_c; i++)
{
GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_STRONG, &hash);
+ GNUNET_CRYPTO_hash (&hash, sizeof (struct GNUNET_HashCode), &hashhash);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Set c: Created element %s\n",
+ GNUNET_h2s (&hashhash));
GNUNET_CONTAINER_multihashmap_put (common_sent, &hash, NULL,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
}
- /* use last hash for app id */
- app_id = hash;
+ GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_STRONG, &app_id);
/* FIXME: also implement intersection etc. */
info1.set = GNUNET_SET_create (config, GNUNET_SET_OPERATION_UNION);
set_listener = GNUNET_SET_listen (config, GNUNET_SET_OPERATION_UNION,
&app_id, set_listen_cb, NULL);
- info1.oh = GNUNET_SET_prepare (&local_peer, &app_id, NULL, salt, GNUNET_SET_RESULT_ADDED,
- set_result_cb, &info1);
+ info1.oh = GNUNET_SET_prepare (&local_peer, &app_id, NULL,
+ GNUNET_SET_RESULT_SYMMETRIC,
+ set_result_cb, &info1);
GNUNET_SET_commit (info1.oh, info1.set);
GNUNET_SET_destroy (info1.set);
info1.set = NULL;
}
+static void
+pre_run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ if (0 != GNUNET_TESTING_peer_run ("set-profiler",
+ cfgfile,
+ &run, NULL))
+ ret = 2;
+}
+
+
int
main (int argc, char **argv)
{
gettext_noop ("number of values"),
GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_c },
{ 'x', "operation", NULL,
- gettext_noop ("oeration to execute"),
+ gettext_noop ("operation to execute"),
GNUNET_YES, &GNUNET_GETOPT_set_string, &op_str },
GNUNET_GETOPT_OPTION_END
};
- GNUNET_PROGRAM_run (argc, argv, "gnunet-set-profiler",
- "help",
- options, &run, NULL);
+ GNUNET_PROGRAM_run2 (argc, argv, "gnunet-set-profiler",
+ "help",
+ options, &pre_run, NULL, GNUNET_YES);
return ret;
}
projects / oweals / gnunet.git / blobdiff