flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

main.cpp: field style fixes

Browse Source
This commit is contained in:
archshift 2014-07-19 15:44:19 -07:00
parent 1831c2e652
commit 14826b6606
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Root.cpp
View File

@ -77,7 +77,7 @@ void cRoot::InputThread(void * a_Params)
cLogCommandOutputCallback Output; cLogCommandOutputCallback Output;
while (!self.m_bStop && !self.m_bRestart && !g_TERMINATE_EVENT_RAISED && std::cin.good()) while (!self.m_bStop && !self.m_bRestart && !m_TerminateEventRaised && std::cin.good())
{ {
AString Command; AString Command;
std::getline(std::cin, Command); std::getline(std::cin, Command);
@ -87,7 +87,7 @@ void cRoot::InputThread(void * a_Params)
} }
} }
if (g_TERMINATE_EVENT_RAISED || !std::cin.good()) if (m_TerminateEventRaised || !std::cin.good())
{ {
// We have come here because the std::cin has received an EOF / a terminate signal has been sent, and the server is still running; stop the server: // We have come here because the std::cin has received an EOF / a terminate signal has been sent, and the server is still running; stop the server:
self.m_bStop = true; self.m_bStop = true;
@ -203,12 +203,12 @@ void cRoot::Start(void)
EnableMenuItem(hmenu, SC_CLOSE, MF_ENABLED); // Re-enable close button EnableMenuItem(hmenu, SC_CLOSE, MF_ENABLED); // Re-enable close button
#endif #endif
while (!m_bStop && !m_bRestart && !g_TERMINATE_EVENT_RAISED) // These are modified by external threads while (!m_bStop && !m_bRestart && !m_TerminateEventRaised) // These are modified by external threads
{ {
cSleep::MilliSleep(1000); cSleep::MilliSleep(1000);
} }
if (g_TERMINATE_EVENT_RAISED) if (m_TerminateEventRaised)
{ {
m_bStop = true; m_bStop = true;
} }

2
src/Root.h
View File

@ -40,7 +40,7 @@ namespace Json
class cRoot class cRoot
{ {
public: public:
static bool g_TERMINATE_EVENT_RAISED; static bool m_TerminateEventRaised;
static cRoot * Get() { return s_Root; } static cRoot * Get() { return s_Root; }
// tolua_end // tolua_end

14
src/main.cpp
View File

@ -11,9 +11,9 @@
#include <dbghelp.h> #include <dbghelp.h>
#endif // _MSC_VER #endif // _MSC_VER
// Here, we have some ALL CAPS variables, to give the impression that this is deeeep, gritty programming :P
bool cRoot::g_TERMINATE_EVENT_RAISED = false; // If something has told the server to stop; checked periodically in cRoot bool cRoot::m_TerminateEventRaised = false; // If something has told the server to stop; checked periodically in cRoot
static bool g_SERVER_TERMINATED = false; // Set to true when the server terminates, so our CTRL handler can then tell the OS to close the console static bool g_ServerTerminated = false; // Set to true when the server terminates, so our CTRL handler can then tell the OS to close the console
@ -52,7 +52,7 @@ bool g_ShouldLogCommOut;
void NonCtrlHandler(int a_Signal) void NonCtrlHandler(int a_Signal)
{ {
LOGD("Terminate event raised from std::signal"); LOGD("Terminate event raised from std::signal");
cRoot::g_TERMINATE_EVENT_RAISED = true; cRoot::m_TerminateEventRaised = true;
switch (a_Signal) switch (a_Signal)
{ {
@ -155,12 +155,12 @@ LONG WINAPI LastChanceExceptionFilter(__in struct _EXCEPTION_POINTERS * a_Except
// Handle CTRL events in windows, including console window close // Handle CTRL events in windows, including console window close
BOOL CtrlHandler(DWORD fdwCtrlType) BOOL CtrlHandler(DWORD fdwCtrlType)
{ {
cRoot::g_TERMINATE_EVENT_RAISED = true; cRoot::m_TerminateEventRaised = true;
LOGD("Terminate event raised from the Windows CtrlHandler"); LOGD("Terminate event raised from the Windows CtrlHandler");
if (fdwCtrlType == CTRL_CLOSE_EVENT) // Console window closed via 'x' button, Windows will try to close immediately, therefore... if (fdwCtrlType == CTRL_CLOSE_EVENT) // Console window closed via 'x' button, Windows will try to close immediately, therefore...
{ {
while (!g_SERVER_TERMINATED) { cSleep::MilliSleep(100); } // Delay as much as possible to try to get the server to shut down cleanly while (!g_ServerTerminated) { cSleep::MilliSleep(100); } // Delay as much as possible to try to get the server to shut down cleanly
} }
return TRUE; return TRUE;
@ -296,7 +296,7 @@ int main( int argc, char **argv )
DeinitLeakFinder(); DeinitLeakFinder();
#endif #endif
g_SERVER_TERMINATED = true; g_ServerTerminated = true;
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }