projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing #3799: only unindex if DB operations succeeded previously in the first place...
[oweals/gnunet.git]
/
src
/
fs
/
gnunet-daemon-fsprofiler.c
diff --git
a/src/fs/gnunet-daemon-fsprofiler.c
b/src/fs/gnunet-daemon-fsprofiler.c
index d4c2b1c02efa37a49292069373c009bfc55bd42d..16fd0a9aa98a141bf44fb9881e877cf83718d2f5 100644
(file)
--- a/
src/fs/gnunet-daemon-fsprofiler.c
+++ b/
src/fs/gnunet-daemon-fsprofiler.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff
+
Copyright
(C) 2012 Christian Grothoff
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
@@
-69,12
+69,12
@@
struct Pattern
/**
* Task to run the operation.
*/
/**
* Task to run the operation.
*/
-
GNUNET_SCHEDULER_TaskIdentifier
task;
+
struct GNUNET_SCHEDULER_Task *
task;
/**
* Secondary task to run the operation.
*/
/**
* Secondary task to run the operation.
*/
-
GNUNET_SCHEDULER_TaskIdentifier
stask;
+
struct GNUNET_SCHEDULER_Task *
stask;
/**
* X-value.
/**
* X-value.
@@
-276,7
+276,7
@@
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
while (NULL != (p = publish_head))
{
while (NULL != (p = publish_head))
{
- if (
GNUNET_SCHEDULER_NO_TASK
!= p->task)
+ if (
NULL
!= p->task)
GNUNET_SCHEDULER_cancel (p->task);
if (NULL != p->ctx)
GNUNET_FS_publish_stop (p->ctx);
GNUNET_SCHEDULER_cancel (p->task);
if (NULL != p->ctx)
GNUNET_FS_publish_stop (p->ctx);
@@
-285,9
+285,9
@@
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
}
while (NULL != (p = download_head))
{
}
while (NULL != (p = download_head))
{
- if (
GNUNET_SCHEDULER_NO_TASK
!= p->task)
+ if (
NULL
!= p->task)
GNUNET_SCHEDULER_cancel (p->task);
GNUNET_SCHEDULER_cancel (p->task);
- if (
GNUNET_SCHEDULER_NO_TASK
!= p->stask)
+ if (
NULL
!= p->stask)
GNUNET_SCHEDULER_cancel (p->stask);
if (NULL != p->ctx)
GNUNET_FS_download_stop (p->ctx, GNUNET_YES);
GNUNET_SCHEDULER_cancel (p->stask);
if (NULL != p->ctx)
GNUNET_FS_download_stop (p->ctx, GNUNET_YES);
@@
-320,7
+320,7
@@
publish_stop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct Pattern *p = cls;
{
struct Pattern *p = cls;
- p->task =
GNUNET_SCHEDULER_NO_TASK
;
+ p->task =
NULL
;
GNUNET_FS_publish_stop (p->ctx);
}
GNUNET_FS_publish_stop (p->ctx);
}
@@
-336,7
+336,7
@@
download_stop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct Pattern *p = cls;
{
struct Pattern *p = cls;
- p->task =
GNUNET_SCHEDULER_NO_TASK
;
+ p->task =
NULL
;
GNUNET_FS_download_stop (p->ctx, GNUNET_YES);
}
GNUNET_FS_download_stop (p->ctx, GNUNET_YES);
}
@@
-352,7
+352,7
@@
search_stop_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct Pattern *p = cls;
{
struct Pattern *p = cls;
- p->stask =
GNUNET_SCHEDULER_NO_TASK
;
+ p->stask =
NULL
;
GNUNET_FS_search_stop (p->sctx);
}
GNUNET_FS_search_stop (p->sctx);
}
@@
-385,6
+385,9
@@
progress_cb (void *cls,
case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
p = info->value.publish.cctx;
return p;
case GNUNET_FS_STATUS_PUBLISH_PROGRESS:
p = info->value.publish.cctx;
return p;
+ case GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY:
+ p = info->value.publish.cctx;
+ return p;
case GNUNET_FS_STATUS_PUBLISH_ERROR:
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Publishing failed\n");
case GNUNET_FS_STATUS_PUBLISH_ERROR:
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Publishing failed\n");
@@
-504,7
+507,7
@@
start_publish (void *cls,
struct Pattern *p = cls;
struct GNUNET_FS_FileInformation *fi;
struct Pattern *p = cls;
struct GNUNET_FS_FileInformation *fi;
- p->task =
GNUNET_SCHEDULER_NO_TASK
;
+ p->task =
NULL
;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
fi = make_file (p->x, p->y, p);
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
fi = make_file (p->x, p->y, p);
@@
-529,7
+532,7
@@
start_download (void *cls,
struct Pattern *p = cls;
struct GNUNET_FS_Uri *keywords;
struct Pattern *p = cls;
struct GNUNET_FS_Uri *keywords;
- p->task =
GNUNET_SCHEDULER_NO_TASK
;
+ p->task =
NULL
;
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
keywords = make_keywords (p->x);
if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
return;
keywords = make_keywords (p->x);