summaryrefslogtreecommitdiff
path: root/source/api_wrappers/linux/CSemaphore.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'source/api_wrappers/linux/CSemaphore.cpp')
-rw-r--r--source/api_wrappers/linux/CSemaphore.cpp48
1 files changed, 39 insertions, 9 deletions
diff --git a/source/api_wrappers/linux/CSemaphore.cpp b/source/api_wrappers/linux/CSemaphore.cpp
index 0246091..5dae856 100644
--- a/source/api_wrappers/linux/CSemaphore.cpp
+++ b/source/api_wrappers/linux/CSemaphore.cpp
@@ -3,21 +3,33 @@
* License terms: 3-clause BSD license
******************************************************************************/
-#include <errno.h>
+#include <sys/errno.h>
#include <semaphore.h>
#include <sys/time.h>
+#include <fcntl.h>
#include "Types.h"
#include "CSemaphore.h"
#include "OS.h"
+
CSemaphore::CSemaphore(unsigned int initial_count)
{
- sem_init(&m_semaphore, 0, initial_count);
+ char sem_name[SEM_NAME_MAX_LENGTH];
+ int sem_nr = 1;
+ while(sem_nr <= SEM_MAX_NR) {
+ snprintf(sem_name, SEM_NAME_MAX_LENGTH, "lcdriversem_%d", sem_nr);
+
+ /* open semaphore with "rw" permissions for everyone - 0666 */
+ m_semaphore = sem_open(sem_name, O_CREAT | O_EXCL, 0666 , 0);
+ if (m_semaphore != SEM_FAILED)
+ break;
+ sem_nr++;
+ }
}
CSemaphore::~CSemaphore()
{
- sem_destroy(&m_semaphore);
+ sem_close(m_semaphore);
}
bool CSemaphore::Release(unsigned int count)
@@ -27,7 +39,7 @@ bool CSemaphore::Release(unsigned int count)
}
for (unsigned int i = 0; i < count; ++i) {
- if (sem_post(&m_semaphore)) {
+ if (sem_post(m_semaphore)) {
return false;
}
}
@@ -38,15 +50,33 @@ bool CSemaphore::Release(unsigned int count)
DWORD CSemaphore::Wait(DWORD timeout)
{
if (INFINITE == timeout) {
- sem_wait(&m_semaphore);
+ sem_wait(m_semaphore);
} else {
- timespec absoulute_time = OS::GetAbsoluteTime(timeout);
+ struct timeval curr_time, start_time;
+ DWORD dwTimePassed = 0;
int ret;
- /* coverity[returned_null] */
- while (-1 == (ret = sem_timedwait(&m_semaphore, &absoulute_time)) && errno == EINTR);
+ gettimeofday(&start_time, NULL);
+
+ /* Try to lock the semaphore */
+ ret = sem_trywait(m_semaphore);
+ if (ret != 0) {
+ while (dwTimePassed < timeout) {
+ /* Sleep 1ms */
+ OS::Sleep(1);
+
+ /* Try to lock the semaphore again*/
+ ret = sem_trywait(m_semaphore);
+ if (ret == 0) {
+ return WAIT_OBJECT_0;
+ }
+
+ gettimeofday(&curr_time, NULL);
+
+ dwTimePassed = 1000 * (curr_time.tv_sec - start_time.tv_sec) + \
+ (curr_time.tv_usec - start_time.tv_usec) / 1000;
+ }
- if (0 != ret) {
return WAIT_TIMEOUT;
}
}