projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.1.3
[fms.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
069cb90
..
3e135a0
100644
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-14,7
+14,7
@@
int main()
xmem_disable_print();
\r
#endif
\r
\r
xmem_disable_print();
\r
#endif
\r
\r
- std::vector<
Z
Thread::Thread *> threads;
\r
+ std::vector<
P
Thread::Thread *> threads;
\r
\r
srand(time(NULL));
\r
\r
\r
srand(time(NULL));
\r
\r
@@
-26,22
+26,23
@@
int main()
\r
SetupNetwork();
\r
\r
\r
SetupNetwork();
\r
\r
- LogFile::
i
nstance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS startup v"FMS_VERSION);
\r
+ LogFile::
I
nstance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS startup v"FMS_VERSION);
\r
\r
\r
StartThreads(threads);
\r
\r
\r
\r
\r
StartThreads(threads);
\r
\r
\r
- ZThread::Thread commandthread(new CommandThread());
\r
- commandthread.wait();
\r
+ //ZThread::Thread commandthread(new CommandThread());
\r
+ PThread::Thread commandthread(new CommandThread());
\r
+ commandthread.Join();
\r
\r
\r
ShutdownThreads(threads);
\r
\r
ShutdownNetwork();
\r
\r
\r
\r
ShutdownThreads(threads);
\r
\r
ShutdownNetwork();
\r
\r
- LogFile::
i
nstance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS shutdown");
\r
- LogFile::
i
nstance()->WriteNewLine();
\r
+ LogFile::
I
nstance()->WriteLog(LogFile::LOGLEVEL_INFO,"FMS shutdown");
\r
+ LogFile::
I
nstance()->WriteNewLine();
\r
\r
return 0;
\r
}
\r
\r
return 0;
\r
}
\r