[GNUnet-SVN] r14864 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2011-04-05 11:32:13 +0200 (Tue, 05 Apr 2011)
New Revision: 14864

Modified:
   gnunet/src/transport/ats_benchmark.sh
   gnunet/src/transport/gnunet-service-transport.c
Log:
changes


Modified: gnunet/src/transport/ats_benchmark.sh
===================================================================
--- gnunet/src/transport/ats_benchmark.sh       2011-04-05 09:17:52 UTC (rev 
14863)
+++ gnunet/src/transport/ats_benchmark.sh       2011-04-05 09:32:13 UTC (rev 
14864)
@@ -1,6 +1,6 @@
 #/bin/bash
 start=1
-end=10
+end=200
 
 if [ ! $1 = "" ]; then
   start=$1

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2011-04-05 09:17:52 UTC 
(rev 14863)
+++ gnunet/src/transport/gnunet-service-transport.c     2011-04-05 09:32:13 UTC 
(rev 14864)
@@ -940,12 +940,14 @@
  */
 static struct ATS_info *ats;
 
+#if HAVE_LIBGLPK
 static struct ATS_quality_metric qm[] =
 {
                {1, 1028, "QUALITY_NET_DISTANCE"},
                {2, 1034, "QUALITY_NET_DELAY"},
 };
 static int available_quality_metrics = 2;
+#endif
 
 /**
  * The peer specified by the given neighbour has timed-out or a plugin
@@ -6140,9 +6142,21 @@
        result = glp_intopt (prob, &opt_mlp);
        solution =  glp_mip_status (prob);
 
+#if WRITE_MLP
+       if (c_peers > 1)
+       {
+               char * filename;
+
+               GNUNET_asprintf (&filename, "ats_mlp_p%i_m%i.mlp",c_peers, 
c_mechs);
+               if (GNUNET_NO == GNUNET_DISK_file_test(filename))
+                       glp_write_lp (prob, NULL, filename);
+               GNUNET_free (filename);
+       }
+#endif
 #if VERBOSE_ATS
-       if (VERBOSE_ATS) glp_write_lp(prob, NULL, "ats_mlp.lp");
 
+
+
        switch (result) {
        case GLP_ESTOP  :    /* search terminated by application */
                GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Search terminated by 
application ");