static struct GNUNET_TESTBED_Operation *op;
+struct DownloadContext
+{
+ char *fn;
+
+ struct GNUNET_FS_Uri *uri;
+};
+
+
static void
do_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
{
del = GNUNET_TIME_absolute_get_duration (start_time);
- if (del.rel_value == 0)
- del.rel_value = 1;
+ if (del.rel_value_us == 0)
+ del.rel_value_us = 1;
fancy =
GNUNET_STRINGS_byte_size_fancy (((unsigned long long) FILESIZE) *
- 1000LL / del.rel_value);
+ 1000000LL / del.rel_value_us);
FPRINTF (stdout, "Download speed was %s/s\n", fancy);
GNUNET_free (fancy);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished download, shutting down\n",
static void
-do_download (void *cls,
+do_download (void *cls,
const char *emsg)
{
- struct GNUNET_FS_Uri *uri = cls;
+ struct DownloadContext *dc = cls;
+ struct GNUNET_FS_Uri *uri = dc->uri;
GNUNET_TESTBED_operation_done (op);
op = NULL;
+ if (NULL != dc->fn)
+ {
+ GNUNET_DISK_directory_remove (dc->fn);
+ GNUNET_free (dc->fn);
+ }
+ GNUNET_free (dc);
if (NULL != emsg)
{
GNUNET_SCHEDULER_shutdown ();
static void
stop_source_peer (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct GNUNET_FS_Uri *uri = cls;
+ struct DownloadContext *dc = cls;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping source peer\n");
- op = GNUNET_TESTBED_peer_stop (daemons[1], &do_download, uri);
+ op = GNUNET_TESTBED_peer_stop (NULL, daemons[1], &do_download, dc);
GNUNET_assert (NULL != op);
}
static void
-do_wait (void *cls, const struct GNUNET_FS_Uri *uri)
+do_wait (void *cls, const struct GNUNET_FS_Uri *uri,
+ const char *fn)
{
- struct GNUNET_FS_Uri *d;
+ struct DownloadContext *dc;
if (NULL == uri)
{
return;
}
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Waiting to allow content to migrate\n");
- d = GNUNET_FS_uri_dup (uri);
- (void) GNUNET_SCHEDULER_add_delayed (MIGRATION_DELAY, &stop_source_peer, d);
+ dc = GNUNET_new (struct DownloadContext);
+ dc->uri = GNUNET_FS_uri_dup (uri);
+ if (NULL != fn)
+ dc->fn = GNUNET_strdup (fn);
+ (void) GNUNET_SCHEDULER_add_delayed (MIGRATION_DELAY, &stop_source_peer, dc);
}
static void
-do_publish (void *cls,
+do_publish (void *cls,
+ struct GNUNET_TESTBED_RunHandle *h,
unsigned int num_peers,
- struct GNUNET_TESTBED_Peer **peers)
+ struct GNUNET_TESTBED_Peer **peers,
+ unsigned int links_succeeded,
+ unsigned int links_failed)
{
unsigned int i;
int
main (int argc, char *argv[])
{
- GNUNET_TESTBED_test_run ("test-gnunet-service-fs-migration",
- "fs_test_lib_data.conf",
- 2,
- 0, NULL, NULL,
- &do_publish,
- NULL);
+ (void) GNUNET_TESTBED_test_run ("test-gnunet-service-fs-migration",
+ "fs_test_lib_data.conf",
+ 2,
+ 0, NULL, NULL,
+ &do_publish,
+ NULL);
GNUNET_DISK_directory_remove ("/tmp/test-gnunet-service-fs-migration/");
return ok;
}