diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-02-08 13:19:14 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-02-08 13:19:14 +0000 |
commit | e90c4dce6fc3253c9ca69305fb4efecf8eccc62e (patch) | |
tree | cd2f56b6244436b1b5ca4a651650ffd7327359b3 /src/ats/gnunet-service-ats_plugins.c | |
parent | aa42cd5e2a145b6a66cdc62051b50274109cff42 (diff) | |
download | gnunet-e90c4dce6fc3253c9ca69305fb4efecf8eccc62e.tar.gz gnunet-e90c4dce6fc3253c9ca69305fb4efecf8eccc62e.zip |
-rename for naming consistency
Diffstat (limited to 'src/ats/gnunet-service-ats_plugins.c')
-rw-r--r-- | src/ats/gnunet-service-ats_plugins.c | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/src/ats/gnunet-service-ats_plugins.c b/src/ats/gnunet-service-ats_plugins.c index 8448e4c4e..b44934999 100644 --- a/src/ats/gnunet-service-ats_plugins.c +++ b/src/ats/gnunet-service-ats_plugins.c | |||
@@ -58,9 +58,9 @@ static char *plugin; | |||
58 | * @param pref_rel the new relative preference value | 58 | * @param pref_rel the new relative preference value |
59 | */ | 59 | */ |
60 | void | 60 | void |
61 | GAS_normalized_preference_changed (const struct GNUNET_PeerIdentity *peer, | 61 | GAS_plugin_notify_preference_changed (const struct GNUNET_PeerIdentity *peer, |
62 | enum GNUNET_ATS_PreferenceKind kind, | 62 | enum GNUNET_ATS_PreferenceKind kind, |
63 | double pref_rel) | 63 | double pref_rel) |
64 | { | 64 | { |
65 | sf->s_pref (sf->cls, | 65 | sf->s_pref (sf->cls, |
66 | peer, | 66 | peer, |
@@ -77,15 +77,10 @@ GAS_normalized_preference_changed (const struct GNUNET_PeerIdentity *peer, | |||
77 | * @param prop_rel the new relative preference value | 77 | * @param prop_rel the new relative preference value |
78 | */ | 78 | */ |
79 | void | 79 | void |
80 | GAS_normalized_property_changed (struct ATS_Address *address, | 80 | GAS_plugin_notify_property_changed (struct ATS_Address *address, |
81 | enum GNUNET_ATS_Property type, | 81 | enum GNUNET_ATS_Property type, |
82 | double prop_rel) | 82 | double prop_rel) |
83 | { | 83 | { |
84 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
85 | "Normalized property %s for peer `%s' changed to %.3f \n", | ||
86 | GNUNET_ATS_print_property_type (type), | ||
87 | GNUNET_i2s (&address->peer), | ||
88 | prop_rel); | ||
89 | sf->s_address_update_property (sf->cls, | 84 | sf->s_address_update_property (sf->cls, |
90 | address, | 85 | address, |
91 | type, | 86 | type, |
@@ -413,7 +408,7 @@ load_quotas (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
413 | * solver plugin) | 408 | * solver plugin) |
414 | */ | 409 | */ |
415 | int | 410 | int |
416 | GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg) | 411 | GAS_plugin_init (const struct GNUNET_CONFIGURATION_Handle *cfg) |
417 | { | 412 | { |
418 | char *mode_str; | 413 | char *mode_str; |
419 | 414 | ||
@@ -431,7 +426,7 @@ GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
431 | env.cls = NULL; | 426 | env.cls = NULL; |
432 | env.info_cb = &solver_info_cb; | 427 | env.info_cb = &solver_info_cb; |
433 | env.bandwidth_changed_cb = &bandwidth_changed_cb; | 428 | env.bandwidth_changed_cb = &bandwidth_changed_cb; |
434 | env.get_preferences = &GAS_normalization_get_preferences_by_peer; | 429 | env.get_preferences = &GAS_preference_get_by_peer; |
435 | env.cfg = cfg; | 430 | env.cfg = cfg; |
436 | env.stats = GSA_stats; | 431 | env.stats = GSA_stats; |
437 | env.addresses = GSA_addresses; | 432 | env.addresses = GSA_addresses; |
@@ -462,7 +457,7 @@ GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
462 | * Shutdown address subsystem. | 457 | * Shutdown address subsystem. |
463 | */ | 458 | */ |
464 | void | 459 | void |
465 | GAS_plugins_done () | 460 | GAS_plugin_done () |
466 | { | 461 | { |
467 | GNUNET_PLUGIN_unload (plugin, | 462 | GNUNET_PLUGIN_unload (plugin, |
468 | sf); | 463 | sf); |
@@ -491,7 +486,7 @@ GAS_plugin_new_address (struct ATS_Address *new_address, | |||
491 | new_address, | 486 | new_address, |
492 | addr_net); | 487 | addr_net); |
493 | sf->s_bulk_start (sf->cls); | 488 | sf->s_bulk_start (sf->cls); |
494 | GAS_normalization_normalize_property (new_address, | 489 | GAS_normalization_update_property (new_address, |
495 | atsi, | 490 | atsi, |
496 | atsi_count); | 491 | atsi_count); |
497 | sf->s_bulk_stop (sf->cls); | 492 | sf->s_bulk_stop (sf->cls); |
@@ -524,11 +519,11 @@ GAS_plugin_delete_address (struct ATS_Address *address) | |||
524 | * @param score_abs degree of the appreciation | 519 | * @param score_abs degree of the appreciation |
525 | */ | 520 | */ |
526 | void | 521 | void |
527 | GAS_plugin_preference_feedback (struct GNUNET_SERVER_Client *application, | 522 | GAS_plugin_notify_feedback (struct GNUNET_SERVER_Client *application, |
528 | const struct GNUNET_PeerIdentity *peer, | 523 | const struct GNUNET_PeerIdentity *peer, |
529 | const struct GNUNET_TIME_Relative scope, | 524 | const struct GNUNET_TIME_Relative scope, |
530 | enum GNUNET_ATS_PreferenceKind kind, | 525 | enum GNUNET_ATS_PreferenceKind kind, |
531 | float score_abs) | 526 | float score_abs) |
532 | { | 527 | { |
533 | sf->s_feedback (sf->cls, | 528 | sf->s_feedback (sf->cls, |
534 | application, | 529 | application, |