diff options
| -rw-r--r-- | src/uscxml/interpreter/BasicDelayedEventQueue.cpp | 4 | ||||
| -rw-r--r-- | test/src/test-extensions.cpp | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/uscxml/interpreter/BasicDelayedEventQueue.cpp b/src/uscxml/interpreter/BasicDelayedEventQueue.cpp index 5081e05..49ed2f9 100644 --- a/src/uscxml/interpreter/BasicDelayedEventQueue.cpp +++ b/src/uscxml/interpreter/BasicDelayedEventQueue.cpp @@ -93,8 +93,8 @@ void BasicDelayedEventQueue::enqueueDelayed(const Event& event, size_t delayMs, struct event* e = event_new(_eventLoop, -1, 0, timerCallback, &_callbackData[eventUUID]); _callbackData[eventUUID].event = e; - gettimeofday(&(_callbackData[eventUUID].added), NULL); - timeradd(&delay, &_callbackData[eventUUID].added, &_callbackData[eventUUID].due); + evutil_gettimeofday(&(_callbackData[eventUUID].added), NULL); + evutil_timeradd(&delay, &_callbackData[eventUUID].added, &_callbackData[eventUUID].due); event_add(e, &delay); } diff --git a/test/src/test-extensions.cpp b/test/src/test-extensions.cpp index ca189ef..fe12f5f 100644 --- a/test/src/test-extensions.cpp +++ b/test/src/test-extensions.cpp @@ -4,6 +4,8 @@ #include "uscxml/interpreter/BasicEventQueue.h" #include "uscxml/interpreter/BasicDelayedEventQueue.h" +#include <event2/util.h> // for evutil_socket_t + #include <chrono> #include <mutex> @@ -64,7 +66,7 @@ public: return; // we are already paused! } - gettimeofday(&_pausedAt, NULL); // remember when we paused + evutil_gettimeofday(&_pausedAt, NULL); // remember when we paused { // Verbatim copy of stop() without cancelAllDelayed() @@ -93,16 +95,16 @@ public: struct timeval now; struct timeval pausedFor; - gettimeofday(&now, NULL); - timersub(&now, &_pausedAt, &pausedFor); + evutil_gettimeofday(&now, NULL); + evutil_timersub(&now, &_pausedAt, &pausedFor); _pausedAt = {0,0}; for(auto& callbackData : _callbackData) { // add the time we were paused to all due times - timeradd(&callbackData.second.due, &pausedFor, &callbackData.second.due); + evutil_timeradd(&callbackData.second.due, &pausedFor, &callbackData.second.due); struct timeval remain; - timersub(&callbackData.second.due, &now, &remain); + evutil_timersub(&callbackData.second.due, &now, &remain); #if 0 std::cout << "Now : " << now.tv_sec << "." << now.tv_usec << std::endl; |