hacking on fs

1 files changed, 102 insertions, 48 deletions

diff --git a/src/fs/test_fs_start_stop.c b/src/fs/test_fs_start_stop.c
index 1ec1176a6..e25de8e70 100644
--- a/src/fs/test_fs_start_stop.c
+++ b/src/fs/test_fs_start_stop.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2004, 2005, 2006, 2009 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
@@ -19,71 +19,125 @@
 */
 
 /**
- * @file applications/fs/fsui/fsui_start_stop_test.c
- * @brief testcase for fsui (start-stop only)
+ * @file fs/test_fs_start_stop.c
+ * @brief testcase for fs.c (start-stop only)
  * @author Christian Grothoff
  */
 
 #include "platform.h"
-#include "gnunet_util.h"
-#include "gnunet_fsui_lib.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_arm_service.h"
+#include "gnunet_fs_service.h"
 
-#define CHECK(a) if (!(a)) { ok = GNUNET_NO; GNUNET_GE_BREAK(NULL, 0); goto FAILURE; }
+#define START_ARM GNUNET_YES
 
+static struct GNUNET_SCHEDULER_Handle *sched;
+
+static struct PeerContext p1;
+
+struct PeerContext
+{
+  struct GNUNET_CONFIGURATION_Handle *cfg;
+  struct GNUNET_PeerIdentity id;   
+#if START_ARM
+  pid_t arm_pid;
+#endif
+};
 
-static struct GNUNET_FSUI_Context *ctx;
 
 static void *
-eventCallback (void *cls, const GNUNET_FSUI_Event * event)
+progress_cb (void *cls, 
+             const struct GNUNET_FS_ProgressInfo *event)
 {
   return NULL;
 }
 
-#define START_DAEMON 1
 
-int
-main (int argc, char *argv[])
+static void
+setup_peer (struct PeerContext *p, const char *cfgname)
 {
-#if START_DAEMON
-  pid_t daemon;
+  p->cfg = GNUNET_CONFIGURATION_create ();
+#if START_ARM
+  p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm",
+                                        "gnunet-service-arm",
+#if VERBOSE
+                                        "-L", "DEBUG",
 #endif
-  int ok;
-  struct GNUNET_GC_Configuration *cfg;
-
-  cfg = GNUNET_GC_create ();
-  if (-1 == GNUNET_GC_parse_configuration (cfg, "check.conf"))
-    {
-      GNUNET_GC_free (cfg);
-      return -1;
-    }
-#if START_DAEMON
-  daemon = GNUNET_daemon_start (NULL, cfg, "peer.conf", GNUNET_NO);
-  GNUNET_GE_ASSERT (NULL, daemon > 0);
-  CHECK (GNUNET_OK ==
-         GNUNET_wait_for_daemon_running (NULL, cfg,
-                                         60 * GNUNET_CRON_SECONDS));
+                                        "-c", cfgname, NULL);
+  sleep (1);                    /* allow ARM to start */
 #endif
-  ok = GNUNET_YES;
-  GNUNET_thread_sleep (5 * GNUNET_CRON_SECONDS);        /* give apps time to start */
-
-  /* ACTUAL TEST CODE */
-  ctx = GNUNET_FSUI_start (NULL, cfg, "fsui_start_stop_test", 32, GNUNET_YES,   /* do resume! */
-                           &eventCallback, NULL);
-  CHECK (ctx != NULL);
-  GNUNET_FSUI_stop (ctx);
-  ctx =
-    GNUNET_FSUI_start (NULL, cfg, "fsui_start_stop_test", 32, GNUNET_YES,
-                       &eventCallback, NULL);
-  CHECK (ctx != NULL);
-FAILURE:
-  if (ctx != NULL)
-    GNUNET_FSUI_stop (ctx);
-#if START_DAEMON
-  GNUNET_GE_ASSERT (NULL, GNUNET_OK == GNUNET_daemon_stop (NULL, daemon));
+  GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
+  GNUNET_ARM_start_services (p->cfg, sched, "core", NULL);
+}
+
+
+static void
+stop_arm (struct PeerContext *p)
+{
+#if START_ARM
+  if (0 != PLIBC_KILL (p->arm_pid, SIGTERM))
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
+  if (GNUNET_OS_process_wait(p->arm_pid) != GNUNET_OK)
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "ARM process %u stopped\n", p->arm_pid);
 #endif
-  GNUNET_GC_free (cfg);
+  GNUNET_CONFIGURATION_destroy (p->cfg);
+}
+
 
-  return (ok == GNUNET_YES) ? 0 : 1;
+static void
+run (void *cls,
+     struct GNUNET_SCHEDULER_Handle *s,
+     char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+  struct GNUNET_FS_Handle *fs;
+
+  sched = s;
+  setup_peer (&p1, "test_fs_data.conf");
+  fs = GNUNET_FS_start (sched,
+                        cfg,
+                        "test-fs-start-stop",
+                        &progress_cb,
+                        NULL,
+                        GNUNET_FS_FLAGS_NONE,
+                        GNUNET_FS_OPTIONS_END);
+  GNUNET_assert (NULL != fs); 
+  GNUNET_FS_stop (fs);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  char *const argvx[] = { 
+    "test-fs-start-stop",
+    "-c",
+    "test_fs_data.conf",
+#if VERBOSE
+    "-L", "DEBUG",
+#endif
+    NULL
+  };
+  struct GNUNET_GETOPT_CommandLineOption options[] = {
+    GNUNET_GETOPT_OPTION_END
+  };
+
+  GNUNET_log_setup ("test_fs_start_stop", 
+#if VERBOSE
+                    "DEBUG",
+#else
+                    "WARNING",
+#endif
+                    NULL);
+  GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
+                      argvx, "test-fs-start-stop",
+                      "nohelp", options, &run, NULL);
+  stop_arm (&p1);
+  GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs/");
+  return 0;
 }
 
-/* end of fsui_start_stop_test.c */
+/* end of test_fs_start_stop.c */