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

[gnunet]

Author: wachs
Date: 2013-07-02 16:54:42 +0200 (Tue, 02 Jul 2013)
New Revision: 27726

Modified:
   gnunet/src/ats/gnunet-service-ats-solver_mlp.c
   gnunet/src/ats/gnunet-service-ats-solver_mlp.h
   gnunet/src/ats/gnunet-service-ats-solver_proportional.c
   gnunet/src/ats/gnunet-service-ats_addresses.c
Log:
added support for bulk operations


Modified: gnunet/src/ats/gnunet-service-ats-solver_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats-solver_mlp.c      2013-07-02 14:39:23 UTC 
(rev 27725)
+++ gnunet/src/ats/gnunet-service-ats-solver_mlp.c      2013-07-02 14:54:42 UTC 
(rev 27726)
@@ -958,7 +958,7 @@
                LOG (GNUNET_ERROR_TYPE_DEBUG, "No changes to problem\n");
                return GNUNET_OK;
        }
-
+       mlp->addresses = addresses;
        if (GNUNET_YES == mlp->mlp_prob_changed)
        {
                        LOG (GNUNET_ERROR_TYPE_DEBUG, "Problem size changed, 
rebuilding\n");
@@ -1061,7 +1061,7 @@
   GNUNET_assert (NULL != addresses);
   GNUNET_assert (NULL != address);
 
-
+       mlp->addresses = addresses;
   if (NULL == address->solver_information)
   {
                address->solver_information = GNUNET_malloc (sizeof (struct 
MLP_information));
@@ -1338,6 +1338,7 @@
        GNUNET_assert (NULL != address);
        GNUNET_assert ((NULL != prev_atsi) || (0 == prev_atsi_count));
 
+       mlp->addresses = addresses;
   if (NULL == mlpi)
   {
       LOG (GNUNET_ERROR_TYPE_ERROR, _("Updating address for peer `%s' not 
added before\n"), GNUNET_i2s(&address->peer));
@@ -1386,7 +1387,7 @@
        GNUNET_assert (NULL != address);
 
        mlpi = address->solver_information;
-
+       mlp->addresses = addresses;
        if (NULL != mlpi)
        {
                        GNUNET_free (mlpi);
@@ -1480,7 +1481,7 @@
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Getting preferred address for `%s'\n",
                GNUNET_i2s (peer));
-
+       mlp->addresses = addresses;
   /* Is this peer included in the problem? */
   if (NULL == (p = GNUNET_CONTAINER_multihashmap_get (mlp->peers, 
&peer->hashPubKey)))
   {
@@ -1514,13 +1515,34 @@
 void
 GAS_mlp_bulk_start (void *solver)
 {
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Locking solver for bulk operation ...\n");
+  struct GAS_MLP_Handle *s = (struct GAS_MLP_Handle *) solver;
 
+  GNUNET_assert (NULL != solver);
+
+  s->bulk_lock ++;
 }
 
 void
 GAS_mlp_bulk_stop (void *solver)
 {
+       LOG (GNUNET_ERROR_TYPE_DEBUG, "Unlocking solver from bulk operation 
...\n");
 
+  struct GAS_MLP_Handle *s = (struct GAS_MLP_Handle *) solver;
+  GNUNET_assert (NULL != solver);
+
+  if (s->bulk_lock < 1)
+  {
+       GNUNET_break (0);
+       return;
+  }
+  s->bulk_lock --;
+
+  if (0 < s->bulk_changes)
+  {
+       GAS_mlp_solve_problem (solver, s->addresses);
+       s->bulk_changes = 0;
+  }
 }
 
 
@@ -1575,10 +1597,9 @@
                GNUNET_i2s(peer));
 
   GNUNET_STATISTICS_update (mlp->stats,"# LP address preference changes", 1, 
GNUNET_NO);
-
+       mlp->addresses = addresses;
   /* Update the constraints with changed preferences */
 
-
   /* Update quality constraint c7 */
 
   /* Update relativity constraint c9 */
@@ -1588,11 +1609,16 @@
        return;
   }
   p->f = get_peer_pref_value (mlp, peer);
-  mlp_create_problem_set_value (&mlp->p, p->r_c9, mlp->p.c_r, -p->f, __LINE__);
+  /* FXIME: cannot use set_value mlp_create_problem_set_value (&mlp->p, 
p->r_c9, mlp->p.c_r, -p->f, __LINE__);*/
 
-
        /* Problem size changed: new address for peer with pending request */
        mlp->mlp_prob_updated = GNUNET_YES;
+       if (GNUNET_YES == mlp->bulk_lock)
+       {
+               mlp->bulk_changes++;
+               return;
+       }
+
        if (GNUNET_YES == mlp->mlp_auto_solve)
                GAS_mlp_solve_problem (solver, addresses);
   return;

Modified: gnunet/src/ats/gnunet-service-ats-solver_mlp.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats-solver_mlp.h      2013-07-02 14:39:23 UTC 
(rev 27725)
+++ gnunet/src/ats/gnunet-service-ats-solver_mlp.h      2013-07-02 14:54:42 UTC 
(rev 27726)
@@ -110,6 +110,7 @@
 #else
   void *prob;
 #endif
+
   /* Number of addresses in problem */
   unsigned int num_addresses;
   /* Number of peers in problem */
@@ -150,6 +151,7 @@
   int *ja;
   /* Column index value */
   double *ar;
+
 };
 
 struct MLP_Variables
@@ -219,6 +221,11 @@
   struct GNUNET_STATISTICS_Handle *stats;
 
   /**
+   * Address hashmap for lookups
+   */
+  struct GNUNET_CONTAINER_MultiHashMap *addresses;
+
+  /**
    * Addresses' bandwidth changed callback
    */
   GAS_bandwidth_changed_cb bw_changed_cb;
@@ -239,6 +246,17 @@
   struct MLP_Solution ps;
 
   /**
+   * Bulk lock
+   */
+
+  int bulk_lock;
+
+  /**
+   * Number of changes while solver was locked
+   */
+  int bulk_changes;
+
+  /**
    * GLPK LP control parameter
    */
 #if HAVE_LIBGLPK

Modified: gnunet/src/ats/gnunet-service-ats-solver_proportional.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats-solver_proportional.c     2013-07-02 
14:39:23 UTC (rev 27725)
+++ gnunet/src/ats/gnunet-service-ats-solver_proportional.c     2013-07-02 
14:54:42 UTC (rev 27726)
@@ -221,51 +221,59 @@
   /**
    * Statistics handle
    */
-
   struct GNUNET_STATISTICS_Handle *stats;
 
   /**
-   * Total number of addresses for solver
+   * Bandwidth changed callback
    */
-  unsigned int total_addresses;
+  GAS_bandwidth_changed_cb bw_changed;
 
   /**
-   * Number of active addresses for solver
+   * Bandwidth changed callback cls
    */
-  unsigned int active_addresses;
+  void *bw_changed_cls;
 
   /**
-   * Networks array
+   * ATS function to get preferences
    */
-  struct Network *network_entries;
+  GAS_get_preferences get_preferences;
 
   /**
-   * Number of networks
+   * Closure for ATS function to get preferences
    */
-  unsigned int networks;
+  void *get_preferences_cls;
 
   /**
-   * Callback
+   * Bulk lock
    */
-  GAS_bandwidth_changed_cb bw_changed;
+  int bulk_lock;
 
   /**
-   * Callback cls
+   * Number of changes while solver was locked
    */
-  void *bw_changed_cls;
+  int bulk_changes;
 
+
   /**
-   * ATS function to get preferences
+   * Total number of addresses for solver
    */
-  GAS_get_preferences get_preferences;
+  unsigned int total_addresses;
 
   /**
-   * Closure for ATS function to get preferences
+   * Number of active addresses for solver
    */
-  void *get_preferences_cls;
+  unsigned int active_addresses;
 
-  struct PreferenceClient *pc_head;
-  struct PreferenceClient *pc_tail;
+  /**
+   * Networks array
+   */
+  struct Network *network_entries;
+
+  /**
+   * Number of networks
+   */
+  unsigned int networks;
+
 };
 
 
@@ -856,7 +864,11 @@
   struct GAS_PROPORTIONAL_Handle *s = solver;
   GNUNET_assert (NULL != solver);
   GNUNET_assert (NULL != peer);
-  distribute_bandwidth_in_all_networks (s);
+
+  if (GNUNET_NO == s->bulk_lock)
+       distribute_bandwidth_in_all_networks (s);
+  else
+       s->bulk_changes ++;
 }
 
 /**
@@ -922,7 +934,10 @@
       s->bw_changed (s->bw_changed_cls, prev); /* notify about bw change, 
REQUIRED? */
       if (GNUNET_SYSERR == addresse_decrement (s, net_prev, GNUNET_NO, 
GNUNET_YES))
         GNUNET_break (0);
-      distribute_bandwidth_in_network (s, net_prev, NULL);
+      if (GNUNET_NO == s->bulk_lock)
+       distribute_bandwidth_in_network (s, net_prev, NULL);
+      else
+       s->bulk_changes ++;
   }
 
   if (GNUNET_NO == (is_bandwidth_available_in_network 
(cur->solver_information)))
@@ -933,7 +948,10 @@
 
   cur->active = GNUNET_YES;
   addresse_increment(s, net_cur, GNUNET_NO, GNUNET_YES);
-  distribute_bandwidth_in_network (s, net_cur, cur);
+  if (GNUNET_NO == s->bulk_lock)
+       distribute_bandwidth_in_network (s, net_cur, cur);
+  else
+       s->bulk_changes ++;
 
   return cur;
 }
@@ -1019,7 +1037,10 @@
       address->active = GNUNET_NO;
       if (GNUNET_SYSERR == addresse_decrement (s, net, GNUNET_NO, GNUNET_YES))
         GNUNET_break (0);
-      distribute_bandwidth_in_network (s, net, NULL);
+      if (GNUNET_NO == s->bulk_lock)
+       distribute_bandwidth_in_network (s, net, NULL);
+      else
+       s->bulk_changes ++;
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG, "After deleting address now total %u and 
active %u addresses in network `%s'\n",
       net->total_addresses,
@@ -1037,7 +1058,11 @@
 void
 GAS_proportional_bulk_start (void *solver)
 {
+  LOG (GNUNET_ERROR_TYPE_ERROR, "Locking solver for bulk operation ...\n");
+  struct GAS_PROPORTIONAL_Handle *s = (struct GAS_PROPORTIONAL_Handle *) 
solver;
 
+  GNUNET_assert (NULL != solver);
+  s->bulk_lock ++;
 }
 
 /**
@@ -1046,7 +1071,23 @@
 void
 GAS_proportional_bulk_stop (void *solver)
 {
+       LOG (GNUNET_ERROR_TYPE_ERROR, "Unlocking solver from bulk operation 
...\n");
 
+  struct GAS_PROPORTIONAL_Handle *s = (struct GAS_PROPORTIONAL_Handle *) 
solver;
+  GNUNET_assert (NULL != solver);
+
+  if (s->bulk_lock < 1)
+  {
+       GNUNET_break (0);
+       return;
+  }
+  s->bulk_lock --;
+  if ((0 == s->bulk_lock) && (s->bulk_changes))
+  {
+       LOG (GNUNET_ERROR_TYPE_ERROR, "No lock pending, recalculating\n");
+       distribute_bandwidth_in_all_networks (s);
+       s->bulk_changes = 0;
+  }
 }
 
 
@@ -1153,7 +1194,10 @@
               /* Suggest updated address */
               address->active = GNUNET_YES;
               addresse_increment (s, new_net, GNUNET_NO, GNUNET_YES);
-              distribute_bandwidth_in_network (solver, new_net, NULL);
+              if (GNUNET_NO == s->bulk_lock)
+               distribute_bandwidth_in_network (solver, new_net, NULL);
+              else
+               s->bulk_changes ++;
           }
           else
           {
@@ -1294,6 +1338,7 @@
   s->network_entries = GNUNET_malloc (dest_length * sizeof (struct Network));
   s->active_addresses = 0;
   s->total_addresses = 0;
+  s->bulk_lock = GNUNET_NO;
 
   for (c = 0; c < dest_length; c++)
   {

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2013-07-02 14:39:23 UTC 
(rev 27725)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2013-07-02 14:54:42 UTC 
(rev 27726)
@@ -819,7 +819,9 @@
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Added new address for peer `%s' 
session id %u, %p\n",
                 GNUNET_i2s (peer), session_id, aa);
     /* Tell solver about new address */
+    handle->s_bulk_start (handle->solver);
     GAS_normalization_normalize_property (handle->addresses, aa, atsi, 
atsi_count);
+    handle->s_bulk_stop (handle->solver);
     handle->s_add (handle->solver, handle->addresses, aa, addr_net);
     /* Notify performance clients about new address */
     GAS_performance_notify_all_clients (&aa->peer,
@@ -863,7 +865,9 @@
   }
 
   /* Notify solver about update with atsi information and session */
+  handle->s_bulk_start (handle->solver);
   GAS_normalization_normalize_property (handle->addresses, ea, atsi, 
atsi_count);
+  handle->s_bulk_stop (handle->solver);
   handle->s_update (handle->solver, handle->addresses, ea, session_id, 
ea->used, atsi_delta, atsi_delta_count);
   GNUNET_free_non_null (atsi_delta);
 
@@ -1415,8 +1419,9 @@
                   GNUNET_i2s (peer), client);
       return;
   }
+
+  handle->s_bulk_start (handle->solver);
   /* Tell normalization about change, normalization will call callback if 
preference changed */
-  handle->s_bulk_start (handle->solver);
   GAS_normalization_normalize_preference (client, peer, kind, score_abs);
   handle->s_bulk_stop (handle->solver);
 }