diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2013-06-14 07:47:35 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2013-06-14 07:47:35 +0000 |
commit | d08fb553ced7b11351c4837bb02f0e43a11d57ab (patch) | |
tree | a5f9e51a94186e790b772e4b34767e023cd0ea89 /src/ats/gnunet-service-ats-solver_proportional.c | |
parent | b88f9b616ad8efbb395dd006d214172723e51e00 (diff) | |
download | gnunet-d08fb553ced7b11351c4837bb02f0e43a11d57ab.tar.gz gnunet-d08fb553ced7b11351c4837bb02f0e43a11d57ab.zip |
rename function
Diffstat (limited to 'src/ats/gnunet-service-ats-solver_proportional.c')
-rw-r--r-- | src/ats/gnunet-service-ats-solver_proportional.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ats/gnunet-service-ats-solver_proportional.c b/src/ats/gnunet-service-ats-solver_proportional.c index 9b197b21b..9eac459ff 100644 --- a/src/ats/gnunet-service-ats-solver_proportional.c +++ b/src/ats/gnunet-service-ats-solver_proportional.c | |||
@@ -465,11 +465,11 @@ is_bandwidth_available_in_network (struct Network *net) | |||
465 | * | 465 | * |
466 | * @param s the solver handle | 466 | * @param s the solver handle |
467 | * @param net the network type to update | 467 | * @param net the network type to update |
468 | * @param address_except address excluded from notifcation, since we suggest | 468 | * @param address_except address excluded from notification, since we suggest |
469 | * this address | 469 | * this address |
470 | */ | 470 | */ |
471 | static void | 471 | static void |
472 | update_quota_per_network (struct GAS_PROPORTIONAL_Handle *s, | 472 | distribute_bandwidth_in_network (struct GAS_PROPORTIONAL_Handle *s, |
473 | struct Network *net, | 473 | struct Network *net, |
474 | struct ATS_Address *address_except) | 474 | struct ATS_Address *address_except) |
475 | { | 475 | { |
@@ -713,11 +713,11 @@ find_address_it (void *cls, const struct GNUNET_HashCode * key, void *value) | |||
713 | * @param s the solver handle | 713 | * @param s the solver handle |
714 | */ | 714 | */ |
715 | static void | 715 | static void |
716 | update_all_networks (struct GAS_PROPORTIONAL_Handle *s) | 716 | distribute_bandwidth_in_all_networks (struct GAS_PROPORTIONAL_Handle *s) |
717 | { | 717 | { |
718 | int i; | 718 | int i; |
719 | for (i = 0; i < s->networks; i++) | 719 | for (i = 0; i < s->networks; i++) |
720 | update_quota_per_network (s, &s->network_entries[i], NULL); | 720 | distribute_bandwidth_in_network (s, &s->network_entries[i], NULL); |
721 | 721 | ||
722 | } | 722 | } |
723 | 723 | ||
@@ -1057,7 +1057,7 @@ update_preference (struct PreferencePeer *p, | |||
1057 | break; | 1057 | break; |
1058 | } | 1058 | } |
1059 | recalculate_preferences(p); | 1059 | recalculate_preferences(p); |
1060 | update_all_networks (p->s); | 1060 | distribute_bandwidth_in_all_networks (p->s); |
1061 | } | 1061 | } |
1062 | 1062 | ||
1063 | 1063 | ||
@@ -1113,7 +1113,7 @@ preference_aging (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1113 | (*t) = (*t) * PREF_AGING_FACTOR; | 1113 | (*t) = (*t) * PREF_AGING_FACTOR; |
1114 | else | 1114 | else |
1115 | (*t) = 1.0; | 1115 | (*t) = 1.0; |
1116 | update_all_networks (p->s); | 1116 | distribute_bandwidth_in_all_networks (p->s); |
1117 | } | 1117 | } |
1118 | p->aging_task = GNUNET_SCHEDULER_add_delayed (PREF_AGING_INTERVAL, | 1118 | p->aging_task = GNUNET_SCHEDULER_add_delayed (PREF_AGING_INTERVAL, |
1119 | &preference_aging, p); | 1119 | &preference_aging, p); |
@@ -1269,7 +1269,7 @@ GAS_proportional_get_preferred_address (void *solver, | |||
1269 | s->bw_changed (s->bw_changed_cls, prev); /* notify about bw change, REQUIRED? */ | 1269 | s->bw_changed (s->bw_changed_cls, prev); /* notify about bw change, REQUIRED? */ |
1270 | if (GNUNET_SYSERR == addresse_decrement (s, net_prev, GNUNET_NO, GNUNET_YES)) | 1270 | if (GNUNET_SYSERR == addresse_decrement (s, net_prev, GNUNET_NO, GNUNET_YES)) |
1271 | GNUNET_break (0); | 1271 | GNUNET_break (0); |
1272 | update_quota_per_network (s, net_prev, NULL); | 1272 | distribute_bandwidth_in_network (s, net_prev, NULL); |
1273 | } | 1273 | } |
1274 | 1274 | ||
1275 | if (GNUNET_NO == (is_bandwidth_available_in_network (cur->solver_information))) | 1275 | if (GNUNET_NO == (is_bandwidth_available_in_network (cur->solver_information))) |
@@ -1280,7 +1280,7 @@ GAS_proportional_get_preferred_address (void *solver, | |||
1280 | 1280 | ||
1281 | cur->active = GNUNET_YES; | 1281 | cur->active = GNUNET_YES; |
1282 | addresse_increment(s, net_cur, GNUNET_NO, GNUNET_YES); | 1282 | addresse_increment(s, net_cur, GNUNET_NO, GNUNET_YES); |
1283 | update_quota_per_network (s, net_cur, cur); | 1283 | distribute_bandwidth_in_network (s, net_cur, cur); |
1284 | 1284 | ||
1285 | return cur; | 1285 | return cur; |
1286 | } | 1286 | } |
@@ -1366,7 +1366,7 @@ GAS_proportional_address_delete (void *solver, | |||
1366 | address->active = GNUNET_NO; | 1366 | address->active = GNUNET_NO; |
1367 | if (GNUNET_SYSERR == addresse_decrement (s, net, GNUNET_NO, GNUNET_YES)) | 1367 | if (GNUNET_SYSERR == addresse_decrement (s, net, GNUNET_NO, GNUNET_YES)) |
1368 | GNUNET_break (0); | 1368 | GNUNET_break (0); |
1369 | update_quota_per_network (s, net, NULL); | 1369 | distribute_bandwidth_in_network (s, net, NULL); |
1370 | } | 1370 | } |
1371 | LOG (GNUNET_ERROR_TYPE_DEBUG, "After deleting address now total %u and active %u addresses in network `%s'\n", | 1371 | LOG (GNUNET_ERROR_TYPE_DEBUG, "After deleting address now total %u and active %u addresses in network `%s'\n", |
1372 | net->total_addresses, | 1372 | net->total_addresses, |
@@ -1469,7 +1469,7 @@ GAS_proportional_address_update (void *solver, | |||
1469 | /* Suggest updated address */ | 1469 | /* Suggest updated address */ |
1470 | address->active = GNUNET_YES; | 1470 | address->active = GNUNET_YES; |
1471 | addresse_increment (s, new_net, GNUNET_NO, GNUNET_YES); | 1471 | addresse_increment (s, new_net, GNUNET_NO, GNUNET_YES); |
1472 | update_quota_per_network (solver, new_net, NULL); | 1472 | distribute_bandwidth_in_network (solver, new_net, NULL); |
1473 | } | 1473 | } |
1474 | else | 1474 | else |
1475 | { | 1475 | { |