[GNUnet-SVN] r13414 - gnunet/src/testing

[gnunet]

Author: wachs
Date: 2010-10-27 11:22:31 +0200 (Wed, 27 Oct 2010)
New Revision: 13414

Modified:
   gnunet/src/testing/test_testing_topology.c
   gnunet/src/testing/testing.c
Log:
Refactoring GNUNET_time structs


Modified: gnunet/src/testing/test_testing_topology.c
===================================================================
--- gnunet/src/testing/test_testing_topology.c  2010-10-27 09:21:14 UTC (rev 
13413)
+++ gnunet/src/testing/test_testing_topology.c  2010-10-27 09:22:31 UTC (rev 
13414)
@@ -539,7 +539,7 @@
 {
   struct TestMessageContext *pos = cls;
 
-  if ((pos == test_messages) && (settle_time.value > 0))
+  if ((pos == test_messages) && (settle_time.rel_value > 0))
     {
       topology_connections = 0;
       GNUNET_TESTING_get_topology (pg, &topology_cb, NULL);
@@ -670,7 +670,7 @@
                                     &send_test_messages, test_messages);
       gather_log_data();
 #else
-      if (settle_time.value > 0)
+      if (settle_time.rel_value > 0)
         {
           GNUNET_TESTING_get_topology (pg, &topology_cb, NULL);
         }

Modified: gnunet/src/testing/testing.c
===================================================================
--- gnunet/src/testing/testing.c        2010-10-27 09:21:14 UTC (rev 13413)
+++ gnunet/src/testing/testing.c        2010-10-27 09:22:31 UTC (rev 13414)
@@ -207,7 +207,7 @@
       /* confirm copying complete */
       if (GNUNET_OK != GNUNET_OS_process_status (d->pid, &type, &code))
         {
-          if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0)
+          if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 
0)
             {
               cb = d->cb;
               d->cb = NULL;
@@ -410,7 +410,7 @@
       /* Fall through */
     case SP_HOSTKEY_CREATED:
       /* wait for topology finished */
-      if ((GNUNET_YES == d->dead) || 
(GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0))
+      if ((GNUNET_YES == d->dead) || 
(GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 0))
         {
           cb = d->cb;
           d->cb = NULL;
@@ -522,7 +522,7 @@
     case SP_START_ARMING:
       if (GNUNET_OK != GNUNET_OS_process_status (d->pid, &type, &code))
         {
-          if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0)
+          if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 
0)
             {
               cb = d->cb;
               d->cb = NULL;
@@ -567,7 +567,7 @@
       /* confirm copying complete */
       if (GNUNET_OK != GNUNET_OS_process_status (d->pid, &type, &code))
         {
-          if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0)
+          if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 
0)
             {
               if (NULL != d->dead_cb)
                 d->dead_cb (d->dead_cb_cls,
@@ -647,7 +647,7 @@
       /* confirm copying complete */
       if (GNUNET_OK != GNUNET_OS_process_status (d->pid, &type, &code))
         {
-          if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).value == 0) 
/* FIXME: config update should take timeout parameter! */
+          if (GNUNET_TIME_absolute_get_remaining(d->max_timeout).rel_value == 
0) /* FIXME: config update should take timeout parameter! */
             {
               cb = d->cb;
               d->cb = NULL;
@@ -1366,7 +1366,7 @@
                    ctx->d2->cfg, ctx->d1, ctx->d2, NULL);
         }
     }
-  else if (remaining.value > 0)
+  else if (remaining.rel_value > 0)
     {
       if (ctx->d1core != NULL)
         {