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

[gnunet]

Author: grothoff
Date: 2013-03-28 15:10:02 +0100 (Thu, 28 Mar 2013)
New Revision: 26643

Removed:
   gnunet/src/fs/test_fs_search_ranking.c
Modified:
   gnunet/src/fs/test_fs_search_persistence.c
   gnunet/src/fs/test_fs_search_probes.c
Log:
-timeout

Modified: gnunet/src/fs/test_fs_search_persistence.c
===================================================================
--- gnunet/src/fs/test_fs_search_persistence.c  2013-03-28 14:07:42 UTC (rev 
26642)
+++ gnunet/src/fs/test_fs_search_persistence.c  2013-03-28 14:10:02 UTC (rev 
26643)
@@ -54,8 +54,30 @@
 
 static const struct GNUNET_CONFIGURATION_Handle *cfg;
 
+static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
 
+static int err;
+
+
 static void
+abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  fprintf (stderr,
+          "Timeout\n");
+  if (NULL != publish)
+  {
+    GNUNET_FS_publish_stop (publish);
+    publish = NULL;
+  }
+  if (NULL != search)
+  {
+    GNUNET_FS_search_stop (search);
+    search = NULL;
+  }
+  err = 1;
+}
+
+static void
 abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_FS_publish_stop (publish);
@@ -252,6 +274,8 @@
       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);
 }
 
 
@@ -262,7 +286,7 @@
                                    "test_fs_search_data.conf",
                                    &run, NULL))
     return 1;
-  return 0;
+  return err;
 }
 
 /* end of test_fs_search_persistence.c */

Modified: gnunet/src/fs/test_fs_search_probes.c
===================================================================
--- gnunet/src/fs/test_fs_search_probes.c       2013-03-28 14:07:42 UTC (rev 
26642)
+++ gnunet/src/fs/test_fs_search_probes.c       2013-03-28 14:10:02 UTC (rev 
26643)
@@ -53,8 +53,31 @@
 
 static struct GNUNET_FS_PublishContext *publish;
 
+static GNUNET_SCHEDULER_TaskIdentifier timeout_task;
 
+static int err;
+
+
 static void
+abort_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+  fprintf (stderr,
+          "Timeout\n");
+  if (NULL != publish)
+  {
+    GNUNET_FS_publish_stop (publish);
+    publish = NULL;
+  }
+  if (NULL != search)
+  {
+    GNUNET_FS_search_stop (search);
+    search = NULL;
+  }
+  err = 1;
+}
+
+
+static void
 abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_FS_publish_stop (publish);
@@ -194,6 +217,8 @@
       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);
 }
 
 
@@ -204,7 +229,7 @@
                                    "test_fs_search_data.conf",
                                    &run, NULL))
     return 1;
-  return 0;
+  return err;
 }
 
 /* end of test_fs_search_probes.c */

Deleted: gnunet/src/fs/test_fs_search_ranking.c
===================================================================
--- gnunet/src/fs/test_fs_search_ranking.c      2013-03-28 14:07:42 UTC (rev 
26642)
+++ gnunet/src/fs/test_fs_search_ranking.c      2013-03-28 14:10:02 UTC (rev 
26643)
@@ -1,246 +0,0 @@
-/*
-     This file is part of GNUnet.
-     (C) 2004, 2005, 2006, 2008 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 applications/fs/fsui/search_ranking_test.c
- * @brief testcase for search ranking (availability, etc)
- * @author Christian Grothoff
- */
-
-#include "platform.h"
-#include "gnunet_util.h"
-#include "gnunet_fsui_lib.h"
-
-#define CHECK_VERBOSE GNUNET_NO
-
-#define CHECK(a) if (!(a)) { ok = GNUNET_NO; GNUNET_GE_BREAK(NULL, 0); goto 
FAILURE; }
-
-static char *
-makeName (unsigned int i)
-{
-  char *fn;
-
-  fn = GNUNET_malloc (strlen ("/tmp/gnunet-fsui-searchranktest/FSUITEST") + 
14);
-  GNUNET_snprintf (fn, strlen ("/tmp/gnunet-fsui-searchranktest/FSUITEST") + 
14,
-                   "/tmp/gnunet-fsui-searchranktest/FSUITEST%u", i);
-  GNUNET_disk_directory_create_for_file (NULL, fn);
-  return fn;
-}
-
-static struct GNUNET_FSUI_SearchList *search;
-
-static enum GNUNET_FSUI_EventType lastEvent;
-
-static struct GNUNET_ECRS_URI *uri;
-
-static int availability;
-
-static unsigned int rank;
-
-static enum GNUNET_FSUI_EventType waitForEvent;
-
-static void *
-eventCallback (void *cls, const GNUNET_FSUI_Event * event)
-{
-  static char unused;
-
-  switch (event->type)
-  {
-  case GNUNET_FSUI_search_resumed:
-    search = event->data.SearchResumed.sc.pos;
-    break;
-  case GNUNET_FSUI_search_suspended:
-    search = NULL;
-    break;
-  case GNUNET_FSUI_search_update:
-    availability = event->data.SearchUpdate.availability_rank;
-    rank = event->data.SearchUpdate.applicability_rank;
-    break;
-  case GNUNET_FSUI_search_paused:
-  case GNUNET_FSUI_search_restarted:
-    break;
-  case GNUNET_FSUI_download_resumed:
-  case GNUNET_FSUI_upload_resumed:
-  case GNUNET_FSUI_unindex_resumed:
-    return &unused;
-  case GNUNET_FSUI_search_result:
-#if CHECK_VERBOSE
-    printf ("Received search result\n");
-#endif
-    uri = GNUNET_ECRS_uri_duplicate (event->data.SearchResult.fi.uri);
-    break;
-  case GNUNET_FSUI_upload_completed:
-#if CHECK_VERBOSE
-    printf ("Upload complete.\n");
-#endif
-    break;
-  case GNUNET_FSUI_download_completed:
-#if CHECK_VERBOSE
-    printf ("Download complete.\n");
-#endif
-    break;
-  case GNUNET_FSUI_unindex_completed:
-#if CHECK_VERBOSE
-    printf ("Unindex complete.\n");
-#endif
-    break;
-  case GNUNET_FSUI_upload_error:
-    printf ("Upload error.\n");
-    break;
-  case GNUNET_FSUI_download_error:
-    printf ("Download error.\n");
-    break;
-  case GNUNET_FSUI_unindex_error:
-    printf ("Unindex error.\n");
-    break;
-  default:
-    break;
-  }
-  if (lastEvent != waitForEvent)
-    lastEvent = event->type;
-  return NULL;
-}
-
-#define START_DAEMON 1
-
-int
-main (int argc, char *argv[])
-{
-#if START_DAEMON
-  struct GNUNET_OS_Process *daemon;
-#endif
-  int ok;
-  char *fn = NULL;
-
-  char *keywords[] = {
-    "search_foo",
-    "search_bar",
-  };
-  char keyword[40];
-  int prog;
-  struct GNUNET_MetaData *meta;
-  struct GNUNET_ECRS_URI *kuri;
-  struct GNUNET_GC_Configuration *cfg;
-  struct GNUNET_FSUI_UploadList *upload;
-  struct GNUNET_ECRS_URI *luri;
-  struct GNUNET_FSUI_Context *ctx = NULL;
-
-  ok = GNUNET_YES;
-  cfg = GNUNET_GC_create ();
-  if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
-  {
-    GNUNET_GC_free (cfg);
-    return -1;
-  }
-#if START_DAEMON
-  GNUNET_disk_directory_remove (NULL, "/tmp/gnunet-fsui-searchranktest/");
-  daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO);
-  GNUNET_GE_ASSERT (NULL, daemon != NULL);
-  CHECK (GNUNET_OK ==
-         GNUNET_wait_for_daemon_running (NULL, cfg, 30 * GNUNET_CRON_SECONDS));
-  GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS);        /* give apps time to 
start */
-  /* ACTUAL TEST CODE */
-#endif
-  ctx =
-      GNUNET_FSUI_start (NULL, cfg, "fsuisearchranktest", 32, GNUNET_YES,
-                         &eventCallback, NULL);
-  CHECK (ctx != NULL);
-  /* upload */
-  fn = makeName (42);
-  GNUNET_disk_file_write (NULL, fn, "foo bar test!", strlen ("foo bar test!"),
-                          "600");
-  meta = GNUNET_meta_data_create ();
-  kuri =
-      GNUNET_ECRS_keyword_command_line_to_uri (NULL, 2,
-                                               (const char **) keywords);
-  waitForEvent = GNUNET_FSUI_upload_completed;
-  upload =
-      GNUNET_FSUI_upload_start (ctx, fn,
-                                (GNUNET_FSUI_DirectoryScanCallback) &
-                                GNUNET_disk_directory_scan, NULL, 0, 0,
-                                GNUNET_YES, GNUNET_NO, GNUNET_NO,
-                                GNUNET_get_time () + 5 * GNUNET_CRON_HOURS,
-                                meta, kuri, kuri);
-  CHECK (NULL != upload);
-  GNUNET_free (fn);
-  fn = NULL;
-  GNUNET_ECRS_uri_destroy (kuri);
-  GNUNET_meta_data_destroy (meta);
-  prog = 0;
-  while (lastEvent != GNUNET_FSUI_upload_completed)
-  {
-    prog++;
-    if (prog == 10000)
-    {
-      FPRINTF (stderr, "Upload failed to complete -- last event: %u\n",
-               lastEvent);
-    }
-    CHECK (prog < 10000);
-    GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
-    if (GNUNET_shutdown_test () == GNUNET_YES)
-      break;
-  }
-  GNUNET_FSUI_upload_stop (upload);
-
-  /* search */
-  GNUNET_snprintf (keyword, 40, "%s %s", keywords[0], keywords[1]);
-  luri = GNUNET_ECRS_keyword_string_to_uri (NULL, keyword);
-  uri = NULL;
-  search = GNUNET_FSUI_search_start (ctx, 0, luri);
-  GNUNET_ECRS_uri_destroy (luri);
-  luri = NULL;
-  CHECK (NULL != search);
-  GNUNET_FSUI_search_pause (search);
-  GNUNET_FSUI_search_restart (search);
-  while ((uri == NULL) && (availability < 3) && (rank != 2) &&
-         (GNUNET_shutdown_test () != GNUNET_YES))
-  {
-    prog++;
-    CHECK (prog < 10000);
-    GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
-  }
-  GNUNET_FSUI_search_abort (search);
-  GNUNET_FSUI_search_stop (search);
-  CHECK (uri != NULL);
-
-
-  /* END OF TEST CODE */
-FAILURE:
-  if (ctx != NULL)
-    GNUNET_FSUI_stop (ctx);
-  GNUNET_free_non_null (fn);
-  /* TODO: verify file 'fn(42)' == file 'fn(43)' */
-  fn = makeName (42);
-  UNLINK (fn);
-  GNUNET_free (fn);
-  fn = makeName (43);
-  UNLINK (fn);
-  GNUNET_free (fn);
-
-#if START_DAEMON
-  GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon));
-  GNUNET_OS_process_destroy (daemon);
-  daemon = NULL;
-#endif
-  GNUNET_GC_free (cfg);
-  return (ok == GNUNET_YES) ? 0 : 1;
-}
-
-/* end of searchtest.c */