diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-11-04 14:00:32 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-11-04 14:00:32 +0000 |
commit | 83b19539f4d322b43683f5838b72e9ec2c8e6073 (patch) | |
tree | d0ab9329fcbefe360d9d14e2ace21a6b3396dfe9 /src/ats/test_ats_api_scheduling.c | |
parent | 28a2eb43281a1f08a67954f07beb9af3a9bc9a35 (diff) | |
download | gnunet-83b19539f4d322b43683f5838b72e9ec2c8e6073.tar.gz gnunet-83b19539f4d322b43683f5838b72e9ec2c8e6073.zip |
curly wars / auto-indentation
Diffstat (limited to 'src/ats/test_ats_api_scheduling.c')
-rw-r--r-- | src/ats/test_ats_api_scheduling.c | 105 |
1 files changed, 53 insertions, 52 deletions
diff --git a/src/ats/test_ats_api_scheduling.c b/src/ats/test_ats_api_scheduling.c index 201855283..a2ee7f060 100644 --- a/src/ats/test_ats_api_scheduling.c +++ b/src/ats/test_ats_api_scheduling.c | |||
@@ -44,7 +44,7 @@ static GNUNET_SCHEDULER_TaskIdentifier die_task; | |||
44 | 44 | ||
45 | static struct GNUNET_ATS_SchedulingHandle *ats; | 45 | static struct GNUNET_ATS_SchedulingHandle *ats; |
46 | 46 | ||
47 | struct GNUNET_OS_Process * arm_proc; | 47 | struct GNUNET_OS_Process *arm_proc; |
48 | 48 | ||
49 | 49 | ||
50 | 50 | ||
@@ -52,23 +52,23 @@ static int ret; | |||
52 | 52 | ||
53 | struct Address | 53 | struct Address |
54 | { | 54 | { |
55 | char * plugin; | 55 | char *plugin; |
56 | size_t plugin_len; | 56 | size_t plugin_len; |
57 | 57 | ||
58 | void * addr; | 58 | void *addr; |
59 | size_t addr_len; | 59 | size_t addr_len; |
60 | 60 | ||
61 | struct GNUNET_ATS_Information * ats; | 61 | struct GNUNET_ATS_Information *ats; |
62 | int ats_count; | 62 | int ats_count; |
63 | 63 | ||
64 | void *session; | 64 | void *session; |
65 | }; | 65 | }; |
66 | 66 | ||
67 | struct PeerContext | 67 | struct PeerContext |
68 | { | 68 | { |
69 | struct GNUNET_PeerIdentity id; | 69 | struct GNUNET_PeerIdentity id; |
70 | 70 | ||
71 | struct Address * addr; | 71 | struct Address *addr; |
72 | }; | 72 | }; |
73 | 73 | ||
74 | struct Address addr[2]; | 74 | struct Address addr[2]; |
@@ -105,7 +105,7 @@ end () | |||
105 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n"); | 105 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Shutting down\n"); |
106 | if (die_task != GNUNET_SCHEDULER_NO_TASK) | 106 | if (die_task != GNUNET_SCHEDULER_NO_TASK) |
107 | { | 107 | { |
108 | GNUNET_SCHEDULER_cancel(die_task); | 108 | GNUNET_SCHEDULER_cancel (die_task); |
109 | die_task = GNUNET_SCHEDULER_NO_TASK; | 109 | die_task = GNUNET_SCHEDULER_NO_TASK; |
110 | } | 110 | } |
111 | 111 | ||
@@ -118,29 +118,19 @@ end () | |||
118 | 118 | ||
119 | 119 | ||
120 | static void | 120 | static void |
121 | address_suggest_cb (void *cls, | 121 | address_suggest_cb (void *cls, const struct GNUNET_PeerIdentity *peer, |
122 | const struct | 122 | const char *plugin_name, const void *plugin_addr, |
123 | GNUNET_PeerIdentity * | 123 | size_t plugin_addr_len, struct Session *session, |
124 | peer, | 124 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, |
125 | const char *plugin_name, | 125 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, |
126 | const void *plugin_addr, | 126 | const struct GNUNET_ATS_Information *ats, |
127 | size_t plugin_addr_len, | ||
128 | struct Session * session, | ||
129 | struct | ||
130 | GNUNET_BANDWIDTH_Value32NBO | ||
131 | bandwidth_out, | ||
132 | struct | ||
133 | GNUNET_BANDWIDTH_Value32NBO | ||
134 | bandwidth_in, | ||
135 | const struct | ||
136 | GNUNET_ATS_Information | ||
137 | * ats, | ||
138 | uint32_t ats_count) | 127 | uint32_t ats_count) |
139 | |||
140 | { | 128 | { |
141 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS suggests address `%s'\n", GNUNET_i2s (peer)); | 129 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS suggests address `%s'\n", |
130 | GNUNET_i2s (peer)); | ||
142 | 131 | ||
143 | GNUNET_assert (0 == memcmp (peer, &p[0].id, sizeof (struct GNUNET_PeerIdentity))); | 132 | GNUNET_assert (0 == |
133 | memcmp (peer, &p[0].id, sizeof (struct GNUNET_PeerIdentity))); | ||
144 | GNUNET_assert (0 == strcmp (plugin_name, addr[0].plugin)); | 134 | GNUNET_assert (0 == strcmp (plugin_name, addr[0].plugin)); |
145 | GNUNET_assert (plugin_addr_len == addr[0].addr_len); | 135 | GNUNET_assert (plugin_addr_len == addr[0].addr_len); |
146 | GNUNET_assert (0 == memcmp (plugin_addr, addr[0].plugin, plugin_addr_len)); | 136 | GNUNET_assert (0 == memcmp (plugin_addr, addr[0].plugin, plugin_addr_len)); |
@@ -148,27 +138,28 @@ address_suggest_cb (void *cls, | |||
148 | 138 | ||
149 | 139 | ||
150 | /* TODO ats merge | 140 | /* TODO ats merge |
151 | GNUNET_assert (ats_count == 2); | 141 | * GNUNET_assert (ats_count == 2); |
152 | GNUNET_assert (atsi[0].type == htons (1)); | 142 | * GNUNET_assert (atsi[0].type == htons (1)); |
153 | GNUNET_assert (atsi[0].type == htons (2)); | 143 | * GNUNET_assert (atsi[0].type == htons (2)); |
154 | GNUNET_assert (atsi[1].type == htons (2)); | 144 | * GNUNET_assert (atsi[1].type == htons (2)); |
155 | GNUNET_assert (atsi[1].type == htons (2)); | 145 | * GNUNET_assert (atsi[1].type == htons (2)); |
156 | */ | 146 | */ |
157 | 147 | ||
158 | ret = 0; | 148 | ret = 0; |
159 | 149 | ||
160 | GNUNET_SCHEDULER_add_now(&end, NULL); | 150 | GNUNET_SCHEDULER_add_now (&end, NULL); |
161 | } | 151 | } |
162 | 152 | ||
163 | void | 153 | void |
164 | start_arm (const char *cfgname) | 154 | start_arm (const char *cfgname) |
165 | { | 155 | { |
166 | arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", | 156 | arm_proc = |
167 | "gnunet-service-arm", | 157 | GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm", |
158 | "gnunet-service-arm", | ||
168 | #if VERBOSE_ARM | 159 | #if VERBOSE_ARM |
169 | "-L", "DEBUG", | 160 | "-L", "DEBUG", |
170 | #endif | 161 | #endif |
171 | "-c", cfgname, NULL); | 162 | "-c", cfgname, NULL); |
172 | } | 163 | } |
173 | 164 | ||
174 | static void | 165 | static void |
@@ -177,7 +168,7 @@ check (void *cls, char *const *args, const char *cfgfile, | |||
177 | { | 168 | { |
178 | ret = GNUNET_SYSERR; | 169 | ret = GNUNET_SYSERR; |
179 | 170 | ||
180 | die_task = GNUNET_SCHEDULER_add_delayed(TIMEOUT, &end_badly, NULL); | 171 | die_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_badly, NULL); |
181 | start_arm (cfgfile); | 172 | start_arm (cfgfile); |
182 | 173 | ||
183 | ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL); | 174 | ats = GNUNET_ATS_scheduling_init (cfg, &address_suggest_cb, NULL); |
@@ -190,27 +181,33 @@ check (void *cls, char *const *args, const char *cfgfile, | |||
190 | } | 181 | } |
191 | 182 | ||
192 | /* set up peer */ | 183 | /* set up peer */ |
193 | GNUNET_CRYPTO_hash_create_random(GNUNET_CRYPTO_QUALITY_WEAK, &p[0].id.hashPubKey); | 184 | GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, |
194 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n", GNUNET_i2s (&p[0].id)); | 185 | &p[0].id.hashPubKey); |
186 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n", | ||
187 | GNUNET_i2s (&p[0].id)); | ||
195 | 188 | ||
196 | GNUNET_CRYPTO_hash_create_random(GNUNET_CRYPTO_QUALITY_WEAK, &p[1].id.hashPubKey); | 189 | GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, |
197 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n", GNUNET_i2s (&p[1].id)); | 190 | &p[1].id.hashPubKey); |
191 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Created peer `%s'\n", | ||
192 | GNUNET_i2s (&p[1].id)); | ||
198 | 193 | ||
199 | addr[0].plugin = "test"; | 194 | addr[0].plugin = "test"; |
200 | addr[0].session = NULL; | 195 | addr[0].session = NULL; |
201 | addr[0].addr = strdup("test"); | 196 | addr[0].addr = strdup ("test"); |
202 | addr[0].addr_len = 4; | 197 | addr[0].addr_len = 4; |
203 | 198 | ||
204 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing address creation\n"); | 199 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing address creation\n"); |
205 | 200 | ||
206 | GNUNET_ATS_address_update(ats, &p[0].id, addr[0].plugin, addr[0].addr, addr[0].addr_len, addr[0].session, NULL, 0); | 201 | GNUNET_ATS_address_update (ats, &p[0].id, addr[0].plugin, addr[0].addr, |
202 | addr[0].addr_len, addr[0].session, NULL, 0); | ||
207 | 203 | ||
208 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing ATS info creation\n"); | 204 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing ATS info creation\n"); |
209 | 205 | ||
210 | atsi[0].type = htonl (GNUNET_ATS_UTILIZATION_UP); | 206 | atsi[0].type = htonl (GNUNET_ATS_UTILIZATION_UP); |
211 | atsi[0].value = htonl (1024); | 207 | atsi[0].value = htonl (1024); |
212 | 208 | ||
213 | GNUNET_ATS_address_update(ats, &p[0].id, addr[0].plugin, addr[0].addr, addr[0].addr_len, addr[0].session, atsi, 1); | 209 | GNUNET_ATS_address_update (ats, &p[0].id, addr[0].plugin, addr[0].addr, |
210 | addr[0].addr_len, addr[0].session, atsi, 1); | ||
214 | 211 | ||
215 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing ATS info update\n"); | 212 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing ATS info update\n"); |
216 | 213 | ||
@@ -220,14 +217,18 @@ check (void *cls, char *const *args, const char *cfgfile, | |||
220 | atsi[1].type = htonl (GNUNET_ATS_UTILIZATION_DOWN); | 217 | atsi[1].type = htonl (GNUNET_ATS_UTILIZATION_DOWN); |
221 | atsi[1].value = htonl (1024); | 218 | atsi[1].value = htonl (1024); |
222 | 219 | ||
223 | GNUNET_ATS_address_update(ats, &p[0].id, addr[0].plugin, addr[0].addr, addr[0].addr_len, addr[0].session, atsi, 2); | 220 | GNUNET_ATS_address_update (ats, &p[0].id, addr[0].plugin, addr[0].addr, |
221 | addr[0].addr_len, addr[0].session, atsi, 2); | ||
224 | 222 | ||
225 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing manual address deletion \n"); | 223 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Testing manual address deletion \n"); |
226 | GNUNET_ATS_address_update(ats, &p[1].id, addr[0].plugin, addr[0].addr, addr[0].addr_len, addr[0].session, NULL, 0); | 224 | GNUNET_ATS_address_update (ats, &p[1].id, addr[0].plugin, addr[0].addr, |
227 | GNUNET_ATS_address_destroyed (ats, &p[1].id, addr[0].plugin, addr[0].addr, addr[0].addr_len, addr[0].session ); | 225 | addr[0].addr_len, addr[0].session, NULL, 0); |
228 | 226 | GNUNET_ATS_address_destroyed (ats, &p[1].id, addr[0].plugin, addr[0].addr, | |
229 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting peer `%s'\n", GNUNET_i2s (&p[0].id)); | 227 | addr[0].addr_len, addr[0].session); |
230 | GNUNET_ATS_suggest_address(ats, &p[0].id); | 228 | |
229 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Requesting peer `%s'\n", | ||
230 | GNUNET_i2s (&p[0].id)); | ||
231 | GNUNET_ATS_suggest_address (ats, &p[0].id); | ||
231 | } | 232 | } |
232 | 233 | ||
233 | int | 234 | int |