* @author Christian Grothoff
*/
#include "platform.h"
+#include "fs.h"
#include "fs_test_lib.h"
#include "gnunet_testing_lib.h"
*/
struct GNUNET_PeerIdentity id;
- /**
- * Scheduler to use (for publish_cont).
- */
- struct GNUNET_SCHEDULER_Handle *publish_sched;
-
/**
* Function to call when upload is done.
*/
struct GNUNET_FS_Uri *publish_uri;
/**
- * Scheduler to use (for download_cont).
- */
- struct GNUNET_SCHEDULER_Handle *download_sched;
+ * Name of the temporary file used, or NULL for none.
+ */
+ char *publish_tmp_file;
/**
* Function to call when download is done.
GNUNET_FS_publish_stop (daemon->publish_context);
daemon->publish_context = NULL;
- daemon->publish_sched = NULL;
cont = daemon->publish_cont;
daemon->publish_cont = NULL;
uri = daemon->publish_uri;
GNUNET_FS_download_stop (daemon->download_context, GNUNET_YES);
daemon->download_context = NULL;
- GNUNET_SCHEDULER_add_continuation (daemon->download_sched,
- daemon->download_cont,
+ GNUNET_SCHEDULER_add_continuation (daemon->download_cont,
daemon->download_cont_cls,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
daemon->download_cont = NULL;
- daemon->download_sched = NULL;
}
switch (info->status)
{
case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
- GNUNET_SCHEDULER_cancel (daemon->publish_sched,
- daemon->publish_timeout_task);
+ GNUNET_SCHEDULER_cancel (daemon->publish_timeout_task);
daemon->publish_timeout_task = GNUNET_SCHEDULER_NO_TASK;
daemon->publish_uri = GNUNET_FS_uri_dup (info->value.publish.specifics.completed.chk_uri);
- GNUNET_SCHEDULER_add_continuation (daemon->publish_sched,
- &report_uri,
+ GNUNET_SCHEDULER_add_continuation (&report_uri,
daemon,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
(unsigned long long) info->value.download.size);
break;
case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
- GNUNET_SCHEDULER_cancel (daemon->download_sched,
- daemon->download_timeout_task);
+ GNUNET_SCHEDULER_cancel (daemon->download_timeout_task);
daemon->download_timeout_task = GNUNET_SCHEDULER_NO_TASK;
- GNUNET_SCHEDULER_add_continuation (daemon->download_sched,
- &report_success,
+ GNUNET_SCHEDULER_add_continuation (&report_success,
daemon,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
struct StartContext
{
- struct GNUNET_SCHEDULER_Handle *sched;
struct GNUNET_TIME_Relative timeout;
unsigned int total;
unsigned int have;
sctx->have++;
if (sctx->have == sctx->total)
{
- GNUNET_SCHEDULER_add_continuation (sctx->sched,
- sctx->cont,
+ GNUNET_SCHEDULER_add_continuation (sctx->cont,
sctx->cont_cls,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
sctx->daemons[0]->gcfg = sctx->cfg;
- GNUNET_SCHEDULER_cancel (sctx->sched,
- sctx->timeout_task);
+ GNUNET_SCHEDULER_cancel (sctx->timeout_task);
for (i=0;i<sctx->total;i++)
{
- sctx->daemons[i]->fs = GNUNET_FS_start (sctx->sched,
- sctx->daemons[i]->cfg,
+ sctx->daemons[i]->fs = GNUNET_FS_start (sctx->daemons[i]->cfg,
"<tester>",
&progress_cb,
sctx->daemons[i],
sctx->daemons[i] = NULL;
}
GNUNET_CONFIGURATION_destroy (sctx->cfg);
- GNUNET_SCHEDULER_add_continuation (sctx->sched,
- sctx->cont,
+ GNUNET_SCHEDULER_add_continuation (sctx->cont,
sctx->cont_cls,
GNUNET_SCHEDULER_REASON_TIMEOUT);
GNUNET_free (sctx);
/**
* Start daemons for testing.
*
- * @param sched scheduler to use
* @param template_cfg_file configuration template to use
* @param timeout if this operation cannot be completed within the
* given period, call the continuation with an error code
* @param cont_cls closure for cont
*/
void
-GNUNET_FS_TEST_daemons_start (struct GNUNET_SCHEDULER_Handle *sched,
- const char *template_cfg_file,
+GNUNET_FS_TEST_daemons_start (const char *template_cfg_file,
struct GNUNET_TIME_Relative timeout,
unsigned int total,
struct GNUNET_FS_TestDaemon **daemons,
GNUNET_assert (total > 0);
sctx = GNUNET_malloc (sizeof (struct StartContext));
- sctx->sched = sched;
sctx->daemons = daemons;
sctx->total = total;
sctx->cont = cont;
GNUNET_break (0);
GNUNET_CONFIGURATION_destroy (sctx->cfg);
GNUNET_free (sctx);
- GNUNET_SCHEDULER_add_continuation (sched,
- cont,
+ GNUNET_SCHEDULER_add_continuation (cont,
cont_cls,
GNUNET_SCHEDULER_REASON_TIMEOUT);
return;
}
for (i=0;i<total;i++)
daemons[i] = GNUNET_malloc (sizeof (struct GNUNET_FS_TestDaemon));
- sctx->group = GNUNET_TESTING_daemons_start (sched,
- sctx->cfg,
+ sctx->group = GNUNET_TESTING_daemons_start (sctx->cfg,
total,
timeout,
NULL,
sctx,
NULL, NULL,
NULL);
- sctx->timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
- timeout,
+ sctx->timeout_task = GNUNET_SCHEDULER_add_delayed (timeout,
&start_timeout,
sctx);
}
struct ConnectContext
{
- struct GNUNET_SCHEDULER_Handle *sched;
GNUNET_SCHEDULER_Task cont;
void *cont_cls;
};
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Failed to connect peers: %s\n",
emsg);
- GNUNET_SCHEDULER_add_continuation (cc->sched,
- cc->cont,
+ GNUNET_SCHEDULER_add_continuation (cc->cont,
cc->cont_cls,
(emsg != NULL)
? GNUNET_SCHEDULER_REASON_TIMEOUT
/**
* Connect two daemons for testing.
*
- * @param sched scheduler to use
* @param daemon1 first daemon to connect
* @param daemon2 second first daemon to connect
* @param timeout if this operation cannot be completed within the
* @param cont_cls closure for cont
*/
void
-GNUNET_FS_TEST_daemons_connect (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_FS_TestDaemon *daemon1,
+GNUNET_FS_TEST_daemons_connect (struct GNUNET_FS_TestDaemon *daemon1,
struct GNUNET_FS_TestDaemon *daemon2,
struct GNUNET_TIME_Relative timeout,
GNUNET_SCHEDULER_Task cont,
struct ConnectContext *ncc;
ncc = GNUNET_malloc (sizeof (struct ConnectContext));
- ncc->sched = sched;
ncc->cont = cont;
ncc->cont_cls = cont_cls;
GNUNET_TESTING_daemons_connect (daemon1->daemon,
/**
* Stop daemons used for testing.
*
- * @param sched scheduler to use
* @param total number of daemons to stop
* @param daemons array with the daemons (values will be clobbered)
*/
void
-GNUNET_FS_TEST_daemons_stop (struct GNUNET_SCHEDULER_Handle *sched,
- unsigned int total,
+GNUNET_FS_TEST_daemons_stop (unsigned int total,
struct GNUNET_FS_TestDaemon **daemons)
{
unsigned int i;
GNUNET_FS_stop (daemons[i]->fs);
if (daemons[i]->cfg != NULL)
GNUNET_CONFIGURATION_destroy (daemons[i]->cfg);
+ if (NULL != daemons[i]->publish_tmp_file)
+ {
+ GNUNET_DISK_directory_remove (daemons[i]->publish_tmp_file);
+ GNUNET_free (daemons[i]->publish_tmp_file);
+ }
GNUNET_free (daemons[i]);
daemons[i] = NULL;
}
/**
* Publish a file at the given daemon.
*
- * @param sched scheduler to use
* @param daemon where to publish
* @param timeout if this operation cannot be completed within the
* given period, call the continuation with an error code
* @param cont_cls closure for cont
*/
void
-GNUNET_FS_TEST_publish (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_FS_TestDaemon *daemon,
+GNUNET_FS_TEST_publish (struct GNUNET_FS_TestDaemon *daemon,
struct GNUNET_TIME_Relative timeout,
uint32_t anonymity,
int do_index,
GNUNET_FS_TEST_UriContinuation cont,
void *cont_cls)
{
- GNUNET_assert (daemon->publish_cont == NULL);
struct GNUNET_FS_FileInformation *fi;
+ struct GNUNET_DISK_FileHandle *fh;
+ char *emsg;
+ uint64_t off;
+ char buf[DBLOCK_SIZE];
+ size_t bsize;
+ GNUNET_assert (daemon->publish_cont == NULL);
daemon->publish_cont = cont;
daemon->publish_cont_cls = cont_cls;
daemon->publish_seed = seed;
daemon->verbose = verbose;
- daemon->publish_sched = sched;
- fi = GNUNET_FS_file_information_create_from_reader (daemon->fs,
- daemon,
- size,
- &file_generator,
- daemon,
- NULL,
- NULL,
- do_index,
- anonymity,
- 42 /* priority */,
- GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS));
+ if (GNUNET_YES == do_index)
+ {
+ GNUNET_assert (daemon->publish_tmp_file == NULL);
+ daemon->publish_tmp_file = GNUNET_DISK_mktemp ("fs-test-publish-index");
+ GNUNET_assert (daemon->publish_tmp_file != NULL);
+ fh = GNUNET_DISK_file_open (daemon->publish_tmp_file,
+ GNUNET_DISK_OPEN_WRITE | GNUNET_DISK_OPEN_CREATE,
+ GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE);
+ GNUNET_assert (NULL != fh);
+ off = 0;
+ while (off < size)
+ {
+ bsize = GNUNET_MIN (sizeof (buf),
+ size - off);
+ GNUNET_assert (bsize ==
+ file_generator (daemon,
+ off,
+ bsize,
+ buf,
+ &emsg));
+ GNUNET_assert (emsg == NULL);
+ GNUNET_assert (bsize ==
+ GNUNET_DISK_file_write (fh,
+ buf,
+ bsize));
+ off += bsize;
+ }
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_DISK_file_close (fh));
+ fi = GNUNET_FS_file_information_create_from_file (daemon->fs,
+ daemon,
+ daemon->publish_tmp_file,
+ NULL, NULL,
+ do_index,
+ anonymity,
+ 42 /* priority */,
+ GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS));
+ }
+ else
+ {
+ fi = GNUNET_FS_file_information_create_from_reader (daemon->fs,
+ daemon,
+ size,
+ &file_generator,
+ daemon,
+ NULL,
+ NULL,
+ do_index,
+ anonymity,
+ 42 /* priority */,
+ GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS));
+ }
daemon->publish_context = GNUNET_FS_publish_start (daemon->fs,
fi,
NULL, NULL, NULL,
GNUNET_FS_PUBLISH_OPTION_NONE);
- daemon->publish_timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
- timeout,
+ daemon->publish_timeout_task = GNUNET_SCHEDULER_add_delayed (timeout,
&publish_timeout,
daemon);
}
daemon->download_timeout_task = GNUNET_SCHEDULER_NO_TASK;
GNUNET_FS_download_stop (daemon->download_context, GNUNET_YES);
daemon->download_context = NULL;
- GNUNET_SCHEDULER_add_continuation (daemon->download_sched,
- daemon->download_cont,
+ GNUNET_SCHEDULER_add_continuation (daemon->download_cont,
daemon->download_cont_cls,
GNUNET_SCHEDULER_REASON_TIMEOUT);
daemon->download_cont = NULL;
- daemon->download_sched = NULL;
}
/**
* Perform test download.
*
- * @param sched scheduler to use
* @param daemon which peer to download from
* @param timeout if this operation cannot be completed within the
* given period, call the continuation with an error code
* @param cont_cls closure for cont
*/
void
-GNUNET_FS_TEST_download (struct GNUNET_SCHEDULER_Handle *sched,
- struct GNUNET_FS_TestDaemon *daemon,
+GNUNET_FS_TEST_download (struct GNUNET_FS_TestDaemon *daemon,
struct GNUNET_TIME_Relative timeout,
uint32_t anonymity,
uint32_t seed,
GNUNET_assert (daemon->download_cont == NULL);
size = GNUNET_FS_uri_chk_get_file_size (uri);
daemon->verbose = verbose;
- daemon->download_sched = sched;
daemon->download_cont = cont;
daemon->download_cont_cls = cont_cls;
daemon->download_seed = seed;
GNUNET_FS_DOWNLOAD_OPTION_NONE,
NULL,
NULL);
- daemon->download_timeout_task = GNUNET_SCHEDULER_add_delayed (sched,
- timeout,
+ daemon->download_timeout_task = GNUNET_SCHEDULER_add_delayed (timeout,
&download_timeout,
daemon);
}
projects / oweals / gnunet.git / blobdiff