/*
This file is part of GNUnet.
- (C) 2004, 2005, 2006, 2008, 2009, 2010 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 GNUnet e.V.
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.
*/
-
/**
* @file fs/test_fs_publish_persistence.c
* @brief simple testcase for persistence of simple publish operation
* @author Christian Grothoff
*/
-
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_arm_service.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
-#define VERBOSE GNUNET_NO
-
-#define START_ARM GNUNET_YES
/**
* File-size we use for testing.
*/
#define LIFETIME GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
-struct PeerContext
-{
- struct GNUNET_CONFIGURATION_Handle *cfg;
-#if START_ARM
- struct GNUNET_OS_Process *arm_proc;
-#endif
-};
-
-static struct PeerContext p1;
static struct GNUNET_TIME_Absolute start;
static int err;
-static GNUNET_SCHEDULER_TaskIdentifier rtask;
+static struct GNUNET_SCHEDULER_Task *rtask;
+
static void
-abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+abort_publish_task (void *cls)
{
GNUNET_FS_publish_stop (publish);
publish = NULL;
fn2 = NULL;
GNUNET_FS_stop (fs);
fs = NULL;
- if (GNUNET_SCHEDULER_NO_TASK != rtask)
+ if (NULL != rtask)
{
GNUNET_SCHEDULER_cancel (rtask);
- rtask = GNUNET_SCHEDULER_NO_TASK;
+ rtask = NULL;
}
}
-static void *progress_cb (void *cls,
- const struct GNUNET_FS_ProgressInfo *event);
+static void *
+progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event);
static void
-restart_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+restart_fs_task (void *cls)
{
- rtask = GNUNET_SCHEDULER_NO_TASK;
+ rtask = NULL;
GNUNET_FS_stop (fs);
- fs = GNUNET_FS_start (cfg,
- "test-fs-publish-persistence",
- &progress_cb,
- NULL,
- GNUNET_FS_FLAGS_PERSISTENCE, GNUNET_FS_OPTIONS_END);
+ fs = GNUNET_FS_start (cfg, "test-fs-publish-persistence",
+ &progress_cb, NULL,
+ GNUNET_FS_FLAGS_PERSISTENCE,
+ GNUNET_FS_OPTIONS_END);
}
/**
- * Consider scheduling the restart-task.
- * Only runs the restart task once per event
+ * Consider scheduling the restart-task.
+ * Only runs the restart task once per event
* category.
*
* @param ev type of the event to consider
if (prev[i] == ev)
return;
prev[off++] = ev;
- rtask = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_URGENT,
- &restart_fs_task, NULL);
+ rtask =
+ GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_URGENT,
+ &restart_fs_task, NULL);
}
static void *
-progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
+progress_cb (void *cls,
+ const struct GNUNET_FS_ProgressInfo *event)
{
void *ret;
consider_restart (event->status);
ret = event->value.publish.cctx;
printf ("Publish complete, %llu kbps.\n",
- (unsigned long long) (FILESIZE * 1000LL /
+ (unsigned long long) (FILESIZE * 1000000LL /
(1 +
GNUNET_TIME_absolute_get_duration
- (start).rel_value) / 1024));
- if (0 == strcmp ("publish-context-dir", event->value.publish.cctx))
+ (start).rel_value_us) / 1024));
+ if ( (NULL != event->value.publish.cctx) &&
+ (0 == strcmp ("publish-context-dir", event->value.publish.cctx)) )
GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
break;
+ case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
+ ret = event->value.publish.cctx;
+ return ret;
case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
consider_restart (event->status);
ret = event->value.publish.cctx;
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
ret = event->value.publish.cctx;
- fprintf (stderr,
- "Error publishing file: %s\n",
+ FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
err = 1;
GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
ret = event->value.publish.cctx;
if (0 == strcmp ("publish-context1", event->value.publish.cctx))
{
- GNUNET_assert (0 == strcmp ("publish-context-dir",
- event->value.publish.pctx));
+ GNUNET_assert (0 ==
+ strcmp ("publish-context-dir", 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);
}
else if (0 == strcmp ("publish-context2", event->value.publish.cctx))
{
- GNUNET_assert (0 == strcmp ("publish-context-dir",
- event->value.publish.pctx));
+ GNUNET_assert (0 ==
+ strcmp ("publish-context-dir", event->value.publish.pctx));
GNUNET_assert (FILESIZE == event->value.publish.size);
GNUNET_assert (0 == event->value.publish.completed);
GNUNET_assert (2 == event->value.publish.anonymity);
break;
case GNUNET_FS_STATUS_PUBLISH_STOPPED:
consider_restart (event->status);
- if (0 == strcmp ("publish-context-dir", event->value.publish.cctx))
+ if ( (NULL != event->value.publish.cctx) &&
+ (0 == strcmp ("publish-context-dir", event->value.publish.cctx)) )
GNUNET_assert (publish == event->value.publish.pc);
break;
default:
}
-static void
-setup_peer (struct PeerContext *p, const char *cfgname)
-{
- p->cfg = GNUNET_CONFIGURATION_create ();
-#if START_ARM
- p->arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- "-c", cfgname, NULL);
-#endif
- GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_load (p->cfg, cfgname));
-}
-
-
-static void
-stop_arm (struct PeerContext *p)
-{
-#if START_ARM
- if (NULL != p->arm_proc)
- {
- if (0 != GNUNET_OS_process_kill (p->arm_proc, SIGTERM))
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- if (GNUNET_OS_process_wait (p->arm_proc) != GNUNET_OK)
- GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ARM process %u stopped\n",
- GNUNET_OS_process_get_pid (p->arm_proc));
- GNUNET_OS_process_close (p->arm_proc);
- p->arm_proc = NULL;
- }
-#endif
- GNUNET_CONFIGURATION_destroy (p->cfg);
-}
-
-
static void
run (void *cls,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *c)
+ const struct GNUNET_CONFIGURATION_Handle *c,
+ struct GNUNET_TESTING_Peer *peer)
{
const char *keywords[] = {
"down_foo",
struct GNUNET_FS_BlockOptions bo;
cfg = c;
- setup_peer (&p1, "test_fs_publish_data.conf");
- fs = GNUNET_FS_start (cfg,
- "test-fs-publish-persistence",
- &progress_cb,
- NULL,
+ fs = GNUNET_FS_start (cfg, "test-fs-publish-persistence", &progress_cb, NULL,
GNUNET_FS_FLAGS_PERSISTENCE, GNUNET_FS_OPTIONS_END);
GNUNET_assert (NULL != fs);
fn1 = GNUNET_DISK_mktemp ("gnunet-publish-test-dst");
for (i = 0; i < FILESIZE; i++)
buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
GNUNET_assert (FILESIZE ==
- GNUNET_DISK_fn_write (fn1,
- buf,
- FILESIZE,
+ GNUNET_DISK_fn_write (fn1, buf, FILESIZE,
GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE));
GNUNET_free (buf);
for (i = 0; i < FILESIZE; i++)
buf[i] = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 256);
GNUNET_assert (FILESIZE ==
- GNUNET_DISK_fn_write (fn2,
- buf,
- FILESIZE,
+ GNUNET_DISK_fn_write (fn2, buf, FILESIZE,
GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE));
GNUNET_free (buf);
bo.anonymity_level = 1;
bo.replication_level = 0;
bo.expiration_time = GNUNET_TIME_relative_to_absolute (LIFETIME);
- fi1 = GNUNET_FS_file_information_create_from_file (fs,
- "publish-context1",
- fn1,
- kuri,
- meta, GNUNET_YES, &bo);
+ fi1 =
+ GNUNET_FS_file_information_create_from_file (fs, "publish-context1", fn1,
+ kuri, meta, GNUNET_YES, &bo);
GNUNET_assert (NULL != fi1);
bo.anonymity_level = 2;
- fi2 = GNUNET_FS_file_information_create_from_file (fs,
- "publish-context2",
- fn2,
- kuri,
- meta, GNUNET_YES, &bo);
+ fi2 =
+ GNUNET_FS_file_information_create_from_file (fs, "publish-context2", fn2,
+ kuri, meta, GNUNET_YES, &bo);
GNUNET_assert (NULL != fi2);
bo.anonymity_level = 3;
- fidir = GNUNET_FS_file_information_create_empty_directory (fs,
- "publish-context-dir",
- kuri, meta, &bo);
+ fidir =
+ GNUNET_FS_file_information_create_empty_directory (fs,
+ "publish-context-dir",
+ kuri, meta, &bo, NULL);
GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi1));
GNUNET_assert (GNUNET_OK == GNUNET_FS_file_information_add (fidir, fi2));
GNUNET_FS_uri_destroy (kuri);
GNUNET_CONTAINER_meta_data_destroy (meta);
GNUNET_assert (NULL != fidir);
start = GNUNET_TIME_absolute_get ();
- GNUNET_FS_publish_start (fs,
- fidir,
- NULL, NULL, NULL, GNUNET_FS_PUBLISH_OPTION_NONE);
+ GNUNET_FS_publish_start (fs, fidir, NULL, NULL, NULL,
+ GNUNET_FS_PUBLISH_OPTION_NONE);
GNUNET_assert (publish != NULL);
}
int
main (int argc, char *argv[])
{
- char *const argvx[] = {
- "test-fs-publish-persistence",
- "-c",
- "test_fs_publish_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- NULL
- };
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
-
- GNUNET_log_setup ("test_fs_publish_persistence",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
- argvx, "test-fs-publish", "nohelp", options, &run, NULL);
- stop_arm (&p1);
- GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-publish/");
- if (fn1 != NULL)
- {
- GNUNET_DISK_directory_remove (fn1);
- GNUNET_free (fn1);
- }
- if (fn2 != NULL)
- {
- GNUNET_DISK_directory_remove (fn2);
- GNUNET_free (fn2);
- }
+ if (0 != GNUNET_TESTING_peer_run ("test-fs-publish-persistence",
+ "test_fs_publish_data.conf",
+ &run, NULL))
+ return 1;
return err;
}