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

added the ignore_if_unhandled parameter to App::neglectsignal().

Browse Source 
added App::logfmt() and App::logfmtv()
added QSE::TcpServerFD<F,D> and  QSE::ThreadFD<F,D>
This commit is contained in:
hyung-hwan
2019-06-11 09:10:09 +00:00
parent 9a0f2e15b8
commit f95e9d36cf
8 changed files with 212 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qse/lib/cmn/fmt-prv.h
View File

@ -99,8 +99,10 @@ QSE_EXPORT int qse_wfmtout (
);
#if defined(QSE_CHAR_IS_MCHAR)
# define qse_fmtout_t qse_mfmtout_t
# define qse_fmtout(fmt,fo,ap) qse_mfmtout(fmt,fo,ap)
#else
# define qse_fmtout_t qse_wfmtout_t
# define qse_fmtout(fmt,fo,ap) qse_wfmtout(fmt,fo,ap)
#endif

58
qse/lib/si/App.cpp
View File

@ -30,6 +30,7 @@
#include <qse/si/os.h>
#include "../cmn/syscall.h"
#include "../cmn/mem-prv.h"
#include "../cmn/fmt-prv.h"
#include <qse/cmn/mbwc.h>
/////////////////////////////////
@ -72,7 +73,7 @@ protected:
sigset_t oldsigset;
};
App::App (Mmgr* mmgr) QSE_CPP_NOEXCEPT: Mmged(mmgr), _prev_app(QSE_NULL), _next_app(QSE_NULL), _guarded_child_pid(-1)
App::App (Mmgr* mmgr) QSE_CPP_NOEXCEPT: Mmged(mmgr), _prev_app(QSE_NULL), _next_app(QSE_NULL), _guarded_child_pid(-1), _log(this)
{
SigScopedMutexLocker sml(g_app_mutex);
if (!g_app_top)
@ -467,6 +468,8 @@ int App::guardProcess (const SignalSet& signals, const qse_mchar_t* proc_name)
// child process
this->_guarded_child_pid = -1;
// the child process has inherited the signal handlers.
// restore the signal handlers of the child process to the original handlers.
for (int i = 0; i < QSE_NSIGS; i++)
{
if (signals.isSet(i)) this->setSignalSubscription (i, old_ss[i]);
@ -519,6 +522,59 @@ int App::guardProcess (const SignalSet& signals, const qse_mchar_t* proc_name)
return seq; // the caller must execute the actual work.
}
int App::put_char_to_log_buf (qse_char_t c, void* ctx)
{
App* app = (App*)ctx;
if (app->_log.len >= QSE_COUNTOF(app->_log.buf) - 1) // -1 for the lien terminator appending in App::logfmtv()
{
app->log_write (app->_log.last_mask, app->_log.buf, app->_log.len);
app->_log.len = 0;
}
app->_log.buf[app->_log.len++] = c;
if (c == QSE_T('\n'))
{
app->log_write (app->_log.last_mask, app->_log.buf, app->_log.len);
app->_log.len = 0;
}
return 1;
}
void App::logfmtv (int mask, const qse_char_t* fmt, va_list ap)
{
/*if (this->threaded)*/ this->_log.mtx.lock ();
if (this->_log.len > 0 && this->_log.last_mask != mask)
{
if (this->_log.buf[this->_log.len - 1] != QSE_T('\n'))
{
// no line ending - append a line terminator
this->_log.buf[this->_log.len++] = QSE_T('\n');
}
this->log_write (this->_log.last_mask, this->_log.buf, this->_log.len);
this->_log.len = 0;
}
qse_fmtout_t fo;
fo.count = 0;
fo.limit = QSE_TYPE_MAX(qse_size_t) - 1;
fo.ctx = this;
fo.put = put_char_to_log_buf;
#if defined(QSE_CHAR_IS_WCHAR)
fo.conv = QSE_NULL;
#else
fo.conv = QSE_NULL;
#endif
this->_log.last_mask = mask;
qse_fmtout(fmt, &fo, ap);
/*if (this->threaded)*/ this->_log.mtx.unlock ();
}
/////////////////////////////////
QSE_END_NAMESPACE(QSE)
/////////////////////////////////

10
qse/lib/si/TcpServer.cpp
View File

@ -401,9 +401,13 @@ int TcpServer::start (const qse_char_t* addrs) QSE_CPP_NOEXCEPT
n = qse_mux_poll(this->listener_list.mux, QSE_NULL);
if (n <= -1)
{
this->setErrorCode (E_ESYSERR); // TODO: proper error code conversion
xret = -1;
break;
qse_mux_errnum_t merr = qse_mux_geterrnum(this->listener_list.mux);
if (merr != QSE_MUX_EINTR)
{
this->setErrorCode (E_ESYSERR); // TODO: proper error code conversion
xret = -1;
break;
}
}
}