X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fcore%2Ftest_core_quota_compliance.c;h=d951113fc908c14dd4a99ea4e72cd4f9bb126286;hb=5b79d2a877b71d5e718328784fd69725efa1d38d;hp=65f28bb72bc67ded55db2270b5a460c46cc0e5bd;hpb=8a44c62b724481110559a62912b5881254fff851;p=oweals%2Fgnunet.git

diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c
index 65f28bb72..d951113fc 100644
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -20,9 +20,6 @@
 /**
  * @file core/test_core_quota_compliance.c
  * @brief testcase for core_api.c focusing quota compliance on core level
- *
- * FIXME:
- * - make sure connect callback is invoked properly as well!
  */
 #include "platform.h"
 #include "gnunet_common.h"
@@ -55,7 +52,7 @@
 /**
  * How long until we give up on transmitting the message?
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 180)
 
 /**
  * What delay do we request from the core service for transmission?
@@ -122,10 +119,14 @@ struct TestMessage
 static void
 terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_CORE_disconnect (p1.ch);
+  struct GNUNET_CORE_Handle *ch;
+
+  ch = p1.ch;
   p1.ch = NULL;
-  GNUNET_CORE_disconnect (p2.ch);
+  GNUNET_CORE_disconnect (ch);
+  ch = p2.ch;
   p2.ch = NULL;
+  GNUNET_CORE_disconnect (ch);
   GNUNET_TRANSPORT_disconnect (p1.th);
   p1.th = NULL;
   GNUNET_TRANSPORT_disconnect (p2.th);
@@ -136,8 +137,9 @@ terminate_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 static void
 terminate_task_error (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase timout, exit!\n");
-  GNUNET_break (0);
+  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
+	  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Testcase failed!\n");
+  //GNUNET_break (0);
 
   if (measure_task != GNUNET_SCHEDULER_NO_TASK)
 	  GNUNET_SCHEDULER_cancel(measure_task);
@@ -217,10 +219,10 @@ measurement_stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   else
 	  quota_delta = max_quota_out / 10;
 
-  if ((throughput_out < (max_quota_out/1024)) && (throughput_out < (max_quota_in/1024)))
-	  ok = 0;
-  else
+  if ((throughput_out > (max_quota_out+quota_delta)/1024) || (throughput_in > (max_quota_in+quota_delta)/1024))
 	  ok = 1;
+  else
+	  ok = 0;
 
   GNUNET_STATISTICS_get (p1.stats,
 		     "core",
@@ -313,7 +315,8 @@ transmit_ready (void *cls, size_t size, void *buf)
   GNUNET_assert (size <= GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE);
   if (buf == NULL)
     {
-      if (p1.ch != NULL)
+      if ( (p1.ch != NULL) &&
+	   (p1.connect_status == 1) )
 	GNUNET_break (NULL !=
 		      GNUNET_CORE_notify_transmit_ready (p1.ch,
 							 0,
@@ -367,6 +370,10 @@ connect_notify (void *cls,
 {
   struct PeerContext *pc = cls;
 
+  if (0 == memcmp (&pc->id,
+		   peer,
+		   sizeof (struct GNUNET_PeerIdentity)))
+    return;
   GNUNET_assert (pc->connect_status == 0);
   pc->connect_status = 1;
   if (pc == &p1)
@@ -402,6 +409,11 @@ disconnect_notify (void *cls,
                    const struct GNUNET_PeerIdentity *peer)
 {
   struct PeerContext *pc = cls;
+
+  if (0 == memcmp (&pc->id,
+		   peer,
+		   sizeof (struct GNUNET_PeerIdentity)))
+    return;
   pc->connect_status = 0;
 #if DEBUG_TRANSMISSION
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -486,14 +498,9 @@ process_mtype (void *cls,
   n++;
   if (0 == (n % 10))
     fprintf (stderr, ".");
-  if (n == TOTAL_MSGS)
-    {
-      GNUNET_SCHEDULER_cancel (err_task);
-      GNUNET_SCHEDULER_add_now (&terminate_task, NULL);
-    }
-  else
-    {
-      if (running == GNUNET_YES)
+
+
+  if (running == GNUNET_YES)
 	GNUNET_break (NULL !=
 		      GNUNET_CORE_notify_transmit_ready (p1.ch,
 							 0,
@@ -501,7 +508,6 @@ process_mtype (void *cls,
 							 &p2.id,
 							 MESSAGESIZE,
 							 &transmit_ready, &p1));
-    }
   return GNUNET_OK;
 }
 
@@ -628,8 +634,8 @@ run (void *cls,
     }
   else if (test == ASYMMETRIC_SEND_LIMITED)
     {
-      setup_peer (&p1, "test_core_quota_asymmetric_send_limited_peer1.conf");
-      setup_peer (&p2, "test_core_quota_asymmetric_send_limited_peer2.conf");
+      setup_peer (&p1, "test_core_quota_asymmetric_send_limit_peer1.conf");
+      setup_peer (&p2, "test_core_quota_asymmetric_send_limit_peer2.conf");
     }
   else if (test == ASYMMETRIC_RECV_LIMITED)
     {
@@ -725,6 +731,22 @@ main (int argc, char *argv[])
 	  test = ASYMMETRIC_RECV_LIMITED;
     }
   GNUNET_assert (test != -1);
+  if (test == SYMMETRIC)
+    {
+	  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-1/");
+	  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-sym-peer-2/");
+    }
+  else if (test == ASYMMETRIC_SEND_LIMITED)
+    {
+	  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-1/");
+	  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-2/");
+    }
+  else if (test == ASYMMETRIC_RECV_LIMITED)
+    {
+	  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/");
+	  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/");
+    }
+
   GNUNET_log_setup ("test-core-quota-compliance",
 #if VERBOSE
                     "DEBUG",
@@ -740,8 +762,8 @@ main (int argc, char *argv[])
     }
   else if (test == ASYMMETRIC_SEND_LIMITED)
     {
-	  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-sender-lim-peer-1/");
-	  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-sender-lim-peer-2/");
+	  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-1/");
+	  GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-quota-asym-send-lim-peer-2/");
     }
   else if (test == ASYMMETRIC_RECV_LIMITED)
     {