indent

[oweals/gnunet.git] / src / ats / gnunet-service-ats_normalization.h

diff --git a/src/ats/gnunet-service-ats_normalization.h b/src/ats/gnunet-service-ats_normalization.h
index 24b6b505106b275a54097592416553a38e441e8a..1bced55e132b1a27895d2d590ae2919d12ef3dfe 100644 (file)
--- a/src/ats/gnunet-service-ats_normalization.h
+++ b/src/ats/gnunet-service-ats_normalization.h
@@ -27,8 +27,9 @@
 #include "platform.h"
 #include "gnunet_ats_service.h"
 
-#define PREF_AGING_INTERVAL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
+#define PREF_AGING_INTERVAL GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1)
 #define PREF_AGING_FACTOR 0.95
+#define PREF_EPSILON 0.1
 
 #define DEFAULT_REL_PREFERENCE 1.0
 #define DEFAULT_ABS_PREFERENCE 0.0
@@ -41,6 +42,12 @@ typedef void
                                                                                                                                                                                enum GNUNET_ATS_PreferenceKind kind,
                                                                                                                                                                                double pref_rel);
 
+typedef void
+(*GAS_Normalization_property_changed_cb) (void *cls,
+                                                                                                                                                                struct ATS_Address *peer,
+                                                                                                                                                                uint32_t type,
+                                                                                                                                                                double prop_rel);
+
 /**
  * Get the normalized preference values for a specific peer
  *
@@ -51,6 +58,17 @@ const double *
 GAS_normalization_get_preferences (const struct GNUNET_PeerIdentity *id);
 
 
+/**
+ * Get the normalized properties values for a specific peer or
+ * the default values if
+ *
+ * @param address the address
+ * @return pointer to the values, can be indexed with GNUNET_ATS_PreferenceKind,
+ * default preferences if peer does not exist
+ */
+const double *
+GAS_normalization_get_properties (struct ATS_Address *address);
+
 /**
  * Normalize an updated preference value
  *
@@ -59,25 +77,40 @@ GAS_normalization_get_preferences (const struct GNUNET_PeerIdentity *id);
  * @param kind the kind to change the preference
  * @param score_abs the normalized score
  */
-float
+void
 GAS_normalization_normalize_preference (void *src,
                                         const struct GNUNET_PeerIdentity *peer,
                                         enum GNUNET_ATS_PreferenceKind kind,
                                         float score_abs);
 
+/**
+ * Update and normalize a atsi performance information
+ *
+ * @param addresses hashmap containing all addresses
+ * @param address the address to update
+ * @param atsi the array of performance information
+ * @param atsi_count the number of atsi information in the array
+ */
 void
-GAS_normalization_normalize_property (struct ATS_Address *address,
+GAS_normalization_normalize_property (struct GNUNET_CONTAINER_MultiHashMap *addresses,
+                                                                                                                                                       struct ATS_Address *address,
                                                                                                                                                        const struct GNUNET_ATS_Information *atsi,
                                                                                                                                                        uint32_t atsi_count);
 
+
 /**
  * Start the normalization component
  *
  * @param pref_ch_cb callback to call on relative preference changing
- * @param pref_ch_cb_cls cls for the callback
+ * @param pref_ch_cb_cls cls for the preference callback
+ * @param property_ch_cb callback to call on relative property changing
+ * @param property_ch_cb_cls cls for the property callback
  */
 void
-GAS_normalization_start (GAS_Normalization_preference_changed_cb pref_ch_cb, void *pref_ch_cb_cls);
+GAS_normalization_start (GAS_Normalization_preference_changed_cb pref_ch_cb,
+               void *pref_ch_cb_cls,
+               GAS_Normalization_property_changed_cb property_ch_cb,
+               void *property_ch_cb_cls);
 
 
 /**