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

[gnunet]

Author: wachs
Date: 2014-05-08 15:58:57 +0200 (Thu, 08 May 2014)
New Revision: 33223

Modified:
   gnunet/src/ats/perf_ats_solver.c
   gnunet/src/ats/plugin_ats_mlp.c
Log:
fixing network generation issue with mlp evalution tool


Modified: gnunet/src/ats/perf_ats_solver.c
===================================================================
--- gnunet/src/ats/perf_ats_solver.c    2014-05-08 13:58:52 UTC (rev 33222)
+++ gnunet/src/ats/perf_ats_solver.c    2014-05-08 13:58:57 UTC (rev 33223)
@@ -1428,7 +1428,13 @@
     {
       cur_addr = perf_create_address (cp, ca);
       /* Add address */
-      ph.env.sf.s_add (ph.solver, cur_addr, 
GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 
GNUNET_ATS_NetworkTypeCount));
+      uint32_t net = 1 + GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 
GNUNET_ATS_NetworkTypeCount - 1);
+      cur_addr->atsi = GNUNET_new (struct GNUNET_ATS_Information);
+      cur_addr->atsi_count = 1;
+      cur_addr->atsi[0].type = htonl (GNUNET_ATS_NETWORK_TYPE);
+      cur_addr->atsi[0].value = htonl (net);
+      ph.env.sf.s_add (ph.solver, cur_addr, net);
+
       ph.current_a = ca + 1;
       perf_address_initial_update (ph.solver, ph.addresses, cur_addr);
       GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
@@ -1496,7 +1502,8 @@
       ph.env.sf.s_del (ph.solver, cur, GNUNET_NO);
       next = cur->next;
       GNUNET_CONTAINER_DLL_remove(ph.peers[cp].head, ph.peers[cp].tail, cur);
-      GNUNET_free(cur);
+      GNUNET_free_non_null (cur->atsi);
+      GNUNET_free (cur);
     }
   }
 

Modified: gnunet/src/ats/plugin_ats_mlp.c
===================================================================
--- gnunet/src/ats/plugin_ats_mlp.c     2014-05-08 13:58:52 UTC (rev 33222)
+++ gnunet/src/ats/plugin_ats_mlp.c     2014-05-08 13:58:57 UTC (rev 33223)
@@ -366,7 +366,7 @@
  * @param type the type to extract in HBO
  * @return the value in HBO or GNUNET_ATS_VALUE_UNDEFINED in HBO if value does 
not exist
  */
-static int
+static uint32_t
 get_performance_info (struct ATS_Address *address, uint32_t type)
 {
   int c1;