From 49d3dcfedadcbe8ce83a0c889ff3d2c87c3fd9d7 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Thu, 28 Apr 2016 14:33:10 +0000 Subject: [PATCH] merged sys and io to si --- qse/configure.ac | 8 +-- qse/include/qse/{sys => si}/Makefile.am | 10 ++- qse/include/qse/{sys => si}/Makefile.in | 0 qse/include/qse/{sys => si}/Socket.hpp | 0 qse/include/qse/{sys => si}/SocketAddress.hpp | 0 qse/include/qse/{io => si}/aio-pro.h | 0 qse/include/qse/{io => si}/aio-sck.h | 0 qse/include/qse/{io => si}/aio.h | 0 qse/include/qse/{sys => si}/cnd.h | 0 qse/include/qse/{io => si}/fio.h | 0 qse/include/qse/{sys => si}/intr.h | 0 qse/include/qse/{sys => si}/mtx.h | 0 qse/include/qse/{sys => si}/mux.h | 0 qse/include/qse/{io => si}/nwio.h | 0 qse/include/qse/{io => si}/pio.h | 0 qse/include/qse/{sys => si}/rwl.h | 0 qse/include/qse/{io => si}/sio.h | 0 qse/include/qse/{sys => si}/task.h | 0 qse/include/qse/{sys => si}/thr.h | 0 qse/include/qse/{io => si}/tio.h | 0 qse/lib/Makefile.am | 2 +- qse/lib/cmn/assert.c | 68 ++++++++++++++----- qse/lib/cmn/fmt.h | 5 +- qse/lib/cmn/sck.c | 25 ++++++- qse/lib/si/Makefile.am | 40 +++++++++++ qse/lib/{sys => si}/Makefile.in | 0 qse/lib/{sys => si}/Socket.cpp | 2 +- qse/lib/{sys => si}/SocketAddress.cpp | 2 +- qse/lib/{io => si}/aio-pro.c | 2 +- qse/lib/{io => si}/aio-prv.h | 0 qse/lib/{io => si}/aio-sck.c | 2 +- qse/lib/{io => si}/aio-tmr.c | 0 qse/lib/{io => si}/aio.c | 0 qse/lib/{sys => si}/cnd.c | 2 +- qse/lib/{io => si}/fio.c | 2 +- qse/lib/{sys => si}/intr.c | 2 +- qse/lib/{sys => si}/mtx.c | 2 +- qse/lib/{sys => si}/mux.c | 2 +- qse/lib/{io => si}/nwio.c | 2 +- qse/lib/{io => si}/pio.c | 2 +- qse/lib/{sys => si}/rwl.c | 2 +- qse/lib/{io => si}/sio.c | 2 +- qse/lib/{sys => si}/task.c | 2 +- qse/lib/{sys/thr.h => si/thr-prv.h} | 2 +- qse/lib/{sys => si}/thr.c | 2 +- qse/lib/{io => si}/tio.c | 2 +- qse/lib/sys/Makefile.am | 29 -------- qse/samples/{sys => si}/Makefile.am | 4 +- qse/samples/{sys => si}/Makefile.in | 0 qse/samples/{sys => si}/rwl01.c | 0 50 files changed, 147 insertions(+), 78 deletions(-) rename qse/include/qse/{sys => si}/Makefile.am (68%) rename qse/include/qse/{sys => si}/Makefile.in (100%) rename qse/include/qse/{sys => si}/Socket.hpp (100%) rename qse/include/qse/{sys => si}/SocketAddress.hpp (100%) rename qse/include/qse/{io => si}/aio-pro.h (100%) rename qse/include/qse/{io => si}/aio-sck.h (100%) rename qse/include/qse/{io => si}/aio.h (100%) rename qse/include/qse/{sys => si}/cnd.h (100%) rename qse/include/qse/{io => si}/fio.h (100%) rename qse/include/qse/{sys => si}/intr.h (100%) rename qse/include/qse/{sys => si}/mtx.h (100%) rename qse/include/qse/{sys => si}/mux.h (100%) rename qse/include/qse/{io => si}/nwio.h (100%) rename qse/include/qse/{io => si}/pio.h (100%) rename qse/include/qse/{sys => si}/rwl.h (100%) rename qse/include/qse/{io => si}/sio.h (100%) rename qse/include/qse/{sys => si}/task.h (100%) rename qse/include/qse/{sys => si}/thr.h (100%) rename qse/include/qse/{io => si}/tio.h (100%) create mode 100644 qse/lib/si/Makefile.am rename qse/lib/{sys => si}/Makefile.in (100%) rename qse/lib/{sys => si}/Socket.cpp (98%) rename qse/lib/{sys => si}/SocketAddress.cpp (99%) rename qse/lib/{io => si}/aio-pro.c (99%) rename qse/lib/{io => si}/aio-prv.h (100%) rename qse/lib/{io => si}/aio-sck.c (99%) rename qse/lib/{io => si}/aio-tmr.c (100%) rename qse/lib/{io => si}/aio.c (100%) rename qse/lib/{sys => si}/cnd.c (99%) rename qse/lib/{io => si}/fio.c (99%) rename qse/lib/{sys => si}/intr.c (99%) rename qse/lib/{sys => si}/mtx.c (99%) rename qse/lib/{sys => si}/mux.c (99%) rename qse/lib/{io => si}/nwio.c (99%) rename qse/lib/{io => si}/pio.c (99%) rename qse/lib/{sys => si}/rwl.c (99%) rename qse/lib/{io => si}/sio.c (99%) rename qse/lib/{sys => si}/task.c (99%) rename qse/lib/{sys/thr.h => si/thr-prv.h} (98%) rename qse/lib/{sys => si}/thr.c (99%) rename qse/lib/{io => si}/tio.c (99%) delete mode 100644 qse/lib/sys/Makefile.am rename qse/samples/{sys => si}/Makefile.am (74%) rename qse/samples/{sys => si}/Makefile.in (100%) rename qse/samples/{sys => si}/rwl01.c (100%) diff --git a/qse/configure.ac b/qse/configure.ac index 62ef07d4..62518aa5 100644 --- a/qse/configure.ac +++ b/qse/configure.ac @@ -783,16 +783,14 @@ AC_CONFIG_FILES([ include/Makefile include/qse/Makefile include/qse/cmn/Makefile - include/qse/sys/Makefile - include/qse/io/Makefile + include/qse/si/Makefile include/qse/awk/Makefile include/qse/sed/Makefile include/qse/xli/Makefile include/qse/http/Makefile lib/Makefile lib/cmn/Makefile - lib/sys/Makefile - lib/io/Makefile + lib/si/Makefile lib/awk/Makefile lib/sed/Makefile lib/xli/Makefile @@ -809,7 +807,7 @@ AC_CONFIG_FILES([ cmd/http/Makefile samples/Makefile samples/cmn/Makefile - samples/sys/Makefile + samples/si/Makefile samples/awk/Makefile samples/sed/Makefile samples/http/Makefile diff --git a/qse/include/qse/sys/Makefile.am b/qse/include/qse/si/Makefile.am similarity index 68% rename from qse/include/qse/sys/Makefile.am rename to qse/include/qse/si/Makefile.am index 939098c6..ea8e4e0d 100644 --- a/qse/include/qse/sys/Makefile.am +++ b/qse/include/qse/si/Makefile.am @@ -1,13 +1,21 @@ pkgincludedir = $(includedir)/qse/sys pkginclude_HEADERS = \ + aio.h \ + aio-pro.h \ + aio-sck.h cnd.h \ + fio.h \ intr.h \ mtx.h \ mux.h \ + nwio.h \ + pio.h \ rwl.h \ + sio.h \ task.h \ - thr.h + thr.h \ + tio.h if ENABLE_CXX pkginclude_HEADERS += \ diff --git a/qse/include/qse/sys/Makefile.in b/qse/include/qse/si/Makefile.in similarity index 100% rename from qse/include/qse/sys/Makefile.in rename to qse/include/qse/si/Makefile.in diff --git a/qse/include/qse/sys/Socket.hpp b/qse/include/qse/si/Socket.hpp similarity index 100% rename from qse/include/qse/sys/Socket.hpp rename to qse/include/qse/si/Socket.hpp diff --git a/qse/include/qse/sys/SocketAddress.hpp b/qse/include/qse/si/SocketAddress.hpp similarity index 100% rename from qse/include/qse/sys/SocketAddress.hpp rename to qse/include/qse/si/SocketAddress.hpp diff --git a/qse/include/qse/io/aio-pro.h b/qse/include/qse/si/aio-pro.h similarity index 100% rename from qse/include/qse/io/aio-pro.h rename to qse/include/qse/si/aio-pro.h diff --git a/qse/include/qse/io/aio-sck.h b/qse/include/qse/si/aio-sck.h similarity index 100% rename from qse/include/qse/io/aio-sck.h rename to qse/include/qse/si/aio-sck.h diff --git a/qse/include/qse/io/aio.h b/qse/include/qse/si/aio.h similarity index 100% rename from qse/include/qse/io/aio.h rename to qse/include/qse/si/aio.h diff --git a/qse/include/qse/sys/cnd.h b/qse/include/qse/si/cnd.h similarity index 100% rename from qse/include/qse/sys/cnd.h rename to qse/include/qse/si/cnd.h diff --git a/qse/include/qse/io/fio.h b/qse/include/qse/si/fio.h similarity index 100% rename from qse/include/qse/io/fio.h rename to qse/include/qse/si/fio.h diff --git a/qse/include/qse/sys/intr.h b/qse/include/qse/si/intr.h similarity index 100% rename from qse/include/qse/sys/intr.h rename to qse/include/qse/si/intr.h diff --git a/qse/include/qse/sys/mtx.h b/qse/include/qse/si/mtx.h similarity index 100% rename from qse/include/qse/sys/mtx.h rename to qse/include/qse/si/mtx.h diff --git a/qse/include/qse/sys/mux.h b/qse/include/qse/si/mux.h similarity index 100% rename from qse/include/qse/sys/mux.h rename to qse/include/qse/si/mux.h diff --git a/qse/include/qse/io/nwio.h b/qse/include/qse/si/nwio.h similarity index 100% rename from qse/include/qse/io/nwio.h rename to qse/include/qse/si/nwio.h diff --git a/qse/include/qse/io/pio.h b/qse/include/qse/si/pio.h similarity index 100% rename from qse/include/qse/io/pio.h rename to qse/include/qse/si/pio.h diff --git a/qse/include/qse/sys/rwl.h b/qse/include/qse/si/rwl.h similarity index 100% rename from qse/include/qse/sys/rwl.h rename to qse/include/qse/si/rwl.h diff --git a/qse/include/qse/io/sio.h b/qse/include/qse/si/sio.h similarity index 100% rename from qse/include/qse/io/sio.h rename to qse/include/qse/si/sio.h diff --git a/qse/include/qse/sys/task.h b/qse/include/qse/si/task.h similarity index 100% rename from qse/include/qse/sys/task.h rename to qse/include/qse/si/task.h diff --git a/qse/include/qse/sys/thr.h b/qse/include/qse/si/thr.h similarity index 100% rename from qse/include/qse/sys/thr.h rename to qse/include/qse/si/thr.h diff --git a/qse/include/qse/io/tio.h b/qse/include/qse/si/tio.h similarity index 100% rename from qse/include/qse/io/tio.h rename to qse/include/qse/si/tio.h diff --git a/qse/lib/Makefile.am b/qse/lib/Makefile.am index 5d7c084d..f3b89220 100644 --- a/qse/lib/Makefile.am +++ b/qse/lib/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = cmn sys io sed awk xli http +SUBDIRS = cmn si sed awk xli http DIST_SUBDIRS = $(SUBDIRS) pkgconfigdir = $(libdir)/pkgconfig diff --git a/qse/lib/cmn/assert.c b/qse/lib/cmn/assert.c index d0770975..1f832953 100644 --- a/qse/lib/cmn/assert.c +++ b/qse/lib/cmn/assert.c @@ -39,6 +39,7 @@ # include #elif defined(__OS2__) # define INCL_DOSPROCESS +# define INCL_DOSFILEMGR # include #elif defined(__DOS__) # include @@ -78,7 +79,7 @@ void qse_assert_failed ( qse_char_t tmp[1024]; qse_strxfmt (tmp, QSE_COUNTOF(tmp), - QSE_T("FILE %s LINE %lu - %s%s%s"), + QSE_T("[FILE %s LINE %lu]\r\n%s%s%s"), file, line, expr, (desc? QSE_T("\n\n"): QSE_T("")), (desc? desc: QSE_T("")) @@ -90,53 +91,84 @@ void qse_assert_failed ( qse_char_t tmp[1024]; DWORD written; - WriteConsole (stderr, QSE_T("[ASSERTION FAILURE]\r\n"), 21, &written, STIO_NULL); + WriteConsole (stderr, QSE_T("[ASSERTION FAILURE]\r\n"), 21, &written, QSE_NULL); - qse_strxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("FILE %s LINE %lu\r\n"), file, (unsigned long)line); - WriteConsole (stderr, tmp, qse_strlen(tmp), &written, STIO_NULL); + qse_strxfmt (tmp, QSE_COUNTOF(tmp), QSE_T("[FILE %s LINE %lu]\r\n"), file, (unsigned long)line); + WriteConsole (stderr, tmp, qse_strlen(tmp), &written, QSE_NULL); - WriteConsoel (stderr, QSE_T("[EXPRESSION] "), 13, &written, STIO_NULL); - WriteConsole (stderr, expr, qse_strlen(expr), &written, STIO_NULL); - WriteConsole (stderr, QSE_T("\r\n"), 2, &written, STIO_NULL); + WriteConsole (stderr, QSE_T("[EXPRESSION] "), 13, &written, QSE_NULL); + WriteConsole (stderr, expr, qse_strlen(expr), &written, QSE_NULL); + WriteConsole (stderr, QSE_T("\r\n"), 2, &written, QSE_NULL); if (desc) { - WriteConsole (stderr, QSE_T("[DESCRIPTION] "), 14, &written, STIO_NULL); - WriteConsole (stderr, desc, qse_strlen(desc), &written, STIO_NULL); - WriteConsole (stderr, QSE_T("\r\n"), 2, &written, STIO_NULL); + WriteConsole (stderr, QSE_T("[DESCRIPTION] "), 14, &written, QSE_NULL); + WriteConsole (stderr, desc, qse_strlen(desc), &written, QSE_NULL); + WriteConsole (stderr, QSE_T("\r\n"), 2, &written, QSE_NULL); } } #elif defined(__OS2__) HFILE stderr = (HFILE)2; - USHORT written; + ULONG written; qse_mchar_t tmp[1024]; DosWrite (stderr, QSE_T("[ASSERTION FAILURE]\r\n"), 21, &written); #if defined(QSE_CHAR_IS_MCHAR) - qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("FILE %hs LINE %lu\n"), file, (unsigned long)line); + qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("FILE %hs LINE %lu\r\n"), file, (unsigned long)line); #else - qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("FILE %ls LINE %lu\n"), file, (unsigned long)line); + qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("FILE %ls LINE %lu\r\n"), file, (unsigned long)line); #endif DosWrite (stderr, tmp, qse_mbslen(tmp), &written); #if defined(QSE_CHAR_IS_MCHAR) - qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("[EXPRESSION] %hs\n"), expr); + qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("[EXPRESSION] %hs\r\n"), expr); #else - qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("[EXPRESSION] %ls\n"), expr); + qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("[EXPRESSION] %ls\r\n"), expr); #endif DosWrite (stderr, tmp, qse_mbslen(tmp), &written); if (desc) { #if defined(QSE_CHAR_IS_MCHAR) - qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("[DESCRIPTION] %hs\n"), desc); + qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("[DESCRIPTION] %hs\r\n"), desc); #else - qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("[DESCRIPTION] %ls\n"), desc); + qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("[DESCRIPTION] %ls\r\n"), desc); #endif DosWrite (stderr, tmp, qse_mbslen(tmp), &written); } +#elif defined(__DOS__) + int stderr = 2; + qse_mchar_t tmp[1024]; + + write (stderr, QSE_T("[ASSERTION FAILURE]\r\n"), 21); + + #if defined(QSE_CHAR_IS_MCHAR) + qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("FILE %hs LINE %lu\r\n"), file, (unsigned long)line); + #else + qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("FILE %ls LINE %lu\r\n"), file, (unsigned long)line); + #endif + write (stderr, tmp, qse_mbslen(tmp)); + + #if defined(QSE_CHAR_IS_MCHAR) + qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("[EXPRESSION] %hs\r\n"), expr); + #else + qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("[EXPRESSION] %ls\r\n"), expr); + #endif + write (stderr, tmp, qse_mbslen(tmp)); + + if (desc) + { + #if defined(QSE_CHAR_IS_MCHAR) + qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("[DESCRIPTION] %hs\r\n"), desc); + #else + qse_mbsxfmt (tmp, QSE_COUNTOF(tmp), QSE_MT("[DESCRIPTION] %ls\r\n"), desc); + #endif + write (stderr, tmp, qse_mbslen(tmp)); + } + + #elif defined(macintosh) /* note 'desc' is not used for macintosh at this moment. * TODO: include 'desc' in the message */ @@ -168,8 +200,8 @@ void qse_assert_failed ( WHAT TO DO???? */ -#else +#else static qse_mchar_t* static_msg[] = { QSE_MT("=[ASSERTION FAILURE]============================================================\n"), diff --git a/qse/lib/cmn/fmt.h b/qse/lib/cmn/fmt.h index 59cb2a84..36acd5be 100644 --- a/qse/lib/cmn/fmt.h +++ b/qse/lib/cmn/fmt.h @@ -108,13 +108,14 @@ typedef struct qse_wfmtout_t qse_wfmtout_t; extern "C" { #endif -int qse_mfmtout ( +/* QSE_EXPORTed, but keep in it the private header for used by other libraries in QSE */ +QSE_EXPORT int qse_mfmtout ( const qse_mchar_t* fmt, qse_mfmtout_t* data, va_list ap ); -int qse_wfmtout ( +QSE_EXPORT int qse_wfmtout ( const qse_wchar_t* fmt, qse_wfmtout_t* data, va_list ap diff --git a/qse/lib/cmn/sck.c b/qse/lib/cmn/sck.c index 98ee25d6..066a1a41 100644 --- a/qse/lib/cmn/sck.c +++ b/qse/lib/cmn/sck.c @@ -182,6 +182,8 @@ int qse_initsckconn (qse_sck_hnd_t handle, const qse_nwad_t* nwad) int n; #if defined(_WIN32) unsigned long cmd; +#elif defined(__OS2__) + int enabled; #else int saved = 0; #endif @@ -204,13 +206,30 @@ int qse_initsckconn (qse_sck_hnd_t handle, const qse_nwad_t* nwad) n = connect (handle, (struct sockaddr*)&skad, skadlen); if (n == -1 && WSAGetLastError() != WSAEWOULDBLOCK) { - /* attemp to restore to the blocking mode upon failure. + /* attempt to restore to the blocking mode upon failure. * there is no guarantee that this was the previous mode. */ cmd = 0; ioctlsocket (handle, FIONBIO, &cmd); return -1; } +#elif defined(__OS2__) + + enabled = 1; + if (ioctl (handle, FIONBIO, (char*)&enabled, sizeof(enabled)) <= -1) return -1; + + /* attempt to connet */ + n = connect (handle, (struct sockaddr*)&skad, skadlen); + if (n == -1 && sock_errno() != EINPROGRESS) + { + /* attempt to restore to the blocking mode upon failure. + * there is no guarantee that this was the previous mode. */ + enabled = 0; + ioctl (handle, FIONBIO, (char*)&enabled, sizeof(enabled)); + return -1; + } + #else + /* switch to the non-blocking mode */ saved = fcntl (handle, F_GETFL, 0); if (saved == -1) return -1; @@ -242,7 +261,7 @@ int qse_finisckconn (qse_sck_hnd_t handle) len = (qse_sck_len_t)QSE_SIZEOF (ret); if (getsockopt (handle, SOL_SOCKET, SO_ERROR, (char*)&ret, &len) == -1) return -1; -#ifdef _WIN32 +#if defined(_WIN32) if (ret == WSAETIMEDOUT) #else if (ret == ETIMEDOUT) @@ -250,7 +269,7 @@ int qse_finisckconn (qse_sck_hnd_t handle) { return -1; /* failure - timed out */ } -#ifdef _WIN32 +#if defined(_WIN32) else if (ret == WSAEWOULDBLOCK) #else else if (ret == EINPROGRESS) diff --git a/qse/lib/si/Makefile.am b/qse/lib/si/Makefile.am new file mode 100644 index 00000000..12a14376 --- /dev/null +++ b/qse/lib/si/Makefile.am @@ -0,0 +1,40 @@ +AUTOMAKE_OPTIONS = nostdinc + +AM_CPPFLAGS = \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include + +lib_LTLIBRARIES = libqsesi.la +libqsesi_la_SOURCES = \ + aio-prv.h \ + aio.c \ + aio-pro.c \ + aio-sck.c \ + aio-tmr.c \ + cnd.c \ + fio.c \ + intr.c \ + mtx.c \ + mux.c \ + nwio.c \ + pio.c \ + rwl.c \ + sio.c \ + task.c \ + thr.c \ + thr.h \ + tio.c + +libqsesi_la_CFLAGS = $(PTHREAD_CFLAGS) +libqsesi_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined +libqsesi_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) + +if ENABLE_CXX +lib_LTLIBRARIES += libqsesixx.la +libqsesixx_la_SOURCES = \ + SocketAddress.cpp \ + Socket.cpp +libqsesixx_la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined +libqsesixx_la_LIBADD = -lqsecmnxx -lqsecmn +endif + diff --git a/qse/lib/sys/Makefile.in b/qse/lib/si/Makefile.in similarity index 100% rename from qse/lib/sys/Makefile.in rename to qse/lib/si/Makefile.in diff --git a/qse/lib/sys/Socket.cpp b/qse/lib/si/Socket.cpp similarity index 98% rename from qse/lib/sys/Socket.cpp rename to qse/lib/si/Socket.cpp index 420bf35f..79b7d110 100644 --- a/qse/lib/sys/Socket.cpp +++ b/qse/lib/si/Socket.cpp @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include ///////////////////////////////// QSE_BEGIN_NAMESPACE(QSE) diff --git a/qse/lib/sys/SocketAddress.cpp b/qse/lib/si/SocketAddress.cpp similarity index 99% rename from qse/lib/sys/SocketAddress.cpp rename to qse/lib/si/SocketAddress.cpp index f831d6ca..a9e7588f 100644 --- a/qse/lib/sys/SocketAddress.cpp +++ b/qse/lib/si/SocketAddress.cpp @@ -25,7 +25,7 @@ */ -#include +#include #include "../cmn/mem.h" #if defined(_WIN32) diff --git a/qse/lib/io/aio-pro.c b/qse/lib/si/aio-pro.c similarity index 99% rename from qse/lib/io/aio-pro.c rename to qse/lib/si/aio-pro.c index 29feba5b..23794a9d 100644 --- a/qse/lib/io/aio-pro.c +++ b/qse/lib/si/aio-pro.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "aio-prv.h" #include diff --git a/qse/lib/io/aio-prv.h b/qse/lib/si/aio-prv.h similarity index 100% rename from qse/lib/io/aio-prv.h rename to qse/lib/si/aio-prv.h diff --git a/qse/lib/io/aio-sck.c b/qse/lib/si/aio-sck.c similarity index 99% rename from qse/lib/io/aio-sck.c rename to qse/lib/si/aio-sck.c index 1defd40f..6544178c 100644 --- a/qse/lib/io/aio-sck.c +++ b/qse/lib/si/aio-sck.c @@ -25,7 +25,7 @@ */ -#include +#include #include "aio-prv.h" #include diff --git a/qse/lib/io/aio-tmr.c b/qse/lib/si/aio-tmr.c similarity index 100% rename from qse/lib/io/aio-tmr.c rename to qse/lib/si/aio-tmr.c diff --git a/qse/lib/io/aio.c b/qse/lib/si/aio.c similarity index 100% rename from qse/lib/io/aio.c rename to qse/lib/si/aio.c diff --git a/qse/lib/sys/cnd.c b/qse/lib/si/cnd.c similarity index 99% rename from qse/lib/sys/cnd.c rename to qse/lib/si/cnd.c index f687d794..4df562d3 100644 --- a/qse/lib/sys/cnd.c +++ b/qse/lib/si/cnd.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "../cmn/mem.h" #if (!defined(__unix__) && !defined(__unix)) || defined(HAVE_PTHREAD) diff --git a/qse/lib/io/fio.c b/qse/lib/si/fio.c similarity index 99% rename from qse/lib/io/fio.c rename to qse/lib/si/fio.c index 80eb16a5..7d13b36e 100644 --- a/qse/lib/io/fio.c +++ b/qse/lib/si/fio.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include diff --git a/qse/lib/sys/intr.c b/qse/lib/si/intr.c similarity index 99% rename from qse/lib/sys/intr.c rename to qse/lib/si/intr.c index 9888b85a..1ba13798 100644 --- a/qse/lib/sys/intr.c +++ b/qse/lib/si/intr.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #if defined(_WIN32) # include diff --git a/qse/lib/sys/mtx.c b/qse/lib/si/mtx.c similarity index 99% rename from qse/lib/sys/mtx.c rename to qse/lib/si/mtx.c index dc2d892a..21d273ae 100644 --- a/qse/lib/sys/mtx.c +++ b/qse/lib/si/mtx.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "../cmn/mem.h" #if (!defined(__unix__) && !defined(__unix)) || defined(HAVE_PTHREAD) diff --git a/qse/lib/sys/mux.c b/qse/lib/si/mux.c similarity index 99% rename from qse/lib/sys/mux.c rename to qse/lib/si/mux.c index 27f6a631..78eb2fad 100644 --- a/qse/lib/sys/mux.c +++ b/qse/lib/si/mux.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "../cmn/mem.h" #if defined(_WIN32) diff --git a/qse/lib/io/nwio.c b/qse/lib/si/nwio.c similarity index 99% rename from qse/lib/io/nwio.c rename to qse/lib/si/nwio.c index ddc4e2a7..5418142a 100644 --- a/qse/lib/io/nwio.c +++ b/qse/lib/si/nwio.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "../cmn/mem.h" diff --git a/qse/lib/io/pio.c b/qse/lib/si/pio.c similarity index 99% rename from qse/lib/io/pio.c rename to qse/lib/si/pio.c index 652a3419..8ff708c3 100644 --- a/qse/lib/io/pio.c +++ b/qse/lib/si/pio.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "../cmn/mem.h" diff --git a/qse/lib/sys/rwl.c b/qse/lib/si/rwl.c similarity index 99% rename from qse/lib/sys/rwl.c rename to qse/lib/si/rwl.c index c7aa70b2..9f4aabcc 100644 --- a/qse/lib/sys/rwl.c +++ b/qse/lib/si/rwl.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "../cmn/mem.h" qse_rwl_t* qse_rwl_open (qse_mmgr_t* mmgr, qse_size_t xtnsize, int flags) diff --git a/qse/lib/io/sio.c b/qse/lib/si/sio.c similarity index 99% rename from qse/lib/io/sio.c rename to qse/lib/si/sio.c index 8b949d89..73cd1b1a 100644 --- a/qse/lib/io/sio.c +++ b/qse/lib/si/sio.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "../cmn/mem.h" #include "../cmn/fmt.h" diff --git a/qse/lib/sys/task.c b/qse/lib/si/task.c similarity index 99% rename from qse/lib/sys/task.c rename to qse/lib/si/task.c index 7c1e7e34..9315f694 100644 --- a/qse/lib/sys/task.c +++ b/qse/lib/si/task.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "../cmn/mem.h" #if defined(_WIN64) diff --git a/qse/lib/sys/thr.h b/qse/lib/si/thr-prv.h similarity index 98% rename from qse/lib/sys/thr.h rename to qse/lib/si/thr-prv.h index a4e023bf..2d31d120 100644 --- a/qse/lib/sys/thr.h +++ b/qse/lib/si/thr-prv.h @@ -27,7 +27,7 @@ #ifndef _QSE_LIB_CMN_THR_H_ #define _QSE_LIB_CMN_THR_H_ -#include +#include #if (!defined(__unix__) && !defined(__unix)) || defined(HAVE_PTHREAD) diff --git a/qse/lib/sys/thr.c b/qse/lib/si/thr.c similarity index 99% rename from qse/lib/sys/thr.c rename to qse/lib/si/thr.c index acbcee20..8f3b70b0 100644 --- a/qse/lib/sys/thr.c +++ b/qse/lib/si/thr.c @@ -25,7 +25,7 @@ */ -#include "thr.h" +#include "thr-prv.h" #include "../cmn/mem.h" #include #include diff --git a/qse/lib/io/tio.c b/qse/lib/si/tio.c similarity index 99% rename from qse/lib/io/tio.c rename to qse/lib/si/tio.c index b38880a4..542f51ef 100644 --- a/qse/lib/io/tio.c +++ b/qse/lib/si/tio.c @@ -24,7 +24,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include "../cmn/mem.h" diff --git a/qse/lib/sys/Makefile.am b/qse/lib/sys/Makefile.am deleted file mode 100644 index 116f1504..00000000 --- a/qse/lib/sys/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -AUTOMAKE_OPTIONS = nostdinc - -AM_CPPFLAGS = \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include - -lib_LTLIBRARIES = libqsesys.la -libqsesys_la_SOURCES = \ - cnd.c \ - intr.c \ - mtx.c \ - mux.c \ - rwl.c \ - task.c \ - thr.c \ - thr.h -libqsesys_la_CFLAGS = $(PTHREAD_CFLAGS) -libqsesys_la_LDFLAGS = -L../cmn -version-info 1:0:0 -no-undefined -libqsesys_la_LIBADD = -lqsecmn $(PTHREAD_LIBS) - -if ENABLE_CXX -lib_LTLIBRARIES += libqsesysxx.la -libqsesysxx_la_SOURCES = \ - SocketAddress.cpp \ - Socket.cpp -libqsesysxx_la_LDFLAGS = -L. -L../cmn -version-info 1:0:0 -no-undefined -libqsesysxx_la_LIBADD = -lqsecmnxx -lqsecmn -endif - diff --git a/qse/samples/sys/Makefile.am b/qse/samples/si/Makefile.am similarity index 74% rename from qse/samples/sys/Makefile.am rename to qse/samples/si/Makefile.am index 273214b3..626dcd2b 100644 --- a/qse/samples/sys/Makefile.am +++ b/qse/samples/si/Makefile.am @@ -8,9 +8,9 @@ AM_CPPFLAGS = \ bin_PROGRAMS = \ rwl01 -AM_LDFLAGS = -L../../lib/sys -L../../lib/cmn +AM_LDFLAGS = -L../../lib/si -L../../lib/cmn AM_CFLAGS = $(PTHREAD_CFLAGS) -LDADD = -lqsesys -lqsecmn $(PTHREAD_LIBS) +LDADD = -lqsesi -lqsecmn $(PTHREAD_LIBS) if WIN32 if WCHAR diff --git a/qse/samples/sys/Makefile.in b/qse/samples/si/Makefile.in similarity index 100% rename from qse/samples/sys/Makefile.in rename to qse/samples/si/Makefile.in diff --git a/qse/samples/sys/rwl01.c b/qse/samples/si/rwl01.c similarity index 100% rename from qse/samples/sys/rwl01.c rename to qse/samples/si/rwl01.c