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

[gnunet]

Author: wachs
Date: 2013-11-07 11:39:56 +0100 (Thu, 07 Nov 2013)
New Revision: 30596

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/libgnunet_plugin_ats_mlp.c
Log:
fix and eval function


Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2013-11-07 10:35:34 UTC 
(rev 30595)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2013-11-07 10:39:56 UTC 
(rev 30596)
@@ -1273,8 +1273,118 @@
                                                                   
&reset_address_it, NULL));
 }
 
+/**
+ * Evaluathe current bandwidth assignment
+ */
+void
+GAS_addresses_evaluate_assignment (struct GAS_Addresses_Handle *ah)
+{
+  GNUNET_assert (NULL != ah);
+  GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Current assignment has quality: Not 
implemented!\n");
 
+}
+
 /**
+ * Solver information callback
+ *
+ * @param cls,
+ * @param op the operation
+ * @param stat operation status
+ * @param add additional information
+ */
+
+static void
+solver_info_cb (void *cls,
+    enum GAS_Solver_Operation op,
+    enum GAS_Solver_Status stat,
+    enum GAS_Solver_Additional_Information add)
+{
+  char *add_info;
+
+  switch (add) {
+    case GAS_INFO_NONE:
+      add_info = "GAS_INFO_NONE";
+      break;
+    case GAS_INFO_FULL:
+      add_info = "GAS_INFO_MLP_FULL";
+      break;
+    case GAS_INFO_UPDATED:
+      add_info = "GAS_INFO_MLP_UPDATED";
+      break;
+    case GAS_INFO_PROP_ALL:
+      add_info = "GAS_INFO_PROP_ALL";
+      break;
+    case GAS_INFO_PROP_SINGLE:
+      add_info = "GAS_INFO_PROP_SINGLE";
+      break;
+    default:
+      add_info = "INVALID";
+      break;
+  }
+  switch (op)
+  {
+    case GAS_OP_SOLVE_START:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+          "Solver notifies `%s' with result `%s' `%s'\n", "GAS_OP_SOLVE_START",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL", add_info);
+      return;
+    case GAS_OP_SOLVE_STOP:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_STOP",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL", add_info);
+      return;
+
+    case GAS_OP_SOLVE_SETUP_START:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+          "Solver notifies `%s' with result `%s'\n", 
"GAS_OP_SOLVE_SETUP_START",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+
+    case GAS_OP_SOLVE_SETUP_STOP:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_SETUP_STOP",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+
+    case GAS_OP_SOLVE_MLP_LP_START:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_LP_START",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+    case GAS_OP_SOLVE_MLP_LP_STOP:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_LP_STOP",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+
+    case GAS_OP_SOLVE_MLP_MLP_START:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_MLP_START",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+    case GAS_OP_SOLVE_MLP_MLP_STOP:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+          "Solver notifies `%s' with result `%s'\n", "GAS_OP_SOLVE_MLP_STOP",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+    case GAS_OP_SOLVE_UPDATE_NOTIFICATION_START:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+          "Solver notifies `%s' with result `%s'\n", 
"GAS_OP_SOLVE_UPDATE_NOTIFICATION_START",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      return;
+    case GAS_OP_SOLVE_UPDATE_NOTIFICATION_STOP:
+      GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
+          "Solver notifies `%s' with result `%s'\n", 
"GAS_OP_SOLVE_UPDATE_NOTIFICATION_STOP",
+          (GAS_STAT_SUCCESS == stat) ? "SUCCESS" : "FAIL");
+      GAS_addresses_evaluate_assignment (cls);
+      return;
+    default:
+      break;
+    }
+}
+
+
+/**
  * The preference changed for a peer
  *
  * @param cls the address handle
@@ -1677,6 +1787,8 @@
   }
 
   load_quotas (cfg, quotas_in, quotas_out, GNUNET_ATS_NetworkTypeCount);
+  ah->env.info_cb = &solver_info_cb;
+  ah->env.info_cb_cls = &ah;
   ah->env.bandwidth_changed_cb = &bandwidth_changed_cb;
   ah->env.bw_changed_cb_cls = ah;
   ah->env.get_preferences = &get_preferences_cb;

Modified: gnunet/src/ats/libgnunet_plugin_ats_mlp.c
===================================================================
--- gnunet/src/ats/libgnunet_plugin_ats_mlp.c   2013-11-07 10:35:34 UTC (rev 
30595)
+++ gnunet/src/ats/libgnunet_plugin_ats_mlp.c   2013-11-07 10:39:56 UTC (rev 
30596)
@@ -1266,7 +1266,7 @@
   GNUNET_assert (NULL != solver);
   GNUNET_assert (NULL != address);
 
-  if (GNUNET_ATS_NetworkTypeCount >= network)
+  if (GNUNET_ATS_NetworkTypeCount <= network)
   {
    GNUNET_break (0);
    return;
@@ -1435,7 +1435,7 @@
   GNUNET_assert (NULL != solver);
   GNUNET_assert (NULL != address);
 
-  if (GNUNET_ATS_NetworkTypeCount >= new_network)
+  if (GNUNET_ATS_NetworkTypeCount <= new_network)
   {
    GNUNET_break (0);
    return;