projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added helper for handling the "view" in rps
[oweals/gnunet.git]
/
src
/
regex
/
gnunet-regex-simulation-profiler.c
diff --git
a/src/regex/gnunet-regex-simulation-profiler.c
b/src/regex/gnunet-regex-simulation-profiler.c
index f0010801108c26e4e5ba78f0bc6bfee7b0b46cf5..4555b1f14e0198cf1ab8680f845cf98f6da16aa7 100644
(file)
--- a/
src/regex/gnunet-regex-simulation-profiler.c
+++ b/
src/regex/gnunet-regex-simulation-profiler.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2011, 2012 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2011, 2012 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.
*/
/**
*/
/**
@@
-91,17
+91,17
@@
static struct ProgressMeter *meter;
/**
* Abort task identifier.
*/
/**
* Abort task identifier.
*/
-static
GNUNET_SCHEDULER_TaskIdentifier
abort_task;
+static
struct GNUNET_SCHEDULER_Task *
abort_task;
/**
* Shutdown task identifier.
*/
/**
* Shutdown task identifier.
*/
-static
GNUNET_SCHEDULER_TaskIdentifier
shutdown_task;
+static
struct GNUNET_SCHEDULER_Task *
shutdown_task;
/**
* Scan task identifier;
*/
/**
* Scan task identifier;
*/
-static
GNUNET_SCHEDULER_TaskIdentifier
scan_task;
+static
struct GNUNET_SCHEDULER_Task *
scan_task;
/**
* Global testing status.
/**
* Global testing status.
@@
-276,8
+276,8
@@
free_meter (struct ProgressMeter *meter)
static void
do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- shutdown_task =
GNUNET_SCHEDULER_NO_TASK
;
- if (
GNUNET_SCHEDULER_NO_TASK
!= abort_task)
+ shutdown_task =
NULL
;
+ if (
NULL
!= abort_task)
GNUNET_SCHEDULER_cancel (abort_task);
if (NULL != mysql_ctx)
GNUNET_MYSQL_context_destroy (mysql_ctx);
GNUNET_SCHEDULER_cancel (abort_task);
if (NULL != mysql_ctx)
GNUNET_MYSQL_context_destroy (mysql_ctx);
@@
-298,9
+298,9
@@
static void
do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting\n");
do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Aborting\n");
- abort_task =
GNUNET_SCHEDULER_NO_TASK
;
+ abort_task =
NULL
;
GNUNET_SCHEDULER_cancel (scan_task);
GNUNET_SCHEDULER_cancel (scan_task);
- scan_task =
GNUNET_SCHEDULER_NO_TASK
;
+ scan_task =
NULL
;
result = GNUNET_SYSERR;
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
result = GNUNET_SYSERR;
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}