fixing uninitialized values
[oweals/gnunet.git] / src / ats / perf_ats_mlp.c
index 0da00ea102fc978ffc3476e39648ef776913bd92..e2d3fb567d49f2e4ab351e246bf3384c5567f403 100644 (file)
@@ -55,7 +55,8 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
 #include "gnunet_ats_service.h"
-#include "gnunet-service-ats_addresses_mlp.h"
+#include "gnunet-service-ats-solver_mlp.h"
+#include "gnunet-service-ats_normalization.h"
 #include "test_ats_api_common.h"
 
 #define PEERS_START 100
@@ -129,7 +130,7 @@ end_now (int res)
                GAS_mlp_done (mlp);
                mlp = NULL;
   }
-
+  GAS_normalization_stop();
        ret = res;
 }
 
@@ -140,6 +141,29 @@ bandwidth_changed_cb (void *cls, struct ATS_Address *address)
 
 }
 
+static void
+normalized_property_changed_cb (void *cls,
+                                                                                                                struct ATS_Address *peer,
+                                                                                                                uint32_t type,
+                                                                                                                double prop_rel)
+{
+        /* TODO */
+}
+
+const double *
+get_property_cb (void *cls, const struct ATS_Address *address)
+{
+       return GAS_normalization_get_properties ((struct ATS_Address *) address);
+}
+
+
+static const double *
+get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
+{
+       return GAS_normalization_get_preferences (id);
+}
+
+
 static void
 perf_create_peer (int cp)
 {
@@ -160,13 +184,13 @@ perf_create_address (int cp, int ca)
 static void
 address_initial_update (void *solver, struct GNUNET_CONTAINER_MultiHashMap * addresses, struct ATS_Address *address)
 {
-       ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
-       ats[0].value = htonl (GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 100));
-
-       ats[1].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
-       ats[1].value = htonl (GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 10));
+       GAS_mlp_address_property_changed (mlp, address,
+                       GNUNET_ATS_QUALITY_NET_DELAY, 100,
+                       (double)(100 + GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 100)) / 100);
 
-       GAS_mlp_address_update (mlp, addresses, address, 0, GNUNET_YES, ats, 2);
+       GAS_mlp_address_property_changed (mlp, address,
+                       GNUNET_ATS_QUALITY_NET_DISTANCE, 10,
+                       (double)(100 + GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 100)) / 100);
 }
 
 
@@ -180,24 +204,26 @@ update_single_addresses (struct ATS_Address *cur)
        switch (r_type) {
                case 0:
                        r_val = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 100);
-                       ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DELAY);
-                       ats[0].value = htonl (r_val);
                        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating peer `%s' address %p type %s val %u\n",
                                        GNUNET_i2s (&cur->peer), cur,
                                        "GNUNET_ATS_QUALITY_NET_DELAY", r_val);
+                       GAS_mlp_address_property_changed (mlp, cur, GNUNET_ATS_QUALITY_NET_DELAY, r_val,
+                                       (double)(100 + r_val / 100));
                        break;
                case 1:
                        r_val = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 10);
-                       ats[0].type = htonl (GNUNET_ATS_QUALITY_NET_DISTANCE);
-                       ats[0].value = htonl (r_val);
+
                        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating peer `%s' address %p type %s val %u\n",
                                        GNUNET_i2s (&cur->peer), cur,
                                        "GNUNET_ATS_QUALITY_NET_DISTANCE", r_val);
+                       GAS_mlp_address_property_changed (mlp, cur, GNUNET_ATS_QUALITY_NET_DISTANCE, r_val,
+                                       (double)(100 + r_val) / 100);
                        break;
                default:
                        break;
        }
-       GAS_mlp_address_update (mlp, addresses, cur, 0, GNUNET_YES, ats, 1);
+       GAS_mlp_address_inuse_changed(mlp, cur, GNUNET_YES);
+
 }
 
 static void
@@ -250,6 +276,22 @@ check (void *cls, char *const *args, const char *cfgfile,
        int ca;
        struct ATS_Address * cur_addr;
 
+       int full_lp_res;
+       int full_mip_res;
+       int full_lp_presolv;
+       int full_mip_presolv;
+       struct GNUNET_TIME_Relative full_build_dur;
+       struct GNUNET_TIME_Relative full_lp_dur;
+       struct GNUNET_TIME_Relative full_mip_dur;
+
+       int update_lp_res;
+       int update_mip_res;
+       int update_lp_presolv;
+       int update_mip_presolv;
+       struct GNUNET_TIME_Relative update_build_dur;
+       struct GNUNET_TIME_Relative update_lp_dur;
+       struct GNUNET_TIME_Relative update_mip_dur;
+
   stats = GNUNET_STATISTICS_create("ats", cfg);
   if (NULL == stats)
   {
@@ -257,7 +299,7 @@ check (void *cls, char *const *args, const char *cfgfile,
     end_now (1);
     return;
   }
-
+  GAS_normalization_start (NULL, NULL, &normalized_property_changed_cb, NULL);
   /* Load quotas */
   if (GNUNET_ATS_NetworkTypeCount != load_quotas (cfg, quotas_out, quotas_in,
                        GNUNET_ATS_NetworkTypeCount))
@@ -280,8 +322,11 @@ check (void *cls, char *const *args, const char *cfgfile,
   addresses = GNUNET_CONTAINER_multihashmap_create (N_address, GNUNET_NO);
 
   /* Init MLP solver */
-  mlp  = GAS_mlp_init (cfg, stats, quotas, quotas_out, quotas_in,
-               GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL);
+  mlp  = GAS_mlp_init (cfg, stats, addresses,
+               quotas, quotas_out, quotas_in,
+               GNUNET_ATS_NetworkTypeCount, &bandwidth_changed_cb, NULL,
+               &get_preferences_cb, NULL,
+               &get_property_cb, NULL);
   if (NULL == mlp)
   {
        GNUNET_break (0);
@@ -304,66 +349,84 @@ check (void *cls, char *const *args, const char *cfgfile,
                        {
                                        cur_addr = perf_create_address(cp, ca);
                                        /* add address */
-                                       GAS_mlp_address_add (mlp, addresses, cur_addr);
+                                       GAS_mlp_address_add (mlp, cur_addr, GNUNET_ATS_NET_UNSPECIFIED);
                                        address_initial_update (mlp, addresses, cur_addr);
                                        GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding address for peer %u address %u: \n", cp, ca);
                        }
-                       GAS_mlp_get_preferred_address( mlp, addresses, &peers[cp].id);
+                       GAS_mlp_get_preferred_address( mlp, &peers[cp].id);
                        /* solve */
                        if (cp + 1 >= N_peers_start)
                        {
-                               GAS_mlp_solve_problem (mlp, addresses);
-                               if (GNUNET_NO == opt_numeric)
-                                       fprintf (stderr, "%u peers each %u addresses;  LP/MIP state [%s/%s] presolv [%s/%s], (build/LP/MIP in ms): %04llu %04llu %04llu; size (cols x rows, nonzero elements): [%u x %u] = %u\n",
-                                                       cp + 1, ca,
-                                                       (GNUNET_OK == mlp->ps.lp_res) ? "OK" : "FAIL",
-                                                       (GNUNET_OK == mlp->ps.mip_res) ? "OK" : "FAIL",
-                                                       (GLP_YES == mlp->ps.lp_presolv) ? "YES" : "NO",
-                                                       (GNUNET_OK == mlp->ps.mip_presolv) ? "YES" : "NO",
-                                                       (unsigned long long) mlp->ps.build_dur.rel_value,
-                                                       (unsigned long long) mlp->ps.lp_dur.rel_value,
-                                                       (unsigned long long) mlp->ps.mip_dur.rel_value,
-                                                       mlp->ps.p_cols, mlp->ps.p_rows, mlp->ps.p_elements);
-                               else
-                                       fprintf (stderr, "%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu;%u;%u;%u\n",
-                                                       cp + 1, ca,
-                                                       (GNUNET_OK == mlp->ps.lp_res) ? "OK" : "FAIL",
-                                                       (GNUNET_OK == mlp->ps.mip_res) ? "OK" : "FAIL",
-                                                       (GLP_YES == mlp->ps.lp_presolv) ? "YES" : "NO",
-                                                       (GNUNET_OK == mlp->ps.mip_presolv) ? "YES" : "NO",
-                                                       (unsigned long long) mlp->ps.build_dur.rel_value,
-                                                       (unsigned long long) mlp->ps.lp_dur.rel_value,
-                                                       (unsigned long long) mlp->ps.mip_dur.rel_value,
-                                                       mlp->ps.p_cols, mlp->ps.p_rows, mlp->ps.p_elements);
+
+                               update_mip_dur = GNUNET_TIME_UNIT_FOREVER_REL;
+                               update_lp_dur = GNUNET_TIME_UNIT_FOREVER_REL;
+                               update_build_dur = GNUNET_TIME_UNIT_FOREVER_REL;
+                               update_mip_presolv = GNUNET_SYSERR;
+                               update_lp_presolv = GNUNET_SYSERR;
+                               update_mip_res = GNUNET_SYSERR;
+                               update_lp_res = GNUNET_SYSERR;
+                               /* Solve the full problem */
+                               GAS_mlp_solve_problem (mlp);
+                               full_lp_res = mlp->ps.lp_res;
+                               full_mip_res = mlp->ps.mip_res;
+                               full_lp_presolv = mlp->ps.lp_presolv;
+                               full_mip_presolv = mlp->ps.mip_presolv;
+                               full_build_dur = mlp->ps.build_dur;
+                               full_lp_dur = mlp->ps.lp_dur;
+                               full_mip_dur = mlp->ps.mip_dur;
+
+                               /* Update and solve the problem */
                                if ((0 < opt_update_quantity) || (0 < opt_update_percent))
                                {
-                                       GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Updating problem with %u peers and %u addresses\n", cp + 1, ca);
+                                       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating problem with %u peers and %u addresses\n", cp + 1, ca);
                                        update_addresses (cp + 1, ca, opt_update_quantity);
-                                       GAS_mlp_solve_problem (mlp, addresses);
-                                       if (GNUNET_NO == opt_numeric)
-                                               fprintf (stderr, "%u peers each %u addresses;  LP/MIP state [%s/%s] presolv [%s/%s], (build/LP/MIP in ms): %04llu %04llu %04llu; size (cols x rows, nonzero elements): [%u x %u] = %u\n",
-                                                               cp + 1, ca,
-                                                               (GNUNET_OK == mlp->ps.lp_res) ? "OK" : "FAIL",
-                                                               (GNUNET_OK == mlp->ps.mip_res) ? "OK" : "FAIL",
-                                                               (GLP_YES == mlp->ps.lp_presolv) ? "YES" : "NO",
-                                                               (GNUNET_OK == mlp->ps.mip_presolv) ? "YES" : "NO",
-                                                               (unsigned long long) mlp->ps.build_dur.rel_value,
-                                                               (unsigned long long) mlp->ps.lp_dur.rel_value,
-                                                               (unsigned long long) mlp->ps.mip_dur.rel_value,
-                                                               mlp->ps.p_cols, mlp->ps.p_rows, mlp->ps.p_elements);
-                                       else
-                                               fprintf (stderr, "%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu;%u;%u;%u\n",
+                                       GAS_mlp_solve_problem (mlp);
+                                       GAS_mlp_solve_problem (mlp);
+                                       update_lp_res = mlp->ps.lp_res;
+                                       update_mip_res = mlp->ps.mip_res;
+                                       update_lp_presolv = mlp->ps.lp_presolv;
+                                       update_mip_presolv = mlp->ps.mip_presolv;
+                                       update_build_dur = mlp->ps.build_dur;
+                                       update_lp_dur = mlp->ps.lp_dur;
+                                       update_mip_dur = mlp->ps.mip_dur;
+
+                               }
+                               if (GNUNET_NO == opt_numeric)
+                               {
+                               fprintf (stderr, "Rebuild: %03u peers each %02u addresses; rebuild: LP/MIP state [%3s/%3s] presolv [%3s/%3s], (build/LP/MIP in ms) %04llu / %04llu / %04llu\n",
+                                               cp + 1, ca,
+                                               (GNUNET_OK == full_lp_res) ? "OK" : "FAIL",
+                                               (GNUNET_OK == full_mip_res) ? "OK" : "FAIL",
+                                               (GLP_YES == full_lp_presolv) ? "YES" : "NO",
+                                               (GNUNET_OK == full_mip_presolv) ? "YES" : "NO",
+                                               (unsigned long long) full_build_dur.rel_value, (unsigned long long) full_lp_dur.rel_value, (unsigned long long) full_mip_dur.rel_value);
+                               if ((0 < opt_update_quantity) || (0 < opt_update_percent))
+                                       fprintf (stderr, "Update : %03u peers each %02u addresses; rebuild: LP/MIP state [%3s/%3s] presolv [%3s/%3s], (build/LP/MIP in ms) %04llu / %04llu / %04llu\n",
+                                               cp + 1, ca,
+                                               (GNUNET_OK == update_lp_res) ? "OK" : "FAIL",
+                                               (GNUNET_OK == update_mip_res) ? "OK" : "FAIL",
+                                               (GLP_YES == update_lp_presolv) ? "YES" : "NO",
+                                               (GNUNET_OK == update_mip_presolv) ? "YES" : "NO",
+                                               (unsigned long long) update_build_dur.rel_value, (unsigned long long) update_lp_dur.rel_value, (unsigned long long) update_mip_dur.rel_value);
+                               }
+                               else
+                               {
+                                               fprintf (stderr, "Rebuild;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n",
                                                                cp + 1, ca,
-                                                               (GNUNET_OK == mlp->ps.lp_res) ? "OK" : "FAIL",
-                                                               (GNUNET_OK == mlp->ps.mip_res) ? "OK" : "FAIL",
-                                                               (GLP_YES == mlp->ps.lp_presolv) ? "YES" : "NO",
-                                                               (GNUNET_OK == mlp->ps.mip_presolv) ? "YES" : "NO",
-                                                               (unsigned long long) mlp->ps.build_dur.rel_value,
-                                                               (unsigned long long) mlp->ps.lp_dur.rel_value,
-                                                               (unsigned long long) mlp->ps.mip_dur.rel_value,
-                                                               mlp->ps.p_cols, mlp->ps.p_rows, mlp->ps.p_elements);
+                                                               (GNUNET_OK == full_lp_res) ? "OK" : "FAIL",
+                                                               (GNUNET_OK == full_mip_res) ? "OK" : "FAIL",
+                                                               (GLP_YES == full_lp_presolv) ? "YES" : "NO",
+                                                               (GNUNET_OK == full_mip_presolv) ? "YES" : "NO",
+                                                               (unsigned long long) full_build_dur.rel_value, (unsigned long long) full_lp_dur.rel_value, (unsigned long long) full_mip_dur.rel_value);
+                                               if ((0 < opt_update_quantity) || (0 < opt_update_percent))
+                                                       fprintf (stderr, "Update;%u;%u;%s;%s;%s;%s;%04llu;%04llu;%04llu\n",
+                                                                       cp + 1, ca,
+                                                                       (GNUNET_OK == update_lp_res) ? "OK" : "FAIL",
+                                                                       (GNUNET_OK == update_mip_res) ? "OK" : "FAIL",
+                                                                       (GLP_YES == update_lp_presolv) ? "YES" : "NO",
+                                                                       (GNUNET_OK == update_mip_presolv) ? "YES" : "NO",
+                                                                       (unsigned long long) update_build_dur.rel_value, (unsigned long long) update_lp_dur.rel_value, (unsigned long long) update_mip_dur.rel_value);
                                }
-                               fprintf (stderr, "\n");
                        }
        }
 
@@ -374,7 +437,7 @@ check (void *cls, char *const *args, const char *cfgfile,
        {
                        for (cur = peers[cp].head; cur != NULL; cur = next)
                        {
-                                       GAS_mlp_address_delete (mlp, addresses, cur, GNUNET_NO);
+                                       GAS_mlp_address_delete (mlp, cur, GNUNET_NO);
                                        next = cur->next;
                                        GNUNET_CONTAINER_DLL_remove (peers[cp].head, peers[cp].tail, cur);
                                        GNUNET_free (cur);
@@ -428,7 +491,7 @@ main (int argc, char *argv[])
                                                N_address = atoi(argv[c+1]);
                                }
                }
-               if ((0 == strcmp (argv[c], "-v")))
+               if ((0 == strcmp (argv[c], "-n")))
                {
                                opt_numeric = GNUNET_YES;
                }