diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2014-07-17 09:47:51 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2014-07-17 09:47:51 +0000 |
commit | 615d5aef87f985e4c489fac6c6d6232d35f8b0c2 (patch) | |
tree | 82eb29b40821ee0a5405737ac2d9f0428c6c2619 /src/ats/gnunet-ats-solver-eval.c | |
parent | 6053799e5d05b8d5c6c664b66e48f367b3dd6578 (diff) | |
download | gnunet-615d5aef87f985e4c489fac6c6d6232d35f8b0c2.tar.gz gnunet-615d5aef87f985e4c489fac6c6d6232d35f8b0c2.zip |
do not use NBO internally
Diffstat (limited to 'src/ats/gnunet-ats-solver-eval.c')
-rw-r--r-- | src/ats/gnunet-ats-solver-eval.c | 61 |
1 files changed, 29 insertions, 32 deletions
diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c index dd1bb9275..d21529f22 100644 --- a/src/ats/gnunet-ats-solver-eval.c +++ b/src/ats/gnunet-ats-solver-eval.c | |||
@@ -232,8 +232,8 @@ GNUNET_ATS_solver_logging_now (struct LoggingHandle *l) | |||
232 | log_a->prop_abs[c], log_a->prop_norm[c]); | 232 | log_a->prop_abs[c], log_a->prop_norm[c]); |
233 | } | 233 | } |
234 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t Active = %i\n", log_a->active); | 234 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t Active = %i\n", log_a->active); |
235 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t BW in = %llu\n", ntohl(log_a->assigned_bw_in.value__)); | 235 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "\t BW in = %llu\n", log_a->assigned_bw_in); |
236 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "\t BW out = %llu\n", ntohl(log_a->assigned_bw_out.value__)); | 236 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "\t BW out = %llu\n", log_a->assigned_bw_out); |
237 | 237 | ||
238 | GNUNET_CONTAINER_DLL_insert_tail (log_p->addr_head, log_p->addr_tail, log_a); | 238 | GNUNET_CONTAINER_DLL_insert_tail (log_p->addr_head, log_p->addr_tail, log_a); |
239 | } | 239 | } |
@@ -430,15 +430,12 @@ GNUNET_ATS_solver_logging_write_to_disk (struct LoggingHandle *l, int add_time_s | |||
430 | propstring = GNUNET_strdup(propstring_tmp); | 430 | propstring = GNUNET_strdup(propstring_tmp); |
431 | GNUNET_free (propstring_tmp); | 431 | GNUNET_free (propstring_tmp); |
432 | } | 432 | } |
433 | GNUNET_asprintf(&datastring,"%llu;%llu;%u;%u;%i;%u;%u;%s;%s\n", | 433 | GNUNET_asprintf (&datastring, "%llu;%llu;%u;%u;%i;%u;%u;%s;%s\n", |
434 | GNUNET_TIME_absolute_get_difference(l->head->timestamp, lts->timestamp).rel_value_us / 1000, | 434 | GNUNET_TIME_absolute_get_difference (l->head->timestamp, |
435 | lts->delta, | 435 | lts->timestamp).rel_value_us / 1000, lts->delta, |
436 | log_p->is_requested, | 436 | log_p->is_requested, log_a->network, log_a->active, |
437 | log_a->network, | 437 | log_a->assigned_bw_in, log_a->assigned_bw_out, propstring, |
438 | log_a->active, | 438 | prefstring); |
439 | ntohl (log_a->assigned_bw_in.value__), | ||
440 | ntohl (log_a->assigned_bw_out.value__), | ||
441 | propstring, prefstring); | ||
442 | 439 | ||
443 | GNUNET_DISK_file_write (cur->f_hd, datastring, strlen(datastring)); | 440 | GNUNET_DISK_file_write (cur->f_hd, datastring, strlen(datastring)); |
444 | GNUNET_free (datastring); | 441 | GNUNET_free (datastring); |
@@ -489,8 +486,8 @@ GNUNET_ATS_solver_logging_eval (struct LoggingHandle *l) | |||
489 | { | 486 | { |
490 | fprintf (stderr, "\tPeer pid %llu address %llu: %u %u %u\n", | 487 | fprintf (stderr, "\tPeer pid %llu address %llu: %u %u %u\n", |
491 | log_p->id, log_a->aid, log_a->active, | 488 | log_p->id, log_a->aid, log_a->active, |
492 | ntohl(log_a->assigned_bw_in.value__), | 489 | log_a->assigned_bw_in, |
493 | ntohl(log_a->assigned_bw_out.value__)); | 490 | log_a->assigned_bw_out); |
494 | 491 | ||
495 | for (c = 1; c < GNUNET_ATS_PropertyCount; c++) | 492 | for (c = 1; c < GNUNET_ATS_PropertyCount; c++) |
496 | { | 493 | { |
@@ -1139,8 +1136,8 @@ GNUNET_ATS_solver_generate_preferences_start (unsigned int peer, | |||
1139 | struct TestAddress * addr = find_active_address(p); | 1136 | struct TestAddress * addr = find_active_address(p); |
1140 | const double *properties = get_property_cb (NULL, addr->ats_addr); | 1137 | const double *properties = get_property_cb (NULL, addr->ats_addr); |
1141 | 1138 | ||
1142 | pg->last_assigned_bw_in = ntohl(p->assigned_bw_in.value__); | 1139 | pg->last_assigned_bw_in = p->assigned_bw_in; |
1143 | pg->last_assigned_bw_out = ntohl(p->assigned_bw_out.value__); | 1140 | pg->last_assigned_bw_out = p->assigned_bw_out; |
1144 | pg->feedback_bw_in_acc = 0; | 1141 | pg->feedback_bw_in_acc = 0; |
1145 | pg->feedback_bw_out_acc = 0; | 1142 | pg->feedback_bw_out_acc = 0; |
1146 | 1143 | ||
@@ -2178,8 +2175,8 @@ create_ats_address (const struct GNUNET_PeerIdentity *peer, | |||
2178 | aa->active = GNUNET_NO; | 2175 | aa->active = GNUNET_NO; |
2179 | aa->used = GNUNET_NO; | 2176 | aa->used = GNUNET_NO; |
2180 | aa->solver_information = NULL; | 2177 | aa->solver_information = NULL; |
2181 | aa->assigned_bw_in = GNUNET_BANDWIDTH_value_init(0); | 2178 | aa->assigned_bw_in = 0; |
2182 | aa->assigned_bw_out = GNUNET_BANDWIDTH_value_init(0); | 2179 | aa->assigned_bw_out = 0; |
2183 | 2180 | ||
2184 | return aa; | 2181 | return aa; |
2185 | } | 2182 | } |
@@ -2197,8 +2194,8 @@ enforce_add_address (struct GNUNET_ATS_TEST_Operation *op) | |||
2197 | { | 2194 | { |
2198 | p = GNUNET_new (struct TestPeer); | 2195 | p = GNUNET_new (struct TestPeer); |
2199 | p->id = op->peer_id; | 2196 | p->id = op->peer_id; |
2200 | p->assigned_bw_in = GNUNET_BANDWIDTH_value_init(0); | 2197 | p->assigned_bw_in = 0; |
2201 | p->assigned_bw_out = GNUNET_BANDWIDTH_value_init(0); | 2198 | p->assigned_bw_out = 0; |
2202 | memset (&p->peer_id, op->peer_id, sizeof (p->peer_id)); | 2199 | memset (&p->peer_id, op->peer_id, sizeof (p->peer_id)); |
2203 | for (c = 0; c < GNUNET_ATS_PreferenceCount; c++) | 2200 | for (c = 0; c < GNUNET_ATS_PreferenceCount; c++) |
2204 | { | 2201 | { |
@@ -2421,8 +2418,8 @@ enforce_start_request (struct GNUNET_ATS_TEST_Operation *op) | |||
2421 | { | 2418 | { |
2422 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Suggested address for peer %u: %llu %llu\n", | 2419 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Suggested address for peer %u: %llu %llu\n", |
2423 | op->peer_id, | 2420 | op->peer_id, |
2424 | ntohl(res->assigned_bw_in.value__), | 2421 | res->assigned_bw_in, |
2425 | ntohl(res->assigned_bw_out.value__)); | 2422 | res->assigned_bw_out); |
2426 | if (NULL != l) | 2423 | if (NULL != l) |
2427 | GNUNET_ATS_solver_logging_now (l); | 2424 | GNUNET_ATS_solver_logging_now (l); |
2428 | } | 2425 | } |
@@ -2446,8 +2443,8 @@ enforce_stop_request (struct GNUNET_ATS_TEST_Operation *op) | |||
2446 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stop requesting address for peer %u\n", | 2443 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stop requesting address for peer %u\n", |
2447 | op->peer_id); | 2444 | op->peer_id); |
2448 | p->is_requested = GNUNET_NO; | 2445 | p->is_requested = GNUNET_NO; |
2449 | p->assigned_bw_in.value__ = htonl(0); | 2446 | p->assigned_bw_in = 0; |
2450 | p->assigned_bw_out.value__ = htonl(0); | 2447 | p->assigned_bw_out = 0; |
2451 | sh->env.sf.s_get_stop (sh->solver, &p->peer_id); | 2448 | sh->env.sf.s_get_stop (sh->solver, &p->peer_id); |
2452 | 2449 | ||
2453 | if (NULL != l) | 2450 | if (NULL != l) |
@@ -2952,8 +2949,7 @@ solver_bandwidth_changed_cb (void *cls, struct ATS_Address *address) | |||
2952 | struct TestPeer *p; | 2949 | struct TestPeer *p; |
2953 | static struct PreferenceGenerator *pg; | 2950 | static struct PreferenceGenerator *pg; |
2954 | uint32_t delta; | 2951 | uint32_t delta; |
2955 | if ( (0 == ntohl (address->assigned_bw_out.value__)) && | 2952 | if ( (0 == address->assigned_bw_out) && (0 == address->assigned_bw_in) ) |
2956 | (0 == ntohl (address->assigned_bw_in.value__)) ) | ||
2957 | { | 2953 | { |
2958 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 2954 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
2959 | "Solver notified to disconnect peer `%s'\n", | 2955 | "Solver notified to disconnect peer `%s'\n", |
@@ -2976,18 +2972,19 @@ solver_bandwidth_changed_cb (void *cls, struct ATS_Address *address) | |||
2976 | delta = duration.rel_value_us * pg->last_assigned_bw_in; | 2972 | delta = duration.rel_value_us * pg->last_assigned_bw_in; |
2977 | pg->feedback_bw_in_acc += delta; | 2973 | pg->feedback_bw_in_acc += delta; |
2978 | 2974 | ||
2979 | pg->last_assigned_bw_in = ntohl (address->assigned_bw_in.value__); | 2975 | pg->last_assigned_bw_in = address->assigned_bw_in; |
2980 | pg->last_assigned_bw_out = ntohl (address->assigned_bw_out.value__); | 2976 | pg->last_assigned_bw_out = address->assigned_bw_out; |
2981 | pg->feedback_last_bw_update = GNUNET_TIME_absolute_get(); | 2977 | pg->feedback_last_bw_update = GNUNET_TIME_absolute_get(); |
2982 | } | 2978 | } |
2983 | } | 2979 | } |
2984 | 2980 | ||
2985 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 2981 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
2986 | "Bandwidth changed addresses %s %p to %u Bps out / %u Bps in\n", | 2982 | "Bandwidth changed addresses %s %p to %u Bps out / %u Bps in\n", |
2987 | GNUNET_i2s (&address->peer), | 2983 | GNUNET_i2s (&address->peer), |
2988 | address, | 2984 | address, |
2989 | (unsigned int) ntohl (address->assigned_bw_out.value__), | 2985 | address->assigned_bw_out, |
2990 | (unsigned int) ntohl (address->assigned_bw_in.value__)); | 2986 | address->assigned_bw_in); |
2987 | |||
2991 | if (NULL != l) | 2988 | if (NULL != l) |
2992 | GNUNET_ATS_solver_logging_now (l); | 2989 | GNUNET_ATS_solver_logging_now (l); |
2993 | 2990 | ||