[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25620 - gnunet/src/stream
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r25620 - gnunet/src/stream |
|
Date: |
Fri, 21 Dec 2012 14:12:04 +0100 |
Author: harsha
Date: 2012-12-21 14:12:03 +0100 (Fri, 21 Dec 2012)
New Revision: 25620
Modified:
gnunet/src/stream/perf_stream_api.c
gnunet/src/stream/test_stream_2peers.c
gnunet/src/stream/test_stream_2peers_halfclose.c
gnunet/src/stream/test_stream_local.conf
Log:
- no more explicit overlay linking
Modified: gnunet/src/stream/perf_stream_api.c
===================================================================
--- gnunet/src/stream/perf_stream_api.c 2012-12-21 12:21:41 UTC (rev 25619)
+++ gnunet/src/stream/perf_stream_api.c 2012-12-21 13:12:03 UTC (rev 25620)
@@ -243,7 +243,7 @@
* Payload sizes to test each major test with
*/
static uint16_t payload_size[] =
-{ 20, 500, 2000, 7000, 13000, 25000, 50000};//, 60000, 63000, 64000 };
+{ 20, 500, 2000, 7000, 13000, 25000, 30000};//, 50000, 60000, 63000, 64000 };
/**
* Current step of testing
@@ -939,14 +939,6 @@
GNUNET_assert (0);
}
break;
- case GNUNET_TESTBED_ET_CONNECT:
- GNUNET_TESTBED_operation_done (common_op);
- /* Get the peer identity and configuration of peers */
- common_op =
- GNUNET_TESTBED_peer_get_information (peer_data[0].peer,
- GNUNET_TESTBED_PIT_IDENTITY,
- &peerinfo_cb, &peer_data[0]);
- break;
default:
GNUNET_assert (0);
}
@@ -971,9 +963,11 @@
peer_data[0].peer = peers[0];
peer_data[1].peer = peers[1];
if (2 == num_peers)
- common_op = GNUNET_TESTBED_overlay_connect (NULL, NULL, NULL,
- peer_data[0].peer,
- peer_data[1].peer);
+ /* Get the peer identity and configuration of peers */
+ common_op =
+ GNUNET_TESTBED_peer_get_information (peer_data[0].peer,
+ GNUNET_TESTBED_PIT_IDENTITY,
+ &peerinfo_cb, &peer_data[0]);
else
GNUNET_break (0);
abort_task =
@@ -1021,7 +1015,6 @@
test_step = TEST_STEP_2_HOP;
num_peers = 2;
event_mask = 0;
- event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
for (payload_size_index = 0;
payload_size_index < (sizeof (payload_size) / sizeof (uint16_t));
Modified: gnunet/src/stream/test_stream_2peers.c
===================================================================
--- gnunet/src/stream/test_stream_2peers.c 2012-12-21 12:21:41 UTC (rev
25619)
+++ gnunet/src/stream/test_stream_2peers.c 2012-12-21 13:12:03 UTC (rev
25620)
@@ -101,11 +101,6 @@
enum SetupState
{
/**
- * The initial state
- */
- INIT,
-
- /**
* Get the identity of peer 1
*/
PEER1_GET_IDENTITY,
@@ -600,15 +595,6 @@
{
switch (event->type)
{
- case GNUNET_TESTBED_ET_CONNECT:
- GNUNET_assert (INIT == setup_state);
- GNUNET_TESTBED_operation_done (op);
- /* Get the peer identity and configuration of peers */
- op = GNUNET_TESTBED_peer_get_information (peer1.peer,
- GNUNET_TESTBED_PIT_IDENTITY,
- &peerinfo_cb, NULL);
- setup_state = PEER1_GET_IDENTITY;
- break;
case GNUNET_TESTBED_ET_OPERATION_FINISHED:
switch (setup_state)
{
@@ -642,8 +628,11 @@
GNUNET_assert (NULL != peers[1]);
peer1.peer = peers[0];
peer2.peer = peers[1];
- op = GNUNET_TESTBED_overlay_connect (NULL, NULL, NULL, peer2.peer,
peer1.peer);
- setup_state = INIT;
+ /* Get the peer identity and configuration of peers */
+ op = GNUNET_TESTBED_peer_get_information (peer1.peer,
+ GNUNET_TESTBED_PIT_IDENTITY,
+ &peerinfo_cb, NULL);
+ setup_state = PEER1_GET_IDENTITY;
abort_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 40), &do_abort,
@@ -660,7 +649,6 @@
result = GNUNET_NO;
event_mask = 0;
- event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
(void) GNUNET_TESTBED_test_run ("test_stream_2peers",
"test_stream_local.conf",
Modified: gnunet/src/stream/test_stream_2peers_halfclose.c
===================================================================
--- gnunet/src/stream/test_stream_2peers_halfclose.c 2012-12-21 12:21:41 UTC
(rev 25619)
+++ gnunet/src/stream/test_stream_2peers_halfclose.c 2012-12-21 13:12:03 UTC
(rev 25620)
@@ -143,11 +143,6 @@
enum SetupState
{
/**
- * The initial state
- */
- INIT,
-
- /**
* Get the identity of peer 1
*/
PEER1_GET_IDENTITY,
@@ -824,14 +819,6 @@
{
switch (event->type)
{
- case GNUNET_TESTBED_ET_CONNECT:
- GNUNET_assert (INIT == setup_state);
- GNUNET_TESTBED_operation_done (op);
- op = GNUNET_TESTBED_peer_get_information (peer1.peer,
- GNUNET_TESTBED_PIT_IDENTITY,
- &peerinfo_cb, NULL);
- setup_state = PEER1_GET_IDENTITY;
- break;
case GNUNET_TESTBED_ET_OPERATION_FINISHED:
switch (setup_state)
{
@@ -865,8 +852,10 @@
GNUNET_assert (NULL != peers[1]);
peer1.peer = peers[0];
peer2.peer = peers[1];
- op = GNUNET_TESTBED_overlay_connect (NULL, NULL, NULL, peer2.peer,
peer1.peer);
- setup_state = INIT;
+ op = GNUNET_TESTBED_peer_get_information (peer1.peer,
+ GNUNET_TESTBED_PIT_IDENTITY,
+ &peerinfo_cb, NULL);
+ setup_state = PEER1_GET_IDENTITY;
abort_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_SECONDS, 1000), &do_abort,
@@ -883,7 +872,6 @@
result = GNUNET_NO;
event_mask = 0;
- event_mask |= (1LL << GNUNET_TESTBED_ET_CONNECT);
event_mask |= (1LL << GNUNET_TESTBED_ET_OPERATION_FINISHED);
(void) GNUNET_TESTBED_test_run ("test_stream_2peers_halfclose",
"test_stream_local.conf", NUM_PEERS,
Modified: gnunet/src/stream/test_stream_local.conf
===================================================================
--- gnunet/src/stream/test_stream_local.conf 2012-12-21 12:21:41 UTC (rev
25619)
+++ gnunet/src/stream/test_stream_local.conf 2012-12-21 13:12:03 UTC (rev
25620)
@@ -62,12 +62,8 @@
[TESTING]
WEAKRANDOM = YES
-[testing_old]
-NUM_PEERS = 5
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-MAX_CONCURRENT_SSH = 10
-USE_PROGRESSBARS = YES
-PEERGROUP_TIMEOUT = 2400 s
+[testbed]
+OVERLAY_TOPOLOGY = LINE
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25620 - gnunet/src/stream,
gnunet <=