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

[gnunet]

Author: wachs
Date: 2013-02-19 14:37:29 +0100 (Tue, 19 Feb 2013)
New Revision: 26159

Modified:
   gnunet/src/ats/ats.conf.in
   gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
   gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
   gnunet/src/ats/test_ats_mlp.c
   gnunet/src/ats/test_ats_mlp.conf
Log:
changes


Modified: gnunet/src/ats/ats.conf.in
===================================================================
--- gnunet/src/ats/ats.conf.in  2013-02-19 12:52:39 UTC (rev 26158)
+++ gnunet/src/ats/ats.conf.in  2013-02-19 13:37:29 UTC (rev 26159)
@@ -32,9 +32,11 @@
 
 
 # MLP specific settings
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000
+MLP_MIN_INTERVAL = 15000
 
+# check if required
+#MLP_EXEC_INTERVAL = 30000
+
 # MLP defaults
 # MLP_MAX_DURATION = 3 s
 # MLP_MAX_ITERATIONS = 1024 

Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2013-02-19 12:52:39 UTC 
(rev 26158)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2013-02-19 13:37:29 UTC 
(rev 26159)
@@ -1138,7 +1138,9 @@
   mlp->prob = glp_create_prob();
   if (NULL == mlp->prob)
   {
-               GNUNET_assert (mlp->prob != NULL);
+               LOG (GNUNET_ERROR_TYPE_ERROR, "Failed to create MLP problem!");
+               GNUNET_free (mlp);
+      return NULL;
   }
 
   mlp->BIG_M = (double) BIG_M_VALUE;
@@ -1298,17 +1300,26 @@
 
   /* Get minimum number of connections from configuration */
   if (GNUNET_OK == GNUNET_CONFIGURATION_get_value_time (cfg, "ats",
-                                                        "ATS_EXEC_INTERVAL",
+                                                        "MLP_EXEC_INTERVAL",
                                                         &i_exec))
     mlp->exec_interval = i_exec;
   else
     mlp->exec_interval = 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30);
 
-
   /* Assign options to handle */
   mlp->stats = (struct GNUNET_STATISTICS_Handle *) stats;
+  mlp->bw_changed_cb = bw_changed_cb;
+  mlp->bw_changed_cb_cls = bw_changed_cb_cls;
+  mlp->co_D = D;
+  mlp->co_R = R;
+  mlp->co_U = U;
+  mlp->b_min = b_min;
+  mlp->n_min = n_min;
+  mlp->m_q = GNUNET_ATS_QualityPropertiesCount;
+  mlp->semaphore = GNUNET_NO;
   mlp->max_iterations = max_iterations;
   mlp->max_exec_duration = max_duration;
+  mlp->last_execution = GNUNET_TIME_UNIT_FOREVER_ABS;
   mlp->auto_solve = GNUNET_YES;
 
   /* Redirect GLPK output to GNUnet logging */
@@ -1316,34 +1327,21 @@
 
   /* Init LP solving parameters */
   glp_init_smcp(&mlp->control_param_lp);
-
   mlp->control_param_lp.msg_lev = GLP_MSG_OFF;
 #if VERBOSE_GLPK
   mlp->control_param_lp.msg_lev = GLP_MSG_ALL;
 #endif
-
   mlp->control_param_lp.it_lim = max_iterations;
   mlp->control_param_lp.tm_lim = max_duration.rel_value;
 
   /* Init MLP solving parameters */
   glp_init_iocp(&mlp->control_param_mlp);
-
   mlp->control_param_mlp.msg_lev = GLP_MSG_OFF;
 #if VERBOSE_GLPK
   mlp->control_param_mlp.msg_lev = GLP_MSG_ALL;
 #endif
   mlp->control_param_mlp.tm_lim = max_duration.rel_value;
 
-  mlp->last_execution = GNUNET_TIME_UNIT_FOREVER_ABS;
-
-  mlp->co_D = D;
-  mlp->co_R = R;
-  mlp->co_U = U;
-  mlp->b_min = b_min;
-  mlp->n_min = n_min;
-  mlp->m_q = GNUNET_ATS_QualityPropertiesCount;
-  mlp->semaphore = GNUNET_NO;
-
   LOG (GNUNET_ERROR_TYPE_DEBUG, "solver ready\n");
 
   return mlp;

Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.h   2013-02-19 12:52:39 UTC 
(rev 26158)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.h   2013-02-19 13:37:29 UTC 
(rev 26159)
@@ -91,6 +91,16 @@
   struct GNUNET_STATISTICS_Handle *stats;
 
   /**
+   * Addresses' bandwidth changed callback
+   */
+  GAS_bandwidth_changed_cb bw_changed_cb;
+
+  /**
+   * Addresses' bandwidth changed callback closure
+   */
+  void *bw_changed_cb_cls;
+
+  /**
    * GLPK (MLP) problem object
    */
 #if HAVE_LIBGLPK
@@ -146,6 +156,9 @@
    */
   int auto_solve;
 
+  /**
+   * Is a solution attemp running?
+   */
   int semaphore;
 
   /* state information */

Modified: gnunet/src/ats/test_ats_mlp.c
===================================================================
--- gnunet/src/ats/test_ats_mlp.c       2013-02-19 12:52:39 UTC (rev 26158)
+++ gnunet/src/ats/test_ats_mlp.c       2013-02-19 13:37:29 UTC (rev 26159)
@@ -208,6 +208,11 @@
 
   /* Retrieving preferred address for peer and wait for callback */
   GAS_mlp_get_preferred_address (mlp, addresses, &p);
+
+  /* Shutdown */
+  GAS_mlp_done (mlp);
+  mlp = NULL;
+  end_now (0);
 }
 
 

Modified: gnunet/src/ats/test_ats_mlp.conf
===================================================================
--- gnunet/src/ats/test_ats_mlp.conf    2013-02-19 12:52:39 UTC (rev 26158)
+++ gnunet/src/ats/test_ats_mlp.conf    2013-02-19 13:37:29 UTC (rev 26159)
@@ -38,12 +38,23 @@
 WLAN_QUOTA_IN = 4096
 WLAN_QUOTA_OUT = 4096
 
-# ATS extended options
+# MLP specific settings
+ATS_MIN_INTERVAL = 15000
+ATS_EXEC_INTERVAL = 30000
+
+# MLP defaults
+# MLP_MAX_DURATION = 3 s
+# MLP_MAX_ITERATIONS = 1024 
+# MLP_COEFFICIENT_D = 1.0
+# MLP_COEFFICIENT_U = 1.0
+# MLP_COEFFICIENT_R = 1.0
+# MLP_MIN_BANDWIDTH = 1024
+# MLP_MIN_CONNECTIONS = 4
+
+# MLP Debugging settings
 DUMP_MLP = NO
 DUMP_SOLUTION = NO
 DUMP_OVERWRITE = NO 
 DUMP_MIN_PEERS = 0
 DUMP_MIN_ADDRS = 0
 DUMP_OVERWRITE = NO
-ATS_MIN_INTERVAL = 15000
-ATS_EXEC_INTERVAL = 30000