REST/NAMESTORE: rework API

[oweals/gnunet.git] / src / ats-tests / perf_ats_logging.c

diff --git a/src/ats-tests/perf_ats_logging.c b/src/ats-tests/perf_ats_logging.c
index 6dc5a96b40dc0eb1787f1ac1d6bceda037f8b72e..4b59515d3ee750034e4691955564363c3cc53fb1 100644 (file)
--- a/src/ats-tests/perf_ats_logging.c
+++ b/src/ats-tests/perf_ats_logging.c
@@ -1,21 +1,21 @@
 /*
  This file is part of GNUnet.
- (C) 2010-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2013 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
 
  GNUnet is distributed in the hope that it will be useful, but
  WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
 
- 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ You should have received a copy of the GNU Affero General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+     SPDX-License-Identifier: AGPL3.0-or-later
  */
 /**
  * @file ats/perf_ats_logging.c
@@ -72,7 +72,7 @@
 /**
  * Logging task
  */
-static GNUNET_SCHEDULER_TaskIdentifier log_task;
+static struct GNUNET_SCHEDULER_Task * log_task;
 
 /**
  * Reference to perf_ats' masters
@@ -513,7 +513,7 @@ collect_log_now (void)
   for (c_m = 0; c_m < num_peers; c_m++)
   {
     bp = &lp[c_m];
-    mlt = GNUNET_malloc (sizeof (struct PeerLoggingTimestep));
+    mlt = GNUNET_new (struct PeerLoggingTimestep);
     GNUNET_CONTAINER_DLL_insert_tail(bp->head, bp->tail, mlt);
     prev_log_mlt = mlt->prev;
 
@@ -637,17 +637,12 @@ collect_log_now (void)
 }
 
 static void
-collect_log_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+collect_log_task (void *cls)
 {
-  log_task = GNUNET_SCHEDULER_NO_TASK;
-
-  collect_log_now();
-
-  if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN)
-    return;
-
+  log_task = NULL;
+  collect_log_now ();
   log_task = GNUNET_SCHEDULER_add_delayed (frequency,
-      &collect_log_task, NULL);
+                                           &collect_log_task, NULL);
 }
 
 
@@ -655,17 +650,17 @@ void
 perf_logging_stop ()
 {
   int c_m;
-  struct GNUNET_SCHEDULER_TaskContext tc;
   struct PeerLoggingTimestep *cur;
 
-  if (GNUNET_YES!= running)
+  if (GNUNET_YES != running)
     return;
 
-  if (GNUNET_SCHEDULER_NO_TASK != log_task)
+  if (NULL != log_task)
+  {
     GNUNET_SCHEDULER_cancel (log_task);
-  log_task = GNUNET_SCHEDULER_NO_TASK;
-  tc.reason = GNUNET_SCHEDULER_REASON_SHUTDOWN;
-  collect_log_task (NULL, &tc);
+    log_task = NULL;
+  }
+  collect_log_task (NULL);
 
   GNUNET_log(GNUNET_ERROR_TYPE_INFO,
       _("Stop logging\n"));
@@ -685,6 +680,7 @@ perf_logging_stop ()
   GNUNET_free (lp);
 }
 
+
 void
 perf_logging_start (struct GNUNET_TIME_Relative log_frequency,
     char * testname, struct BenchmarkPeer *masters, int num_masters)
@@ -710,4 +706,3 @@ perf_logging_start (struct GNUNET_TIME_Relative log_frequency,
   running = GNUNET_YES;
 }
 /* end of file perf_ats_logging.c */
-