aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-02-25 14:58:33 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-02-25 14:58:33 +0000
commit2bfda1b61e4fffb4ff562bf52c26ce9a4bb095ab (patch)
tree7f3b47d5b5fc217c84b524b2461149c88f4bc061
parentc1fc36e99b0d077b660cf6e5c3d3846e30cd4320 (diff)
downloadgnunet-2bfda1b61e4fffb4ff562bf52c26ce9a4bb095ab.tar.gz
gnunet-2bfda1b61e4fffb4ff562bf52c26ce9a4bb095ab.zip
old code
-rw-r--r--src/ats/gnunet-service-ats_addresses_mlp.h80
-rw-r--r--src/ats/test_ats_mlp.c1
2 files changed, 0 insertions, 81 deletions
diff --git a/src/ats/gnunet-service-ats_addresses_mlp.h b/src/ats/gnunet-service-ats_addresses_mlp.h
index efffa7320..c4a1718cd 100644
--- a/src/ats/gnunet-service-ats_addresses_mlp.h
+++ b/src/ats/gnunet-service-ats_addresses_mlp.h
@@ -76,14 +76,6 @@ struct ATS_Peer
76#endif 76#endif
77}; 77};
78 78
79struct GAS_MLP_SolutionContext
80{
81 int lp_result;
82 int mlp_result;
83 struct GNUNET_TIME_Relative lp_duration;
84 struct GNUNET_TIME_Relative mlp_duration;
85};
86
87 79
88 80
89struct MLP_Problem 81struct MLP_Problem
@@ -255,84 +247,12 @@ struct GAS_MLP_Handle
255 */ 247 */
256 int mlp_prob_changed; 248 int mlp_prob_changed;
257 249
258
259 /** 250 /**
260 * Solve the problem automatically when updates occur? 251 * Solve the problem automatically when updates occur?
261 * Default: GNUNET_YES 252 * Default: GNUNET_YES
262 * Can be disabled for test and measurements 253 * Can be disabled for test and measurements
263 */ 254 */
264 int mlp_auto_solve; 255 int mlp_auto_solve;
265
266
267#if 0
268 /**
269 * Interval between scheduled problem solving
270 */
271 struct GNUNET_TIME_Relative exec_interval;
272
273 /**
274 * Maximum execution time per problem solving
275 */
276 struct GNUNET_TIME_Relative max_exec_duration;
277
278 /**
279 * Maximum number of LP iterations per problem solving
280 */
281 unsigned int max_iterations;
282
283
284 /**
285 * Is a solution attemp running?
286 */
287 int semaphore;
288
289 /* state information */
290
291 /**
292 * Do we need to use the LP presolver?
293 *
294 * If the problem addresses were added or removed and the last basis was we
295 * need to use the presolver.
296 * presolver_required == GNUNET_YES
297 *
298 * If values were modified, we can reuse a valid basis
299 * presolver_required == GNUNET_NO
300 */
301 int presolver_required;
302
303 /* statistics */
304
305 /**
306 * Time of last execution
307 */
308 struct GNUNET_TIME_Absolute last_execution;
309
310
311 /**
312 * How often was the LP problem solved
313 */
314 unsigned int lp_solved;
315
316 /**
317 * total duration of all lp solver executions
318 */
319 uint64_t lp_total_duration;
320
321 /**
322 * How often was the MLP problem solved
323 */
324 unsigned int mlp_solved;
325
326 /**
327 * total duration of all mlp solver executions
328 */
329 uint64_t mlp_total_duration;
330
331 /* Information about the problem */
332
333 struct ATS_Peer *peer_head;
334 struct ATS_Peer *peer_tail;
335#endif
336}; 256};
337 257
338 258
diff --git a/src/ats/test_ats_mlp.c b/src/ats/test_ats_mlp.c
index d564b0228..918edef02 100644
--- a/src/ats/test_ats_mlp.c
+++ b/src/ats/test_ats_mlp.c
@@ -237,7 +237,6 @@ check (void *cls, char *const *args, const char *cfgfile,
237 ats.value = htonl (GNUNET_ATS_NET_WAN); 237 ats.value = htonl (GNUNET_ATS_NET_WAN);
238 GAS_mlp_address_update (mlp, addresses, address[0], 1, GNUNET_NO, &ats, 1); 238 GAS_mlp_address_update (mlp, addresses, address[0], 1, GNUNET_NO, &ats, 1);
239 239
240
241 /* Retrieving preferred address for peer and wait for callback */ 240 /* Retrieving preferred address for peer and wait for callback */
242 GAS_mlp_get_preferred_address (mlp, addresses, &p[0]); 241 GAS_mlp_get_preferred_address (mlp, addresses, &p[0]);
243 242