gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: gnunet
Subject: [GNUnet-SVN] r26161 - gnunet/src/ats
Date: Tue, 19 Feb 2013 16:37:48 +0100

Author: wachs
Date: 2013-02-19 16:37:48 +0100 (Tue, 19 Feb 2013)
New Revision: 26161

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


Modified: gnunet/src/ats/gnunet-service-ats_addresses_mlp.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2013-02-19 13:39:31 UTC 
(rev 26160)
+++ gnunet/src/ats/gnunet-service-ats_addresses_mlp.c   2013-02-19 15:37:48 UTC 
(rev 26161)
@@ -1622,7 +1622,8 @@
   struct MLP_information *mlpi;
   struct GAS_MLP_SolutionContext ctx;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Updating address for peer `%s'\n", 
GNUNET_i2s(&address->peer));
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Updating address for peer `%s'\n",
+               GNUNET_i2s(&address->peer));
 
   GNUNET_STATISTICS_update (mlp->stats, "# MLP address updates", 1, GNUNET_NO);
 
@@ -1729,7 +1730,9 @@
 {
   struct GAS_MLP_Handle *mlp = solver;
 
-  LOG (GNUNET_ERROR_TYPE_DEBUG, "Deleting address for peer `%s'\n", 
GNUNET_i2s(&address->peer));
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Deleting address for peer `%s'\n",
+               GNUNET_i2s(&address->peer));
+
   GNUNET_STATISTICS_update (mlp->stats,"# LP address deletions", 1, GNUNET_NO);
   struct GAS_MLP_SolutionContext ctx;
 
@@ -1814,7 +1817,8 @@
                                const struct GNUNET_PeerIdentity *peer)
 {
   struct ATS_Address * aa = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Getting preferred address for `%s'\n", 
GNUNET_i2s (peer));
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Getting preferred address for `%s'\n",
+               GNUNET_i2s (peer));
   GNUNET_CONTAINER_multihashmap_get_multiple (addresses, &peer->hashPubKey, 
mlp_get_preferred_address_it, aa);
   return aa;
 }
@@ -1837,6 +1841,9 @@
                                    float score)
 {
   struct GAS_MLP_Handle *mlp = solver;
+
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Changing preference for address for peer 
`%s'\n",
+               GNUNET_i2s(peer));
   GNUNET_STATISTICS_update (mlp->stats,"# LP address preference changes", 1, 
GNUNET_NO);
 
   //struct ATS_Peer *p = mlp_find_peer (mlp, peer);
@@ -1859,6 +1866,8 @@
 
   GNUNET_assert (mlp != NULL);
 
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutting down mlp solver\n");
+
   if (mlp->mlp_task != GNUNET_SCHEDULER_NO_TASK)
   {
     GNUNET_SCHEDULER_cancel(mlp->mlp_task);
@@ -1884,8 +1893,9 @@
 
   /* Clean up GLPK environment */
   glp_free_env();
+  GNUNET_free (mlp);
 
-  GNUNET_free (mlp);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "Shutdown down of mlp solver complete\n");
 }
 
 

Modified: gnunet/src/ats/test_ats_mlp.c
===================================================================
--- gnunet/src/ats/test_ats_mlp.c       2013-02-19 13:39:31 UTC (rev 26160)
+++ gnunet/src/ats/test_ats_mlp.c       2013-02-19 15:37:48 UTC (rev 26161)
@@ -145,6 +145,7 @@
   int quotas[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
   unsigned long long  quotas_in[GNUNET_ATS_NetworkTypeCount];
   unsigned long long  quotas_out[GNUNET_ATS_NetworkTypeCount];
+  struct GNUNET_ATS_Information ats;
 
 #if !HAVE_LIBGLPK
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed!");
@@ -206,9 +207,16 @@
   /* Adding address */
   GAS_mlp_address_add (mlp, addresses, address);
 
+  /* Updating address */
+  ats.type =  htonl (GNUNET_ATS_NETWORK_TYPE);
+  ats.value = htonl (GNUNET_ATS_NET_LAN);
+  GAS_mlp_address_update (mlp, addresses, address, 1, GNUNET_NO, &ats, 1);
+
   /* Retrieving preferred address for peer and wait for callback */
   GAS_mlp_get_preferred_address (mlp, addresses, &p);
 
+  GAS_mlp_address_delete (mlp, addresses, address, GNUNET_NO);
+
   /* Shutdown */
   GAS_mlp_done (mlp);
   mlp = NULL;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]