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

[gnunet]

Author: wachs
Date: 2014-05-05 15:09:00 +0200 (Mon, 05 May 2014)
New Revision: 33164

Modified:
   gnunet/src/ats/gnunet-ats-solver-eval.c
   gnunet/src/ats/plugin_ats_mlp.c
   gnunet/src/ats/plugin_ats_ril.c
Log:
fix: setting network in address with eval tool


Modified: gnunet/src/ats/gnunet-ats-solver-eval.c
===================================================================
--- gnunet/src/ats/gnunet-ats-solver-eval.c     2014-05-05 11:03:22 UTC (rev 
33163)
+++ gnunet/src/ats/gnunet-ats-solver-eval.c     2014-05-05 13:09:00 UTC (rev 
33164)
@@ -211,8 +211,8 @@
 
     for (cur_addr = cur->addr_head; NULL != cur_addr; cur_addr = 
cur_addr->next)
     {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Logging peer id %llu address 
%llu\n",
-          cur->peer_id, cur_addr->aid);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Logging peer id %llu address %llu 
\n",
+          cur->id, cur_addr->aid);
       log_a = GNUNET_new (struct LoggingAddress);
       log_a->aid = cur_addr->aid;
       log_a->active = cur_addr->ats_addr->active;
@@ -362,7 +362,7 @@
                 cur->aid,
                 cur->pid);
 
-          fprintf (stderr, "Add writing log data for %llu %llu to file `%s'\n",
+          fprintf (stderr, "Add writing log data for peer %llu address %llu to 
file `%s'\n",
               cur->pid, cur->aid, filename);
 
 
@@ -2022,12 +2022,19 @@
 struct ATS_Address *
 create_ats_address (const struct GNUNET_PeerIdentity *peer,
                 const char *plugin_name,
-                const void *plugin_addr, size_t plugin_addr_len,
-                uint32_t session_id)
+                const void *plugin_addr,
+                size_t plugin_addr_len,
+                uint32_t session_id,
+                uint32_t network)
 {
   struct ATS_Address *aa = NULL;
 
   aa = GNUNET_malloc (sizeof (struct ATS_Address) + plugin_addr_len + strlen 
(plugin_name) + 1);
+  aa->atsi = GNUNET_new (struct GNUNET_ATS_Information);
+  aa->atsi[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+  aa->atsi[0].value = htonl (network);
+  aa->atsi_count = 1;
+
   aa->peer = *peer;
   aa->addr_len = plugin_addr_len;
   aa->addr = &aa[1];
@@ -2040,6 +2047,7 @@
   aa->solver_information = NULL;
   aa->assigned_bw_in = GNUNET_BANDWIDTH_value_init(0);
   aa->assigned_bw_out = GNUNET_BANDWIDTH_value_init(0);
+
   return aa;
 }
 
@@ -2075,10 +2083,9 @@
 
   a = GNUNET_new (struct TestAddress);
   a->aid = op->address_id;
-  fprintf (stderr, "XXXX : %llu %llu \n", a->aid, op->address_id);
   a->network = op->address_network;
   a->ats_addr = create_ats_address (&p->peer_id, op->plugin, op->address,
-      strlen (op->address) + 1, op->address_session);
+      strlen (op->address) + 1, op->address_session, op->address_network);
   memset (&p->peer_id, op->peer_id, sizeof (p->peer_id));
   GNUNET_CONTAINER_DLL_insert_tail (p->addr_head, p->addr_tail, a);
 
@@ -2089,7 +2096,7 @@
     GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Adding address %u for peer %u in 
network `%s'\n",
-    op->address_id, op->peer_id, 
GNUNET_ATS_print_network_type(op->address_network));
+    op->address_id, op->peer_id, GNUNET_ATS_print_network_type(a->network));
 
   sh->env.sf.s_add (sh->solver, a->ats_addr, op->address_network);
 
@@ -2131,6 +2138,7 @@
       op->address_id, op->peer_id);
 
   sh->env.sf.s_del (sh->solver, a->ats_addr, GNUNET_NO);
+  GNUNET_free_non_null(a->ats_addr->atsi);
   GNUNET_free (a->ats_addr);
   GNUNET_free (a);
 
@@ -2244,7 +2252,10 @@
   res = sh->env.sf.s_get (sh->solver, &p->peer_id);
   if (NULL != res)
   {
-
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Requesting address for peer %u: %llu 
%llu\n",
+        op->peer_id,
+        ntohl(res->assigned_bw_in.value__),
+        ntohl(res->assigned_bw_out.value__));
   }
 }
 

Modified: gnunet/src/ats/plugin_ats_mlp.c
===================================================================
--- gnunet/src/ats/plugin_ats_mlp.c     2014-05-05 11:03:22 UTC (rev 33163)
+++ gnunet/src/ats/plugin_ats_mlp.c     2014-05-05 13:09:00 UTC (rev 33164)
@@ -373,12 +373,12 @@
   GNUNET_assert (NULL != address);
 
   if ((NULL == address->atsi) || (0 == address->atsi_count))
-      return GNUNET_ATS_VALUE_UNDEFINED;
+    return GNUNET_ATS_VALUE_UNDEFINED;
 
   for (c1 = 0; c1 < address->atsi_count; c1++)
   {
-      if (ntohl(address->atsi[c1].type) == type)
-        return ntohl(address->atsi[c1].value);
+    if (ntohl (address->atsi[c1].type) == type)
+      return ntohl (address->atsi[c1].value);
   }
   return GNUNET_ATS_VALUE_UNDEFINED;
 }
@@ -737,7 +737,10 @@
   {
     addr_net = get_performance_info (address, GNUNET_ATS_NETWORK_TYPE);
     if (GNUNET_ATS_VALUE_UNDEFINED == addr_net)
-            addr_net = GNUNET_ATS_NET_UNSPECIFIED;
+    {
+      GNUNET_break (0);
+      addr_net = GNUNET_ATS_NET_UNSPECIFIED;
+    }
 
     if (mlp->pv.quota_index[c] == addr_net)
     {

Modified: gnunet/src/ats/plugin_ats_ril.c
===================================================================
--- gnunet/src/ats/plugin_ats_ril.c     2014-05-05 11:03:22 UTC (rev 33163)
+++ gnunet/src/ats/plugin_ats_ril.c     2014-05-05 13:09:00 UTC (rev 33164)
@@ -1502,7 +1502,7 @@
 
   GNUNET_assert(RIL_ACTION_INVALID != a_next);
 
-  LOG (GNUNET_ERROR_TYPE_INFO, "step()  Step# %llu  R: %f  IN %llu  OUT %llu  
A: %d\n",
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "step()  Step# %llu  R: %f  IN %llu  OUT %llu  
A: %d\n",
         agent->step_count,
         reward,
         agent->bw_in/1024,