updated experimentation tests

added scope time for feedback api 

10 files changed, 50 insertions, 12 deletions

diff --git a/src/ats/ats.h b/src/ats/ats.h
index d202ddc24..4f8ab1b81 100644
--- a/src/ats/ats.h
+++ b/src/ats/ats.h
@@ -262,15 +262,30 @@ struct ChangePreferenceMessage
    * struct PreferenceInformation values */
 };
 
+
+/**
+ * Message containing application feedback for a peer
+ */
 struct FeedbackPreferenceMessage
 {
   struct GNUNET_MessageHeader header;
 
-  uint32_t num_preferences GNUNET_PACKED;
+  /**
+   * Number of feedback values included
+   */
+  uint32_t num_feedback GNUNET_PACKED;
 
+  /**
+   * Relative time describing for which time interval this feedback is
+   */
+  struct GNUNET_TIME_RelativeNBO scope;
+
+  /**
+   * Peer this feedback is for
+   */
   struct GNUNET_PeerIdentity peer;
 
-  /* followed by 'num_preferences'
+  /* followed by 'num_feedback'
    * struct PreferenceInformation values */
 };
 
diff --git a/src/ats/ats_api_performance.c b/src/ats/ats_api_performance.c
index b7c24aa53..8d8df6474 100644
--- a/src/ats/ats_api_performance.c
+++ b/src/ats/ats_api_performance.c
@@ -943,12 +943,14 @@ GNUNET_ATS_performance_change_preference (struct GNUNET_ATS_PerformanceHandle *p
  * preference is satisfied by ATS
  *
  * @param ph performance handle
+ * @param scope the time interval this valid for: [now - scope .. now]
  * @param peer identifies the peer
  * @param ... 0-terminated specification of the desired changes
  */
 void
 GNUNET_ATS_performance_give_feedback (struct GNUNET_ATS_PerformanceHandle *ph,
-                                                                                                                                                        const struct GNUNET_PeerIdentity *peer, ...)
+                                                                                                                                                        const struct GNUNET_PeerIdentity *peer,
+                                                                                                                                                        const struct GNUNET_TIME_Relative scope, ...)
 {
   struct PendingMessage *p;
   struct FeedbackPreferenceMessage *m;
@@ -959,7 +961,7 @@ GNUNET_ATS_performance_give_feedback (struct GNUNET_ATS_PerformanceHandle *ph,
   enum GNUNET_ATS_PreferenceKind kind;
 
   count = 0;
-  va_start (ap, peer);
+  va_start (ap, scope);
   while (GNUNET_ATS_PREFERENCE_END !=
          (kind = va_arg (ap, enum GNUNET_ATS_PreferenceKind)))
   {
@@ -989,11 +991,12 @@ GNUNET_ATS_performance_give_feedback (struct GNUNET_ATS_PerformanceHandle *ph,
   m = (struct FeedbackPreferenceMessage *) &p[1];
   m->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_FEEDBACK);
   m->header.size = htons (msize);
-  m->num_preferences = htonl (count);
+  m->scope = GNUNET_TIME_relative_hton (scope);
+  m->num_feedback = htonl (count);
   m->peer = *peer;
   pi = (struct PreferenceInformation *) &m[1];
   count = 0;
-  va_start (ap, peer);
+  va_start (ap, scope);
   while (GNUNET_ATS_PREFERENCE_END !=
          (kind = va_arg (ap, enum GNUNET_ATS_PreferenceKind)))
   {
diff --git a/src/ats/gnunet-service-ats-solver_mlp.c b/src/ats/gnunet-service-ats-solver_mlp.c
index 9c1cb10b6..c2873a4f6 100644
--- a/src/ats/gnunet-service-ats-solver_mlp.c
+++ b/src/ats/gnunet-service-ats-solver_mlp.c
@@ -1657,6 +1657,7 @@ GAS_mlp_address_change_preference (void *solver,
  * @param solver the solver handle
  * @param application the application
  * @param peer the peer to change the preference for
+ * @param scope the time interval for this feedback: [now - scope .. now]
  * @param kind the kind to change the preference
  * @param score the score
  */
@@ -1664,6 +1665,7 @@ void
 GAS_mlp_address_preference_feedback (void *solver,
                                                                                         void *application,
                                                                                         const struct GNUNET_PeerIdentity *peer,
+                                                                                  const struct GNUNET_TIME_Relative scope,
                                                                                         enum GNUNET_ATS_PreferenceKind kind,
                                                                                         double score)
 {
diff --git a/src/ats/gnunet-service-ats-solver_mlp.h b/src/ats/gnunet-service-ats-solver_mlp.h
index 647ab8b30..d1a65c002 100644
--- a/src/ats/gnunet-service-ats-solver_mlp.h
+++ b/src/ats/gnunet-service-ats-solver_mlp.h
@@ -506,6 +506,7 @@ GAS_mlp_address_change_preference (void *solver,
  * @param solver the solver handle
  * @param application the application
  * @param peer the peer to change the preference for
+ * @param scope the time interval for this feedback: [now - scope .. now]
  * @param kind the kind to change the preference
  * @param score the score
  */
@@ -513,6 +514,7 @@ void
 GAS_mlp_address_preference_feedback (void *solver,
                                                                                         void *application,
                                                                                         const struct GNUNET_PeerIdentity *peer,
+                                                                                        const struct GNUNET_TIME_Relative scope,
                                                                                         enum GNUNET_ATS_PreferenceKind kind,
                                                                                         double score);
 
diff --git a/src/ats/gnunet-service-ats-solver_proportional.c b/src/ats/gnunet-service-ats-solver_proportional.c
index d62cface9..e36f04b5e 100644
--- a/src/ats/gnunet-service-ats-solver_proportional.c
+++ b/src/ats/gnunet-service-ats-solver_proportional.c
@@ -892,6 +892,7 @@ GAS_proportional_address_change_preference (void *solver,
  * @param solver the solver handle
  * @param application the application
  * @param peer the peer to change the preference for
+ * @param scope the time interval for this feedback: [now - scope .. now]
  * @param kind the kind to change the preference
  * @param score the score
  */
@@ -899,6 +900,7 @@ void
 GAS_proportional_address_preference_feedback (void *solver,
                                                                                         void *application,
                                                                                         const struct GNUNET_PeerIdentity *peer,
+                                                                                        const struct GNUNET_TIME_Relative scope,
                                                                                         enum GNUNET_ATS_PreferenceKind kind,
                                                                                         double score)
 {
diff --git a/src/ats/gnunet-service-ats-solver_proportional.h b/src/ats/gnunet-service-ats-solver_proportional.h
index 0f950eb94..94612b736 100644
--- a/src/ats/gnunet-service-ats-solver_proportional.h
+++ b/src/ats/gnunet-service-ats-solver_proportional.h
@@ -55,6 +55,7 @@ GAS_proportional_address_change_preference (void *solver,
  * @param solver the solver handle
  * @param application the application
  * @param peer the peer to change the preference for
+ * @param scope the time interval for this feedback: [now - scope .. now]
  * @param kind the kind to change the preference
  * @param score the score
  */
@@ -62,6 +63,7 @@ void
 GAS_proportional_address_preference_feedback (void *solver,
                                                                                         void *application,
                                                                                         const struct GNUNET_PeerIdentity *peer,
+                                                                                  const struct GNUNET_TIME_Relative scope,
                                                                                         enum GNUNET_ATS_PreferenceKind kind,
                                                                                         double score);
 
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 76489d129..a6351e343 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -1486,12 +1486,14 @@ GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle,
   handle->s_bulk_stop (handle->solver);
 }
 
+
 /**
  * Change the preference for a peer
  *
  * @param handle the address handle
  * @param application the client sending this request
  * @param peer the peer id
+ * @param scope the time interval for this feedback: [now - scope .. now]
  * @param kind the preference kind to change
  * @param score_abs the new preference score
  */
@@ -1499,6 +1501,7 @@ void
 GAS_addresses_preference_feedback (struct GAS_Addresses_Handle *handle,
                                                                                                                                                 void *application,
                                                                                                                                                 const struct GNUNET_PeerIdentity *peer,
+                                                                                                                                                const struct GNUNET_TIME_Relative scope,
                                                                                                                                                 enum GNUNET_ATS_PreferenceKind kind,
                                                                                                                                                 float score_abs)
 {
@@ -1520,7 +1523,7 @@ GAS_addresses_preference_feedback (struct GAS_Addresses_Handle *handle,
       return;
   }
 
-  handle->s_feedback (handle->solver, application, peer, kind, score_abs);
+  handle->s_feedback (handle->solver, application, peer, scope, kind, score_abs);
 }
 
 
diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h
index a50234361..5fa8a4906 100644
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -455,6 +455,7 @@ typedef void
  * @param handle the solver handle
  * @param application the application sending this request
  * @param peer the peer id
+ * @param scope the time interval for this feedback: [now - scope .. now]
  * @param kind the preference kind for this feedback
  * @param score the feedback score
  */
@@ -462,6 +463,7 @@ typedef void
 (*GAS_solver_address_feedback_preference) (void *solver,
                                                                                                                                                                  void *application,
                                                                                                                                                                  const struct GNUNET_PeerIdentity *peer,
+                                                                                                                                                                 const struct GNUNET_TIME_Relative scope,
                                                                                                                                                                  enum GNUNET_ATS_PreferenceKind kind,
                                                                                                                                                                  double score);
 
@@ -796,15 +798,17 @@ GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle,
  * Change the preference for a peer
  *
  * @param handle the address handle
- * @param client the client sending this request
+ * @param application the client sending this request
  * @param peer the peer id
+ * @param scope the time interval this valid for: [now - scope .. now]
  * @param kind the preference kind to change
  * @param score_abs the new preference score
  */
 void
 GAS_addresses_preference_feedback (struct GAS_Addresses_Handle *handle,
-                                                                                                                                                void *client,
+                                                                                                                                                void *application,
                                                                                                                                                 const struct GNUNET_PeerIdentity *peer,
+                                                                                                                                                const struct GNUNET_TIME_Relative scope,
                                                                                                                                                 enum GNUNET_ATS_PreferenceKind kind,
                                                                                                                                                 float score_abs);
 
diff --git a/src/ats/gnunet-service-ats_performance.c b/src/ats/gnunet-service-ats_performance.c
index bb7ed7934..9447691e1 100644
--- a/src/ats/gnunet-service-ats_performance.c
+++ b/src/ats/gnunet-service-ats_performance.c
@@ -676,7 +676,7 @@ GAS_handle_preference_feedback (void *cls,
     return;
   }
   msg = (const struct FeedbackPreferenceMessage *) message;
-  nump = ntohl (msg->num_preferences);
+  nump = ntohl (msg->num_feedback);
   if (msize !=
       sizeof (struct FeedbackPreferenceMessage) +
       nump * sizeof (struct PreferenceInformation))
@@ -692,6 +692,7 @@ GAS_handle_preference_feedback (void *cls,
     GAS_addresses_preference_feedback (GSA_addresses,
                                      client,
                                      &msg->peer,
+                                     GNUNET_TIME_relative_ntoh(msg->scope),
                                      (enum GNUNET_ATS_PreferenceKind)
                                      ntohl (pi[i].preference_kind),
                                      pi[i].preference_value);
diff --git a/src/ats/test_ats_api_performance_feedback.c b/src/ats/test_ats_api_performance_feedback.c
index 39cc5136f..35d31c495 100644
--- a/src/ats/test_ats_api_performance_feedback.c
+++ b/src/ats/test_ats_api_performance_feedback.c
@@ -167,11 +167,15 @@ void ats_suggest_cb (void *cls,
                 res_suggest_cb_p0 = GNUNET_YES;
                 stage = 1;
                 GNUNET_ATS_address_update (sh, &addr[1], NULL, atsi, ATS_COUNT);
-                GNUNET_ATS_performance_give_feedback (ph, &addr[0].peer, GNUNET_ATS_PREFERENCE_BANDWIDTH,(double) 1000, GNUNET_ATS_PREFERENCE_END);
+                GNUNET_ATS_performance_give_feedback (ph, &addr[0].peer,
+                                GNUNET_TIME_UNIT_SECONDS, GNUNET_ATS_PREFERENCE_BANDWIDTH,
+                                (double) 1000, GNUNET_ATS_PREFERENCE_END);
         }
         if (0 == memcmp (&addr[1].peer, &address->peer, sizeof (address->peer)))
         {
-                GNUNET_ATS_performance_give_feedback (ph, &addr[1].peer, GNUNET_ATS_PREFERENCE_BANDWIDTH,(double) 1000, GNUNET_ATS_PREFERENCE_END);
+                GNUNET_ATS_performance_give_feedback (ph, &addr[1].peer,
+                                GNUNET_TIME_UNIT_SECONDS, GNUNET_ATS_PREFERENCE_BANDWIDTH,
+                                GNUNET_ATS_PREFERENCE_END);
                 res_suggest_cb_p1 = GNUNET_YES;
         }
 }