[GNUnet-SVN] r25515 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2012-12-17 15:30:16 +0100 (Mon, 17 Dec 2012)
New Revision: 25515

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_addresses.h
   gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
   gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
   gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
   gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h
   gnunet/src/ats/gnunet-service-ats_performance.c
   gnunet/src/ats/test_ats_api.conf
Log:
adding client reference

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2012-12-17 14:26:17 UTC 
(rev 25514)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2012-12-17 14:30:16 UTC 
(rev 25515)
@@ -929,20 +929,21 @@
 
 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

Modified: gnunet/src/ats/gnunet-service-ats_addresses.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.h       2012-12-17 14:26:17 UTC 
(rev 25514)
+++ gnunet/src/ats/gnunet-service-ats_addresses.h       2012-12-17 14:30:16 UTC 
(rev 25515)
@@ -182,6 +182,7 @@
 
 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 @@
 
 void
 GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle,
+                                 void *client,
                                  const struct GNUNET_PeerIdentity *peer,
                                  enum GNUNET_ATS_PreferenceKind kind,
                                  float score);

Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2012-12-17 14:26:17 UTC 
(rev 25514)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2012-12-17 14:30:16 UTC 
(rev 25515)
@@ -1776,6 +1776,7 @@
  */
 void
 GAS_mlp_address_change_preference (void *solver,
+                                   void *client,
                                    const struct GNUNET_PeerIdentity *peer,
                                    enum GNUNET_ATS_PreferenceKind kind,
                                    float score)

Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.h   2012-12-17 14:26:17 UTC 
(rev 25514)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.h   2012-12-17 14:30:16 UTC 
(rev 25515)
@@ -400,6 +400,7 @@
  */
 void
 GAS_mlp_address_change_preference (void *solver,
+                                   void *client,
                                    const struct GNUNET_PeerIdentity *peer,
                                    enum GNUNET_ATS_PreferenceKind kind,
                                    float score);

Modified: gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2012-12-17 
14:26:17 UTC (rev 25514)
+++ gnunet/src/ats/gnunet-service-ats_addresses_simplistic.c    2012-12-17 
14:30:16 UTC (rev 25515)
@@ -843,12 +843,14 @@
  * 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)

Modified: gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h    2012-12-17 
14:26:17 UTC (rev 25514)
+++ gnunet/src/ats/gnunet-service-ats_addresses_simplistic.h    2012-12-17 
14:30:16 UTC (rev 25515)
@@ -135,12 +135,14 @@
  * 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);

Modified: gnunet/src/ats/gnunet-service-ats_performance.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_performance.c     2012-12-17 14:26:17 UTC 
(rev 25514)
+++ gnunet/src/ats/gnunet-service-ats_performance.c     2012-12-17 14:30:16 UTC 
(rev 25515)
@@ -587,7 +587,9 @@
                             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);

Modified: gnunet/src/ats/test_ats_api.conf
===================================================================
--- gnunet/src/ats/test_ats_api.conf    2012-12-17 14:26:17 UTC (rev 25514)
+++ gnunet/src/ats/test_ats_api.conf    2012-12-17 14:30:16 UTC (rev 25515)
@@ -7,7 +7,7 @@
 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