From 2c416a793ea781273a5da6742211f5f01af13a2b Mon Sep 17 00:00:00 2001 From: Martin Lucina Date: Mon, 23 Jan 2012 08:53:29 +0100 Subject: Imported Upstream version 2.0.10 --- src/app_thread.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/app_thread.cpp') diff --git a/src/app_thread.cpp b/src/app_thread.cpp index ac59464..fc9bc1f 100644 --- a/src/app_thread.cpp +++ b/src/app_thread.cpp @@ -111,9 +111,11 @@ bool zmq::app_thread_t::process_commands (bool block_, bool throttle_) #error #endif - // Check whether certain time have elapsed since last command - // processing. - if (current_time - last_processing_time <= max_command_delay) + // Check whether TSC haven't jumped backwards (in case of migration + // between CPU cores) and whether certain time have elapsed since + // last command processing. If it didn't do nothing. + if (current_time >= last_processing_time && + current_time - last_processing_time <= max_command_delay) return !terminated; last_processing_time = current_time; } -- cgit v1.2.3