aboutsummaryrefslogtreecommitdiff
path: root/src/stream/perf_stream_api.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/stream/perf_stream_api.c')
-rw-r--r--src/stream/perf_stream_api.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/src/stream/perf_stream_api.c b/src/stream/perf_stream_api.c
index 9150ca6e9..63244cc58 100644
--- a/src/stream/perf_stream_api.c
+++ b/src/stream/perf_stream_api.c
@@ -243,7 +243,7 @@ static uint32_t data[DATA_SIZE / 4];
243 * Payload sizes to test each major test with 243 * Payload sizes to test each major test with
244 */ 244 */
245static uint16_t payload_size[] = 245static uint16_t payload_size[] =
246{ 20, 500, 2000, 7000, 13000, 25000, 50000};//, 60000, 63000, 64000 }; 246{ 20, 500, 2000, 7000, 13000, 25000, 30000};//, 50000, 60000, 63000, 64000 };
247 247
248/** 248/**
249 * Current step of testing 249 * Current step of testing
@@ -939,14 +939,6 @@ controller_event_cb (void *cls,
939 GNUNET_assert (0); 939 GNUNET_assert (0);
940 } 940 }
941 break; 941 break;
942 case GNUNET_TESTBED_ET_CONNECT:
943 GNUNET_TESTBED_operation_done (common_op);
944 /* Get the peer identity and configuration of peers */
945 common_op =
946 GNUNET_TESTBED_peer_get_information (peer_data[0].peer,
947 GNUNET_TESTBED_PIT_IDENTITY,
948 &peerinfo_cb, &peer_data[0]);
949 break;
950 default: 942 default:
951 GNUNET_assert (0); 943 GNUNET_assert (0);
952 } 944 }
@@ -971,9 +963,11 @@ test_master (void *cls, unsigned int num_peers_,
971 peer_data[0].peer = peers[0]; 963 peer_data[0].peer = peers[0];
972 peer_data[1].peer = peers[1]; 964 peer_data[1].peer = peers[1];
973 if (2 == num_peers) 965 if (2 == num_peers)
974 common_op = GNUNET_TESTBED_overlay_connect (NULL, NULL, NULL, 966 /* Get the peer identity and configuration of peers */
975 peer_data[0].peer, 967 common_op =
976 peer_data[1].peer); 968 GNUNET_TESTBED_peer_get_information (peer_data[0].peer,
969 GNUNET_TESTBED_PIT_IDENTITY,
970 &peerinfo_cb, &peer_data[0]);
977 else 971 else
978 GNUNET_break (0); 972 GNUNET_break (0);
979 abort_task = 973 abort_task =
@@ -1021,7 +1015,6 @@ int main (int argc, char **argv)
1021 test_step = TEST_STEP_2_HOP; 1015 test_step = TEST_STEP_2_HOP;
1022 num_peers = 2; 1016 num_peers = 2;
1023 event_mask = 0; 1017 event_mask = 0;
1024 event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
1025 event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED); 1018 event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
1026 for (payload_size_index = 0; 1019 for (payload_size_index = 0;
1027 payload_size_index < (sizeof (payload_size) / sizeof (uint16_t)); 1020 payload_size_index < (sizeof (payload_size) / sizeof (uint16_t));