* @brief simple testcase for persistence of simple download operation
* @author Christian Grothoff
*/
-
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_arm_service.h"
+#include "gnunet_testing_lib-new.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 void
timeout_kill_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
err = 1;
}
+
static void
abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_FS_download_stop (download, GNUNET_YES);
download = NULL;
}
- GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_size (fn, &size, GNUNET_YES));
+ GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_size (fn, &size, GNUNET_YES, GNUNET_NO));
GNUNET_assert (size == FILESIZE);
GNUNET_DISK_directory_remove (fn);
GNUNET_free (fn);
}
-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
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Restarting FS.\n");
GNUNET_FS_stop (fs);
- fs = GNUNET_FS_start (cfg,
- "test-fs-download-persistence",
- &progress_cb,
- NULL,
+ fs = GNUNET_FS_start (cfg, "test-fs-download-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
switch (event->status)
{
case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
-#if VERBOSE
- printf ("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);
-#endif
+ 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_COMPLETED:
printf ("Publishing complete, %llu kbps.\n",
GNUNET_assert (download == NULL);
GNUNET_FS_download_start (fs,
event->value.publish.specifics.completed.chk_uri,
- NULL,
- fn, NULL,
- 0,
- FILESIZE,
- 1,
+ NULL, fn, NULL, 0, FILESIZE, 1,
GNUNET_FS_DOWNLOAD_OPTION_NONE, "download", NULL);
break;
case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
consider_restart (event->status);
GNUNET_assert (download == event->value.download.dc);
-#if VERBOSE
- printf ("Download is progressing (%llu/%llu at level %u off %llu)...\n",
- (unsigned long long) event->value.download.completed,
- (unsigned long long) event->value.download.size,
- event->value.download.specifics.progress.depth,
- (unsigned long long) event->value.download.specifics.
- progress.offset);
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Download is progressing (%llu/%llu at level %u off %llu)...\n",
+ (unsigned long long) event->value.download.completed,
+ (unsigned long long) event->value.download.size,
+ event->value.download.specifics.progress.depth,
+ (unsigned long long) event->value.download.specifics.
+ progress.offset);
break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
- fprintf (stderr,
- "Error publishing file: %s\n",
+ 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_add_continuation (&abort_publish_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
- fprintf (stderr,
- "Error downloading file: %s\n",
+ FPRINTF (stderr, "Error downloading file: %s\n",
event->value.download.specifics.error.message);
GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
break;
break;
case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
GNUNET_assert (download == event->value.download.dc);
- GNUNET_SCHEDULER_add_continuation (&abort_publish_task,
- NULL,
+ GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
download = NULL;
break;
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)
+run (void *cls,
+ 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_download_data.conf");
- fs = GNUNET_FS_start (cfg,
- "test-fs-download-persistence",
- &progress_cb,
- NULL,
+ fs = GNUNET_FS_start (cfg, "test-fs-download-persistence", &progress_cb, NULL,
GNUNET_FS_FLAGS_PERSISTENCE, GNUNET_FS_OPTIONS_END);
GNUNET_assert (NULL != fs);
buf = GNUNET_malloc (FILESIZE);
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);
+ 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);
- timeout_kill = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
- &timeout_kill_task, NULL);
+ timeout_kill =
+ GNUNET_SCHEDULER_add_delayed (TIMEOUT, &timeout_kill_task, NULL);
start = GNUNET_TIME_absolute_get ();
- publish = GNUNET_FS_publish_start (fs,
- fi,
- NULL, NULL, NULL,
- GNUNET_FS_PUBLISH_OPTION_NONE);
+ publish =
+ GNUNET_FS_publish_start (fs, fi, NULL, NULL, NULL,
+ GNUNET_FS_PUBLISH_OPTION_NONE);
GNUNET_assert (publish != NULL);
}
int
main (int argc, char *argv[])
{
- char *const argvx[] = {
- "test-fs-download-persistence",
- "-c",
- "test_fs_download_data.conf",
-#if VERBOSE
- "-L", "DEBUG",
-#endif
- NULL
- };
- struct GNUNET_GETOPT_CommandLineOption options[] = {
- GNUNET_GETOPT_OPTION_END
- };
- GNUNET_log_setup ("test_fs_download_persistence",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-download/");
- GNUNET_PROGRAM_run ((sizeof (argvx) / sizeof (char *)) - 1,
- argvx, "test-fs-download-persistence",
- "nohelp", options, &run, NULL);
- stop_arm (&p1);
- GNUNET_DISK_directory_remove ("/tmp/gnunet-test-fs-download/");
+ if (0 != GNUNET_TESTING_peer_run ("test-fs-download-persistence",
+ "test_fs_download_data.conf",
+ &run, NULL))
+ return 1;
return err;
}