From 99206eda2e736a858ded8567614f2f98ec924855 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Mon, 17 Dec 2012 14:30:16 +0000 Subject: [PATCH] adding client reference --- src/ats/gnunet-service-ats_addresses.c | 7 ++++--- src/ats/gnunet-service-ats_addresses.h | 2 ++ src/ats/gnunet-service-ats_addresses_mlp.c | 1 + src/ats/gnunet-service-ats_addresses_mlp.h | 1 + src/ats/gnunet-service-ats_addresses_simplistic.c | 2 ++ src/ats/gnunet-service-ats_addresses_simplistic.h | 2 ++ src/ats/gnunet-service-ats_performance.c | 4 +++- src/ats/test_ats_api.conf | 2 +- 8 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c index 31d4f6808..ed33c2dfd 100644 --- a/src/ats/gnunet-service-ats_addresses.c +++ b/src/ats/gnunet-service-ats_addresses.c @@ -929,20 +929,21 @@ GAS_addresses_handle_backoff_reset (struct GAS_Addresses_Handle *handle, void GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle, + void *client, const struct GNUNET_PeerIdentity *peer, enum GNUNET_ATS_PreferenceKind kind, float score) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received `%s' for peer `%s'\n", + "Received `%s' for peer `%s' for client %p\n", "CHANGE PREFERENCE", - GNUNET_i2s (peer)); + GNUNET_i2s (peer), client); if (GNUNET_NO == handle->running) return; /* Tell solver about update */ - handle->s_pref (handle->solver, peer, kind, score); + handle->s_pref (handle->solver, client, peer, kind, score); } static unsigned int diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h index a9aac2094..b774cff48 100644 --- a/src/ats/gnunet-service-ats_addresses.h +++ b/src/ats/gnunet-service-ats_addresses.h @@ -182,6 +182,7 @@ typedef void * typedef void (*GAS_solver_address_change_preference) (void *solver, + void *client, const struct GNUNET_PeerIdentity *peer, enum GNUNET_ATS_PreferenceKind kind, float score); @@ -290,6 +291,7 @@ GAS_addresses_request_address (struct GAS_Addresses_Handle *handle, void GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle, + void *client, const struct GNUNET_PeerIdentity *peer, enum GNUNET_ATS_PreferenceKind kind, float score); diff --git a/src/ats/gnunet-service-ats_addresses_mlp.c b/src/ats/gnunet-service-ats_addresses_mlp.c index 8e852ad75..e754842f9 100644 --- a/src/ats/gnunet-service-ats_addresses_mlp.c +++ b/src/ats/gnunet-service-ats_addresses_mlp.c @@ -1776,6 +1776,7 @@ GAS_mlp_get_preferred_address (void *solver, */ void GAS_mlp_address_change_preference (void *solver, + void *client, const struct GNUNET_PeerIdentity *peer, enum GNUNET_ATS_PreferenceKind kind, float score) diff --git a/src/ats/gnunet-service-ats_addresses_mlp.h b/src/ats/gnunet-service-ats_addresses_mlp.h index 2f09bd269..428c67d3f 100644 --- a/src/ats/gnunet-service-ats_addresses_mlp.h +++ b/src/ats/gnunet-service-ats_addresses_mlp.h @@ -400,6 +400,7 @@ GAS_mlp_address_delete (void *solver, */ void GAS_mlp_address_change_preference (void *solver, + void *client, const struct GNUNET_PeerIdentity *peer, enum GNUNET_ATS_PreferenceKind kind, float score); diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.c b/src/ats/gnunet-service-ats_addresses_simplistic.c index ddadcb55c..c14b5d60d 100644 --- a/src/ats/gnunet-service-ats_addresses_simplistic.c +++ b/src/ats/gnunet-service-ats_addresses_simplistic.c @@ -843,12 +843,14 @@ GAS_simplistic_get_preferred_address (void *solver, * Changes the preferences for a peer in the problem * * @param solver the solver handle + * @param client the client with this preference * @param peer the peer to change the preference for * @param kind the kind to change the preference * @param score the score */ void GAS_simplistic_address_change_preference (void *solver, + void *client, const struct GNUNET_PeerIdentity *peer, enum GNUNET_ATS_PreferenceKind kind, float score) diff --git a/src/ats/gnunet-service-ats_addresses_simplistic.h b/src/ats/gnunet-service-ats_addresses_simplistic.h index 0a3eee4bd..eab221cbf 100644 --- a/src/ats/gnunet-service-ats_addresses_simplistic.h +++ b/src/ats/gnunet-service-ats_addresses_simplistic.h @@ -135,12 +135,14 @@ GAS_simplistic_get_preferred_address (void *solver, * Changes the preferences for a peer in the problem * * @param solver the solver handle + * @param client the client with this preference * @param peer the peer to change the preference for * @param kind the kind to change the preference * @param score the score */ void GAS_simplistic_address_change_preference (void *solver, + void *client, const struct GNUNET_PeerIdentity *peer, enum GNUNET_ATS_PreferenceKind kind, float score); diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c index 6ebd021cf..35f0223a2 100644 --- a/src/ats/gnunet-service-ats_performance.c +++ b/src/ats/gnunet-service-ats_performance.c @@ -587,7 +587,9 @@ GAS_handle_preference_change (void *cls, 1, GNUNET_NO); pi = (const struct PreferenceInformation *) &msg[1]; for (i = 0; i < nump; i++) - GAS_addresses_change_preference (GSA_addresses, &msg->peer, + GAS_addresses_change_preference (GSA_addresses, + client, + &msg->peer, (enum GNUNET_ATS_PreferenceKind) ntohl (pi[i].preference_kind), pi[i].preference_value); diff --git a/src/ats/test_ats_api.conf b/src/ats/test_ats_api.conf index 7b4a07e15..e5e43ed06 100644 --- a/src/ats/test_ats_api.conf +++ b/src/ats/test_ats_api.conf @@ -7,7 +7,7 @@ DEFAULTSERVICES = ats UNIXPATH = /tmp/test-ats-scheduling-arm.sock [ats] -#PREFIX = valgrind --leak-check=full --track-origins=yes --num-callers=25 +PREFIX = valgrind --leak-check=full --track-origins=yes --num-callers=25 AUTOSTART = YES PORT = 12002 HOSTNAME = localhost -- 2.25.1