diff options
| author | Kevin Dubrulle <kevin.dubrulle@gmail.com> | 2018-07-07 13:34:20 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-07-08 11:48:40 +0200 |
| commit | d0f44d8ba7e87aa263008d3cfc4e68294d783162 (patch) | |
| tree | 8527c62fb066366df2b40386c6544e670aa10a1a /vcl/workben | |
| parent | a2193f8f33565cc896592acb9d3ab65c756d97fb (diff) | |
tdf#84323 - sal - add sane sleep interface: cleanup osl_waitThread
Replace osl_waitThread by osl::Thread::wait.
Use std::chrono instead of TimeValue.
Change-Id: I71691d014feeeb0c5d0ba29d048bda8e25e6e7dd
Reviewed-on: https://gerrit.libreoffice.org/57130
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/workben')
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 0df08ad41176..4cac3e072ab7 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1716,14 +1716,13 @@ class DemoWin : public WorkWindow class RenderThread : public salhelper::Thread { DemoWin &mrWin; - TimeValue maDelay; + sal_uInt32 mnDelaySecs = 0; public: RenderThread(DemoWin &rWin, sal_uInt32 nDelaySecs) : Thread("vcldemo render thread") , mrWin(rWin) + , mnDelaySecs(nDelaySecs) { - maDelay.Seconds = nDelaySecs; - maDelay.Nanosec = 0; launch(); } virtual ~RenderThread() override @@ -1732,7 +1731,7 @@ class DemoWin : public WorkWindow } virtual void execute() override { - osl_waitThread(&maDelay); + wait(std::chrono::seconds(mnDelaySecs)); SolarMutexGuard aGuard; fprintf (stderr, "render from a different thread\n"); @@ -1933,20 +1932,18 @@ public: IMPL_LINK_NOARG(DemoWidgets, GLTestClick, Button*, void) { sal_Int32 nSelected = mpGLCombo->GetSelectedEntryPos(); + sal_uInt32 nDelaySeconds = 0; - TimeValue aDelay; - aDelay.Seconds = 0; - aDelay.Nanosec = 0; switch (nSelected) { case 0: - aDelay.Seconds = 1; + nDelaySeconds = 1; break; case 1: - aDelay.Seconds = 3; + nDelaySeconds = 3; break; case 2: - aDelay.Seconds = 7; + nDelaySeconds = 7; break; default: break; @@ -1956,7 +1953,7 @@ IMPL_LINK_NOARG(DemoWidgets, GLTestClick, Button*, void) if (bEnterLeave) OpenGLZoneTest::enter(); - osl_waitThread(&aDelay); + osl::Thread::wait(std::chrono::seconds(nDelaySeconds)); if (bEnterLeave) OpenGLZoneTest::leave(); |