fixes around setTimeout() and its internals

divanchykhin · divanchykhin · commit 88cb1e70cab8 · 2022-07-06T09:37:17.000+03:00
diff --git a/include/infrastructure/q_based_infrastructure.h b/include/infrastructure/q_based_infrastructure.h
@@ -253,7 +253,7 @@ class NodeProcessor
 		uint64_t nextTimeoutAt = nextTimeout();
 		now = infraGetCurrentTime();
 //		int timeoutToUse = getPollTimeout(nextTimeoutAt, now);
-		uint64_t timeoutToUse = nextTimeoutAt == TimeOutNever ? TimeOutNever : (nextTimeoutAt < now ? 0 : nextTimeoutAt - now);
+		uint64_t timeoutToUse = nextTimeoutAt == TimeOutNever ? TimeOutNever : (nextTimeoutAt > now ? nextTimeoutAt - now : 0);
 
 		timeoutManager = nullptr;
 		inmediateQueue = nullptr;
diff --git a/src/interthread_comm_impl.h b/src/interthread_comm_impl.h
@@ -183,10 +183,18 @@ class MWSRFixedSizeQueueWithFlowControl {
 	}
 
 	std::pair<bool, size_t> pop_front( T* messages, size_t count, uint64_t timeout ) {
+		::std::chrono::steady_clock::time_point now = ::std::chrono::steady_clock::now();
 		std::unique_lock<std::mutex> lock(mx);
 		bool expired = false;
 		while (coll.size() == 0 && !expired && !killflag) {
-			expired = waitrd.wait_for(lock, std::chrono::milliseconds(timeout)) == std::cv_status::timeout;
+			expired = waitrd.wait_for(lock, std::chrono::microseconds(timeout)) == std::cv_status::timeout;
+			if ( !expired )	{
+				uint64_t d = std::chrono::duration_cast<std::chrono::microseconds>( ::std::chrono::steady_clock::now() - now ).count();
+				if ( d < timeout )
+					timeout -= d;
+				else
+					timeout = 0;
+			}
 		}
 		if (killflag)
 		{
diff --git a/src/q_based_infrastructure.cpp b/src/q_based_infrastructure.cpp
@@ -53,6 +53,7 @@
 #endif
 #include <sys/resource.h>
 #endif
+#include <chrono>
 
 
 namespace nodecpp {
@@ -69,7 +70,9 @@ thread_local TimeoutManager* timeoutManager;
 uint64_t infraGetCurrentTime()
 {
 #ifdef _MSC_VER
-	return GetTickCount64() * 1000; // mks
+//	return GetTickCount64() * 1000; // mks
+	auto now = ::std::chrono::steady_clock::now();
+	return std::chrono::duration_cast<std::chrono::microseconds>(now.time_since_epoch()).count();
 #else
     struct timespec ts;
 //    timespec_get(&ts, TIME_UTC);
@@ -126,28 +129,6 @@ namespace nodecpp {
 		inmediateQueue->add(std::move(cb));
 	}
 
-#if 0
-	namespace time
-	{
-		size_t now()
-		{
-#if defined NODECPP_MSVC || ( (defined NODECPP_WINDOWS) && (defined NODECPP_CLANG) )
-#if defined(NODECPP_X64) || defined(NODECPP_ARM64)
-			return GetTickCount64();
-#else
-			return GetTickCount();
-#endif // NODECPP_X86 or NODECPP_X64
-#elif (defined NODECPP_CLANG) || (defined NODECPP_GCC)
-    struct timespec ts;
-    clock_gettime(CLOCK_MONOTONIC, &ts);
-    return (size_t)(ts.tv_nsec / 1000000) + ((uint64_t)ts.tv_sec * 1000ull);
-#else
-#error not implemented for this compiler
-#endif
-		}
-	} // namespace time
-#endif // 0
-
 } // namespace nodecpp
 
 

Original file line number	Diff line number	Diff line change
`@@ -183,10 +183,18 @@ class MWSRFixedSizeQueueWithFlowControl {`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`std::pair<bool, size_t> pop_front( T* messages, size_t count, uint64_t timeout ) {`
	`186`	`+ ::std::chrono::steady_clock::time_point now = ::std::chrono::steady_clock::now();`
`186`	`187`	`std::unique_lock<std::mutex> lock(mx);`
`187`	`188`	`bool expired = false;`
`188`	`189`	`while (coll.size() == 0 && !expired && !killflag) {`
`189`		`- expired = waitrd.wait_for(lock, std::chrono::milliseconds(timeout)) == std::cv_status::timeout;`
	`190`	`+ expired = waitrd.wait_for(lock, std::chrono::microseconds(timeout)) == std::cv_status::timeout;`
	`191`	`+ if ( !expired ) {`
	`192`	`+ uint64_t d = std::chrono::duration_cast<std::chrono::microseconds>( ::std::chrono::steady_clock::now() - now ).count();`
	`193`	`+ if ( d < timeout )`
	`194`	`+ timeout -= d;`
	`195`	`+ else`
	`196`	`+ timeout = 0;`
	`197`	`+ }`
`190`	`198`	`}`
`191`	`199`	`if (killflag)`
`192`	`200`	`{`