diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-07-26 18:22:54 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-07-26 18:22:54 +0000 |
commit | 81eae49a1b5dfeadb9aac5974ec87cd01aed9ffd (patch) | |
tree | 35b65462b9209af4bd610552bb485ad22487400e /src/nse | |
parent | bf4a9d8364675b34ac18d505e508006e2b773670 (diff) | |
download | gnunet-81eae49a1b5dfeadb9aac5974ec87cd01aed9ffd.tar.gz gnunet-81eae49a1b5dfeadb9aac5974ec87cd01aed9ffd.zip |
start service
Diffstat (limited to 'src/nse')
-rw-r--r-- | src/nse/nse-profiler.c | 16 | ||||
-rw-r--r-- | src/nse/nse_profiler_test.conf | 40 | ||||
-rw-r--r-- | src/nse/test_nse.conf | 2 |
3 files changed, 46 insertions, 12 deletions
diff --git a/src/nse/nse-profiler.c b/src/nse/nse-profiler.c index f019165d1..3b7371ccc 100644 --- a/src/nse/nse-profiler.c +++ b/src/nse/nse-profiler.c | |||
@@ -507,6 +507,13 @@ churn_peers (void *cls, | |||
507 | 507 | ||
508 | 508 | ||
509 | static void | 509 | static void |
510 | nse_started_cb(void *cls, const char *emsg) | ||
511 | { | ||
512 | GNUNET_SCHEDULER_add_now(&connect_nse_service, NULL); | ||
513 | disconnect_task = GNUNET_SCHEDULER_add_delayed(wait_time, &disconnect_nse_peers, NULL); | ||
514 | } | ||
515 | |||
516 | static void | ||
510 | my_cb (void *cls, | 517 | my_cb (void *cls, |
511 | const char *emsg) | 518 | const char *emsg) |
512 | { | 519 | { |
@@ -538,10 +545,13 @@ my_cb (void *cls, | |||
538 | GNUNET_free (buf); | 545 | GNUNET_free (buf); |
539 | } | 546 | } |
540 | peers_running = GNUNET_TESTING_daemons_running(pg); | 547 | peers_running = GNUNET_TESTING_daemons_running(pg); |
541 | GNUNET_SCHEDULER_add_now(&connect_nse_service, NULL); | 548 | GNUNET_TESTING_daemons_start_service (pg, |
542 | disconnect_task = GNUNET_SCHEDULER_add_delayed(wait_time, &disconnect_nse_peers, NULL); | 549 | "nse", |
543 | } | 550 | wait_time, |
551 | &nse_started_cb, | ||
552 | NULL); | ||
544 | 553 | ||
554 | } | ||
545 | 555 | ||
546 | /** | 556 | /** |
547 | * Function that will be called whenever two daemons are connected by | 557 | * Function that will be called whenever two daemons are connected by |
diff --git a/src/nse/nse_profiler_test.conf b/src/nse/nse_profiler_test.conf index 7da26b232..ad113b24f 100644 --- a/src/nse/nse_profiler_test.conf +++ b/src/nse/nse_profiler_test.conf | |||
@@ -11,6 +11,12 @@ BINARY = gnunet-service-nse | |||
11 | AUTOSTART = YES | 11 | AUTOSTART = YES |
12 | DEBUG = NO | 12 | DEBUG = NO |
13 | CONFIG = $DEFAULTCONFIG | 13 | CONFIG = $DEFAULTCONFIG |
14 | # Overriding network settings for faster testing (do NOT use | ||
15 | # these values in production just because they are here) | ||
16 | WORKDELAY = 10000 | ||
17 | INTERVAL = 15000 | ||
18 | WORKBITS = 0 | ||
19 | PROOFFILE = $SERVICEHOME/nse.proof | ||
14 | 20 | ||
15 | [arm] | 21 | [arm] |
16 | PORT = 0 | 22 | PORT = 0 |
@@ -19,7 +25,7 @@ UNIXPATH = /tmp/test-nse-service-arm.unix | |||
19 | #DEBUG = YES | 25 | #DEBUG = YES |
20 | 26 | ||
21 | [statistics] | 27 | [statistics] |
22 | AUTOSTART = NO | 28 | AUTOSTART = YES |
23 | 29 | ||
24 | [fs] | 30 | [fs] |
25 | AUTOSTART = NO | 31 | AUTOSTART = NO |
@@ -34,6 +40,15 @@ AUTOSTART = NO | |||
34 | PORT = 0 | 40 | PORT = 0 |
35 | AUTOSTART = YES | 41 | AUTOSTART = YES |
36 | 42 | ||
43 | [nat] | ||
44 | DISABLEV6 = YES | ||
45 | BINDTO = 127.0.0.1 | ||
46 | ENABLE_UPNP = NO | ||
47 | BEHIND_NAT = NO | ||
48 | ALLOW_NAT = NO | ||
49 | INTERNAL_ADDRESS = 127.0.0.1 | ||
50 | EXTERNAL_ADDRESS = 127.0.0.1 | ||
51 | |||
37 | [transport-unix] | 52 | [transport-unix] |
38 | PORT = 11111 | 53 | PORT = 11111 |
39 | 54 | ||
@@ -55,11 +70,15 @@ PORT = 0 | |||
55 | plugins = unix | 70 | plugins = unix |
56 | 71 | ||
57 | [testing] | 72 | [testing] |
58 | NUM_PEERS = 1000 | 73 | NUM_PEERS = 100 |
59 | WEAKRANDOM = YES | 74 | WEAKRANDOM = YES |
60 | TOPOLOGY = NONE | 75 | TOPOLOGY = NONE |
61 | CONNECT_TOPOLOGY = SMALL_WORLD_RING | 76 | CONNECT_TOPOLOGY = SMALL_WORLD_RING |
62 | PERCENTAGE = 4 | 77 | #CONNECT_TOPOLOGY = ERDOS_RENYI |
78 | #CONNECT_TOPOLOGY_OPTION = CONNECT_MINIMUM | ||
79 | #CONNECT_TOPOLOGY_OPTION_MODIFIER = 20 | ||
80 | PERCENTAGE = 3 | ||
81 | #PROBABILITY = .1 | ||
63 | F2F = NO | 82 | F2F = NO |
64 | CONNECT_TIMEOUT = 60 | 83 | CONNECT_TIMEOUT = 60 |
65 | CONNECT_ATTEMPTS = 3 | 84 | CONNECT_ATTEMPTS = 3 |
@@ -74,12 +93,17 @@ MAX_OUTSTANDING_CONNECTIONS = 200 | |||
74 | #NUM_PEERINFO_PER_HOST = 10 | 93 | #NUM_PEERINFO_PER_HOST = 10 |
75 | #SINGLE_STATISTICS_PER_HOST = YES | 94 | #SINGLE_STATISTICS_PER_HOST = YES |
76 | #NUM_STATISTICS_PER_HOST = 10 | 95 | #NUM_STATISTICS_PER_HOST = 10 |
96 | DELETE_FILES = NO | ||
77 | 97 | ||
78 | [nse-profiler] | 98 | [nse-profiler] |
79 | #OUTPUT_FILE = nse_output_1000_peers.dat | 99 | #OUTPUT_FILE = nse_output_100_peers.dat |
80 | #TOPOLOGY_OUTPUT_FILE = nse_topo_1000_peers | 100 | TOPOLOGY_OUTPUT_FILE = nse_topo_100_peers |
81 | #ROUND0 = 75 | 101 | DATA_OUTPUT_FILE = nse_topo_100_peers_stats |
82 | #ROUND1 = 750 | 102 | #ROUND0 = 90 |
103 | #ROUND1 = 100 | ||
104 | #ROUND2 = 50 | ||
105 | #ROUND3 = 100 | ||
83 | #ROUND2 = 500 | 106 | #ROUND2 = 500 |
84 | #ROUND3 = 1000 | 107 | #ROUND3 = 1000 |
85 | WAIT_TIME = 7200 | 108 | WAIT_TIME = 120 |
109 | CONNECTION_LIMIT = 10 | ||
diff --git a/src/nse/test_nse.conf b/src/nse/test_nse.conf index 475f87eaf..ab64dffe2 100644 --- a/src/nse/test_nse.conf +++ b/src/nse/test_nse.conf | |||
@@ -11,7 +11,7 @@ BINARY = gnunet-service-nse | |||
11 | AUTOSTART = YES | 11 | AUTOSTART = YES |
12 | DEBUG = YES | 12 | DEBUG = YES |
13 | CONFIG = $DEFAULTCONFIG | 13 | CONFIG = $DEFAULTCONFIG |
14 | 14 | PROOFFILE = $SERVICEHOME/proof.nse | |
15 | # Overriding network settings for faster testing (do NOT use | 15 | # Overriding network settings for faster testing (do NOT use |
16 | # these values in production just because they are here) | 16 | # these values in production just because they are here) |
17 | WORKDELAY = 1 | 17 | WORKDELAY = 1 |