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

[gnunet]

Author: grothoff
Date: 2015-02-05 21:15:02 +0100 (Thu, 05 Feb 2015)
New Revision: 35115

Modified:
   gnunet/src/ats/gnunet-service-ats_preferences.c
   gnunet/src/ats/gnunet-service-ats_preferences.h
Log:
starting with cleaning up gnunet-service-ats_preferences.c

Modified: gnunet/src/ats/gnunet-service-ats_preferences.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_preferences.c     2015-02-05 20:09:20 UTC 
(rev 35114)
+++ gnunet/src/ats/gnunet-service-ats_preferences.c     2015-02-05 20:15:02 UTC 
(rev 35115)
@@ -34,10 +34,19 @@
 
 #define LOG(kind,...) GNUNET_log_from (kind, "ats-preferencesx",__VA_ARGS__)
 
+/**
+ *
+ */
 #define PREF_AGING_INTERVAL GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 10)
 
+/**
+ *
+ */
 #define PREF_AGING_FACTOR 0.95
 
+/**
+ *
+ */
 #define PREF_EPSILON 0.01
 
 
@@ -205,7 +214,6 @@
         peer_count ++;
         f_rel_total += p_cur->f_rel[kind];
       }
-
     }
   }
 
@@ -230,7 +238,8 @@
       rp->f_rel[kind] = DEFAULT_REL_PREFERENCE;
     }
     if (backup != rp->f_rel[kind])
-      GAS_normalized_preference_changed (&rp->id, kind, rp->f_rel[kind]);
+      GAS_normalized_preference_changed (&rp->id, kind,
+                                         rp->f_rel[kind]);
   }
 }
 
@@ -436,7 +445,6 @@
 }
 
 
-
 /**
  * Change the preference for a peer
  *
@@ -447,9 +455,9 @@
  */
 static void
 preference_change (struct GNUNET_SERVER_Client *client,
-                    const struct GNUNET_PeerIdentity *peer,
-                    enum GNUNET_ATS_PreferenceKind kind,
-                    float score_abs)
+                   const struct GNUNET_PeerIdentity *peer,
+                   enum GNUNET_ATS_PreferenceKind kind,
+                   float score_abs)
 {
   if (GNUNET_NO ==
       GNUNET_CONTAINER_multipeermap_contains (GSA_addresses,
@@ -597,7 +605,9 @@
   while (NULL != (pc = next_pc))
   {
     next_pc = pc->next;
-    GNUNET_CONTAINER_DLL_remove(pc_head, pc_tail, pc);
+    GNUNET_CONTAINER_DLL_remove (pc_head,
+                                 pc_tail,
+                                 pc);
     free_client (pc);
   }
   GNUNET_CONTAINER_multipeermap_iterate (preference_peers,
@@ -642,10 +652,8 @@
 
   /* Find preference client */
   for (c_cur = pc_head; NULL != c_cur; c_cur = c_cur->next)
-  {
     if (client == c_cur->client)
       break;
-  }
   /* Not found: create new preference client */
   if (NULL == c_cur)
   {
@@ -657,13 +665,19 @@
       c_cur->f_rel_sum[i] = DEFAULT_REL_PREFERENCE;
     }
 
-    GNUNET_CONTAINER_DLL_insert(pc_head, pc_tail, c_cur);
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Adding new client %p \n", c_cur);
+    GNUNET_CONTAINER_DLL_insert (pc_head,
+                                 pc_tail,
+                                 c_cur);
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Adding new client %p\n",
+         c_cur);
   }
 
   /* Find entry for peer */
   for (p_cur = c_cur->p_head; NULL != p_cur; p_cur = p_cur->next)
-    if (0 == memcmp (&p_cur->id, peer, sizeof(p_cur->id)))
+    if (0 == memcmp (&p_cur->id,
+                     peer,
+                     sizeof (p_cur->id)))
       break;
 
   /* Not found: create new peer entry */
@@ -680,21 +694,29 @@
       p_cur->f_rel[i] = DEFAULT_REL_PREFERENCE;
       p_cur->next_aging[i] = GNUNET_TIME_UNIT_FOREVER_ABS;
     }
-    LOG (GNUNET_ERROR_TYPE_DEBUG, "Adding new peer %p for client %p \n",
-        p_cur, c_cur);
-    GNUNET_CONTAINER_DLL_insert(c_cur->p_head, c_cur->p_tail, p_cur);
+    LOG (GNUNET_ERROR_TYPE_DEBUG,
+         "Adding new peer %p for client %p\n",
+         p_cur,
+         c_cur);
+    GNUNET_CONTAINER_DLL_insert (c_cur->p_head,
+                                 c_cur->p_tail,
+                                 p_cur);
   }
 
   /* Create struct for peer */
-  if (NULL == GNUNET_CONTAINER_multipeermap_get (preference_peers, peer))
+  if (NULL ==
+      GNUNET_CONTAINER_multipeermap_get (preference_peers,
+                                         peer))
   {
     r_cur = GNUNET_new (struct PeerRelative);
-    r_cur->id = (*peer);
+    r_cur->id = *peer;
     for (i = 0; i < GNUNET_ATS_PreferenceCount; i++)
       r_cur->f_rel[i] = DEFAULT_REL_PREFERENCE;
-    GNUNET_assert(
-        GNUNET_OK == GNUNET_CONTAINER_multipeermap_put (preference_peers,
-            &r_cur->id, r_cur, 
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+    GNUNET_assert(GNUNET_OK ==
+                  GNUNET_CONTAINER_multipeermap_put (preference_peers,
+                                                     &r_cur->id,
+                                                     r_cur,
+                                                     
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
   }
 
   /* Update absolute value */
@@ -703,14 +725,15 @@
   if (p_cur->f_abs[kind] == old_value)
     return;
 
-  run_preference_update (c_cur, p_cur, kind, score_abs);
+  run_preference_update (c_cur,
+                         p_cur,
+                         kind,
+                         score_abs);
 
-  /* Start aging task */
   if (NULL == aging_task)
     aging_task = GNUNET_SCHEDULER_add_delayed (PREF_AGING_INTERVAL,
                                                &preference_aging,
                                                NULL);
-
 }
 
 
@@ -748,16 +771,17 @@
 GAS_normalization_preference_client_disconnect (struct GNUNET_SERVER_Client 
*client)
 {
   struct PreferenceClient *c_cur;
-  /* Find preference client */
 
   for (c_cur = pc_head; NULL != c_cur; c_cur = c_cur->next)
-  {
     if (client == c_cur->client)
       break;
-  }
   if (NULL == c_cur)
     return;
-
-  GNUNET_CONTAINER_DLL_remove(pc_head, pc_tail, c_cur);
+  GNUNET_CONTAINER_DLL_remove (pc_head,
+                               pc_tail,
+                               c_cur);
   free_client (c_cur);
 }
+
+
+/* end of gnunet-service-ats_preferences.c */

Modified: gnunet/src/ats/gnunet-service-ats_preferences.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_preferences.h     2015-02-05 20:09:20 UTC 
(rev 35114)
+++ gnunet/src/ats/gnunet-service-ats_preferences.h     2015-02-05 20:15:02 UTC 
(rev 35115)
@@ -39,19 +39,33 @@
 
 
 /**
- * Get the normalized preference values for a specific peer.
+ * Handle 'preference change' messages from clients.
  *
- * @param cls ignored
- * @param id the peer
- * @return pointer to the values, can be indexed
- *  with GNUNET_ATS_PreferenceKind, NULL if peer does not exist
+ * @param cls unused, NULL
+ * @param client client that sent the request
+ * @param message the request message
  */
-const double *
-GAS_normalization_get_preferences_by_peer (void *cls,
-                                          const struct GNUNET_PeerIdentity 
*id);
+void
+GAS_handle_preference_change (void *cls,
+                              struct GNUNET_SERVER_Client *client,
+                              const struct GNUNET_MessageHeader *message);
 
 
 /**
+ * Initialize preferences subsystem.
+ */
+void
+GAS_preference_init (void);
+
+
+/**
+ * Shutdown preferences subsystem.
+ */
+void
+GAS_preference_done (void);
+
+
+/**
  * Normalize an updated preference value
  *
  * @param client the client with this preference
@@ -65,41 +79,26 @@
                                         enum GNUNET_ATS_PreferenceKind kind,
                                         float score_abs);
 
-
 /**
- * A performance client disconnected
+ * Get the normalized preference values for a specific peer.
  *
- * @param client the disconnecting client
+ * @param cls ignored
+ * @param id the peer
+ * @return pointer to the values, can be indexed
+ *  with GNUNET_ATS_PreferenceKind, NULL if peer does not exist
  */
-void
-GAS_normalization_preference_client_disconnect (struct GNUNET_SERVER_Client 
*client);
+const double *
+GAS_normalization_get_preferences_by_peer (void *cls,
+                                          const struct GNUNET_PeerIdentity 
*id);
 
 
 /**
- * Handle 'preference change' messages from clients.
+ * A performance client disconnected
  *
- * @param cls unused, NULL
- * @param client client that sent the request
- * @param message the request message
+ * @param client the disconnecting client
  */
 void
-GAS_handle_preference_change (void *cls,
-                              struct GNUNET_SERVER_Client *client,
-                              const struct GNUNET_MessageHeader *message);
+GAS_normalization_preference_client_disconnect (struct GNUNET_SERVER_Client 
*client);
 
 
-/**
- * Initialize preferences subsystem.
- */
-void
-GAS_preference_init (void);
-
-
-/**
- * Shutdown preferences subsystem.
- */
-void
-GAS_preference_done (void);
-
-
 #endif