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

[gnunet]

Author: wachs
Date: 2011-03-25 17:40:48 +0100 (Fri, 25 Mar 2011)
New Revision: 14734

Modified:
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/transport.h
Log:
reduce exec frequency


Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2011-03-25 16:25:59 UTC 
(rev 14733)
+++ gnunet/src/transport/gnunet-service-transport.c     2011-03-25 16:40:48 UTC 
(rev 14734)
@@ -48,8 +48,8 @@
 
 #define DEBUG_TRANSPORT_HELLO GNUNET_YES
 
-#define DEBUG_ATS GNUNET_YES
-#define VERBOSE_ATS GNUNET_YES
+#define DEBUG_ATS GNUNET_NO
+#define VERBOSE_ATS GNUNET_NO
 
 /**
  * Should we do some additional checks (to validate behavior
@@ -5711,8 +5711,10 @@
        glp_load_matrix(lp, rows * cols, ia, ja, ar);
 
        /* Solve the MLP problem */
+
        if (mlp == GNUNET_YES)
        {
+#if 0
                glp_iocp opt;
                glp_init_iocp(&opt);
 
@@ -5726,6 +5728,7 @@
                else
                        opt.msg_lev = GLP_MSG_OFF;
                result = glp_intopt(lp, &opt);
+#endif
        }
        /* Solve the LP problem */
        {
@@ -5736,7 +5739,7 @@
                opt.it_lim = max_it;
                /* maximum duration */
                opt.tm_lim = max_dur;
-               opt.presolve =GLP_ON;
+               opt.presolve = GLP_ON;
                /* output level */
                if (VERBOSE_ATS)
                        opt.msg_lev = GLP_MSG_ALL;

Modified: gnunet/src/transport/transport.h
===================================================================
--- gnunet/src/transport/transport.h    2011-03-25 16:25:59 UTC (rev 14733)
+++ gnunet/src/transport/transport.h    2011-03-25 16:40:48 UTC (rev 14734)
@@ -31,7 +31,7 @@
 #include "gnunet_transport_service.h"
 
 /* Minimum time between to calculations*/
-#define ATS_MIN_INTERVAL  
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MILLISECONDS, 1000)
+#define ATS_MIN_INTERVAL  
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 #define ATS_EXEC_INTERVAL 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60)
 #define ATS_MAX_EXEC_DURATION 
GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 500)
 #define ATS_MAX_ITERATIONS INT_MAX