[GNUnet-SVN] r21038 - in gnunet/src: fs include

[gnunet]

Author: grothoff
Date: 2012-04-19 17:23:44 +0200 (Thu, 19 Apr 2012)
New Revision: 21038

Modified:
   gnunet/src/fs/perf_gnunet_service_fs_p2p.c
   gnunet/src/fs/test_gnunet_service_fs_migration.c
   gnunet/src/fs/test_gnunet_service_fs_p2p.c
   gnunet/src/include/gnunet_server_lib.h
Log:
-do not test for prereq done, almost always set now

Modified: gnunet/src/fs/perf_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/perf_gnunet_service_fs_p2p.c  2012-04-19 15:22:23 UTC (rev 
21037)
+++ gnunet/src/fs/perf_gnunet_service_fs_p2p.c  2012-04-19 15:23:44 UTC (rev 
21038)
@@ -191,7 +191,7 @@
   char *fancy;
   struct StatMaster *sm;
 
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
   {
     del = GNUNET_TIME_absolute_get_duration (start_time);
     if (del.rel_value == 0)

Modified: gnunet/src/fs/test_gnunet_service_fs_migration.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_migration.c    2012-04-19 15:22:23 UTC 
(rev 21037)
+++ gnunet/src/fs/test_gnunet_service_fs_migration.c    2012-04-19 15:23:44 UTC 
(rev 21038)
@@ -66,7 +66,7 @@
     cc = NULL;
   }
   GNUNET_FS_TEST_daemons_stop (2, daemons);
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
   {
     del = GNUNET_TIME_absolute_get_duration (start_time);
     if (del.rel_value == 0)
@@ -146,7 +146,7 @@
 do_publish (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   cc = NULL;
-  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
   {
     GNUNET_FS_TEST_daemons_stop (2, daemons);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

Modified: gnunet/src/fs/test_gnunet_service_fs_p2p.c
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_p2p.c  2012-04-19 15:22:23 UTC (rev 
21037)
+++ gnunet/src/fs/test_gnunet_service_fs_p2p.c  2012-04-19 15:23:44 UTC (rev 
21038)
@@ -62,7 +62,7 @@
     cc = NULL;
   }
   GNUNET_FS_TEST_daemons_stop (NUM_DAEMONS, daemons);
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE))
+  if (0 == (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT))
   {
     del = GNUNET_TIME_absolute_get_duration (start_time);
     if (del.rel_value == 0)

Modified: gnunet/src/include/gnunet_server_lib.h
===================================================================
--- gnunet/src/include/gnunet_server_lib.h      2012-04-19 15:22:23 UTC (rev 
21037)
+++ gnunet/src/include/gnunet_server_lib.h      2012-04-19 15:23:44 UTC (rev 
21038)
@@ -223,6 +223,7 @@
 void
 GNUNET_SERVER_client_persist_ (struct GNUNET_SERVER_Client *client);
 
+
 /**
  * Resume receiving from this client, we are done processing the
  * current request.  This function must be called from within each