[GNUnet-SVN] r34275 - gnunet/src/fs

[gnunet]

Author: bratao
Date: 2014-09-05 14:49:58 +0200 (Fri, 05 Sep 2014)
New Revision: 34275

Added:
   gnunet/src/fs/test_fs_search_with_and.c
Modified:
   gnunet/src/fs/Makefile.am
Log:
Add fs search test with multiple files using an AND operator

Modified: gnunet/src/fs/Makefile.am
===================================================================
--- gnunet/src/fs/Makefile.am   2014-09-05 12:36:34 UTC (rev 34274)
+++ gnunet/src/fs/Makefile.am   2014-09-05 12:49:58 UTC (rev 34275)
@@ -247,6 +247,7 @@
  test_fs_publish \
  test_fs_publish_persistence \
  test_fs_search \
+ test_fs_search_with_and \
  test_fs_search_probes \
  test_fs_search_persistence \
  test_fs_start_stop \
@@ -293,6 +294,7 @@
  test_fs_publish \
  test_fs_publish_persistence \
  test_fs_search \
+ test_fs_search_with_and \
  test_fs_search_probes \
  test_fs_search_persistence \
  test_fs_start_stop \
@@ -400,6 +402,13 @@
   $(top_builddir)/src/fs/libgnunetfs.la        \
   $(top_builddir)/src/util/libgnunetutil.la
 
+test_fs_search_with_and_SOURCES = \
+ test_fs_search_with_and.c
+test_fs_search_with_and_LDADD = \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/fs/libgnunetfs.la        \
+  $(top_builddir)/src/util/libgnunetutil.la  
+  
 test_fs_search_probes_SOURCES = \
  test_fs_search_probes.c
 test_fs_search_probes_LDADD = \

Added: gnunet/src/fs/test_fs_search_with_and.c
===================================================================
--- gnunet/src/fs/test_fs_search_with_and.c                             (rev 0)
+++ gnunet/src/fs/test_fs_search_with_and.c     2014-09-05 12:49:58 UTC (rev 
34275)
@@ -0,0 +1,263 @@
+/*
+     This file is part of GNUnet.
+     (C) 2004-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
+     by the Free Software Foundation; either version 3, 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., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file fs/test_fs_search_with_and.c
+ * @brief testcase for publishing multiple files and search with a and operator
+ * @author Bruno Cabral - 99% based on Christian Grothoff code
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+#include "gnunet_fs_service.h"
+
+
+/**
+ * File-size we use for testing.
+ */
+#define FILESIZE 1024
+
+/**
+ * Number of files for testing.
+ */
+#define NUM_FILES 10
+
+
+/**
+ * How long until we give up on transmitting the message?
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+
+/**
+ * How long should our test-content live?
+ */
+#define LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
+
+
+static struct GNUNET_TIME_Absolute start;
+
+static struct GNUNET_FS_Handle *fs;
+
+static struct GNUNET_FS_SearchContext *search;
+
+static struct GNUNET_FS_PublishContext *publish;
+
+static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+
+static int err;
+
+static int processed_files;
+
+
+static void
+abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  if (NULL != publish)
+  {
+    GNUNET_FS_publish_stop (publish);
+    publish = NULL;
+  }
+  if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
+  {
+    GNUNET_SCHEDULER_cancel (timeout_task);
+    timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  }
+}
+
+
+static void
+abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  fprintf (stderr,
+          "Timeout\n");
+  timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  if (NULL != search)
+  {
+    GNUNET_FS_search_stop (search);
+    search = NULL;
+  }
+  if (NULL != publish)
+  {
+    GNUNET_FS_publish_stop (publish);
+    publish = NULL;
+  }
+  err = 1;
+}
+
+
+static void
+abort_search_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  if (NULL != search)
+  {
+    GNUNET_FS_search_stop (search);
+    search = NULL;
+  }
+}
+
+
+static void *
+progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
+{
+
+  struct GNUNET_FS_Uri *kuri;
+
+  switch (event->status)
+  {
+  case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "Publish is progressing (%llu/%llu at level %u off %llu)...\n",
+               (unsigned long long) event->value.publish.completed,
+               (unsigned long long) event->value.publish.size,
+               event->value.publish.specifics.progress.depth,
+               (unsigned long long) event->value.publish.specifics.
+               progress.offset);
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
+       if(processed_files == NUM_FILES)
+       {
+         kuri = GNUNET_FS_uri_ksk_create ("+down_foo +down_bar", NULL);
+      GNUNET_assert (kuri != NULL);
+               
+      start = GNUNET_TIME_absolute_get ();
+      search =
+          GNUNET_FS_search_start (fs, kuri, 1, GNUNET_FS_SEARCH_OPTION_NONE,
+                                  "search");
+      GNUNET_FS_uri_destroy (kuri);
+      GNUNET_assert (search != NULL);
+       }
+    break;
+  case GNUNET_FS_STATUS_SEARCH_RESULT:
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+               "Search complete.\n");
+    GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL,
+                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_ERROR:
+    FPRINTF (stderr, "Error publishing file: %s\n",
+             event->value.publish.specifics.error.message);
+    GNUNET_break (0);
+    GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
+                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    break;
+  case GNUNET_FS_STATUS_SEARCH_ERROR:
+    FPRINTF (stderr, "Error searching file: %s\n",
+             event->value.search.specifics.error.message);
+    GNUNET_SCHEDULER_add_continuation (&abort_search_task, NULL,
+                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_START:
+    GNUNET_assert (0 == strcmp ("publish-context", event->value.publish.cctx));
+    GNUNET_assert (NULL == event->value.publish.pctx);
+    GNUNET_assert (FILESIZE == event->value.publish.size);
+    GNUNET_assert (0 == event->value.publish.completed);
+    GNUNET_assert (1 == event->value.publish.anonymity);
+       processed_files++;
+    break;
+  case GNUNET_FS_STATUS_PUBLISH_STOPPED:
+    GNUNET_assert (publish == event->value.publish.pc);
+    GNUNET_assert (FILESIZE == event->value.publish.size);
+    GNUNET_assert (1 == event->value.publish.anonymity);
+    GNUNET_FS_stop (fs);
+    fs = NULL;
+    break;
+  case GNUNET_FS_STATUS_SEARCH_START:
+    GNUNET_assert (search == NULL);
+    GNUNET_assert (0 == strcmp ("search", event->value.search.cctx));
+    GNUNET_assert (1 == event->value.search.anonymity);
+    break;
+  case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
+    break;
+  case GNUNET_FS_STATUS_SEARCH_STOPPED:
+    GNUNET_assert (search == event->value.search.sc);
+    GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
+                                       GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+    break;
+  default:
+    FPRINTF (stderr, "Unexpected event: %d\n", event->status);
+    break;
+  }
+  return NULL;
+}
+
+
+static void
+run (void *cls,
+     const struct GNUNET_CONFIGURATION_Handle *cfg,
+     struct GNUNET_TESTING_Peer *peer)
+{
+  const char *keywords[] = {
+    "down_foo",
+    "down_bar"
+  };
+  char *buf;
+  struct GNUNET_CONTAINER_MetaData *meta;
+  struct GNUNET_FS_Uri *kuri;
+  struct GNUNET_FS_BlockOptions bo;
+  struct GNUNET_FS_FileInformation *fi;
+  size_t i;
+  size_t j;
+
+  fs = GNUNET_FS_start (cfg, "test-fs-search", &progress_cb, NULL,
+                        GNUNET_FS_FLAGS_NONE, GNUNET_FS_OPTIONS_END);
+  GNUNET_assert (NULL != fs);
+  
+  processed_files = 0;
+  for(j = 0; j < NUM_FILES; j++){
+   buf = GNUNET_malloc (FILESIZE);
+   for (i = 0; i < FILESIZE; i++)
+     buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
+   meta = GNUNET_CONTAINER_meta_data_create ();
+   kuri = GNUNET_FS_uri_ksk_create_from_args (2, keywords);
+   bo.content_priority = 42;
+   bo.anonymity_level = 1;
+   bo.replication_level = 0;
+   bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME);
+   fi = GNUNET_FS_file_information_create_from_data (fs, "publish-context",
+                                                     FILESIZE, buf, kuri, meta,
+                                                     GNUNET_NO, &bo);
+   GNUNET_FS_uri_destroy (kuri);
+   GNUNET_CONTAINER_meta_data_destroy (meta);
+   GNUNET_assert (NULL != fi);
+   start = GNUNET_TIME_absolute_get ();
+   publish =
+       GNUNET_FS_publish_start (fs, fi, NULL, NULL, NULL,
+                                GNUNET_FS_PUBLISH_OPTION_NONE);
+   GNUNET_assert (publish != NULL);
+  }
+  
+  
+  timeout_task = GNUNET_SCHEDULER_add_delayed (LIFETIME,
+                                              &abort_error, NULL);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  if (0 != GNUNET_TESTING_peer_run ("test-fs-search-with-and",
+                                   "test_fs_search_data.conf",
+                                   &run, NULL))
+    return 1;
+  return err;
+}
+
+/* end of test_fs_search.c */