From 776cedda466ed93c1c9f5a8c37f10e32826cd894 Mon Sep 17 00:00:00 2001 From: bvernoux Date: Wed, 23 Sep 2020 07:42:40 +0200 Subject: [PATCH] Replace usleep(..) by std::this_thread::sleep_for(std::chrono::microseconds(..)) see PR #262 --- scopehal/Oscilloscope.cpp | 2 +- scopehal/SignalGeneratorOscilloscope.cpp | 2 +- scopehal/scopehal.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/scopehal/Oscilloscope.cpp b/scopehal/Oscilloscope.cpp index a7a10695..8511b84b 100644 --- a/scopehal/Oscilloscope.cpp +++ b/scopehal/Oscilloscope.cpp @@ -149,7 +149,7 @@ bool Oscilloscope::WaitForTrigger(int timeout) { if(HasPendingWaveforms()) return true; - usleep(10 * 1000); + std::this_thread::sleep_for(std::chrono::microseconds(10 * 1000)); } return false; diff --git a/scopehal/SignalGeneratorOscilloscope.cpp b/scopehal/SignalGeneratorOscilloscope.cpp index 8c9dbd18..a86d4774 100644 --- a/scopehal/SignalGeneratorOscilloscope.cpp +++ b/scopehal/SignalGeneratorOscilloscope.cpp @@ -117,7 +117,7 @@ Oscilloscope::TriggerMode SignalGeneratorOscilloscope::PollTrigger() bool SignalGeneratorOscilloscope::AcquireData() { //cap waveform rate at 25 wfm/s to avoid saturating cpu etc with channel emulation - usleep(40 * 1000); + std::this_thread::sleep_for(std::chrono::microseconds(40 * 1000)); auto waveform = m_bufmodel->SimulatePRBS( rand(), diff --git a/scopehal/scopehal.h b/scopehal/scopehal.h index 97975472..d2a4a2c3 100644 --- a/scopehal/scopehal.h +++ b/scopehal/scopehal.h @@ -40,6 +40,8 @@ #include #include #include +#include +#include #include #include