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

PIMutex as std::mutex

Browse Source
This commit is contained in:
Бычков Андрей
2020-07-17 11:14:11 +03:00
parent ea624a5111
commit 6f5c864e9f
7 changed files with 130 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
lib/main/thread/pimutex.cpp
View File

@@ -34,110 +34,100 @@
*
* */
#include "pimutex.h"
#include "piincludes_p.h"
#ifdef BLACKBERRY
# include <pthread.h>
#endif
//#include "pimutex.h"
//#include "piincludes_p.h"
//#ifdef BLACKBERRY
//# include <pthread.h>
//#endif
PRIVATE_DEFINITION_START(PIMutex)
#ifdef WINDOWS
HANDLE
#else
pthread_mutex_t
#endif
mutex;
PRIVATE_DEFINITION_END(PIMutex)
//PRIVATE_DEFINITION_START(PIMutex)
//#ifdef WINDOWS
// HANDLE
//#else
// pthread_mutex_t
//#endif
// mutex;
//PRIVATE_DEFINITION_END(PIMutex)
PIMutex::PIMutex(): inited_(false) {
//printf("new Mutex %p\n", this);
#ifdef WINDOWS
PRIVATE->mutex = 0;
#endif
init();
}
//PIMutex::PIMutex(): inited_(false) {
// //printf("new Mutex %p\n", this);
//#ifdef WINDOWS
// PRIVATE->mutex = 0;
//#endif
// init();
//}
PIMutex::~PIMutex() {
//printf("del Mutex %p\n", this);
destroy();
}
//PIMutex::~PIMutex() {
// //printf("del Mutex %p\n", this);
// destroy();
//}
void PIMutex::lock() {
#ifdef WINDOWS
// std::cout << (ullong)PRIVATE->mutex << "locking..." << std::endl;
// DWORD wr =
WaitForSingleObject(PRIVATE->mutex, INFINITE);
// std::cout << (ullong)PRIVATE->mutex << " lock wr=" << wr << std::endl;
#else
pthread_mutex_lock(&(PRIVATE->mutex));
#endif
locked = true;
}
//void PIMutex::lock() {
//#ifdef WINDOWS
//// std::cout << (ullong)PRIVATE->mutex << "locking..." << std::endl;
//// DWORD wr =
// WaitForSingleObject(PRIVATE->mutex, INFINITE);
//// std::cout << (ullong)PRIVATE->mutex << " lock wr=" << wr << std::endl;
//#else
// pthread_mutex_lock(&(PRIVATE->mutex));
//#endif
//}
void PIMutex::unlock() {
#ifdef WINDOWS
// BOOL wr =
// ReleaseMutex(PRIVATE->mutex);
SetEvent(PRIVATE->mutex);
// std::cout << (ullong)PRIVATE->mutex << " unlock wr=" << wr << std::endl;
#else
pthread_mutex_unlock(&(PRIVATE->mutex));
#endif
locked = false;
}
//void PIMutex::unlock() {
//#ifdef WINDOWS
//// BOOL wr =
//// ReleaseMutex(PRIVATE->mutex);
// SetEvent(PRIVATE->mutex);
//// std::cout << (ullong)PRIVATE->mutex << " unlock wr=" << wr << std::endl;
//#else
// pthread_mutex_unlock(&(PRIVATE->mutex));
//#endif
//}
bool PIMutex::tryLock() {
bool ret =
#ifdef WINDOWS
(WaitForSingleObject(PRIVATE->mutex, 0) == WAIT_OBJECT_0);
#else
(pthread_mutex_trylock(&(PRIVATE->mutex)) == 0);
#endif
locked = true;
return ret;
}
//bool PIMutex::tryLock() {
// bool ret =
//#ifdef WINDOWS
// (WaitForSingleObject(PRIVATE->mutex, 0) == WAIT_OBJECT_0);
//#else
// (pthread_mutex_trylock(&(PRIVATE->mutex)) == 0);
//#endif
// return ret;
//}
bool PIMutex::isLocked() const {
// std::cout << "test " << (ullong)PRIVATE->mutex << std::endl;
return locked;
}
//void PIMutex::init() {
// if (inited_) destroy();
//#ifdef WINDOWS
// PRIVATE->mutex = CreateEvent(NULL, FALSE, TRUE, NULL);
//// std::cout << "create " << (ullong)PRIVATE->mutex << std::endl;
//#else
// pthread_mutexattr_t attr;
// memset(&attr, 0, sizeof(attr));
// pthread_mutexattr_init(&attr);
// pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
// memset(&(PRIVATE->mutex), 0, sizeof(PRIVATE->mutex));
// pthread_mutex_init(&(PRIVATE->mutex), &attr);
// pthread_mutexattr_destroy(&attr);
//#endif
// inited_ = true;
//}
void PIMutex::init() {
if (inited_) destroy();
#ifdef WINDOWS
PRIVATE->mutex = CreateEvent(NULL, FALSE, TRUE, NULL);
// std::cout << "create " << (ullong)PRIVATE->mutex << std::endl;
#else
pthread_mutexattr_t attr;
memset(&attr, 0, sizeof(attr));
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_NORMAL);
memset(&(PRIVATE->mutex), 0, sizeof(PRIVATE->mutex));
pthread_mutex_init(&(PRIVATE->mutex), &attr);
pthread_mutexattr_destroy(&attr);
#endif
locked = false;
inited_ = true;
}
void PIMutex::destroy() {
if (inited_) {
#ifdef WINDOWS
// std::cout << "destroy " << (ullong)PRIVATE->mutex << std::endl;
if (PRIVATE->mutex) CloseHandle(PRIVATE->mutex);
PRIVATE->mutex = 0;
#else
pthread_mutex_destroy(&(PRIVATE->mutex));
#endif
}
locked = inited_ = false;
}
//void PIMutex::destroy() {
// if (inited_) {
//#ifdef WINDOWS
//// std::cout << "destroy " << (ullong)PRIVATE->mutex << std::endl;
// if (PRIVATE->mutex) CloseHandle(PRIVATE->mutex);
// PRIVATE->mutex = 0;
//#else
// pthread_mutex_destroy(&(PRIVATE->mutex));
//#endif
// }
// inited_ = false;
//}