diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-05-16 12:32:44 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-05-16 12:32:44 +0000 |
commit | 369811cfb47a51f240c7c4872e29c6eccd21fb0c (patch) | |
tree | 5db0ebec52759d4007f73ea5f1e5b4b0bd842afb /src/ats/gnunet-ats-solver-eval.h | |
parent | a523a1d723acb1544bf2066dbe63fe5e2a07f71b (diff) | |
download | gnunet-369811cfb47a51f240c7c4872e29c6eccd21fb0c.tar.gz gnunet-369811cfb47a51f240c7c4872e29c6eccd21fb0c.zip |
setting feedback with preference generator
Diffstat (limited to 'src/ats/gnunet-ats-solver-eval.h')
-rw-r--r-- | src/ats/gnunet-ats-solver-eval.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/src/ats/gnunet-ats-solver-eval.h b/src/ats/gnunet-ats-solver-eval.h index 35f8fe7b3..27b9e4f9d 100644 --- a/src/ats/gnunet-ats-solver-eval.h +++ b/src/ats/gnunet-ats-solver-eval.h | |||
@@ -158,6 +158,9 @@ struct TestPeer | |||
158 | double pref_abs[GNUNET_ATS_PreferenceCount]; | 158 | double pref_abs[GNUNET_ATS_PreferenceCount]; |
159 | double pref_norm[GNUNET_ATS_PreferenceCount]; | 159 | double pref_norm[GNUNET_ATS_PreferenceCount]; |
160 | 160 | ||
161 | struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_in; | ||
162 | struct GNUNET_BANDWIDTH_Value32NBO assigned_bw_out; | ||
163 | |||
161 | struct TestAddress *addr_head; | 164 | struct TestAddress *addr_head; |
162 | struct TestAddress *addr_tail; | 165 | struct TestAddress *addr_tail; |
163 | }; | 166 | }; |
@@ -208,6 +211,7 @@ struct GNUNET_ATS_TEST_Operation | |||
208 | long long unsigned int max_rate; | 211 | long long unsigned int max_rate; |
209 | struct GNUNET_TIME_Relative period; | 212 | struct GNUNET_TIME_Relative period; |
210 | struct GNUNET_TIME_Relative frequency; | 213 | struct GNUNET_TIME_Relative frequency; |
214 | struct GNUNET_TIME_Relative feedback_delay; | ||
211 | 215 | ||
212 | enum OperationType type; | 216 | enum OperationType type; |
213 | enum GeneratorType gen_type; | 217 | enum GeneratorType gen_type; |
@@ -276,10 +280,30 @@ struct PreferenceGenerator | |||
276 | long int max_value; | 280 | long int max_value; |
277 | struct GNUNET_TIME_Relative duration_period; | 281 | struct GNUNET_TIME_Relative duration_period; |
278 | struct GNUNET_TIME_Relative frequency; | 282 | struct GNUNET_TIME_Relative frequency; |
283 | struct GNUNET_TIME_Relative feedback_frequency; | ||
279 | 284 | ||
280 | GNUNET_SCHEDULER_TaskIdentifier set_task; | 285 | GNUNET_SCHEDULER_TaskIdentifier set_task; |
286 | GNUNET_SCHEDULER_TaskIdentifier feedback_task; | ||
281 | struct GNUNET_TIME_Absolute next_ping_transmission; | 287 | struct GNUNET_TIME_Absolute next_ping_transmission; |
282 | struct GNUNET_TIME_Absolute time_start; | 288 | struct GNUNET_TIME_Absolute time_start; |
289 | |||
290 | |||
291 | /* Feedback */ | ||
292 | uint32_t feedback_bw_out_acc; | ||
293 | uint32_t feedback_bw_in_acc; | ||
294 | uint32_t feedback_delay_acc; | ||
295 | |||
296 | double pref_bw_old; | ||
297 | double pref_latency_old; | ||
298 | |||
299 | struct GNUNET_TIME_Absolute feedback_last; | ||
300 | |||
301 | struct GNUNET_TIME_Absolute feedback_last_bw_update; | ||
302 | struct GNUNET_TIME_Absolute feedback_last_delay_update; | ||
303 | uint32_t last_assigned_bw_in; | ||
304 | uint32_t last_assigned_bw_out; | ||
305 | double last_delay_value; | ||
306 | |||
283 | }; | 307 | }; |
284 | 308 | ||
285 | 309 | ||