reduce exec frequency
authorMatthias Wachs <wachs@net.in.tum.de>
Fri, 25 Mar 2011 16:40:48 +0000 (16:40 +0000)
committerMatthias Wachs <wachs@net.in.tum.de>
Fri, 25 Mar 2011 16:40:48 +0000 (16:40 +0000)
src/transport/gnunet-service-transport.c
src/transport/transport.h

index 191689d988c6baae27369a3f17f042ceb068c225..8c7906a71d8c21c58e7d2d8db09b2a2d06d5578d 100644 (file)
@@ -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 @@ ats_create_problem (int peers,
        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 @@ ats_create_problem (int peers,
                else
                        opt.msg_lev = GLP_MSG_OFF;
                result = glp_intopt(lp, &opt);
+#endif
        }
        /* Solve the LP problem */
        {
@@ -5736,7 +5739,7 @@ ats_create_problem (int peers,
                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;
index 3d6890997275bbd19f92ba60530de1cab46464bb..dd6965a61317b24d3c8d601196e9c75ab2d4a22f 100644 (file)
@@ -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