projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #3904, also simplify and clean up gnunet-publish shutdown logic in general
[oweals/gnunet.git]
/
src
/
fs
/
test_fs_publish_persistence.c
diff --git
a/src/fs/test_fs_publish_persistence.c
b/src/fs/test_fs_publish_persistence.c
index e3bbc77a1bec19cf60a4478e462a294106f4488a..18b17ce270232c0c9bef9ea3eeb84a4b5f159683 100644
(file)
--- a/
src/fs/test_fs_publish_persistence.c
+++ b/
src/fs/test_fs_publish_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 Christian Grothoff (and other contributing authors)
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_persistence.c
*/
/**
* @file fs/test_fs_publish_persistence.c
@@
-60,7
+60,7
@@
static char *fn2;
static int err;
static int err;
-static
GNUNET_SCHEDULER_TaskIdentifier
rtask;
+static
struct GNUNET_SCHEDULER_Task *
rtask;
static void
static void
@@
-76,10
+76,10
@@
abort_publish_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
fn2 = NULL;
GNUNET_FS_stop (fs);
fs = NULL;
fn2 = NULL;
GNUNET_FS_stop (fs);
fs = NULL;
- if (
GNUNET_SCHEDULER_NO_TASK
!= rtask)
+ if (
NULL
!= rtask)
{
GNUNET_SCHEDULER_cancel (rtask);
{
GNUNET_SCHEDULER_cancel (rtask);
- rtask =
GNUNET_SCHEDULER_NO_TASK
;
+ rtask =
NULL
;
}
}
}
}
@@
-91,9
+91,9
@@
progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *event);
static void
restart_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
restart_fs_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- rtask =
GNUNET_SCHEDULER_NO_TASK
;
+ rtask =
NULL
;
GNUNET_FS_stop (fs);
GNUNET_FS_stop (fs);
- fs = GNUNET_FS_start (cfg, "test-fs-publish-persistence",
+ fs = GNUNET_FS_start (cfg, "test-fs-publish-persistence",
&progress_cb, NULL,
GNUNET_FS_FLAGS_PERSISTENCE,
GNUNET_FS_OPTIONS_END);
&progress_cb, NULL,
GNUNET_FS_FLAGS_PERSISTENCE,
GNUNET_FS_OPTIONS_END);
@@
-145,6
+145,9
@@
progress_cb (void *cls,
(0 == strcmp ("publish-context-dir", event->value.publish.cctx)) )
GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
break;
(0 == strcmp ("publish-context-dir", event->value.publish.cctx)) )
GNUNET_SCHEDULER_add_now (&abort_publish_task, NULL);
break;
+ case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
+ ret = event->value.publish.cctx;
+ return ret;
case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
consider_restart (event->status);
ret = event->value.publish.cctx;
case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
consider_restart (event->status);
ret = event->value.publish.cctx;
@@
-223,7
+226,7
@@
progress_cb (void *cls,
static void
static void
-run (void *cls,
+run (void *cls,
const struct GNUNET_CONFIGURATION_Handle *c,
struct GNUNET_TESTING_Peer *peer)
{
const struct GNUNET_CONFIGURATION_Handle *c,
struct GNUNET_TESTING_Peer *peer)
{