gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-01-13 13:37:36 -08:00
Code Issues Packages Projects Releases Wiki Activity

changed a lot of thread locking code in the server, rooms are working with ISL now

Browse Source
This commit is contained in:
Max-Wilhelm Bruker
2012-03-17 16:09:00 +01:00
parent 572e4eaafa
commit c23af44749
16 changed files with 449 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
servatrice/src/main.cpp
View File

@@ -35,7 +35,7 @@
RNG_Abstract *rng;
ServerLogger *logger;
ServerLoggerThread *loggerThread;
QThread *loggerThread;
void testRNG()
{
@@ -100,7 +100,11 @@ void sigSegvHandler(int sig)
logger->logMessage("CRASH: SIGSEGV");
else if (sig == SIGABRT)
logger->logMessage("CRASH: SIGABRT");
logger->deleteLater();
loggerThread->wait();
delete loggerThread;
raise(sig);
}
#endif
@@ -121,10 +125,13 @@ int main(int argc, char *argv[])
QSettings *settings = new QSettings("servatrice.ini", QSettings::IniFormat);
loggerThread = new ServerLoggerThread(settings->value("server/logfile").toString());
loggerThread = new QThread;
logger = new ServerLogger;
logger->moveToThread(loggerThread);
QObject::connect(logger, SIGNAL(destroyed()), loggerThread, SLOT(quit()));
loggerThread->start();
loggerThread->waitForInit();
logger = loggerThread->getLogger();
QMetaObject::invokeMethod(logger, "startLog", Qt::BlockingQueuedConnection, Q_ARG(QString, settings->value("server/logfile").toString()));
qInstallMsgHandler(myMessageOutput2);
#ifdef Q_OS_UNIX
@@ -166,6 +173,9 @@ int main(int argc, char *argv[])
delete rng;
delete settings;
logger->deleteLater();
loggerThread->wait();
delete loggerThread;
return retval;