fix concurrent

git-svn-id: svn://db.shs.com.ru/pip@884 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
2020-02-25 15:58:02 +00:00
parent f8f627360a
commit 92ac2b12cf
7 changed files with 408 additions and 467 deletions

View File

@@ -1,7 +1,3 @@
//
// Created by fomenko on 25.09.2019.
//
#include "piconditionlock.h"
#ifdef WINDOWS
#include "synchapi.h"
@@ -9,70 +5,82 @@
#include "pthread.h"
#endif
PRIVATE_DEFINITION_START(PIConditionLock)
#ifdef WINDOWS
CRITICAL_SECTION
CRITICAL_SECTION
#else
pthread_mutex_t
pthread_mutex_t
#endif
nativeHandle;
nativeHandle;
PRIVATE_DEFINITION_END(PIConditionLock)
#ifdef WINDOWS
PIConditionLock::PIConditionLock() {
InitializeCriticalSection(&PRIVATE->nativeHandle);
InitializeCriticalSection(&PRIVATE->nativeHandle);
}
PIConditionLock::~PIConditionLock() {
DeleteCriticalSection(&PRIVATE->nativeHandle);
DeleteCriticalSection(&PRIVATE->nativeHandle);
}
void PIConditionLock::lock() {
EnterCriticalSection(&PRIVATE->nativeHandle);
EnterCriticalSection(&PRIVATE->nativeHandle);
}
void PIConditionLock::unlock() {
LeaveCriticalSection(&PRIVATE->nativeHandle);
LeaveCriticalSection(&PRIVATE->nativeHandle);
}
void *PIConditionLock::handle() {
return &PRIVATE->nativeHandle;
return &PRIVATE->nativeHandle;
}
bool PIConditionLock::tryLock() {
return TryEnterCriticalSection(&PRIVATE->nativeHandle) != 0;
return TryEnterCriticalSection(&PRIVATE->nativeHandle) != 0;
}
#else
PIConditionLock::PIConditionLock() {
pthread_mutexattr_t attr;
memset(&attr, 0, sizeof(attr));
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
memset(&(PRIVATE->nativeHandle), 0, sizeof(PRIVATE->nativeHandle));
pthread_mutex_init(&(PRIVATE->nativeHandle), &attr);
pthread_mutexattr_destroy(&attr);
pthread_mutexattr_t attr;
memset(&attr, 0, sizeof(attr));
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
memset(&(PRIVATE->nativeHandle), 0, sizeof(PRIVATE->nativeHandle));
pthread_mutex_init(&(PRIVATE->nativeHandle), &attr);
pthread_mutexattr_destroy(&attr);
}
PIConditionLock::~PIConditionLock() {
pthread_mutex_destroy(&(PRIVATE->nativeHandle));
pthread_mutex_destroy(&(PRIVATE->nativeHandle));
}
void PIConditionLock::lock() {
pthread_mutex_lock(&(PRIVATE->nativeHandle));
pthread_mutex_lock(&(PRIVATE->nativeHandle));
}
void PIConditionLock::unlock() {
pthread_mutex_unlock(&(PRIVATE->nativeHandle));
pthread_mutex_unlock(&(PRIVATE->nativeHandle));
}
void *PIConditionLock::handle() {
return &PRIVATE->nativeHandle;
return &PRIVATE->nativeHandle;
}
bool PIConditionLock::tryLock() {
return (pthread_mutex_trylock(&(PRIVATE->nativeHandle)) == 0);;
return (pthread_mutex_trylock(&(PRIVATE->nativeHandle)) == 0);
}
#endif