hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added qse_rwl_t

Browse Source
This commit is contained in:
hyung-hwan
2015-10-01 15:51:15 +00:00
parent 49f4c3087f
commit b53509e1f8
23 changed files with 1812 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
qse/lib/sys/Makefile.am
View File

@ -8,6 +8,7 @@ lib_LTLIBRARIES = libqsesys.la
libqsesys_la_SOURCES = \
cnd.c \
mtx.c \
rwl.c \
thr.c \
thr.h
libqsesys_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined

4
qse/lib/sys/Makefile.in
View File

@ -127,7 +127,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
libqsesys_la_DEPENDENCIES =
am_libqsesys_la_OBJECTS = cnd.lo mtx.lo thr.lo
am_libqsesys_la_OBJECTS = cnd.lo mtx.lo rwl.lo thr.lo
libqsesys_la_OBJECTS = $(am_libqsesys_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@ -409,6 +409,7 @@ lib_LTLIBRARIES = libqsesys.la $(am__append_1)
libqsesys_la_SOURCES = \
cnd.c \
mtx.c \
rwl.c \
thr.c \
thr.h
@ -504,6 +505,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SocketAddress.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cnd.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtx.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rwl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thr.Plo@am__quote@
.c.o:

94
qse/lib/sys/cnd.c
View File

@ -30,18 +30,22 @@
#if (!defined(__unix__) && !defined(__unix)) || defined(HAVE_PTHREAD)
#if defined(_WIN32)
#include <windows.h>
#include <process.h>
# include <windows.h>
# include <process.h>
#elif defined(__OS2__)
/* implement this */
# define INCL_DOSSEMAPHORES
# define INCL_DOSERRORS
# include <os2.h>
#elif defined(__DOS__)
/* implement this */
#else
#if defined(AIX) && defined(__GNUC__)
typedef int crid_t;
typedef unsigned int class_id_t;
#endif
#include <pthread.h>
# if defined(AIX) && defined(__GNUC__)
typedef int crid_t;
typedef unsigned int class_id_t;
# endif
# include <pthread.h>
#endif
qse_cnd_t* qse_cnd_open (qse_mmgr_t* mmgr, qse_size_t xtnsize)
@ -94,9 +98,22 @@ int qse_cnd_init (qse_cnd_t* cnd, qse_mmgr_t* mmgr)
return -1;
}
#elif defined(__OS2__)
# error not implemented
{
APIRET rc;
HEV hev;
rc = DosCreateEventSem (QSE_NULL, &hev, DC_SEM_SHARED, FALSE);
if (rc != NO_ERROR) return -1;
cnd->hnd = hev;
cnd->wait_count = 0;
}
#elif defined(__DOS__)
# error not implemented
#else
if (pthread_cond_init ((pthread_cond_t*)&cnd->hnd, QSE_NULL) != 0) return -1;
#endif
@ -110,10 +127,13 @@ void qse_cnd_fini (qse_cnd_t* cnd)
CloseHandle (cnd->gate);
CloseHandle (cnd->queue);
CloseHandle (cnd->mutex);
#elif defined(__OS2__)
# error not implemented
DosCloseEventSem (cnd->hnd);
#elif defined(__DOS__)
# error not implemented
#else
pthread_cond_destroy ((pthread_cond_t*)&cnd->hnd);
#endif
@ -158,6 +178,21 @@ void qse_cnd_signal (qse_cnd_t* cnd)
ReleaseMutex ((HANDLE)cnd->mutex);
if (signals) ReleaseSemaphore ((HANDLE)cnd->queue, signals, QSE_NULL);
#elif defined(__OS2__)
if (cnd->wait_count > 0)
{
DosPostEventSem (cnd->hnd);
cnd->wait_count--;
}
#elif defined(__DOS__)
# error not implemented
#elif defined(__BEOS__)
# error not implemented
#else
pthread_cond_signal ((pthread_cond_t*)&cnd->hnd);
#endif
@ -202,6 +237,22 @@ void qse_cnd_broadcast (qse_cnd_t* cnd)
ReleaseMutex ((HANDLE)cnd->mutex);
if (signals) ReleaseSemaphore ((HANDLE)cnd->queue, signals, QSE_NULL);
#elif defined(__OS2__)
while (cnd->wait_count > 0)
{
DosPostEventSem (cnd->hnd);
cnd->wait_count--;
}
#elif defined(__DOS__)
# error not implemented
#elif defined(__BEOS__)
# error not implemented
#else
pthread_cond_broadcast ((pthread_cond_t*)&cnd->hnd);
#endif
@ -282,6 +333,29 @@ void qse_cnd_wait (qse_cnd_t* cnd, qse_mtx_t* mutex, qse_ntime_t* waiting_time)
}
qse_mtx_lock (mutex, QSE_NULL);
#elif defined(__OS2__)
cnd->wait_count++;
qse_mtx_unlock (mutex);
if (waiting_time)
{
ULONG msec;
msec = QSE_SECNSEC_TO_MSEC(waiting_time->sec, waiting_time->nsec);
DosWaitEventSem (cnd->hnd, msec);
}
else
{
DosWaitEventSem (cnd->hnd, SEM_INDEFINITE_WAIT);
}
qse_mtx_lock (mutex, QSE_NULL);
#elif defined(__DOS__)
# error not implemented
#elif defined(__BEOS__)
# error not implemented
#else
if (waiting_time)
{

15
qse/lib/sys/mtx.c
View File

@ -32,9 +32,10 @@
#if defined(_WIN32)
# include <windows.h>
# include <process.h>
#elif defined(__OS2__)
#elif defined(__OS2__)
# define INCL_DOSSEMAPHORES
# define INCL_DOSERRORS
# include <os2.h>
#elif defined(__DOS__)
@ -94,7 +95,6 @@ int qse_mtx_init (qse_mtx_t* mtx, qse_mmgr_t* mmgr)
if (rc != NO_ERROR) return -1;
mtx->hnd = m;
return 0;
}
#elif defined(__DOS__)
@ -210,14 +210,18 @@ int qse_mtx_lock (qse_mtx_t* mtx, qse_ntime_t* waiting_time)
{
if (acquire_sem(mtx->hnd) != B_NO_ERROR) return -1;
}
#else
#else
if (waiting_time)
{
qse_ntime_t t;
struct timespec ts;
ts.tv_sec = waiting_time->sec;
ts.tv_nsec = waiting_time->nsec;
qse_gettime (&t);
qse_addtime (&t, waiting_time, &t);
ts.tv_sec = t.sec;
ts.tv_nsec = t.nsec;
if (pthread_mutex_timedlock ((pthread_mutex_t*)&mtx->hnd, &ts) != 0) return -1;
}
else
@ -225,6 +229,7 @@ int qse_mtx_lock (qse_mtx_t* mtx, qse_ntime_t* waiting_time)
if (pthread_mutex_lock ((pthread_mutex_t*)&mtx->hnd) != 0) return -1;
}
#endif
return 0;
}

251
qse/lib/sys/rwl.c Normal file
View File

@ -0,0 +1,251 @@
/*
* $Id$
*
Copyright (c) 2006-2014 Chung, Hyung-Hwan. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <qse/sys/rwl.h>
#include "../cmn/mem.h"
qse_rwl_t* qse_rwl_open (qse_mmgr_t* mmgr, qse_size_t xtnsize, int flags)
{
qse_rwl_t* rwl;
rwl = (qse_rwl_t*) QSE_MMGR_ALLOC (mmgr, QSE_SIZEOF(qse_rwl_t) + xtnsize);
if (rwl)
{
if (qse_rwl_init (rwl, mmgr, flags) <= -1)
{
QSE_MMGR_FREE (mmgr, rwl);
return QSE_NULL;
}
else QSE_MEMSET (QSE_XTN(rwl), 0, xtnsize);
}
return rwl;
}
void qse_rwl_close (qse_rwl_t* rwl)
{
qse_rwl_fini (rwl);
QSE_MMGR_FREE (rwl->mmgr, rwl);
}
int qse_rwl_init (qse_rwl_t* rwl, qse_mmgr_t* mmgr, int flags)
{
QSE_MEMSET (rwl, 0, QSE_SIZEOF(*rwl));
rwl->mmgr = mmgr;
rwl->flags = flags;
if (qse_mtx_init (&rwl->mtx, mmgr) <= -1)
{
return -1;
}
if (qse_cnd_init (&rwl->rcnd, mmgr) <= -1)
{
qse_mtx_fini (&rwl->mtx);
return -1;
}
if (qse_cnd_init (&rwl->wcnd, mmgr) <= -1)
{
qse_cnd_fini (&rwl->rcnd);
qse_mtx_fini (&rwl->mtx);
return -1;
}
rwl->rwait_count = 0;
rwl->wwait_count = 0;
rwl->ractive_count = 0;
rwl->wactive_count = 0;
return 0;
}
void qse_rwl_fini (qse_rwl_t* rwl)
{
qse_cnd_fini (&rwl->wcnd);
qse_cnd_fini (&rwl->rcnd);
qse_mtx_fini (&rwl->mtx);
}
qse_mmgr_t* qse_rwl_getmmgr (qse_rwl_t* rwl)
{
return rwl->mmgr;
}
void* qse_rwl_getxtn (qse_rwl_t* rwl)
{
return QSE_XTN (rwl);
}
int qse_rwl_lockr (qse_rwl_t* rwl, qse_ntime_t* waiting_time)
{
qse_ntime_t dead_line, now, rem, zero;
if (waiting_time)
{
qse_cleartime (&zero);
qse_gettime (&now);
qse_addtime (&now, waiting_time, &dead_line);
}
if (qse_mtx_lock (&rwl->mtx, waiting_time) <= -1) return -1;
if (rwl->wactive_count > 0 || ((rwl->flags & QSE_RWL_PREFER_WRITER) && rwl->wwait_count > 0))
{
rwl->rwait_count++;
while (rwl->wactive_count > 0 || ((rwl->flags & QSE_RWL_PREFER_WRITER) && rwl->wwait_count > 0))
{
if (waiting_time)
{
qse_gettime (&now);
qse_subtime (&dead_line, &now, &rem);
if (qse_cmptime(&rem, &zero) <= 0)
{
/* timed out */
rwl->rwait_count--;
qse_mtx_unlock (&rwl->mtx);
return -1;
}
qse_cnd_wait (&rwl->rcnd, &rwl->mtx, &rem);
}
else
{
qse_cnd_wait (&rwl->rcnd, &rwl->mtx, QSE_NULL);
}
}
rwl->rwait_count--;
}
rwl->ractive_count++;
qse_mtx_unlock (&rwl->mtx);
return 0;
}
int qse_rwl_unlockr (qse_rwl_t* rwl)
{
if (qse_mtx_lock (&rwl->mtx, QSE_NULL) <= -1) return -1;
if (rwl->ractive_count <= 0)
{
qse_mtx_unlock (&rwl->mtx);
return -1;
}
rwl->ractive_count--;
if (rwl->ractive_count == 0 && rwl->wwait_count > 0)
{
qse_cnd_signal (&rwl->wcnd);
}
qse_mtx_unlock (&rwl->mtx);
return 0;
}
int qse_rwl_lockw (qse_rwl_t* rwl, qse_ntime_t* waiting_time)
{
qse_ntime_t dead_line, now, rem, zero;
if (waiting_time)
{
qse_cleartime (&zero);
qse_gettime (&now);
qse_addtime (&now, waiting_time, &dead_line);
}
if (qse_mtx_lock (&rwl->mtx, waiting_time) <= -1) return -1;
if (rwl->wactive_count > 0 || rwl->ractive_count > 0)
{
rwl->wwait_count++;
while (rwl->wactive_count > 0 || rwl->ractive_count > 0)
{
if (waiting_time)
{
qse_gettime (&now);
qse_subtime (&dead_line, &now, &rem);
if (qse_cmptime(&rem, &zero) <= 0)
{
/* timed out */
rwl->wwait_count--;
qse_mtx_unlock (&rwl->mtx);
return -1;
}
qse_cnd_wait (&rwl->wcnd, &rwl->mtx, &rem);
}
else
{
qse_cnd_wait (&rwl->wcnd, &rwl->mtx, QSE_NULL);
}
}
rwl->wwait_count--;
}
rwl->wactive_count++;
qse_mtx_unlock (&rwl->mtx);
return 0;
}
int qse_rwl_unlockw (qse_rwl_t* rwl)
{
if (qse_mtx_lock (&rwl->mtx, QSE_NULL) <= -1) return -1;
if (rwl->wactive_count <= 0)
{
qse_mtx_unlock (&rwl->mtx);
return -1;
}
rwl->wactive_count--;
#if 0
if (rwl->flags & QSE_RWL_PREFER_WRITER)
{
if (rwl->wwait_count > 0)
{
qse_cnd_signal (&rwl->wcnd);
}
else if (rwl->rwait_count > 0)
{
qse_cnd_broadcast (&rwl->rcnd);
}
}
else
{
#endif
if (rwl->rwait_count > 0)
{
qse_cnd_broadcast (&rwl->rcnd);
}
/*else*/ if (rwl->wwait_count > 0)
{
qse_cnd_signal (&rwl->wcnd);
}
#if 0
}
#endif
qse_mtx_unlock (&rwl->mtx);
return 0;
}