[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10546 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10546 - gnunet/src/fs |
Date: |
Thu, 11 Mar 2010 13:47:52 +0100 |
Author: grothoff
Date: 2010-03-11 13:47:52 +0100 (Thu, 11 Mar 2010)
New Revision: 10546
Modified:
gnunet/src/fs/gnunet-unindex.c
Log:
fixing shutdown
Modified: gnunet/src/fs/gnunet-unindex.c
===================================================================
--- gnunet/src/fs/gnunet-unindex.c 2010-03-11 12:45:52 UTC (rev 10545)
+++ gnunet/src/fs/gnunet-unindex.c 2010-03-11 12:47:52 UTC (rev 10546)
@@ -38,7 +38,32 @@
static struct GNUNET_FS_UnindexContext *uc;
+static struct GNUNET_SCHEDULER_Handle *sched;
+
+static void
+cleanup_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ GNUNET_FS_stop (ctx);
+ ctx = NULL;
+}
+
+
+static void
+shutdown_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_FS_UnindexContext *u;
+
+ if (uc != NULL)
+ {
+ u = uc;
+ uc = NULL;
+ GNUNET_FS_unindex_stop (u);
+ }
+}
+
/**
* Called by FS client to give information about the progress of an
* operation.
@@ -78,15 +103,18 @@
fprintf (stderr,
_("Error unindexing: %s.\n"),
info->value.unindex.specifics.error.message);
- GNUNET_FS_unindex_stop (uc);
+ GNUNET_SCHEDULER_shutdown (sched);
break;
case GNUNET_FS_STATUS_UNINDEX_COMPLETED:
fprintf (stdout,
_("Unindexing done.\n"));
- GNUNET_FS_unindex_stop (uc);
+ GNUNET_SCHEDULER_shutdown (sched);
break;
case GNUNET_FS_STATUS_UNINDEX_STOPPED:
- GNUNET_FS_stop (ctx);
+ GNUNET_SCHEDULER_add_continuation (sched,
+ &cleanup_task,
+ NULL,
+ GNUNET_SCHEDULER_REASON_PREREQ_DONE);
break;
default:
fprintf (stderr,
@@ -102,14 +130,14 @@
* Main function that will be run by the scheduler.
*
* @param cls closure
- * @param sched the scheduler to use
+ * @param s the scheduler to use
* @param args remaining command-line arguments
* @param cfgfile name of the configuration file used (for saving, can be
NULL!)
* @param c configuration
*/
static void
run (void *cls,
- struct GNUNET_SCHEDULER_Handle *sched,
+ struct GNUNET_SCHEDULER_Handle *s,
char *const *args,
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *c)
@@ -122,6 +150,7 @@
ret = -1;
return;
}
+ sched = s;
cfg = c;
ctx = GNUNET_FS_start (sched,
cfg,
@@ -146,7 +175,12 @@
fprintf (stderr,
_("Could not start unindex operation.\n"));
GNUNET_FS_stop (ctx);
+ return;
}
+ GNUNET_SCHEDULER_add_delayed (sched,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &shutdown_task,
+ NULL);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10546 - gnunet/src/fs,
gnunet <=