[GNUnet-SVN] r34782 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2014-12-24 02:42:57 +0100 (Wed, 24 Dec 2014)
New Revision: 34782

Modified:
   gnunet/src/util/scheduler.c
Log:
-use flag to check for readyness

Modified: gnunet/src/util/scheduler.c
===================================================================
--- gnunet/src/util/scheduler.c 2014-12-24 01:35:11 UTC (rev 34781)
+++ gnunet/src/util/scheduler.c 2014-12-24 01:42:57 UTC (rev 34782)
@@ -151,6 +151,11 @@
    */
   int lifeness;
 
+  /**
+   * Is this task in the ready list?
+   */
+  int in_ready_list;
+
 #if EXECINFO
   /**
    * Array of strings which make up a backtrace from the point when this
@@ -416,6 +421,7 @@
   GNUNET_CONTAINER_DLL_insert (ready_head[p],
                                ready_tail[p],
                                task);
+  task->in_ready_list = GNUNET_YES;
   ready_count++;
 }
 
@@ -899,8 +905,7 @@
   void *ret;
 
   GNUNET_assert (NULL != active_task);
-  if ( (GNUNET_SCHEDULER_REASON_NONE == task->reason) ||
-       (GNUNET_SCHEDULER_REASON_SHUTDOWN == task->reason) )
+  if (! task->in_ready_list)
   {
     if ( (-1 == task->read_fd) &&
          (-1 == task->write_fd) &&