From 2cec0b1670a5bac9b7d66f8b0ef9b2592a97eefe Mon Sep 17 00:00:00 2001 From: "hta@webrtc.org" Date: Thu, 21 Mar 2013 14:02:29 +0000 Subject: [PATCH] Cleanup nanosleep -> SleepMs Remove some leftover stuff BUG=603 TEST= Review URL: https://webrtc-codereview.appspot.com/672005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3700 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../system_wrappers/source/critical_section_unittest.cc | 8 -------- webrtc/system_wrappers/source/thread_posix.cc | 7 ++----- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/webrtc/system_wrappers/source/critical_section_unittest.cc b/webrtc/system_wrappers/source/critical_section_unittest.cc index f375236913..9d69e4f7ac 100644 --- a/webrtc/system_wrappers/source/critical_section_unittest.cc +++ b/webrtc/system_wrappers/source/critical_section_unittest.cc @@ -10,14 +10,6 @@ #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" -#ifdef _WIN32 -// For Sleep() -#include -#else -// For nanosleep() -#include -#endif - #include "gtest/gtest.h" #include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h" diff --git a/webrtc/system_wrappers/source/thread_posix.cc b/webrtc/system_wrappers/source/thread_posix.cc index f96978304b..204c77e7be 100644 --- a/webrtc/system_wrappers/source/thread_posix.cc +++ b/webrtc/system_wrappers/source/thread_posix.cc @@ -49,7 +49,6 @@ #include #include #include // strncpy -#include // nanosleep #include #ifdef WEBRTC_LINUX #include @@ -61,6 +60,7 @@ #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/event_wrapper.h" +#include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/trace.h" namespace webrtc { @@ -292,10 +292,7 @@ bool ThreadPosix::Stop() { // TODO(hellner) why not use an event here? // Wait up to 10 seconds for the thread to terminate for (int i = 0; i < 1000 && !dead; ++i) { - timespec t; - t.tv_sec = 0; - t.tv_nsec = 10 * 1000 * 1000; - nanosleep(&t, NULL); + SleepMs(10); { CriticalSectionScoped cs(crit_state_); dead = dead_;