[gnunet] branch master updated: SETU imporved tests

[gnunet]

This is an automated email from the git hooks/post-receive script.

elias-summermatter pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new b5660e0a3 SETU imporved tests
     new 26d2c0d58 Merge branch 'master' of ssh://gnunet.org/gnunet
b5660e0a3 is described below

commit b5660e0a33f4c7a819de0b5056172f78f912e352
Author: Elias Summermatter <elias.summermatter@seccom.ch>
AuthorDate: Wed Mar 31 11:16:38 2021 +0200

    SETU imporved tests
---
 src/setu/perf_setu_api.c | 418 +++++++++++++++++++++++++++++++++++++++++++++++
 src/setu/test_setu_api.c |  10 +-
 2 files changed, 423 insertions(+), 5 deletions(-)

diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
new file mode 100644
index 000000000..710e75381
--- /dev/null
+++ b/src/setu/perf_setu_api.c
@@ -0,0 +1,418 @@
+/*
+     This file is part of GNUnet.
+     Copyright (C) 2012 GNUnet e.V.
+
+     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
+     Affero General Public License for more details.
+
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
+ */
+
+/**
+ * @file set/test_setu_api.c
+ * @brief testcase for setu_api.c
+ * @author Florian Dold
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_setu_service.h"
+
+
+static struct GNUNET_PeerIdentity local_id;
+
+static struct GNUNET_HashCode app_id;
+
+static struct GNUNET_SETU_Handle *set1;
+
+static struct GNUNET_SETU_Handle *set2;
+
+static struct GNUNET_SETU_ListenHandle *listen_handle;
+
+static struct GNUNET_SETU_OperationHandle *oh1;
+
+static struct GNUNET_SETU_OperationHandle *oh2;
+
+static const struct GNUNET_CONFIGURATION_Handle *config;
+
+static int ret;
+
+static struct GNUNET_SCHEDULER_Task *tt;
+
+
+static void
+result_cb_set1 (void *cls,
+                const struct GNUNET_SETU_Element *element,
+                uint64_t size,
+                enum GNUNET_SETU_Status status)
+{
+    switch (status)
+    {
+        case GNUNET_SETU_STATUS_ADD_LOCAL:
+            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "set 1: got element\n");
+            break;
+
+        case GNUNET_SETU_STATUS_FAILURE:
+            GNUNET_break (0);
+            oh1 = NULL;
+            fprintf (stderr, "set 1: received failure status!\n");
+            ret = 1;
+            if (NULL != tt)
+            {
+                GNUNET_SCHEDULER_cancel (tt);
+                tt = NULL;
+            }
+            GNUNET_SCHEDULER_shutdown ();
+            break;
+
+        case GNUNET_SETU_STATUS_DONE:
+            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "set 1: done\n");
+            oh1 = NULL;
+            if (NULL != set1)
+            {
+                GNUNET_SETU_destroy (set1);
+                set1 = NULL;
+            }
+            if (NULL == set2)
+            {
+                GNUNET_SCHEDULER_cancel (tt);
+                tt = NULL;
+                GNUNET_SCHEDULER_shutdown ();
+            }
+            break;
+
+        default:
+            GNUNET_assert (0);
+    }
+}
+
+
+static void
+result_cb_set2 (void *cls,
+                const struct GNUNET_SETU_Element *element,
+                uint64_t size,
+                enum GNUNET_SETU_Status status)
+{
+    switch (status)
+    {
+        case GNUNET_SETU_STATUS_ADD_LOCAL:
+            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "set 2: got element\n");
+            break;
+
+        case GNUNET_SETU_STATUS_FAILURE:
+            GNUNET_break (0);
+            oh2 = NULL;
+            fprintf (stderr, "set 2: received failure status\n");
+            GNUNET_SCHEDULER_shutdown ();
+            ret = 1;
+            break;
+
+        case GNUNET_SETU_STATUS_DONE:
+            oh2 = NULL;
+            GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "set 2: done\n");
+            GNUNET_SETU_destroy (set2);
+            set2 = NULL;
+            if (NULL == set1)
+            {
+                GNUNET_SCHEDULER_cancel (tt);
+                tt = NULL;
+                GNUNET_SCHEDULER_shutdown ();
+            }
+            break;
+
+        default:
+            GNUNET_assert (0);
+    }
+}
+
+
+static void
+listen_cb (void *cls,
+           const struct GNUNET_PeerIdentity *other_peer,
+           const struct GNUNET_MessageHeader *context_msg,
+           struct GNUNET_SETU_Request *request)
+{
+    GNUNET_assert (NULL != context_msg);
+    GNUNET_assert (ntohs (context_msg->type) == GNUNET_MESSAGE_TYPE_DUMMY);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "listen cb called\n");
+    oh2 = GNUNET_SETU_accept (request,
+                              (struct GNUNET_SETU_Option[]){ 0 },
+                              &result_cb_set2,
+                              NULL);
+    GNUNET_SETU_commit (oh2, set2);
+}
+
+
+/**
+ * Start the set operation.
+ *
+ * @param cls closure, unused
+ */
+static void
+start (void *cls)
+{
+    struct GNUNET_MessageHeader context_msg;
+
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting reconciliation\n");
+    context_msg.size = htons (sizeof context_msg);
+    context_msg.type = htons (GNUNET_MESSAGE_TYPE_DUMMY);
+    listen_handle = GNUNET_SETU_listen (config,
+                                        &app_id,
+                                        &listen_cb,
+                                        NULL);
+    oh1 = GNUNET_SETU_prepare (&local_id,
+                               &app_id,
+                               &context_msg,
+                               (struct GNUNET_SETU_Option[]){ 0 },
+                               &result_cb_set1,
+                               NULL);
+    GNUNET_SETU_commit (oh1, set1);
+}
+
+
+/**
+ * Initialize the second set, continue
+ *
+ * @param cls closure, unused
+ */
+static void
+init_set2 (void *cls)
+{
+    struct GNUNET_SETU_Element element;
+
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initializing set 2\n");
+
+    element.element_type = 0;
+    element.data = "hello1";
+    element.size = strlen (element.data);
+    GNUNET_SETU_add_element (set2, &element, NULL, NULL);
+    element.data = "quux";
+    element.size = strlen (element.data);
+    GNUNET_SETU_add_element (set2, &element, NULL, NULL);
+    element.data = "baz";
+    element.size = strlen (element.data);
+    GNUNET_SETU_add_element (set2, &element, &start, NULL);
+}
+
+/**
+ * Generate random byte stream
+ */
+
+unsigned char *gen_rdm_bytestream (size_t num_bytes)
+{
+    unsigned char *stream = GNUNET_malloc (num_bytes);
+    GNUNET_CRYPTO_random_block(GNUNET_CRYPTO_QUALITY_WEAK, stream, 
sizeof(stream));
+    return stream;
+}
+
+/**
+ * Generate random sets
+ */
+
+static void
+initRandomSets(int overlap, int set1_size, int set2_size, int 
element_size_in_bytes)
+{
+    struct GNUNET_SETU_Element element;
+    element.element_type = 0;
+
+    // Add elements to both sets
+    for (int i = 0; i < overlap; i++) {
+        element.data = gen_rdm_bytestream(element_size_in_bytes);
+        element.size = strlen (element.data);
+        GNUNET_SETU_add_element (set1, &element, NULL, NULL);
+        GNUNET_SETU_add_element (set2, &element, NULL, NULL);
+        set1_size--;
+        set2_size--;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initialized elements in both sets\n");
+
+    // Add other elements to set 1
+    while(set1_size>0) {
+        element.data = gen_rdm_bytestream(element_size_in_bytes);
+        element.size = strlen (element.data);
+        GNUNET_SETU_add_element (set1, &element, NULL, NULL);
+        set1_size--;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initialized elements in set1\n");
+
+    // Add other elements to set 2
+    while(set2_size > 0) {
+        element.data = gen_rdm_bytestream(element_size_in_bytes);
+        element.size = strlen (element.data);
+
+        if(set2_size != 1) {
+            GNUNET_SETU_add_element (set2, &element,NULL, NULL);
+        } else {
+            GNUNET_SETU_add_element (set2, &element,&start, NULL);
+        }
+
+        set2_size--;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initialized elements in set2\n");
+}
+
+/**
+ * Initialize the first set, continue.
+ */
+static void
+init_set1 (void)
+{
+    struct GNUNET_SETU_Element element;
+
+    element.element_type = 0;
+    element.data = "hello";
+    element.size = strlen (element.data);
+    GNUNET_SETU_add_element (set1, &element, NULL, NULL);
+    element.data = "bar";
+    element.size = strlen (element.data);
+    GNUNET_SETU_add_element (set1, &element, &init_set2, NULL);
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "initialized set 1\n");
+}
+
+
+/**
+ * Function run on timeout.
+ *
+ * @param cls closure
+ */
+static void
+timeout_fail (void *cls)
+{
+    tt = NULL;
+    GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, "Testcase failed with timeout\n");
+    GNUNET_SCHEDULER_shutdown ();
+    ret = 1;
+}
+
+
+/**
+ * Function run on shutdown.
+ *
+ * @param cls closure
+ */
+static void
+do_shutdown (void *cls)
+{
+    if (NULL != tt)
+    {
+        GNUNET_SCHEDULER_cancel (tt);
+        tt = NULL;
+    }
+    if (NULL != oh1)
+    {
+        GNUNET_SETU_operation_cancel (oh1);
+        oh1 = NULL;
+    }
+    if (NULL != oh2)
+    {
+        GNUNET_SETU_operation_cancel (oh2);
+        oh2 = NULL;
+    }
+    if (NULL != set1)
+    {
+        GNUNET_SETU_destroy (set1);
+        set1 = NULL;
+    }
+    if (NULL != set2)
+    {
+        GNUNET_SETU_destroy (set2);
+        set2 = NULL;
+    }
+    if (NULL != listen_handle)
+    {
+        GNUNET_SETU_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'.
+ *
+ * @param cls closure
+ * @param cfg configuration of the peer that was started
+ * @param peer identity of the peer that was created
+ */
+static void
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
+{
+    struct GNUNET_SETU_OperationHandle *my_oh;
+
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Running preparatory tests\n");
+    tt = 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_assert (GNUNET_OK == GNUNET_CRYPTO_get_peer_identity (cfg,
+                                                                 &local_id));
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "my id (from CRYPTO): %s\n",
+                GNUNET_i2s (&local_id));
+    GNUNET_TESTING_peer_get_identity (peer,
+                                      &local_id);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "my id (from TESTING): %s\n",
+                GNUNET_i2s (&local_id));
+    set1 = GNUNET_SETU_create (cfg);
+    set2 = GNUNET_SETU_create (cfg);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Created sets %p and %p for union operation\n",
+                set1,
+                set2);
+    GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &app_id);
+
+    /* test if canceling an uncommited request works! */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Launching and instantly stopping set operation\n");
+    my_oh = GNUNET_SETU_prepare (&local_id,
+                                 &app_id,
+                                 NULL,
+                                 (struct GNUNET_SETU_Option[]){ 0 },
+                                 NULL,
+                                 NULL);
+    GNUNET_SETU_operation_cancel (my_oh);
+
+    /* test the real set reconciliation */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Running real set-reconciliation\n");
+    //init_set1 ();
+    // limit ~23800 element total
+    initRandomSets(19500,20000,20000,32);
+}
+
+
+int
+main (int argc, char **argv)
+{
+    GNUNET_log_setup ("test_setu_api",
+                      "WARNING",
+                      NULL);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Launching peer\n");
+    if (0 !=
+        GNUNET_TESTING_peer_run ("test_setu_api",
+                                 "test_setu.conf",
+                                 &run,
+                                 NULL))
+    {
+        return 1;
+    }
+    return ret;
+}
diff --git a/src/setu/test_setu_api.c b/src/setu/test_setu_api.c
index 797e3f534..d573cfe3c 100644
--- a/src/setu/test_setu_api.c
+++ b/src/setu/test_setu_api.c
@@ -210,8 +210,8 @@ init_set2 (void *cls)
 
 unsigned char *gen_rdm_bytestream (size_t num_bytes)
 {
-    unsigned char *stream = GNUNET_malloc (num_bytes);
-    GNUNET_CRYPTO_random_block(GNUNET_CRYPTO_QUALITY_WEAK, stream, 
sizeof(stream));
+    unsigned char *stream = GNUNET_malloc (num_bytes + 1);
+    GNUNET_CRYPTO_random_block(GNUNET_CRYPTO_QUALITY_WEAK, stream, num_bytes - 
1);
     return stream;
 }
 
@@ -392,9 +392,9 @@ run (void *cls,
   /* test the real set reconciliation */
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Running real set-reconciliation\n");
-  init_set1 ();
-  // limit ~23800 element total
-  //initRandomSets(9990,9997,9997,32);
+  //init_set1 ();
+  initRandomSets(19500,20000,20000,4096);
+  //initRandomSets(19500,20000,20000,32);
 }
 
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.