Author: matz Date: Fri Nov 30 00:02:11 2007 New Revision: 7982 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7982&view=rev Log: Let's not call expensive operators for logging when we're not going to actually print anything. Shoves off another 0.4 seconds, now at 1.3. Can't get much faster without getting rid of the old solver. Modified: branches/use-solv/libzypp/zypp/base/LogControl.cc branches/use-solv/libzypp/zypp/base/Logger.h branches/use-solv/libzypp/zypp/solver/detail/Types.h Modified: branches/use-solv/libzypp/zypp/base/LogControl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/base/LogControl.cc?rev=7982&r1=7981&r2=7982&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/base/LogControl.cc (original) +++ branches/use-solv/libzypp/zypp/base/LogControl.cc Fri Nov 30 00:02:11 2007 @@ -214,6 +214,9 @@ struct LogControlImpl { public: + bool isExcessive() + { return _excessive; } + void excessive( bool onOff_r ) { _excessive = onOff_r; } @@ -361,6 +364,9 @@ buffer_r ); } + bool isExcessive() + { return LogControlImpl::instance.isExcessive(); } + ///////////////////////////////////////////////////////////////// } // namespace logger /////////////////////////////////////////////////////////////////// Modified: branches/use-solv/libzypp/zypp/base/Logger.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/base/Logger.h?rev=7982&r1=7981&r2=7982&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/base/Logger.h (original) +++ branches/use-solv/libzypp/zypp/base/Logger.h Fri Nov 30 00:02:11 2007 @@ -109,6 +109,7 @@ const char * file_r, const char * func_r, const int line_r ); + extern bool isExcessive(); ///////////////////////////////////////////////////////////////// } // namespace logger Modified: branches/use-solv/libzypp/zypp/solver/detail/Types.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/solver/detail/Types.h?rev=7982&r1=7981&r2=7982&view=diff ============================================================================== --- branches/use-solv/libzypp/zypp/solver/detail/Types.h (original) +++ branches/use-solv/libzypp/zypp/solver/detail/Types.h Fri Nov 30 00:02:11 2007 @@ -35,7 +35,7 @@ #include "zypp/PoolItem.h" #define _DEBUG(x) DBG << x << std::endl; -#define _XDEBUG(x) XXX << x << std::endl; +#define _XDEBUG(x) do { if (base::logger::isExcessive()) XXX << x << std::endl;} while (0) //#define _DEBUG(x) ///////////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org