generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reformatted critical_section wrappers.

Browse Source 
BUG=
TEST=ran trybots

Review URL: https://webrtc-codereview.appspot.com/971012

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3210 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
phoglund@webrtc.org
2012-11-30 10:44:49 +00:00
parent 219df91095
commit 99f7c917d2
8 changed files with 110 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
webrtc/system_wrappers/interface/critical_section_wrapper.h
View File

@@ -14,11 +14,10 @@
// If the critical section is heavily contended it may be beneficial to use // If the critical section is heavily contended it may be beneficial to use
// read/write locks instead. // read/write locks instead.
#include "common_types.h" #include "webrtc/common_types.h"
namespace webrtc { namespace webrtc {
class CriticalSectionWrapper class CriticalSectionWrapper {
{
public: public:
// Factory method, constructor disabled // Factory method, constructor disabled
static CriticalSectionWrapper* CreateCriticalSection(); static CriticalSectionWrapper* CreateCriticalSection();
@@ -35,31 +34,28 @@ public:
// RAII extension of the critical section. Prevents Enter/Leave mismatches and // RAII extension of the critical section. Prevents Enter/Leave mismatches and
// provides more compact critical section syntax. // provides more compact critical section syntax.
class CriticalSectionScoped class CriticalSectionScoped {
{
public: public:
explicit CriticalSectionScoped(CriticalSectionWrapper* critsec) explicit CriticalSectionScoped(CriticalSectionWrapper* critsec)
: _ptrCritSec(critsec) : ptr_crit_sec_(critsec) {
{ ptr_crit_sec_->Enter();
_ptrCritSec->Enter();
} }
~CriticalSectionScoped() ~CriticalSectionScoped() {
{ if (ptr_crit_sec_) {
if (_ptrCritSec)
{
Leave(); Leave();
} }
} }
private: private:
void Leave() void Leave() {
{ ptr_crit_sec_->Leave();
_ptrCritSec->Leave(); ptr_crit_sec_ = 0;
_ptrCritSec = 0;
} }
CriticalSectionWrapper* _ptrCritSec; CriticalSectionWrapper* ptr_crit_sec_;
}; };
} // namespace webrtc } // namespace webrtc
#endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CRITICAL_SECTION_WRAPPER_H_ #endif // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_CRITICAL_SECTION_WRAPPER_H_

6
webrtc/system_wrappers/source/condition_variable_posix.cc
View File

@@ -72,7 +72,7 @@ ConditionVariablePosix::~ConditionVariablePosix() {
void ConditionVariablePosix::SleepCS(CriticalSectionWrapper& crit_sect) { void ConditionVariablePosix::SleepCS(CriticalSectionWrapper& crit_sect) {
CriticalSectionPosix* cs = reinterpret_cast<CriticalSectionPosix*>( CriticalSectionPosix* cs = reinterpret_cast<CriticalSectionPosix*>(
&crit_sect); &crit_sect);
pthread_cond_wait(&cond_, &cs->_mutex); pthread_cond_wait(&cond_, &cs->mutex_);
} }
bool ConditionVariablePosix::SleepCS(CriticalSectionWrapper& crit_sect, bool ConditionVariablePosix::SleepCS(CriticalSectionWrapper& crit_sect,
@@ -113,10 +113,10 @@ bool ConditionVariablePosix::SleepCS(CriticalSectionWrapper& crit_sect,
ts.tv_sec += ts.tv_nsec / NANOSECONDS_PER_SECOND; ts.tv_sec += ts.tv_nsec / NANOSECONDS_PER_SECOND;
ts.tv_nsec %= NANOSECONDS_PER_SECOND; ts.tv_nsec %= NANOSECONDS_PER_SECOND;
} }
const int res = pthread_cond_timedwait(&cond_, &cs->_mutex, &ts); const int res = pthread_cond_timedwait(&cond_, &cs->mutex_, &ts);
return (res == ETIMEDOUT) ? false : true; return (res == ETIMEDOUT) ? false : true;
} else { } else {
pthread_cond_wait(&cond_, &cs->_mutex); pthread_cond_wait(&cond_, &cs->mutex_);
return true; return true;
} }
} }

9
webrtc/system_wrappers/source/critical_section.cc
View File

@@ -10,18 +10,19 @@
#if defined(_WIN32) #if defined(_WIN32)
#include <windows.h> #include <windows.h>
#include "critical_section_win.h" #include "webrtc/system_wrappers/source/critical_section_win.h"
#else #else
#include "critical_section_posix.h" #include "webrtc/system_wrappers/source/critical_section_posix.h"
#endif #endif
namespace webrtc { namespace webrtc {
CriticalSectionWrapper* CriticalSectionWrapper::CreateCriticalSection()
{ CriticalSectionWrapper* CriticalSectionWrapper::CreateCriticalSection() {
#ifdef _WIN32 #ifdef _WIN32
return new CriticalSectionWindows(); return new CriticalSectionWindows();
#else #else
return new CriticalSectionPosix(); return new CriticalSectionPosix();
#endif #endif
} }
} // namespace webrtc } // namespace webrtc

22
webrtc/system_wrappers/source/critical_section_posix.cc
View File

@@ -14,33 +14,29 @@
// no equivalent to DCHECK_EQ in WebRTC code so this is the best we can do here. // no equivalent to DCHECK_EQ in WebRTC code so this is the best we can do here.
// TODO(henrike): add logging when pthread synchronization APIs are failing. // TODO(henrike): add logging when pthread synchronization APIs are failing.
#include "critical_section_posix.h" #include "webrtc/system_wrappers/source/critical_section_posix.h"
namespace webrtc { namespace webrtc {
CriticalSectionPosix::CriticalSectionPosix() CriticalSectionPosix::CriticalSectionPosix() {
{
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
(void) pthread_mutexattr_init(&attr); (void) pthread_mutexattr_init(&attr);
(void) pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); (void) pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
(void) pthread_mutex_init(&_mutex, &attr); (void) pthread_mutex_init(&mutex_, &attr);
} }
CriticalSectionPosix::~CriticalSectionPosix() CriticalSectionPosix::~CriticalSectionPosix() {
{ (void) pthread_mutex_destroy(&mutex_);
(void) pthread_mutex_destroy(&_mutex);
} }
void void
CriticalSectionPosix::Enter() CriticalSectionPosix::Enter() {
{ (void) pthread_mutex_lock(&mutex_);
(void) pthread_mutex_lock(&_mutex);
} }
void void
CriticalSectionPosix::Leave() CriticalSectionPosix::Leave() {
{ (void) pthread_mutex_unlock(&mutex_);
(void) pthread_mutex_unlock(&_mutex);
} }
} // namespace webrtc } // namespace webrtc

9
webrtc/system_wrappers/source/critical_section_posix.h
View File

@@ -11,13 +11,13 @@
#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_POSIX_H_ #ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_POSIX_H_
#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_POSIX_H_ #define WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_POSIX_H_
#include "critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include <pthread.h> #include <pthread.h>
namespace webrtc { namespace webrtc {
class CriticalSectionPosix : public CriticalSectionWrapper
{ class CriticalSectionPosix : public CriticalSectionWrapper {
public: public:
CriticalSectionPosix(); CriticalSectionPosix();
@@ -27,9 +27,10 @@ public:
virtual void Leave(); virtual void Leave();
private: private:
pthread_mutex_t _mutex; pthread_mutex_t mutex_;
friend class ConditionVariablePosix; friend class ConditionVariablePosix;
}; };
} // namespace webrtc } // namespace webrtc
#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_POSIX_H_ #endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_POSIX_H_

20
webrtc/system_wrappers/source/critical_section_unittest.cc
View File

@@ -8,6 +8,8 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#ifdef _WIN32 #ifdef _WIN32
// For Sleep() // For Sleep()
#include <windows.h> #include <windows.h>
@@ -16,13 +18,11 @@
#include <time.h> #include <time.h>
#endif #endif
#include "system_wrappers/interface/critical_section_wrapper.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/sleep.h"
#include "system_wrappers/interface/thread_wrapper.h" #include "webrtc/system_wrappers/interface/thread_wrapper.h"
#include "system_wrappers/interface/trace.h" #include "webrtc/system_wrappers/interface/trace.h"
#include "system_wrappers/source/unittest_utilities.h" #include "webrtc/system_wrappers/source/unittest_utilities.h"
namespace webrtc { namespace webrtc {
@@ -90,8 +90,8 @@ bool LockUnlockThenStopRunFunction(void* obj) {
} }
TEST_F(CritSectTest, ThreadWakesOnce) { TEST_F(CritSectTest, ThreadWakesOnce) {
CriticalSectionWrapper* crit_sect CriticalSectionWrapper* crit_sect =
= CriticalSectionWrapper::CreateCriticalSection(); CriticalSectionWrapper::CreateCriticalSection();
ProtectedCount count(crit_sect); ProtectedCount count(crit_sect);
ThreadWrapper* thread = ThreadWrapper::CreateThread( ThreadWrapper* thread = ThreadWrapper::CreateThread(
&LockUnlockThenStopRunFunction, &count); &LockUnlockThenStopRunFunction, &count);
@@ -119,8 +119,8 @@ bool LockUnlockRunFunction(void* obj) {
} }
TEST_F(CritSectTest, ThreadWakesTwice) { TEST_F(CritSectTest, ThreadWakesTwice) {
CriticalSectionWrapper* crit_sect CriticalSectionWrapper* crit_sect =
= CriticalSectionWrapper::CreateCriticalSection(); CriticalSectionWrapper::CreateCriticalSection();
ProtectedCount count(crit_sect); ProtectedCount count(crit_sect);
ThreadWrapper* thread = ThreadWrapper::CreateThread(&LockUnlockRunFunction, ThreadWrapper* thread = ThreadWrapper::CreateThread(&LockUnlockRunFunction,
&count); &count);

16
webrtc/system_wrappers/source/critical_section_win.cc
View File

@@ -8,28 +8,26 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#include "critical_section_win.h" #include "webrtc/system_wrappers/source/critical_section_win.h"
namespace webrtc { namespace webrtc {
CriticalSectionWindows::CriticalSectionWindows()
{ CriticalSectionWindows::CriticalSectionWindows() {
InitializeCriticalSection(&crit); InitializeCriticalSection(&crit);
} }
CriticalSectionWindows::~CriticalSectionWindows() CriticalSectionWindows::~CriticalSectionWindows() {
{
DeleteCriticalSection(&crit); DeleteCriticalSection(&crit);
} }
void void
CriticalSectionWindows::Enter() CriticalSectionWindows::Enter() {
{
EnterCriticalSection(&crit); EnterCriticalSection(&crit);
} }
void void
CriticalSectionWindows::Leave() CriticalSectionWindows::Leave() {
{
LeaveCriticalSection(&crit); LeaveCriticalSection(&crit);
} }
} // namespace webrtc } // namespace webrtc

15
webrtc/system_wrappers/source/critical_section_win.h
View File

@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree. * be found in the AUTHORS file in the root of the source tree.
*/ */
#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_WINDOWS_H_ #ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_WIN_H_
#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_WINDOWS_H_ #define WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_WIN_H_
#include "typedefs.h" #include "webrtc/typedefs.h"
#include "critical_section_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
#include <windows.h> #include <windows.h>
namespace webrtc { namespace webrtc {
class CriticalSectionWindows : public CriticalSectionWrapper
{ class CriticalSectionWindows : public CriticalSectionWrapper {
public: public:
CriticalSectionWindows(); CriticalSectionWindows();
@@ -31,6 +31,7 @@ private:
friend class ConditionVariableWindows; friend class ConditionVariableWindows;
}; };
} // namespace webrtc } // namespace webrtc
#endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_WINDOWS_H_ #endif // WEBRTC_SYSTEM_WRAPPERS_SOURCE_CRITICAL_SECTION_WIN_H_