fixing uninitialized values
[oweals/gnunet.git] / src / ats / perf_ats_mlp.c
index bf2de87191bc0c4500d3f73bd0c3fba3a529beb2..e2d3fb567d49f2e4ab351e246bf3384c5567f403 100644 (file)
  * @author Christian Grothoff
  * @author Matthias Wachs
 
+ */
+
+/*
+     This file is part of GNUnet.
+     (C) 2010,2011 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file ats/test_ats_mlp.c
+ * @brief basic test for the MLP solver
+ * @author Christian Grothoff
+ * @author Matthias Wachs
+
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_statistics_service.h"
-#include "gnunet-service-ats_addresses_mlp.h"
+#include "gnunet_ats_service.h"
+#include "gnunet-service-ats-solver_mlp.h"
+#include "gnunet-service-ats_normalization.h"
+#include "test_ats_api_common.h"
 
-#define VERBOSE GNUNET_YES
-#define VERBOSE_ARM GNUNET_NO
+#define PEERS_START 100
+#define PEERS_END      100
 
-#define MLP_MAX_EXEC_DURATION   GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 3)
-#define MLP_MAX_ITERATIONS      INT_MAX
+#define ADDRESSES 10
 
-#define DEF_PEERS 10
-#define DEF_ADDRESSES_PER_PEER 5
+int count_p;
+int count_a;
 
-static unsigned int peers;
-static unsigned int addresses;
 
-struct PeerContext *p;
-struct ATS_Address *a;
+struct PerfPeer
+{
+       struct GNUNET_PeerIdentity id;
+
+       struct ATS_Address *head;
+       struct ATS_Address *tail;
+};
 
 static int ret;
+static int opt_numeric;
+static int opt_dump;
+static int opt_update_percent;
+static int opt_update_quantity;
 
-struct GNUNET_STATISTICS_Handle * stats;
+static int N_peers_start;
+static int N_peers_end;
+static int N_address;
 
-struct GNUNET_CONTAINER_MultiHashMap * amap;
+/**
+ * Statistics handle
+ */
+struct GNUNET_STATISTICS_Handle * stats;
 
+/**
+ * MLP solver handle
+ */
 struct GAS_MLP_Handle *mlp;
 
-struct GNUNET_STATISTICS_Handle * stats;
+/**
+ * Hashmap containing addresses
+ */
+struct GNUNET_CONTAINER_MultiHashMap * addresses;
 
-struct GNUNET_OS_Process *stats_proc;
+#define ATS_COUNT 2
+struct GNUNET_ATS_Information ats[2];
 
-GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+struct PerfPeer *peers;
 
-struct PeerContext
+static void
+end_now (int res)
 {
-  struct GNUNET_PeerIdentity id;
+  if (NULL != stats)
+  {
+         GNUNET_STATISTICS_destroy(stats, GNUNET_NO);
+         stats = NULL;
+  }
+  /*
+  if (NULL != addresses)
+  {
+               GNUNET_CONTAINER_multihashmap_iterate (addresses, &addr_it, NULL);
+               GNUNET_CONTAINER_multihashmap_destroy (addresses);
+               addresses = NULL ;
+  }*/
+  if (NULL != peers)
+       {
+               GNUNET_free (peers);
+       }
+  if (NULL != mlp)
+  {
+               GAS_mlp_done (mlp);
+               mlp = NULL;
+  }
+  GAS_normalization_stop();
+       ret = res;
+}
 
-  struct Address *addr;
-};
 
-struct Address
+static void
+bandwidth_changed_cb (void *cls, struct ATS_Address *address)
 {
-  char *plugin;
-  size_t plugin_len;
 
-  void *addr;
-  size_t addr_len;
+}
 
-  struct GNUNET_ATS_Information *ats;
-  int ats_count;
+static void
+normalized_property_changed_cb (void *cls,
+                                                                                                                struct ATS_Address *peer,
+                                                                                                                uint32_t type,
+                                                                                                                double prop_rel)
+{
+        /* TODO */
+}
 
-  void *session;
-};
+const double *
+get_property_cb (void *cls, const struct ATS_Address *address)
+{
+       return GAS_normalization_get_properties ((struct ATS_Address *) address);
+}
 
-void
-do_shutdown (void *cls,
-             const struct GNUNET_SCHEDULER_TaskContext *tc)
+
+static const double *
+get_preferences_cb (void *cls, const struct GNUNET_PeerIdentity *id)
 {
-  unsigned int ca;
-  for (ca=0; ca < (peers * addresses); ca++)
-  {
-    GNUNET_free (a[ca].plugin);
-    GNUNET_free (a[ca].ats);
-  }
-  GNUNET_CONTAINER_multihashmap_destroy(amap);
-  GNUNET_free (a);
-  GNUNET_free (p);
-  GNUNET_STATISTICS_destroy(stats,GNUNET_NO);
+       return GAS_normalization_get_preferences (id);
+}
 
-  if (NULL != stats_proc)
-  {
-    if (0 != GNUNET_OS_process_kill (stats_proc, SIGTERM))
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-    if (GNUNET_OS_process_wait (stats_proc) != GNUNET_OK)
-      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
-    GNUNET_OS_process_close (stats_proc);
-    stats_proc = NULL;
-  }
-  ret = 0;
+
+static void
+perf_create_peer (int cp)
+{
+       GNUNET_CRYPTO_hash_create_random(GNUNET_CRYPTO_QUALITY_WEAK, &peers[cp].id.hashPubKey);
+       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating peer #%u: %s \n", cp, GNUNET_i2s (&peers[cp].id));
 }
 
-int stat_it (void *cls, const char *subsystem,
-                                           const char *name, uint64_t value,
-                                           int is_persistent)
+static struct ATS_Address *
+perf_create_address (int cp, int ca)
 {
-  static int calls;
-  static long long unsigned lp_time;
-  static long long unsigned mlp_time;
+       struct ATS_Address *a;
+       a = create_address (&peers[cp].id, "Test 1", "test 1", strlen ("test 1") + 1, 0);
+       GNUNET_CONTAINER_DLL_insert (peers[cp].head, peers[cp].tail, a);
+       GNUNET_CONTAINER_multihashmap_put (addresses, &peers[cp].id.hashPubKey, a, GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+       return a;
+}
 
-  if (0 == strcmp (name, "# LP execution time (ms)"))
-    lp_time = value;
-  if (0 == strcmp (name, "# MLP execution time (ms)"))
-    mlp_time = value;
+static void
+address_initial_update (void *solver, struct GNUNET_CONTAINER_MultiHashMap * addresses, struct ATS_Address *address)
+{
+       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);
 
-  calls ++;
+       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);
+}
 
-  if (2 == calls)
-  {
-    printf ("%u;%u;%llu;%llu\n",peers, addresses, lp_time, mlp_time);
-    if (GNUNET_SCHEDULER_NO_TASK != shutdown_task)
-      GNUNET_SCHEDULER_cancel(shutdown_task);
-    shutdown_task = GNUNET_SCHEDULER_add_now(&do_shutdown, NULL);
-  }
-  return GNUNET_OK;
+
+static void
+update_single_addresses (struct ATS_Address *cur)
+{
+       int r_type;
+       int r_val;
+
+       r_type = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 2);
+       switch (r_type) {
+               case 0:
+                       r_val = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, 100);
+                       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);
+
+                       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_inuse_changed(mlp, cur, GNUNET_YES);
+
+}
+
+static void
+update_addresses (unsigned int cp, unsigned int ca, unsigned int up_q)
+{
+       struct ATS_Address *cur;
+       int c_peer;
+       int c_select;
+       int c_addr;
+       int r;
+
+       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating addresses %u addresses per peer \n", up_q);
+       unsigned int m [ca];
+
+       for (c_peer = 0; c_peer < cp; c_peer++)
+       {
+                       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating peer `%s'\n", GNUNET_i2s (&peers[c_peer].id));
+                       for (c_select = 0; c_select < ca; c_select++)
+                               m[c_select] = 0;
+                       c_select = 0;
+                       while (c_select < opt_update_quantity)
+                       {
+                                       r = GNUNET_CRYPTO_random_u32(GNUNET_CRYPTO_QUALITY_WEAK, ca);
+                                       if (0 == m[r])
+                                       {
+                                               m[r] = 1;
+                                               c_select++;
+                                       }
+                       }
+
+                       c_addr = 0;
+                       for (cur = peers[c_peer].head; NULL != cur; cur = cur->next)
+                       {
+                                       if (1 == m[c_addr])
+                                                       update_single_addresses (cur);
+                                       c_addr ++;
+                       }
+       }
 }
 
+
 static void
 check (void *cls, char *const *args, const char *cfgfile,
        const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-#if !HAVE_LIBGLPK
-  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "GLPK not installed!");
-  ret = 1;
-  return;
-#endif
-  unsigned int c = 0;
-  unsigned int c2 = 0;
-  unsigned int ca = 0;
-
-  stats_proc = GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-service-statistics",
-        "gnunet-service-statistics", NULL);
-
-  if (NULL == stats_proc)
+  int quotas[GNUNET_ATS_NetworkTypeCount] = GNUNET_ATS_NetworkType;
+  unsigned long long  quotas_in[GNUNET_ATS_NetworkTypeCount];
+  unsigned long long  quotas_out[GNUNET_ATS_NetworkTypeCount];
+       int cp;
+       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)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start statistics service \n");
-    ret = 1;
+       GNUNET_break (0);
+    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))
+  {
+       GNUNET_break (0);
+      end_now (1);
+      return;
+  }
 
-  shutdown_task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_UNIT_HOURS, &do_shutdown, NULL);
+  GNUNET_assert (N_peers_end >= N_peers_start);
+  GNUNET_assert (N_address >= 0);
+
+  fprintf (stderr, "Solving problem for %u..%u peers with %u addresses\n",
+               N_peers_start, N_peers_end, N_address);
+
+  count_p = N_peers_end;
+  count_a = N_address;
+  peers = GNUNET_malloc ((count_p) * sizeof (struct PerfPeer));
+  /* Setup address hashmap */
+  addresses = GNUNET_CONTAINER_multihashmap_create (N_address, GNUNET_NO);
+
+  /* Init MLP solver */
+  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);
+      end_now (1);
+      return;
+  }
+  mlp->mlp_auto_solve = GNUNET_NO;
+  mlp->write_mip_mps = opt_dump;
+  mlp->write_mip_sol = opt_dump;
+
+       for (cp = 0; cp < count_p; cp++)
+                       perf_create_peer (cp);
+
+       if (GNUNET_YES == opt_numeric)
+               fprintf (stderr, "#peers;#addresses per peer;LP/MIP state;presolv;exec build in ms;exec LP in ms; exec MIP in ms;#cols;#rows;#nonzero elements\n");
+
+       for (cp = 0; cp < count_p; cp++)
+       {
+                       for (ca = 0; ca < count_a; ca++)
+                       {
+                                       cur_addr = perf_create_address(cp, ca);
+                                       /* add address */
+                                       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, &peers[cp].id);
+                       /* solve */
+                       if (cp + 1 >= N_peers_start)
+                       {
+
+                               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_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);
+                                       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 == 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);
+                               }
+                       }
+       }
+
+
+       struct ATS_Address *cur;
+       struct ATS_Address *next;
+       for (cp = 0; cp < count_p; cp++)
+       {
+                       for (cur = peers[cp].head; cur != NULL; cur = next)
+                       {
+                                       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);
+                       }
+
+       }
+       GNUNET_free (peers);
 
-  if (peers == 0)
-    peers = DEF_PEERS;
-  if (addresses == 0)
-    addresses = DEF_ADDRESSES_PER_PEER;
+}
 
-  p = GNUNET_malloc (peers * sizeof (struct ATS_Peer));
-  a = GNUNET_malloc (peers * addresses * sizeof (struct ATS_Address));
 
-  stats = GNUNET_STATISTICS_create("ats", cfg);
+int
+main (int argc, char *argv[])
+{
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up %u peers with %u addresses per peer\n", peers, addresses);
+  static char *const argv2[] = { "perf_ats_mlp",
+    "-c",
+    "test_ats_mlp.conf",
+    "-L", "WARNING",
+    NULL
+  };
 
-  amap = GNUNET_CONTAINER_multihashmap_create(addresses * peers);
+  opt_dump = GNUNET_NO;
+  opt_update_quantity = 0;
+  opt_update_percent = 0;
 
-  mlp = GAS_mlp_init (cfg, stats, MLP_MAX_EXEC_DURATION, MLP_MAX_ITERATIONS);
-  mlp->auto_solve = GNUNET_NO;
-  for (c=0; c < peers; c++)
+  N_peers_start = 0;
+  N_peers_end = 0;
+  N_address = 0;
+  int c;
+  for (c = 0; c < argc; c++)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up peer %u\n", c);
-    GNUNET_CRYPTO_hash_create_random(GNUNET_CRYPTO_QUALITY_WEAK, &p[c].id.hashPubKey);
-
-    for (c2=0; c2 < addresses; c2++)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up address %u for peer %u\n", c2, c);
-      /* Setting required information */
-      a[ca].mlp_information = NULL;
-      a[ca].prev = NULL;
-      a[ca].next = NULL;
-
-      /* Setting address */
-      a[ca].peer = p[c].id;
-      a[ca].plugin = strdup("test");
-      a[ca].atsp_network_type = GNUNET_ATS_NET_LOOPBACK;
-
-      a[ca].ats = GNUNET_malloc (2 * sizeof (struct GNUNET_ATS_Information));
-      a[ca].ats[0].type = GNUNET_ATS_QUALITY_NET_DELAY;
-      a[ca].ats[0].value = 20;
-      a[ca].ats[1].type = GNUNET_ATS_QUALITY_NET_DISTANCE;
-      a[ca].ats[1].value = 2;
-      a[ca].ats_count = 2;
-      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Setting up address %u\n", ca);
-      GNUNET_CONTAINER_multihashmap_put (amap, &a[ca].peer.hashPubKey, &a[ca], GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
-      GAS_mlp_address_update(mlp, amap, &a[ca]);
-      ca++;
-    }
+               if ((0 == strcmp (argv[c], "-z")) && (c < (argc - 1)))
+               {
+                               if (0 != atoi(argv[c+1]))
+                               {
+                                               N_peers_start = atoi(argv[c+1]);
+                               }
+               }
+               if ((0 == strcmp (argv[c], "-x")) && (c < (argc - 1)))
+               {
+                               if (0 != atoi(argv[c+1]))
+                               {
+                                               N_peers_end = atoi(argv[c+1]);
+                               }
+               }
+               if ((0 == strcmp (argv[c], "-c")) && (c < (argc - 1)))
+               {
+                               if (0 != atoi(argv[c+1]))
+                               {
+                                               N_address = atoi(argv[c+1]);
+                               }
+               }
+               if ((0 == strcmp (argv[c], "-n")))
+               {
+                               opt_numeric = GNUNET_YES;
+               }
+               if ((0 == strcmp (argv[c], "-d")))
+               {
+                               opt_dump = GNUNET_YES;
+               }
+               if ((0 == strcmp (argv[c], "-p")) && (c < (argc - 1)))
+               {
+                               if (0 != atoi(argv[c+1]))
+                               {
+                                       /* Update a fix "p"ercentage of addresses */
+                                               opt_update_percent = atoi(argv[c+1]);
+                                               if ((0 <= opt_update_percent) && (100 <= opt_update_percent))
+                                               {
+                                                       fprintf (stderr, _("Percentage has to be: 0 <= p <= 100 "));
+                                                       exit (1);
+                                               }
+                               }
+               }
+               if ((0 == strcmp (argv[c], "-q")) && (c < (argc - 1)))
+               {
+                               if (0 != atoi(argv[c+1]))
+                               {
+                                       /* Update a fix "q"uantity of addresses */
+                                               opt_update_quantity = atoi(argv[c+1]);
+                                               if (0 >= opt_update_quantity)
+                                               {
+                                                       fprintf (stderr, _("Quantity has to be:  p => 0 "));
+                                                       exit (1);
+                                               }
+                               }
+               }
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Problem contains %u peers and %u adresses\n", mlp->c_p, mlp->addr_in_problem);
-
-  GNUNET_assert (peers == mlp->c_p);
-  GNUNET_assert (peers * addresses == mlp->addr_in_problem);
-
-  /* Solving the problem */
-  if (GNUNET_OK == GAS_mlp_solve_problem(mlp))
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Problem solved successfully \n");
-  else
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Solving problem with %u peers and %u addresses failed\n", peers, addresses);
-
-  GAS_mlp_done (mlp);
-
-  GNUNET_STATISTICS_get (stats, "ats", "# LP execution time (ms)", GNUNET_TIME_UNIT_MINUTES, NULL, &stat_it, NULL);
-  GNUNET_STATISTICS_get (stats, "ats", "# MLP execution time (ms)", GNUNET_TIME_UNIT_MINUTES, NULL, &stat_it, NULL);
-  return;
-}
 
+  if ((0 == N_peers_start) && (0 == N_peers_end))
+  {
+               N_peers_start = PEERS_START;
+               N_peers_end = PEERS_END;
+  }
+  if (0 == N_address)
+               N_address = ADDRESSES;
 
-int
-main (int argc, char *argv[])
-{
+  if (opt_update_quantity > N_address)
+  {
+               fprintf (stderr, _("Trying to update more addresses than we have per peer! (%u vs %u)"), opt_update_quantity, N_address);
+               exit (1);
+  }
 
-  static struct GNUNET_GETOPT_CommandLineOption options[] = {
-    {'a', "addresses", NULL,
-     gettext_noop ("addresses per peer"), 1,
-     &GNUNET_GETOPT_set_uint, &addresses},
-    {'p', "peers", NULL,
-     gettext_noop ("peers"), 1,
-     &GNUNET_GETOPT_set_uint, &peers},
+  static const struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_OPTION_END
   };
 
 
-  GNUNET_PROGRAM_run (argc, argv,
+  GNUNET_PROGRAM_run ((sizeof (argv2) / sizeof (char *)) - 1, argv2,
                       "perf_ats_mlp", "nohelp", options,
                       &check, NULL);