projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of gnunet.org:gnunet
[oweals/gnunet.git]
/
src
/
fs
/
test_fs_publish.c
diff --git
a/src/fs/test_fs_publish.c
b/src/fs/test_fs_publish.c
index e51d6e5d456c0ec89144690516e417a163879b6a..f4c56e015171173727221f29e775e64ab512104b 100644
(file)
--- a/
src/fs/test_fs_publish.c
+++ b/
src/fs/test_fs_publish.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2004, 2005, 2006, 2008, 2009 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2004, 2005, 2006, 2008, 2009 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.
*/
/**
* @file fs/test_fs_publish.c
*/
/**
* @file fs/test_fs_publish.c
@@
-58,7
+58,7
@@
static int err;
static void
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;
{
GNUNET_FS_publish_stop (publish);
publish = NULL;
@@
-82,13
+82,12
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
ret = event->value.publish.cctx;
printf ("Publish complete, %llu kbps.\n",
case GNUNET_FS_STATUS_PUBLISH_COMPLETED:
ret = event->value.publish.cctx;
printf ("Publish complete, %llu kbps.\n",
- (unsigned long long) (FILESIZE * 1000 /
+ (unsigned long long) (FILESIZE * 1000
000LL
/
(1 +
GNUNET_TIME_absolute_get_duration
(1 +
GNUNET_TIME_absolute_get_duration
- (start).rel_value) / 1024));
+ (start).rel_value
_us
) / 1024));
if (0 == strcmp ("publish-context-dir", event->value.publish.cctx))
if (0 == strcmp ("publish-context-dir", event->value.publish.cctx))
- 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_PUBLISH_PROGRESS:
ret = event->value.publish.cctx;
break;
case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
ret = event->value.publish.cctx;
@@
-101,6
+100,9
@@
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:
+ ret = event->value.publish.cctx;
+ break;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
ret = event->value.publish.cctx;
FPRINTF (stderr, "Error publishing file: %s\n",
case GNUNET_FS_STATUS_PUBLISH_ERROR:
ret = event->value.publish.cctx;
FPRINTF (stderr, "Error publishing file: %s\n",
@@
-110,8
+112,7
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
{
FPRINTF (stderr, "Scheduling abort task for error on `%s'\n",
(const char *) event->value.publish.cctx);
{
FPRINTF (stderr, "Scheduling abort task for error on `%s'\n",
(const char *) event->value.publish.cctx);
- 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_PUBLISH_START:
}
break;
case GNUNET_FS_STATUS_PUBLISH_START:
@@
-153,7
+154,7
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event)
static void
static void
-run (void *cls,
+run (void *cls,
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{
const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_TESTING_Peer *peer)
{