AstralTransRocketries/LucidCube
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Revert "Again improved LogReplaceLine"

Browse Source 
This reverts commit dd325d742db9db54a25460fcacd093e7cc6f44f0.
This commit is contained in:
Tiger Wang 2014-02-02 20:09:15 +00:00
parent 55cfb232db
commit 5bf060f06c
2 changed files with 70 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
src/Log.cpp
View File

@ -24,7 +24,8 @@
cLog* cLog::s_Log = NULL; cLog* cLog::s_Log = NULL;
cLog::cLog(const AString & a_FileName ) cLog::cLog(const AString & a_FileName )
: m_File(NULL) : m_File(NULL),
m_LastStringSize(0)
{ {
s_Log = this; s_Log = this;
@ -114,22 +115,20 @@ bool cLog::LogReplaceLine(const char * a_Format, va_list argList)
time(&rawtime); time(&rawtime);
struct tm* timeinfo; struct tm* timeinfo;
#ifdef _MSC_VER
#ifdef _MSC_VER struct tm timeinforeal;
struct tm timeinforeal; timeinfo = &timeinforeal;
timeinfo = &timeinforeal; localtime_s(timeinfo, &rawtime);
localtime_s(timeinfo, &rawtime); #else
#else timeinfo = localtime(&rawtime);
timeinfo = localtime(&rawtime); #endif
#endif
AString Line; AString Line;
#ifdef _DEBUG #ifdef _DEBUG
Printf(Line, "[%04x|%02d:%02d:%02d] %s", cIsThread::GetCurrentID(), timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str()); Printf(Line, "[%04x|%02d:%02d:%02d] %s", cIsThread::GetCurrentID(), timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str());
#else #else
Printf(Line, "[%02d:%02d:%02d] %s", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str()); Printf(Line, "[%02d:%02d:%02d] %s", timeinfo->tm_hour, timeinfo->tm_min, timeinfo->tm_sec, Message.c_str());
#endif #endif
if (m_File) if (m_File)
{ {
fprintf(m_File, "%s\n", Line.c_str()); fprintf(m_File, "%s\n", Line.c_str());
@ -137,68 +136,67 @@ bool cLog::LogReplaceLine(const char * a_Format, va_list argList)
} }
// Print to console: // Print to console:
#if defined(ANDROID_NDK) #if defined(ANDROID_NDK)
//__android_log_vprint(ANDROID_LOG_ERROR,"MCServer", a_Format, argList); //__android_log_vprint(ANDROID_LOG_ERROR,"MCServer", a_Format, argList);
__android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str()); __android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str());
//CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line ); //CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line );
#else #else
#ifdef _WIN32
size_t LineLength = Line.length();
size_t LineLength = Line.length(); if (m_LastStringSize == 0)
#ifdef _WIN32 m_LastStringSize = LineLength; // Initialise m_LastStringSize
HANDLE Output = GetStdHandle(STD_OUTPUT_HANDLE);
CONSOLE_SCREEN_BUFFER_INFO csbi; HANDLE Output = GetStdHandle(STD_OUTPUT_HANDLE);
GetConsoleScreenBufferInfo(Output, &csbi); // Obtain console window information
if ((size_t)((csbi.srWindow.Right - csbi.srWindow.Left) + 1) < LineLength) // Will text overrun width? If so, do not do a replace operation CONSOLE_SCREEN_BUFFER_INFO csbi;
{ GetConsoleScreenBufferInfo(Output, &csbi);
printf("\n%s", Line.c_str()); // We are at line to be replaced, but since we can't, print normally with a newline
return false;
}
for (size_t X = 0; X != (size_t)(csbi.srWindow.Right - csbi.srWindow.Left); ++X) if ((size_t)((csbi.srWindow.Right - csbi.srWindow.Left) + 1) < LineLength)
{ {
fputs(" ", stdout); // Clear current line in preparation for new text printf("\n%s", Line.c_str()); // We are at line to be replaced, but since we can't, add a new line
} return false;
#else // _WIN32 }
// Try to get console width; if text overruns, print normally with a newline
#ifdef TIOCGSIZE
struct ttysize ts;
ioctl(STDIN_FILENO, TIOCGSIZE, &ts);
if (ts.ts_cols < LineLength) if (LineLength < m_LastStringSize) // If last printed line was longer than current, clear this line
{ {
printf("\n%s", Line.c_str()); for (size_t X = 0; X != m_LastStringSize + 1; ++X)
return false; {
} fputs(" ", stdout);
#elif defined(TIOCGWINSZ) }
struct winsize ts; }
ioctl(STDIN_FILENO, TIOCGWINSZ, &ts); #else // _WIN32
struct ttysize ts;
#ifdef TIOCGSIZE
ioctl(STDIN_FILENO, TIOCGSIZE, &ts);
if (ts.ts_cols < LineLength)
{
return false;
}
#elif defined(TIOCGWINSZ)
ioctl(STDIN_FILENO, TIOCGWINSZ, &ts);
if (ts.ts_cols < LineLength)
{
return false;
}
#else /* TIOCGSIZE */
return false;
#endif
fputs("\033[K", stdout); // Clear current line
#endif
printf("\r%s", Line.c_str());
#ifdef __linux
fputs("\033[1B", stdout); // Move down one line
#endif // __linux
if (ts.ws_col < LineLength) m_LastStringSize = LineLength;
{
printf("\n%s", Line.c_str());
return false;
}
#else
printf("\n%s", Line.c_str());
return false;
#endif
fputs("\033[K", stdout); // Clear current line #endif // ANDROID_NDK
#endif // Not _WIN32
printf("\r%s", Line.c_str()); #if defined (_WIN32) && defined(_DEBUG)
// In a Windows Debug build, output the log to debug console as well:
#ifdef __linux OutputDebugStringA((Line + "\n").c_str());
fputs("\033[1B", stdout); // Move down one line #endif // _WIN32
#endif // __linux
#endif // ANDROID_NDK
#if defined (_WIN32) && defined(_DEBUG)
// In a Windows Debug build, output the log to debug console as well:
OutputDebugStringA((Line + "\n").c_str());
#endif // _WIN32
return true; return true;
} }
@ -243,9 +241,7 @@ void cLog::Log(const char * a_Format, va_list argList)
__android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str() ); __android_log_print(ANDROID_LOG_ERROR, "MCServer", "%s", Line.c_str() );
//CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line ); //CallJavaFunction_Void_String(g_JavaThread, "AddToLog", Line );
#else #else
// If something requests the current line to be rewritten (LogReplaceLine), on Linux it clears the current line, but that moves the cursor to the end of that line, so we reset it here (\r) printf("%s", Line.c_str());
// Doesn't affect anything normally - cursor should already be at beginning of line
printf("\r%s", Line.c_str());
#endif #endif
#if defined (_WIN32) && defined(_DEBUG) #if defined (_WIN32) && defined(_DEBUG)

1
src/Log.h
View File

@ -11,6 +11,7 @@ private:
FILE * m_File; FILE * m_File;
static cLog * s_Log; static cLog * s_Log;
size_t m_LastStringSize;
public: public: