X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Ftracing%2FTraceWriter.cpp;h=6111526eecbcc464fc9a4a9d82800d3d711f2b13;hb=4275d46f5d3c3a150ced258ae20c985520f6477a;hp=239db1cb181318b3db50158770d9c11aef0b0d46;hpb=93366a0bda79e6fd6e7dad6316bfcf8cc82f5731;p=anna.git diff --git a/source/core/tracing/TraceWriter.cpp b/source/core/tracing/TraceWriter.cpp index 239db1c..6111526 100644 --- a/source/core/tracing/TraceWriter.cpp +++ b/source/core/tracing/TraceWriter.cpp @@ -47,7 +47,7 @@ TraceWriter::TraceWriter(const char* fileName, const int maxSize) : } void TraceWriter::setup(const char* fileName, const Configuration& configuration) -throw() { +{ int maxSize = a_maxSize; bool clean = true; @@ -74,13 +74,15 @@ throw() { } void TraceWriter::setup(const char* fileName, const int maxSize, const bool clean) -throw() { +{ + ssize_t r; + if(a_stream != -1) { if(clean == false) { string msg("\nTraces go on at: "); msg += fileName; msg += '\n'; - write(a_stream, msg.c_str(), msg.length()); + r = write(a_stream, msg.c_str(), msg.length()); } if(a_observed == true) { @@ -104,7 +106,6 @@ throw() { if(maxSize >= (256 * 1024)) a_maxSize = maxSize; - const char* aux = Logger::asString(Logger::getLevel()); char date [anna::functions::DateTimeSizeString + 7]; anna_strcpy(date, "- ["); anna_strcat(anna_strcat(date, getDate()), "]\n"); @@ -113,20 +114,20 @@ throw() { if(stream != ErrorStream) { const char* aux = "\n--------------------------------------------------------------\n"; const char* aux2 = "- Current trace level: "; - write(stream, aux, anna_strlen(aux)); - write(stream, date, anna_strlen(date)); - write(stream, aux2, anna_strlen(aux2)); + r = write(stream, aux, anna_strlen(aux)); + r = write(stream, date, anna_strlen(date)); + r = write(stream, aux2, anna_strlen(aux2)); aux2 = Logger::asString(Logger::getLevel()); - write(stream, aux2, anna_strlen(aux2)); + r = write(stream, aux2, anna_strlen(aux2)); string filesize = functions::asString("\n- Max file size : %d Kb", a_maxSize >> 10); aux2 = filesize.c_str(); - write(stream, aux2, anna_strlen(aux2)); - write(stream, aux, anna_strlen(aux)); + r = write(stream, aux2, anna_strlen(aux2)); + r = write(stream, aux, anna_strlen(aux)); } } void TraceWriter::attach(TraceWriterObserver* observer) -throw() { +{ if(observer != NULL) { a_observed = true; a_observers.push_back(observer); @@ -137,7 +138,7 @@ throw() { } void TraceWriter::printResume() -throw() { +{ cout << "Traces file ..................................: " << a_outputFile << endl; cout << "Backup copy .................................: " << a_outputOldFile << endl; cout << "Files size (Kbytes) ..........................: " << (a_maxSize >> 10) << endl; @@ -145,7 +146,7 @@ throw() { } void TraceWriter::do_write(int level, const char* text, ...) -throw() { +{ va_list ap; const char* data; int size; @@ -200,7 +201,7 @@ throw() { } const char* TraceWriter::getDate() -throw() { +{ const Microsecond msnow = functions::hardwareClock(); if(a_lastTime == 0 || (msnow - a_lastTime) > 1000000L) { @@ -213,7 +214,7 @@ throw() { } int TraceWriter::prepareOutput(const char* date) -throw() { +{ int result = a_stream; if(result == ErrorStream)