SET service: accurate results for symmetric mode

[oweals/gnunet.git] / src / include / gnunet_scheduler_lib.h

diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h
index e675f74482fe26a1dd928ae8a2e6e58ea1e0d10c..ab1e09e89e554140bf400ae7d71b2324cb43da0c 100644 (file)
--- a/src/include/gnunet_scheduler_lib.h
+++ b/src/include/gnunet_scheduler_lib.h
@@ -1,6 +1,6 @@
 /*
       This file is part of GNUnet
-      Copyright (C) 2009-2013 Christian Grothoff (and other contributing authors)
+      Copyright (C) 2009-2015 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
@@ -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
-      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-      Boston, MA 02111-1307, USA.
+      Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+      Boston, MA 02110-1301, USA.
  */
 
 /**
@@ -87,73 +87,6 @@ enum GNUNET_SCHEDULER_Reason
 };
 
 
-/**
- * Valid task priorities.  Use these, do not
- * pass random integers!
- */
-enum GNUNET_SCHEDULER_Priority
-{
-  /**
-   * Run with the same priority as the current job.
-   */
-  GNUNET_SCHEDULER_PRIORITY_KEEP = 0,
-
-  /**
-   * Run when otherwise idle.
-   */
-  GNUNET_SCHEDULER_PRIORITY_IDLE = 1,
-
-  /**
-   * Run as background job (higher than idle,
-   * lower than default).
-   */
-  GNUNET_SCHEDULER_PRIORITY_BACKGROUND = 2,
-
-  /**
-   * Run with the default priority (normal
-   * P2P operations).  Any task that is scheduled
-   * without an explicit priority being specified
-   * will run with this priority.
-   */
-  GNUNET_SCHEDULER_PRIORITY_DEFAULT = 3,
-
-  /**
-   * Run with high priority (important requests).
-   * Higher than DEFAULT.
-   */
-  GNUNET_SCHEDULER_PRIORITY_HIGH = 4,
-
-  /**
-   * Run with priority for interactive tasks.
-   * Higher than "HIGH".
-   */
-  GNUNET_SCHEDULER_PRIORITY_UI = 5,
-
-  /**
-   * Run with priority for urgent tasks.  Use
-   * for things like aborts and shutdowns that
-   * need to preempt "UI"-level tasks.
-   * Higher than "UI".
-   */
-  GNUNET_SCHEDULER_PRIORITY_URGENT = 6,
-
-  /**
-   * This is an internal priority level that is only used for tasks
-   * that are being triggered due to shutdown (they have automatically
-   * highest priority).  User code must not use this priority level
-   * directly.  Tasks run with this priority level that internally
-   * schedule other tasks will see their original priority level
-   * be inherited (unless otherwise specified).
-   */
-  GNUNET_SCHEDULER_PRIORITY_SHUTDOWN = 7,
-
-  /**
-   * Number of priorities (must be the last priority).
-   * This priority must not be used by clients.
-   */
-  GNUNET_SCHEDULER_PRIORITY_COUNT = 8
-};
-
 #include "gnunet_time_lib.h"
 #include "gnunet_network_lib.h"
 
@@ -227,7 +160,7 @@ typedef int
  * always only create a single scheduler.
  *
  * @param task task to run first (and immediately)
- * @param task_cls closure of task
+ * @param task_cls closure of @a task
  */
 void
 GNUNET_SCHEDULER_run (GNUNET_SCHEDULER_TaskCallback task,
@@ -282,21 +215,6 @@ void *
 GNUNET_SCHEDULER_cancel (struct GNUNET_SCHEDULER_Task *task);
 
 
-/**
- * Continue the current execution with the given function.  This is
- * similar to the other "add" functions except that there is no delay
- * and the reason code can be specified.
- *
- * @param task main function of the task
- * @param task_cls closure of task
- * @param reason reason for task invocation
- */
-void
-GNUNET_SCHEDULER_add_continuation (GNUNET_SCHEDULER_TaskCallback task,
-                                   void *task_cls,
-                                   enum GNUNET_SCHEDULER_Reason reason);
-
-
 /**
  * Continue the current execution with the given function.  This is
  * similar to the other "add" functions except that there is no delay
@@ -308,10 +226,10 @@ GNUNET_SCHEDULER_add_continuation (GNUNET_SCHEDULER_TaskCallback task,
  * @param priority priority to use for the task
  */
 void
-GNUNET_SCHEDULER_add_continuation_with_priority (GNUNET_SCHEDULER_TaskCallback task,
-                                                 void *task_cls,
-                                                enum GNUNET_SCHEDULER_Reason reason,
-                                                enum GNUNET_SCHEDULER_Priority priority);
+GNUNET_SCHEDULER_add_with_reason_and_priority (GNUNET_SCHEDULER_TaskCallback task,
+                                               void *task_cls,
+                                               enum GNUNET_SCHEDULER_Reason reason,
+                                               enum GNUNET_SCHEDULER_Priority priority);
 
 
 /**