Skip to content

U
uniset2
Commit c0428ba5 authored by Pavel Vainerman's avatar Pavel Vainerman
Browse files
Options

(DebugStram): добавил showMicroseconds(), showMilliseconds(),

переписал фунции print[Date,DateTime,Time] на использование std::put_time, а так же небольшой рефакторинг. Добавил вспомогательный класс IosFlagSaver.
parent 9f437a81
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 34 deletions
include/DebugStream.h
View file @ c0428ba5
......@@ -198,11 +198,21 @@ class DebugStream : public std::ostream
*/
std::ostream& operator()(Debug::type t) noexcept;
inline void showDateTime(bool s)
inline void showDateTime(bool s) noexcept
{
show_datetime = s;
}
inline void showMilliseconds( bool s ) noexcept
{
show_msec = s;
}
inline void showMicroseconds( bool s ) noexcept
{
show_usec = s;
}
inline void showLogType(bool s) noexcept
{
show_logtype = s;
......@@ -265,6 +275,29 @@ class DebugStream : public std::ostream
return logname;
}
// ------------------------------------------------------------------------------------------------
// RAII
// https://stackoverflow.com/questions/2273330/restore-the-state-of-stdcout-after-manipulating-it
class IosFlagSaver
{
public:
explicit IosFlagSaver(std::ostream& _ios):
ios(_ios),
f(_ios.flags()) {
}
~IosFlagSaver() {
ios.flags(f);
}
IosFlagSaver(const IosFlagSaver &rhs) = delete;
IosFlagSaver& operator= (const IosFlagSaver& rhs) = delete;
private:
std::ostream& ios;
std::ios::fmtflags f;
};
// ------------------------------------------------------------------------------------------------
protected:
void sbuf_overflow( const std::string& s ) noexcept;
......@@ -279,6 +312,8 @@ class DebugStream : public std::ostream
debugstream_internal* internal = { 0 };
bool show_datetime = { true };
bool show_logtype = { true };
bool show_msec = { false };
bool show_usec = { false };
std::string fname = { "" };
StreamEvent_Signal s_stream;
......@@ -286,5 +321,5 @@ class DebugStream : public std::ostream
bool isWriteLogFile = { false };
};
// ------------------------------------------------------------------------------------------------
#endif
src/Communications/Modbus/ModbusTypes.cc
View file @ c0428ba5
......@@ -22,6 +22,7 @@
#include <iomanip>
#include "modbus/ModbusTypes.h"
#include "UniSetTypes.h"
#include "DebugStream.h"
// -------------------------------------------------------------------------
using namespace ModbusRTU;
using namespace std;
......@@ -208,19 +209,17 @@ bool ModbusRTU::isReadFunction( SlaveFunctionCode c )
std::ostream& ModbusRTU::mbPrintMessage( std::ostream& os, ModbusByte* m, size_t len )
{
// Чтобы не менять настройки 'os'
// сперва создаём свой поток вывода...
ostringstream s;
DebugStream::IosFlagSaver ifs(os);
// << setiosflags(ios::showbase) // для вывода в формате 0xNN
s << hex << showbase << setfill('0'); // << showbase;
os << hex << showbase << setfill('0'); // << showbase;
for( size_t i = 0; i < len; i++ )
s << setw(2) << (short)(m[i]) << " ";
os << setw(2) << (short)(m[i]) << " ";
// s << "<" << setw(2) << (int)(m[i]) << ">";
return os << s.str();
return os;
}
// -------------------------------------------------------------------------
std::ostream& ModbusRTU::operator<<(std::ostream& os, const ModbusHeader& m )
......@@ -2961,10 +2960,6 @@ std::string ModbusRTU::addr2str( const ModbusAddr addr )
ostringstream s;
s << "0x" << hex << setfill('0') << setw(2) << (unsigned short)addr;
return s.str();
// ostringstream s;
// s << hex << setfill('0') << showbase << (int)addr;
// return s.str();
}
// -------------------------------------------------------------------------
std::string ModbusRTU::b2str( const ModbusByte b )
......@@ -3049,8 +3044,9 @@ SetDateTimeMessage::SetDateTimeMessage()
// -------------------------------------------------------------------------
std::ostream& ModbusRTU::operator<<(std::ostream& os, SetDateTimeMessage& m )
{
ostringstream s;
s << setfill('0')
DebugStream::IosFlagSaver ifs(os);
os << setfill('0')
<< setw(2) << (int)m.day << "-"
<< setw(2) << (int)m.mon << "-"
<< setw(2) << (int)m.century
......@@ -3059,7 +3055,7 @@ std::ostream& ModbusRTU::operator<<(std::ostream& os, SetDateTimeMessage& m )
<< setw(2) << (int)m.min << ":"
<< setw(2) << (int)m.sec;
return os << s.str();
return os;
}
std::ostream& ModbusRTU::operator<<(std::ostream& os, SetDateTimeMessage* m )
......
src/Log/DebugStream.cc
View file @ c0428ba5
......@@ -30,7 +30,10 @@
#include <iomanip>
#include <time.h>
#include <iomanip>
#include <ctime>
#include "DebugExtBuf.h"
#include "UniSetTypes.h"
using std::ostream;
using std::streambuf;
......@@ -40,7 +43,6 @@ using std::stringbuf;
using std::cerr;
using std::ios;
//--------------------------------------------------------------------------
/// Constructor, sets the debug level to t.
DebugStream::DebugStream(Debug::type t)
: /* ostream(new debugbuf(cerr.rdbuf())),*/
......@@ -97,6 +99,9 @@ const DebugStream& DebugStream::operator=( const DebugStream& r )
dt = r.dt;
show_datetime = r.show_datetime;
show_logtype = r.show_logtype;
show_msec = r.show_msec;
show_usec = r.show_usec;
fname = r.fname;
if( !r.fname.empty() )
......@@ -140,6 +145,8 @@ std::ostream& DebugStream::debug(Debug::type t) noexcept
{
if(dt & t)
{
IosFlagSaver ifs(*this);
if( show_datetime )
printDateTime(t);
......@@ -164,11 +171,12 @@ std::ostream& DebugStream::printDate(Debug::type t, char brk) noexcept
{
if(dt && t)
{
time_t GMTime = time(NULL);
struct tm* tms = localtime(&GMTime);
return *this << std::setw(2) << std::setfill('0') << tms->tm_mday << brk
<< std::setw(2) << std::setfill('0') << tms->tm_mon + 1 << brk
<< std::setw(4) << std::setfill('0') << tms->tm_year + 1900;
std::time_t tv = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
std::tm tms = *std::localtime(&tv);
std::ostringstream fmt;
fmt << "%Od" << brk << "%Om" << brk << "%Y";
return *this << std::put_time(&tms,fmt.str().c_str());
}
return nullstream;
......@@ -178,11 +186,21 @@ std::ostream& DebugStream::printTime(Debug::type t, char brk) noexcept
{
if(dt && t)
{
time_t GMTime = time(NULL);
struct tm* tms = localtime(&GMTime);
return *this << std::setw(2) << std::setfill('0') << tms->tm_hour << brk
<< std::setw(2) << std::setfill('0') << tms->tm_min << brk
<< std::setw(2) << std::setfill('0') << tms->tm_sec;
IosFlagSaver ifs(*this);
timespec tv = UniSetTypes::now_to_timespec(); // gettimeofday(tv,0);
std::tm tms = *std::localtime(&tv.tv_sec);
std::ostringstream fmt;
fmt << "%OH" << brk << "%OM" << brk << "%OS";
*this << std::put_time(&tms,fmt.str().c_str());
if( show_usec )
(*this) << "." << std::setw(6) << (tv.tv_nsec/1000);
else if( show_msec )
(*this) << "." << std::setw(3) << (tv.tv_nsec/1000000);
return *this;
}
return nullstream;
......@@ -192,14 +210,18 @@ std::ostream& DebugStream::printDateTime(Debug::type t) noexcept
{
if(dt & t)
{
time_t GMTime = time(NULL);
struct tm* tms = localtime(&GMTime);
return *this << std::setw(2) << std::setfill('0') << tms->tm_mday << "/"
<< std::setw(2) << std::setfill('0') << tms->tm_mon + 1 << "/"
<< std::setw(4) << std::setfill('0') << tms->tm_year + 1900 << " "
<< std::setw(2) << std::setfill('0') << tms->tm_hour << ":"
<< std::setw(2) << std::setfill('0') << tms->tm_min << ":"
<< std::setw(2) << std::setfill('0') << tms->tm_sec;
IosFlagSaver ifs(*this);
timespec tv = UniSetTypes::now_to_timespec(); // gettimeofday(tv,0);
std::tm tms = *std::localtime(&tv.tv_sec);
*this << std::put_time(&tms,"%Od/%Om/%Y %OH:%OM:%OS");
if( show_usec )
(*this) << "." << std::setw(6) << std::setfill('0') << (tv.tv_nsec/1000);
else if( show_msec )
(*this) << "." << std::setw(3) << std::setfill('0') << (tv.tv_nsec/1000000);
return *this;
}
return nullstream;
......
src/Various/Configuration.cc
View file @ c0428ba5
......@@ -61,6 +61,8 @@ ostream& UniSetTypes::Configuration::help(ostream& os)
print_help(os, 25, "--[debname]-logfile", "перенаправление лога в файл\n");
print_help(os, 25, "--[debname]-add-levels", "добавить уровень вывода логов\n");
print_help(os, 25, "--[debname]-del-levels", "удалить уровень вывода логов\n");
print_help(os, 25, "--[debname]-show-microseconds", "Выводить время с микросекундами\n");
print_help(os, 25, "--[debname]-show-milliseconds", "Выводить время с миллисекундами\n");
print_help(os, 25, "--uniport num", "использовать заданный порт (переопеределяет 'defaultport' заданный в конф. файле в разделе <nodes>)\n");
print_help(os, 25, "--localIOR {1,0}", "использовать локальные файлы для получения IOR (т.е. не использовать omniNames). Переопределяет параметр в конфигурационном файле.\n");
print_help(os, 25, "--transientIOR {1,0}", "использовать генерируемые IOR(не постоянные). Переопределяет параметр в конфигурационном файле. Default=1\n");
......@@ -929,6 +931,8 @@ namespace UniSetTypes
string logfile("--" + debname + "-logfile");
string add_level("--" + debname + "-add-levels");
string del_level("--" + debname + "-del-levels");
string show_msec("--" + debname + "-show-milliseconds");
string show_usec("--" + debname + "-show-microseconds");
// смотрим командную строку
for (int i = 1; i < (_argc - 1); i++)
......@@ -945,6 +949,14 @@ namespace UniSetTypes
{
deb->delLevel(Debug::value(_argv[i + 1]));
}
else if( show_usec == _argv[i] )
{
deb->showMicroseconds(true);
}
else if( show_msec == _argv[i] )
{
deb->showMilliseconds(true);
}
}
if( !debug_file.empty() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment