adding functions for bulkmode

6 files changed, 97 insertions, 0 deletions

diff --git a/src/ats/gnunet-service-ats-solver_mlp.c b/src/ats/gnunet-service-ats-solver_mlp.c
index 43c62df0a..27dcc21cf 100644
--- a/src/ats/gnunet-service-ats-solver_mlp.c
+++ b/src/ats/gnunet-service-ats-solver_mlp.c
@@ -1507,6 +1507,25 @@ GAS_mlp_get_preferred_address (void *solver,
 
 
 /**
+ * Start a bulk operation
+ *
+ * @param solver the solver
+ */
+void
+GAS_mlp_bulk_start (void *solver)
+{
+
+}
+
+void
+GAS_mlp_bulk_stop (void *solver)
+{
+
+}
+
+
+
+/**
  * Stop notifying about address and bandwidth changes for this peer
  *
  * @param solver the MLP handle
diff --git a/src/ats/gnunet-service-ats-solver_mlp.h b/src/ats/gnunet-service-ats-solver_mlp.h
index ab9c59257..3d762819d 100644
--- a/src/ats/gnunet-service-ats-solver_mlp.h
+++ b/src/ats/gnunet-service-ats-solver_mlp.h
@@ -450,6 +450,22 @@ GAS_mlp_address_change_preference (void *solver,
 
 
 /**
+ * Start a bulk operation
+ *
+ * @param solver the solver
+ */
+void
+GAS_mlp_bulk_start (void *solver);
+
+
+/**
+ * Bulk operation done
+ */
+void
+GAS_mlp_bulk_stop (void *solver);
+
+
+/**
  * Get the preferred address for a specific peer
  *
  * @param solver the MLP Handle
diff --git a/src/ats/gnunet-service-ats-solver_proportional.c b/src/ats/gnunet-service-ats-solver_proportional.c
index bd5caa849..bafb55288 100644
--- a/src/ats/gnunet-service-ats-solver_proportional.c
+++ b/src/ats/gnunet-service-ats-solver_proportional.c
@@ -1030,6 +1030,27 @@ GAS_proportional_address_delete (void *solver,
 
 
 /**
+ * Start a bulk operation
+ *
+ * @param solver the solver
+ */
+void
+GAS_proportional_bulk_start (void *solver)
+{
+
+}
+
+/**
+ * Bulk operation done
+ */
+void
+GAS_proportional_bulk_stop (void *solver)
+{
+
+}
+
+
+/**
  * Add a new single address to a network
  *
  * @param solver the solver Handle
diff --git a/src/ats/gnunet-service-ats-solver_proportional.h b/src/ats/gnunet-service-ats-solver_proportional.h
index fda47cc93..2cef8c922 100644
--- a/src/ats/gnunet-service-ats-solver_proportional.h
+++ b/src/ats/gnunet-service-ats-solver_proportional.h
@@ -150,6 +150,21 @@ GAS_proportional_address_delete (void *solver,
 
 
 /**
+ * Start a bulk operation
+ *
+ * @param solver the solver
+ */
+void
+GAS_proportional_bulk_start (void *solver);
+
+
+/**
+ * Bulk operation done
+ */
+void
+GAS_proportional_bulk_stop (void *solver);
+
+/**
  * Stop notifying about address and bandwidth changes for this peer
  *
  * @param solver the MLP handle
diff --git a/src/ats/gnunet-service-ats_addresses.c b/src/ats/gnunet-service-ats_addresses.c
index 245cfeff7..c446d19c7 100644
--- a/src/ats/gnunet-service-ats_addresses.c
+++ b/src/ats/gnunet-service-ats_addresses.c
@@ -364,6 +364,16 @@ struct GAS_Addresses_Handle
   GAS_solver_address_change_preference s_pref;
 
   /**
+   * Start a bulk operation
+   */
+  GAS_solver_bulk_start s_bulk_start;
+
+  /**
+   * Bulk operation done
+   */
+  GAS_solver_bulk_stop s_bulk_stop;
+
+  /**
    * Shutdown solver
    */
   GAS_solver_done s_done;
@@ -938,7 +948,9 @@ GAS_addresses_update (struct GAS_Addresses_Handle *handle,
   prev_session = aa->session_id;
   aa->session_id = session_id;
 
+  handle->s_bulk_start (handle->solver);
   GAS_normalization_normalize_property (handle->addresses, aa, atsi, atsi_count);
+  handle->s_bulk_stop (handle->solver);
 
   /* Tell solver about update */
   handle->s_update (handle->solver, handle->addresses, aa, prev_session, aa->used, atsi_delta, atsi_delta_count);
@@ -1404,7 +1416,9 @@ GAS_addresses_change_preference (struct GAS_Addresses_Handle *handle,
       return;
   }
   /* 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);
 }
 
 
@@ -1636,6 +1650,8 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
       ah->s_get_stop = &GAS_mlp_stop_get_preferred_address;
       ah->s_pref = &GAS_mlp_address_change_preference;
       ah->s_del =  &GAS_mlp_address_delete;
+      ah->s_bulk_start = &GAS_mlp_bulk_start;
+      ah->s_bulk_stop = &GAS_mlp_bulk_stop;
       ah->s_done = &GAS_mlp_done;
 #else
       GNUNET_free (ah);
@@ -1652,6 +1668,8 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
       ah->s_get_stop = &GAS_proportional_stop_get_preferred_address;
       ah->s_pref = &GAS_proportional_address_change_preference;
       ah->s_del  = &GAS_proportional_address_delete;
+      ah->s_bulk_start = &GAS_proportional_bulk_start;
+      ah->s_bulk_stop = &GAS_proportional_bulk_stop;
       ah->s_done = &GAS_proportional_done;
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ATS started in %s mode\n", "SIMPLISTIC");
       break;
@@ -1668,6 +1686,8 @@ GAS_addresses_init (const struct GNUNET_CONFIGURATION_Handle *cfg,
   GNUNET_assert (NULL != ah->s_pref);
   GNUNET_assert (NULL != ah->s_del);
   GNUNET_assert (NULL != ah->s_done);
+  GNUNET_assert (NULL != ah->s_bulk_start);
+  GNUNET_assert (NULL != ah->s_bulk_stop);
 
   GAS_normalization_start (&normalized_preference_changed_cb, ah,
                                                                                                  &normalized_property_changed_cb, ah);
diff --git a/src/ats/gnunet-service-ats_addresses.h b/src/ats/gnunet-service-ats_addresses.h
index 4eddd5290..9aa3e46e9 100644
--- a/src/ats/gnunet-service-ats_addresses.h
+++ b/src/ats/gnunet-service-ats_addresses.h
@@ -448,6 +448,12 @@ typedef void
                                                                                                                                                                  enum GNUNET_ATS_PreferenceKind kind,
                                                                                                                                                                  double pref_rel);
 
+typedef void
+(*GAS_solver_bulk_start) (void *solver);
+
+typedef void
+(*GAS_solver_bulk_stop) (void *solver);
+
 /**
  * Add a single address within a network to the solver
  *