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

[gnunet]

Author: wachs
Date: 2013-10-09 09:37:11 +0200 (Wed, 09 Oct 2013)
New Revision: 30024

Modified:
   gnunet/src/ats/Makefile.am
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/libgnunet_plugin_ats_mlp.c
   gnunet/src/ats/libgnunet_plugin_ats_proportional.c
   gnunet/src/ats/libgnunet_plugin_ats_ril.c
Log:
renaming


Modified: gnunet/src/ats/Makefile.am
===================================================================
--- gnunet/src/ats/Makefile.am  2013-10-09 07:33:47 UTC (rev 30023)
+++ gnunet/src/ats/Makefile.am  2013-10-09 07:37:11 UTC (rev 30024)
@@ -90,10 +90,6 @@
 libexec_PROGRAMS = \
  gnunet-service-ats
 
-# gnunet-service-ats-solver_proportional.c 
gnunet-service-ats-solver_proportional.h
-# $(GN_MLP_SRC)
-# gnunet-service-ats-solver_ril.c gnunet-service-ats-solver_ril.h 
-
 gnunet_service_ats_SOURCES = \
  gnunet-service-ats.c gnunet-service-ats.h\
  gnunet-service-ats_addresses.c gnunet-service-ats_addresses.h \

Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2013-10-09 07:33:47 UTC 
(rev 30023)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2013-10-09 07:37:11 UTC 
(rev 30024)
@@ -1715,9 +1715,9 @@
   load_quotas (cfg, quotas_in, quotas_out, GNUNET_ATS_NetworkTypeCount);
   ah->env.bandwidth_changed_cb = &bandwidth_changed_cb;
   ah->env.bw_changed_cb_cls = ah;
-  ah->env.get_preferences_cb = &get_preferences_cb;
+  ah->env.get_preferences = &get_preferences_cb;
   ah->env.get_preference_cls = ah;
-  ah->env.get_property_cb = &get_property_cb;
+  ah->env.get_property = &get_property_cb;
   ah->env.get_property_cls = ah;
   ah->env.cfg = cfg;
   ah->env.stats = stats;

Modified: gnunet/src/ats/libgnunet_plugin_ats_mlp.c
===================================================================
--- gnunet/src/ats/libgnunet_plugin_ats_mlp.c   2013-10-09 07:33:47 UTC (rev 
30023)
+++ gnunet/src/ats/libgnunet_plugin_ats_mlp.c   2013-10-09 07:37:11 UTC (rev 
30024)
@@ -1843,8 +1843,8 @@
   GNUNET_assert (NULL != env->stats);
   GNUNET_assert (NULL != env->addresses);
   GNUNET_assert (NULL != env->bandwidth_changed_cb);
-  GNUNET_assert (NULL != env->get_preferences_cb);
-  GNUNET_assert (NULL != env->get_property_cb);
+  GNUNET_assert (NULL != env->get_preferences);
+  GNUNET_assert (NULL != env->get_property);
 
   /* Init GLPK environment */
   int res = glp_init_env();
@@ -2056,9 +2056,9 @@
   mlp->addresses = env->addresses;
   mlp->bw_changed_cb = env->bandwidth_changed_cb;
   mlp->bw_changed_cb_cls = env->bw_changed_cb_cls;
-  mlp->get_preferences =  env->get_preferences_cb;
+  mlp->get_preferences =  env->get_preferences;
   mlp->get_preferences_cls = env->get_preference_cls;
-  mlp->get_properties = env->get_property_cb;
+  mlp->get_properties = env->get_property;
   mlp->get_properties_cls = env->get_property_cls;
   /* Setting MLP Input variables */
 

Modified: gnunet/src/ats/libgnunet_plugin_ats_proportional.c
===================================================================
--- gnunet/src/ats/libgnunet_plugin_ats_proportional.c  2013-10-09 07:33:47 UTC 
(rev 30023)
+++ gnunet/src/ats/libgnunet_plugin_ats_proportional.c  2013-10-09 07:37:11 UTC 
(rev 30024)
@@ -384,8 +384,8 @@
   GNUNET_assert(NULL != env->cfg);
   GNUNET_assert(NULL != env->stats);
   GNUNET_assert(NULL != env->bandwidth_changed_cb);
-  GNUNET_assert(NULL != env->get_preferences_cb);
-  GNUNET_assert(NULL != env->get_property_cb);
+  GNUNET_assert(NULL != env->get_preferences);
+  GNUNET_assert(NULL != env->get_property);
 
   s = GNUNET_malloc (sizeof (struct GAS_PROPORTIONAL_Handle));
   s->env = env;
@@ -405,9 +405,9 @@
   s->stats = (struct GNUNET_STATISTICS_Handle *) env->stats;
   s->bw_changed = env->bandwidth_changed_cb;
   s->bw_changed_cls = env->bw_changed_cb_cls;
-  s->get_preferences = env->get_preferences_cb;
+  s->get_preferences = env->get_preferences;
   s->get_preferences_cls = env->get_preference_cls;
-  s->get_properties = env->get_property_cb;
+  s->get_properties = env->get_property;
   s->get_properties_cls = env->get_property_cls;
   s->network_count = env->network_count;
   s->network_entries = GNUNET_malloc (env->network_count * sizeof (struct 
Network));

Modified: gnunet/src/ats/libgnunet_plugin_ats_ril.c
===================================================================
--- gnunet/src/ats/libgnunet_plugin_ats_ril.c   2013-10-09 07:33:47 UTC (rev 
30023)
+++ gnunet/src/ats/libgnunet_plugin_ats_ril.c   2013-10-09 07:37:11 UTC (rev 
30024)
@@ -1261,8 +1261,8 @@
   GNUNET_assert(NULL != env->cfg);
   GNUNET_assert(NULL != env->stats);
   GNUNET_assert(NULL != env->bandwidth_changed_cb);
-  GNUNET_assert(NULL != env->get_preferences_cb);
-  GNUNET_assert(NULL != env->get_property_cb);
+  GNUNET_assert(NULL != env->get_preferences);
+  GNUNET_assert(NULL != env->get_property);
 
   if (GNUNET_OK
       != GNUNET_CONFIGURATION_get_value_time (env->cfg, "ats", 
"RIL_STEP_TIME", &solver->step_time))
@@ -1321,9 +1321,9 @@
   solver->callbacks = GNUNET_malloc (sizeof (struct RIL_Callbacks));
   solver->callbacks->bw_changed = env->bandwidth_changed_cb;
   solver->callbacks->bw_changed_cls = env->bw_changed_cb_cls;
-  solver->callbacks->get_preferences = env->get_preferences_cb;
+  solver->callbacks->get_preferences = env->get_preferences;
   solver->callbacks->get_preferences_cls = env->get_preference_cls;
-  solver->callbacks->get_properties = env->get_property_cb;
+  solver->callbacks->get_properties = env->get_property;
   solver->callbacks->get_properties_cls = env->get_property_cls;
   solver->networks_count = env->network_count;
   solver->network_entries = GNUNET_malloc (env->network_count * sizeof (struct 
RIL_Network));