fix bug in condition variable using invalid timeout

4bfe2ec6 · somdoron · 1a502cc1 · 4bfe2ec6
Commit 4bfe2ec6 authored 9 years ago by somdoron
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

condition_variable.hpp src/condition_variable.hpp +6 -0

No files found.
--- a/src/condition_variable.hpp
+++ b/src/condition_variable.hpp
@@ -164,6 +164,12 @@ namespace zmq

                timeout.tv_sec += timeout_ / 1000;
                timeout.tv_nsec += (timeout_ % 1000) * 1000000;
+
+                if (timeout.tv_nsec > 1E9) {
+                    timeout.tv_sec++;
+                    timeout.tv_nsec -= 1E9;
+                }
+
                rc = pthread_cond_timedwait (&cond, mutex_->get_mutex (), &timeout);
            }
            else