X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/0cc864dabe50dc3012380bd957241d508335e1da..ac4ba889d9218ebcccc36b3ba91030af45e9cb39:/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp?ds=inline diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp index 19d68f98..ea71a117 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp @@ -56,12 +56,17 @@ return "Stg configurator v.0.08"; } //----------------------------------------------------------------------------- STG_CONFIG::STG_CONFIG() - : nonstop(false), + : errorStr(), + stgConfigSettings(), + thread(), + nonstop(false), isRunning(false), + config(), users(NULL), admins(NULL), tariffs(NULL), store(NULL), + settings(), stgSettings(NULL) { } @@ -118,27 +123,22 @@ for (i = 0; i < 25; i++) if (!isRunning) break; - usleep(200000); + struct timespec ts = {0, 200000000}; + nanosleep(&ts, NULL); } -//after 5 seconds waiting thread still running. now killing it if (isRunning) - { - //TODO pthread_cancel() - if (pthread_kill(thread, SIGINT)) - { - errorStr = "Cannot kill thread."; - printfd(__FILE__, "Cannot kill thread\n"); - return -1; - } - printfd(__FILE__, "STG_CONFIG killed\n"); - } + return -1; return 0; } //----------------------------------------------------------------------------- void * STG_CONFIG::Run(void * d) { +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, NULL); + STG_CONFIG * stgConf = (STG_CONFIG *)d; stgConf->isRunning = true;