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

[gnunet]

Author: grothoff
Date: 2015-02-07 19:35:13 +0100 (Sat, 07 Feb 2015)
New Revision: 35134

Modified:
   gnunet/src/ats/gnunet-ats-solver-eval.c
   gnunet/src/ats/gnunet-ats-solver-eval.h
   gnunet/src/ats/gnunet-service-ats_addresses.h
   gnunet/src/ats/gnunet-service-ats_plugins.c
Log:
DCE

Modified: gnunet/src/ats/gnunet-ats-solver-eval.c
===================================================================
--- gnunet/src/ats/gnunet-ats-solver-eval.c     2015-02-07 18:28:48 UTC (rev 
35133)
+++ gnunet/src/ats/gnunet-ats-solver-eval.c     2015-02-07 18:35:13 UTC (rev 
35134)
@@ -206,7 +206,6 @@
       log_a->aid = cur_addr->aid;
       log_a->active = cur_addr->ats_addr->active;
       log_a->network = cur_addr->network;
-      log_a->used = cur_addr->ats_addr->used;
       log_a->assigned_bw_in = cur_addr->ats_addr->assigned_bw_in;
       log_a->assigned_bw_out = cur_addr->ats_addr->assigned_bw_out;
       for (c = 0; c < GNUNET_ATS_PropertyCount; c++)
@@ -2170,11 +2169,6 @@
   memcpy (&aa[1], plugin_addr, plugin_addr_len);
   memcpy (aa->plugin, plugin_name, strlen (plugin_name) + 1);
   aa->session_id = session_id;
-  aa->active = GNUNET_NO;
-  aa->used = GNUNET_NO;
-  aa->solver_information = NULL;
-  aa->assigned_bw_in = 0;
-  aa->assigned_bw_out = 0;
 
   return aa;
 }

Modified: gnunet/src/ats/gnunet-ats-solver-eval.h
===================================================================
--- gnunet/src/ats/gnunet-ats-solver-eval.h     2015-02-07 18:28:48 UTC (rev 
35133)
+++ gnunet/src/ats/gnunet-ats-solver-eval.h     2015-02-07 18:35:13 UTC (rev 
35134)
@@ -135,7 +135,6 @@
 
   long long unsigned int aid;
   int active;
-  int used;
   uint32_t network;
   uint32_t assigned_bw_in;
   uint32_t assigned_bw_out;

Modified: gnunet/src/ats/gnunet-service-ats_addresses.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.h       2015-02-07 18:28:48 UTC 
(rev 35133)
+++ gnunet/src/ats/gnunet-service-ats_addresses.h       2015-02-07 18:35:13 UTC 
(rev 35134)
@@ -270,7 +270,7 @@
   char *plugin;
 
   /**
-   * Solver specific information for this address
+   * Solver-specific information for this address
    */
   void *solver_information;
 
@@ -300,7 +300,8 @@
   uint32_t session_id;
 
   /**
-   * Field to store local flags
+   * Field to store local flags.
+   * FIXME: `enum GNUNET_HELLO_AddressInfo`?
    */
   uint32_t local_address_info;
 
@@ -335,11 +336,6 @@
   int active;
 
   /**
-   * Is this the address for this peer in use?
-   */
-  int used;
-
-  /**
    * Normalized ATS performance information for this address
    * Each entry can be accessed using the GNUNET_ATS_QualityProperties 
avg_queue_index
    */

Modified: gnunet/src/ats/gnunet-service-ats_plugins.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_plugins.c 2015-02-07 18:28:48 UTC (rev 
35133)
+++ gnunet/src/ats/gnunet-service-ats_plugins.c 2015-02-07 18:35:13 UTC (rev 
35134)
@@ -415,10 +415,7 @@
 int
 GAS_plugins_init (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  unsigned long long quotas_in[GNUNET_ATS_NetworkTypeCount];
-  unsigned long long quotas_out[GNUNET_ATS_NetworkTypeCount];
   char *mode_str;
-  unsigned int c;
 
   /* Figure out configured solution method */
   if (GNUNET_SYSERR ==
@@ -444,7 +441,6 @@
                env.out_quota,
                env.in_quota,
                GNUNET_ATS_NetworkTypeCount);
-
   GNUNET_asprintf (&plugin,
                    "libgnunet_plugin_ats_%s",
                    mode_str);