SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

code clean

Browse Source
This commit is contained in:
Пелипенко Иван
2020-07-10 16:57:02 +03:00
parent 614370096c
commit 835e6c7773
4 changed files with 42 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
lib/concurrent/piconditionlock.cpp
View File

@@ -19,55 +19,26 @@
#include "piconditionlock.h" #include "piconditionlock.h"
#ifdef WINDOWS #ifdef WINDOWS
#include "synchapi.h" # include <synchapi.h>
#else #else
#include "pthread.h" # include <pthread.h>
#endif #endif
PRIVATE_DEFINITION_START(PIConditionLock) PRIVATE_DEFINITION_START(PIConditionLock)
#ifdef WINDOWS #ifdef WINDOWS
CRITICAL_SECTION CRITICAL_SECTION
#else #else
pthread_mutex_t pthread_mutex_t
#endif #endif
nativeHandle; nativeHandle;
PRIVATE_DEFINITION_END(PIConditionLock) PRIVATE_DEFINITION_END(PIConditionLock)
PIConditionLock::PIConditionLock() {
#ifdef WINDOWS #ifdef WINDOWS
PIConditionLock::PIConditionLock() {
InitializeCriticalSection(&PRIVATE->nativeHandle); InitializeCriticalSection(&PRIVATE->nativeHandle);
}
PIConditionLock::~PIConditionLock() {
DeleteCriticalSection(&PRIVATE->nativeHandle);
}
void PIConditionLock::lock() {
EnterCriticalSection(&PRIVATE->nativeHandle);
}
void PIConditionLock::unlock() {
LeaveCriticalSection(&PRIVATE->nativeHandle);
}
void *PIConditionLock::handle() {
return &PRIVATE->nativeHandle;
}
bool PIConditionLock::tryLock() {
return TryEnterCriticalSection(&PRIVATE->nativeHandle) != 0;
}
#else #else
PIConditionLock::PIConditionLock() {
pthread_mutexattr_t attr; pthread_mutexattr_t attr;
memset(&attr, 0, sizeof(attr)); memset(&attr, 0, sizeof(attr));
pthread_mutexattr_init(&attr); pthread_mutexattr_init(&attr);
@@ -75,34 +46,50 @@ PIConditionLock::PIConditionLock() {
memset(&(PRIVATE->nativeHandle), 0, sizeof(PRIVATE->nativeHandle)); memset(&(PRIVATE->nativeHandle), 0, sizeof(PRIVATE->nativeHandle));
pthread_mutex_init(&(PRIVATE->nativeHandle), &attr); pthread_mutex_init(&(PRIVATE->nativeHandle), &attr);
pthread_mutexattr_destroy(&attr); pthread_mutexattr_destroy(&attr);
#endif
} }
PIConditionLock::~PIConditionLock() { PIConditionLock::~PIConditionLock() {
#ifdef WINDOWS
DeleteCriticalSection(&PRIVATE->nativeHandle);
#else
pthread_mutex_destroy(&(PRIVATE->nativeHandle)); pthread_mutex_destroy(&(PRIVATE->nativeHandle));
#endif
} }
void PIConditionLock::lock() { void PIConditionLock::lock() {
#ifdef WINDOWS
EnterCriticalSection(&PRIVATE->nativeHandle);
#else
pthread_mutex_lock(&(PRIVATE->nativeHandle)); pthread_mutex_lock(&(PRIVATE->nativeHandle));
#endif
} }
void PIConditionLock::unlock() { void PIConditionLock::unlock() {
#ifdef WINDOWS
LeaveCriticalSection(&PRIVATE->nativeHandle);
#else
pthread_mutex_unlock(&(PRIVATE->nativeHandle)); pthread_mutex_unlock(&(PRIVATE->nativeHandle));
#endif
} }
void *PIConditionLock::handle() { void *PIConditionLock::handle() {
#ifdef WINDOWS
return &PRIVATE->nativeHandle; return &PRIVATE->nativeHandle;
#else
return &PRIVATE->nativeHandle;
#endif
} }
bool PIConditionLock::tryLock() { bool PIConditionLock::tryLock() {
#ifdef WINDOWS
return TryEnterCriticalSection(&PRIVATE->nativeHandle) != 0;
#else
return (pthread_mutex_trylock(&(PRIVATE->nativeHandle)) == 0); return (pthread_mutex_trylock(&(PRIVATE->nativeHandle)) == 0);
}
#endif #endif
}

19
lib/concurrent/piconditionvar.cpp
View File

@@ -17,28 +17,27 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "piplatform.h"
#include "piconditionvar.h" #include "piconditionvar.h"
#include "pithread.h" #include "pithread.h"
#include "pitime.h" #include "pitime.h"
#ifdef WINDOWS #ifdef WINDOWS
#undef _WIN32_WINNT # undef _WIN32_WINNT
#define _WIN32_WINNT 0x0600 # define _WIN32_WINNT 0x0600
#include "synchapi.h" # include <synchapi.h>
#include <windef.h> # include <windef.h>
#include <winbase.h> # include <winbase.h>
#endif #endif
PRIVATE_DEFINITION_START(PIConditionVariable) PRIVATE_DEFINITION_START(PIConditionVariable)
#ifdef WINDOWS #ifdef WINDOWS
CONDITION_VARIABLE nativeHandle; CONDITION_VARIABLE nativeHandle;
#else #else
pthread_cond_t nativeHandle; pthread_cond_t nativeHandle;
PIConditionLock* currentLock; PIConditionLock* currentLock;
#endif #endif
bool isDestroying; bool isDestroying;
PRIVATE_DEFINITION_END(PIConditionVariable) PRIVATE_DEFINITION_END(PIConditionVariable)

6
lib/main/concurrent/piconditionlock.h
View File

@@ -17,8 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef AWRCANFLASHER_PICONDITIONLOCK_H #ifndef PICONDITIONLOCK_H
#define AWRCANFLASHER_PICONDITIONLOCK_H #define PICONDITIONLOCK_H
#include "pimutex.h" #include "pimutex.h"
@@ -48,4 +48,4 @@ private:
}; };
#endif //AWRCANFLASHER_PICONDITIONLOCK_H #endif // PICONDITIONLOCK_H

7
lib/main/concurrent/piconditionvar.h
View File

@@ -17,12 +17,11 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef PIP_TESTS_PICONDITIONVAR_H #ifndef PICONDITIONVAR_H
#define PIP_TESTS_PICONDITIONVAR_H #define PICONDITIONVAR_H
#include "piconditionlock.h" #include "piconditionlock.h"
#include "pithread.h" #include "pithread.h"
#include "piinit.h"
/** /**
@@ -117,4 +116,4 @@ private:
}; };
#endif //PIP_TESTS_PICONDITIONVAR_H #endif // PICONDITIONVAR_H