projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removing dead/legacy server/connection logic, except for in tcp/wlan/bt plugins ...
[oweals/gnunet.git]
/
src
/
fs
/
test_fs_download_persistence.c
diff --git
a/src/fs/test_fs_download_persistence.c
b/src/fs/test_fs_download_persistence.c
index 98a32af5f778cb1e36ac7d50ae75811bcb08ef81..76a1ea91104605963c8091460b6b77935639cee3 100644
(file)
--- a/
src/fs/test_fs_download_persistence.c
+++ b/
src/fs/test_fs_download_persistence.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
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
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
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., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
*/
/**
@@
-25,7
+25,7
@@
*/
#include "platform.h"
#include "gnunet_util_lib.h"
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib
-new
.h"
+#include "gnunet_testing_lib.h"
#include "gnunet_fs_service.h"
/**
#include "gnunet_fs_service.h"
/**
@@
-54,7
+54,7
@@
static struct GNUNET_FS_DownloadContext *download;
static struct GNUNET_FS_PublishContext *publish;
static struct GNUNET_FS_PublishContext *publish;
-static
GNUNET_SCHEDULER_TaskIdentifier
timeout_kill;
+static
struct GNUNET_SCHEDULER_Task *
timeout_kill;
static char *fn;
static char *fn;
@@
-62,7
+62,7
@@
static int err;
static void
static void
-timeout_kill_task (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+timeout_kill_task (void *cls)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n");
if (download != NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Timeout downloading file\n");
if (download != NULL)
@@
-75,13
+75,13
@@
timeout_kill_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_FS_publish_stop (publish);
publish = NULL;
}
GNUNET_FS_publish_stop (publish);
publish = NULL;
}
- timeout_kill =
GNUNET_SCHEDULER_NO_TASK
;
+ timeout_kill =
NULL
;
err = 1;
}
static void
err = 1;
}
static void
-abort_publish_task (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+abort_publish_task (void *cls)
{
if (publish != NULL)
{
{
if (publish != NULL)
{
@@
-92,7
+92,7
@@
abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
static void
static void
-abort_download_task (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+abort_download_task (void *cls)
{
uint64_t size;
{
uint64_t size;
@@
-107,7
+107,7
@@
abort_download_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
GNUNET_free (fn);
fn = NULL;
GNUNET_SCHEDULER_cancel (timeout_kill);
GNUNET_free (fn);
fn = NULL;
GNUNET_SCHEDULER_cancel (timeout_kill);
- timeout_kill =
GNUNET_SCHEDULER_NO_TASK
;
+ timeout_kill =
NULL
;
}
}
@@
-116,7
+116,7
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event);
static void
static void
-restart_fs_task (void *cls
, const struct GNUNET_SCHEDULER_TaskContext *tc
)
+restart_fs_task (void *cls)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Restarting FS.\n");
GNUNET_FS_stop (fs);
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Restarting FS.\n");
GNUNET_FS_stop (fs);
@@
-162,12
+162,14
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
(unsigned long long) event->value.publish.specifics.
progress.offset);
break;
(unsigned long long) event->value.publish.specifics.
progress.offset);
break;
+ case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
+ break;
case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
printf ("Publishing complete, %llu kbps.\n",
case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
printf ("Publishing complete, %llu kbps.\n",
- (unsigned long long) (FILESIZE * 1000LL /
+ (unsigned long long) (FILESIZE * 1000
000
LL /
(1 +
GNUNET_TIME_absolute_get_duration
(1 +
GNUNET_TIME_absolute_get_duration
- (start).rel_value) / 1024LL));
+ (start).rel_value
_us
) / 1024LL));
fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst");
start = GNUNET_TIME_absolute_get ();
GNUNET_assert (download == NULL);
fn = GNUNET_DISK_mktemp ("gnunet-download-test-dst");
start = GNUNET_TIME_absolute_get ();
GNUNET_assert (download == NULL);
@@
-179,10
+181,10
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
consider_restart (event->status);
printf ("Download complete, %llu kbps.\n",
case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
consider_restart (event->status);
printf ("Download complete, %llu kbps.\n",
- (unsigned long long) (FILESIZE * 1000LL /
+ (unsigned long long) (FILESIZE * 1000
000
LL /
(1 +
GNUNET_TIME_absolute_get_duration
(1 +
GNUNET_TIME_absolute_get_duration
- (start).rel_value) / 1024LL));
+ (start).rel_value
_us
) / 1024LL));
GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
break;
case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
GNUNET_SCHEDULER_add_now (&abort_download_task, NULL);
break;
case GNUNET_FS_STATUS_DOWNLOAD_PROGRESS:
@@
-200,8
+202,7
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
FPRINTF (stderr, "Error publishing file: %s\n",
event->value.publish.specifics.error.message);
GNUNET_break (0);
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_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
FPRINTF (stderr, "Error downloading file: %s\n",
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
FPRINTF (stderr, "Error downloading file: %s\n",
@@
-263,8
+264,7
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
break;
case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
GNUNET_assert (download == event->value.download.dc);
break;
case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
GNUNET_assert (download == event->value.download.dc);
- GNUNET_SCHEDULER_add_continuation (&abort_publish_task, NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
download = NULL;
break;
default:
download = NULL;
break;
default:
@@
-276,8
+276,9
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
static void
static void
-run (void *cls,
- 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",
{
const char *keywords[] = {
"down_foo",