[GNUnet-SVN] r29363 - gnunet/src/ats-tests

[gnunet]

Author: wachs
Date: 2013-09-18 10:12:00 +0200 (Wed, 18 Sep 2013)
New Revision: 29363

Modified:
   gnunet/src/ats-tests/perf_ats.c
Log:
initialize partners during creation


Modified: gnunet/src/ats-tests/perf_ats.c
===================================================================
--- gnunet/src/ats-tests/perf_ats.c     2013-09-18 07:56:43 UTC (rev 29362)
+++ gnunet/src/ats-tests/perf_ats.c     2013-09-18 08:12:00 UTC (rev 29363)
@@ -504,22 +504,10 @@
       &do_shutdown, NULL );
 
   /* Start sending test messages */
-  for (c_s = 0; c_s < num_slaves; c_s++)
-  {
-    for (c_m = 0; c_m < num_masters; c_m++)
-    {
-
-      sps[c_s].partners[c_m].me = &sps[c_s];
-      sps[c_s].partners[c_m].dest = &mps[c_m];
-    }
-  }
-
   for (c_m = 0; c_m < num_masters; c_m++)
   {
     for (c_s = 0; c_s < num_slaves; c_s++)
     {
-      mps[c_m].partners[c_s].me = &mps[c_m];
-      mps[c_m].partners[c_s].dest = &sps[c_s];
       mps[c_m].partners[c_s].cth = GNUNET_CORE_notify_transmit_ready 
(mps[c_m].ch,
           GNUNET_NO, 0, GNUNET_TIME_UNIT_MINUTES, &sps[c_s].id,
           TEST_MESSAGE_SIZE, &core_send_ready, &mps[c_m].partners[c_s]);
@@ -1048,6 +1036,12 @@
     mps[c_m].no = c_m;
     mps[c_m].master = GNUNET_YES;
     mps[c_m].partners = GNUNET_malloc (num_slaves * sizeof (struct 
BenchmarkPeer));
+    /* Initialize partners */
+    for (c_s = 0; c_s < num_slaves; c_s++)
+    {
+      mps[c_m].partners[c_s].me = &mps[c_m];
+      mps[c_m].partners[c_s].dest = &sps[c_s];
+    }
     mps[c_m].peer_id_op = GNUNET_TESTBED_peer_get_information (
             mps[c_m].peer, GNUNET_TESTBED_PIT_IDENTITY,
             &peerinformation_cb,
@@ -1062,6 +1056,12 @@
     sps[c_s].no = c_s + num_masters;
     sps[c_s].master = GNUNET_NO;
     sps[c_s].partners = GNUNET_malloc (num_masters * sizeof (struct 
BenchmarkPeer));
+    /* Initialize partners */
+    for (c_m = 0; c_m < num_masters; c_m++)
+    {
+      sps[c_s].partners[c_m].me = &sps[c_s];
+      sps[c_s].partners[c_m].dest = &mps[c_m];
+    }
     sps[c_s].peer_id_op = GNUNET_TESTBED_peer_get_information (
             sps[c_s].peer, GNUNET_TESTBED_PIT_IDENTITY,
             &peerinformation_cb,