aboutsummaryrefslogtreecommitdiff
path: root/src/ats/gnunet-ats-solver-eval.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ats/gnunet-ats-solver-eval.c')
-rw-r--r--src/ats/gnunet-ats-solver-eval.c40
1 files changed, 24 insertions, 16 deletions
diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c
index 8cf4b115b..5645e81c5 100644
--- a/src/ats/gnunet-ats-solver-eval.c
+++ b/src/ats/gnunet-ats-solver-eval.c
@@ -166,7 +166,8 @@ GNUNET_ATS_solver_logging_now (struct LoggingHandle *l)
166 /* Store logging data here */ 166 /* Store logging data here */
167 for (cur = peer_head; NULL != cur; cur = cur->next) 167 for (cur = peer_head; NULL != cur; cur = cur->next)
168 { 168 {
169 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Logging peer id %llu\n", cur->id); 169 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
170 "Logging peer id %llu\n", cur->id);
170 171
171 log_p = GNUNET_new (struct LoggingPeer); 172 log_p = GNUNET_new (struct LoggingPeer);
172 log_p->id = cur->id; 173 log_p->id = cur->id;
@@ -176,16 +177,18 @@ GNUNET_ATS_solver_logging_now (struct LoggingHandle *l)
176 { 177 {
177 log_p->pref_abs[c] = cur->pref_abs[c]; 178 log_p->pref_abs[c] = cur->pref_abs[c];
178 log_p->pref_norm[c] = cur->pref_norm[c]; 179 log_p->pref_norm[c] = cur->pref_norm[c];
179 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t %s = %.2f %.2f [abs/rel]\n", 180 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
180 GNUNET_ATS_print_preference_type(c), 181 "\t %s = %.2f %.2f [abs/rel]\n",
181 log_p->pref_abs[c], log_p->pref_norm[c]); 182 GNUNET_ATS_print_preference_type(c),
183 log_p->pref_abs[c], log_p->pref_norm[c]);
182 } 184 }
183 GNUNET_CONTAINER_DLL_insert_tail(lts->head, lts->tail, log_p); 185 GNUNET_CONTAINER_DLL_insert_tail(lts->head, lts->tail, log_p);
184 186
185 for (cur_addr = cur->addr_head; NULL != cur_addr; cur_addr = cur_addr->next) 187 for (cur_addr = cur->addr_head; NULL != cur_addr; cur_addr = cur_addr->next)
186 { 188 {
187 GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Logging peer id %llu address %llu \n", 189 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
188 cur->id, cur_addr->aid); 190 "Logging peer id %llu address %llu\n",
191 cur->id, cur_addr->aid);
189 log_a = GNUNET_new (struct LoggingAddress); 192 log_a = GNUNET_new (struct LoggingAddress);
190 log_a->aid = cur_addr->aid; 193 log_a->aid = cur_addr->aid;
191 log_a->active = cur_addr->ats_addr->active; 194 log_a->active = cur_addr->ats_addr->active;
@@ -196,9 +199,11 @@ GNUNET_ATS_solver_logging_now (struct LoggingHandle *l)
196 { 199 {
197 log_a->prop_abs[c] = cur_addr->prop_abs[c]; 200 log_a->prop_abs[c] = cur_addr->prop_abs[c];
198 log_a->prop_norm[c] = cur_addr->prop_norm[c]; 201 log_a->prop_norm[c] = cur_addr->prop_norm[c];
199 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t %s = %.2f %.2f [abs/rel]\n", 202 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
200 GNUNET_ATS_print_property_type(c), 203 "\t %s = %.2f %.2f [abs/rel]\n",
201 log_a->prop_abs[c], log_a->prop_norm[c]); 204 GNUNET_ATS_print_property_type(c),
205 log_a->prop_abs[c],
206 log_a->prop_norm[c]);
202 } 207 }
203 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t Active = %i\n", log_a->active); 208 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t Active = %i\n", log_a->active);
204 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t BW in = %llu\n", log_a->assigned_bw_in); 209 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t BW in = %llu\n", log_a->assigned_bw_in);
@@ -209,16 +214,17 @@ GNUNET_ATS_solver_logging_now (struct LoggingHandle *l)
209 } 214 }
210} 215}
211 216
217
212static void 218static void
213logging_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) 219logging_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
214{ 220{
215 struct LoggingHandle *l = cls; 221 struct LoggingHandle *l = cls;
216 l->logging_task = NULL;
217 222
223 l->logging_task = NULL;
218 GNUNET_ATS_solver_logging_now (l); 224 GNUNET_ATS_solver_logging_now (l);
219 225 l->logging_task = GNUNET_SCHEDULER_add_delayed (l->log_freq,
220 l->logging_task = GNUNET_SCHEDULER_add_delayed (l->log_freq, &logging_task, l); 226 &logging_task,
221 227 l);
222} 228}
223 229
224struct LoggingHandle * 230struct LoggingHandle *
@@ -395,7 +401,9 @@ GNUNET_ATS_solver_logging_write_to_disk (struct LoggingHandle *l, int add_time_s
395 GNUNET_ATS_print_property_type(c), 401 GNUNET_ATS_print_property_type(c),
396 log_a->prop_abs[c], log_a->prop_norm[c]);*/ 402 log_a->prop_abs[c], log_a->prop_norm[c]);*/
397 GNUNET_asprintf(&propstring_tmp,"%s%.3f;%.3f;", 403 GNUNET_asprintf(&propstring_tmp,"%s%.3f;%.3f;",
398 propstring, log_a->prop_abs[c], log_a->prop_norm[c]); 404 propstring,
405 log_a->prop_abs[c],
406 log_a->prop_norm[c]);
399 GNUNET_free (propstring); 407 GNUNET_free (propstring);
400 propstring = GNUNET_strdup(propstring_tmp); 408 propstring = GNUNET_strdup(propstring_tmp);
401 GNUNET_free (propstring_tmp); 409 GNUNET_free (propstring_tmp);
@@ -519,10 +527,10 @@ GNUNET_ATS_solver_logging_free (struct LoggingHandle *l)
519/** 527/**
520 * Property Generators 528 * Property Generators
521 */ 529 */
522
523static struct PropertyGenerator *prop_gen_head; 530static struct PropertyGenerator *prop_gen_head;
524static struct PropertyGenerator *prop_gen_tail; 531static struct PropertyGenerator *prop_gen_tail;
525 532
533
526static double 534static double
527get_property (struct PropertyGenerator *pg) 535get_property (struct PropertyGenerator *pg)
528{ 536{
@@ -3001,7 +3009,7 @@ get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
3001 } 3009 }
3002 else 3010 else
3003 return GAS_preference_get_by_peer (NULL, 3011 return GAS_preference_get_by_peer (NULL,
3004 id); 3012 id);
3005} 3013}
3006 3014
3007 3015