tomasz.sowa/pikotools
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Log class has the Stream class as a base class now

Browse Source 
- implemented some missing operators<<(...)
- removed Manipulators: l1, l2, l3, l4, lend, lsave
- PascalCase to snake_case in Log

added to Stream:
  virtual bool is_char_stream() const = 0;
  virtual bool is_wchar_stream() const = 0;
  virtual char get_char(size_t index) const = 0;
  virtual wchar_t get_wchar(size_t index) const = 0;
  virtual Stream & operator<<(const Stream & stream) = 0;
This commit is contained in:
Tomasz Sowa
2021-06-24 20:52:48 +02:00
parent 2b6789754f
commit 4d9f5f6c55
9 changed files with 706 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

419
src/log/log.cpp
View File

@@ -54,9 +54,8 @@ Log::Log()
{
buffer = nullptr;
file_log = nullptr;
current_level = 4;
max_buffer_length = 2 * 1024 * 1024; // 2MB
max_buffer_length = 2 * 1024 * 1024;
}
@@ -65,70 +64,146 @@ Log::~Log()
}
void Log::SetLogBuffer(WTextStream * buffer)
bool Log::can_put_log()
{
this->buffer = buffer;
return (buffer && file_log && current_level <= file_log->get_log_level());
}
WTextStream * Log::GetLogBuffer()
bool Log::is_char_stream() const
{
return buffer;
return false;
}
void Log::SetMaxBufferLength(size_t max_buffer_length)
bool Log::is_wchar_stream() const
{
this->max_buffer_length = max_buffer_length;
return true;
}
size_t Log::GetMaxBufferLength()
{
return max_buffer_length;
}
void Log::SetFileLog(FileLog * file_log)
{
this->file_log = file_log;
}
FileLog * Log::GetFileLog()
{
return file_log;
}
Log & Log::IntMinWidth(size_t min_width)
void Log::clear()
{
if( buffer )
{
buffer->int_min_width(min_width);
buffer->clear();
}
return *this;
}
Log & Log::operator<<(const void * s)
bool Log::empty() const
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
if( buffer )
{
(*buffer) << s;
return buffer->empty();
}
return *this;
return true;
}
size_t Log::size() const
{
if( buffer )
{
buffer->size();
}
return 0;
}
void Log::reserve(size_t len)
{
if( buffer )
{
buffer->reserve(len);
}
}
size_t Log::capacity() const
{
if( buffer )
{
buffer->capacity();
}
return 0;
}
void Log::to_str(std::string & str, bool clear_string) const
{
if( buffer )
{
buffer->to_str(str, clear_string);
}
}
void Log::to_str(std::wstring & str, bool clear_string) const
{
if( buffer )
{
buffer->to_str(str, clear_string);
}
}
std::string Log::to_str() const
{
if( buffer )
{
return buffer->to_str();
}
return std::string();
}
std::wstring Log::to_wstr() const
{
if( buffer )
{
return buffer->to_wstr();
}
return std::wstring();
}
char Log::get_char(size_t index) const
{
if( buffer )
{
return buffer->get_char(index);
}
return 0;
}
wchar_t Log::get_wchar(size_t index) const
{
if( buffer )
{
return buffer->get_wchar(index);
}
return 0;
}
Log & Log::operator<<(const char * s)
{
if( buffer && file_log && s && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
utf8_to_wide(s, *buffer, false);
(*buffer) << s;
}
return *this;
@@ -138,34 +213,18 @@ Log & Log::operator<<(const char * s)
Log & Log::operator<<(const std::string & s)
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
utf8_to_wide(s, *buffer, false);
(*buffer) << s;
}
return *this;
}
Log & Log::operator<<(const std::string * s)
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
{
utf8_to_wide(*s, *buffer, false);
}
return *this;
}
Log & Log::operator<<(const wchar_t * s)
{
if( buffer && file_log && s && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
(*buffer) << s;
}
@@ -174,10 +233,9 @@ Log & Log::operator<<(const wchar_t * s)
}
Log & Log::operator<<(const std::wstring & s)
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
(*buffer) << s;
}
@@ -186,89 +244,151 @@ Log & Log::operator<<(const std::wstring & s)
}
Log & Log::operator<<(const std::wstring * s)
Log & Log::operator<<(char val)
{
if( buffer && file_log && s && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
(*buffer) << *s;
(*buffer) << val;
}
return *this;
}
Log & Log::operator<<(unsigned char val)
{
if( can_put_log() )
{
(*buffer) << val;
}
return *this;
}
Log & Log::operator<<(int s)
Log & Log::operator<<(wchar_t val)
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
{
(*buffer) << s;
(*buffer) << val;
}
return *this;
}
Log & Log::operator<<(long s)
Log & Log::operator<<(bool val)
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
(*buffer) << s;
(*buffer) << val;
}
return *this;
return *this;
}
Log & Log::operator<<(long long s)
Log & Log::operator<<(short val)
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
(*buffer) << s;
(*buffer) << val;
}
return *this;
return *this;
}
Log & Log::operator<<(char s)
Log & Log::operator<<(int val)
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
(*buffer) << s;
(*buffer) << val;
}
return *this;
}
Log & Log::operator<<(wchar_t s)
Log & Log::operator<<(long val)
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
(*buffer) << s;
(*buffer) << val;
}
return *this;
}
Log & Log::operator<<(size_t s)
Log & Log::operator<<(long long val)
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
(*buffer) << s;
(*buffer) << val;
}
return *this;
}
Log & Log::operator<<(unsigned short val)
{
if( can_put_log() )
{
(*buffer) << val;
}
return *this;
}
Log & Log::operator<<(unsigned int val)
{
if( can_put_log() )
{
(*buffer) << val;
}
return *this;
}
Log & Log::operator<<(unsigned long val)
{
if( can_put_log() )
{
(*buffer) << val;
}
return *this;
}
Log & Log::operator<<(unsigned long long val)
{
if( can_put_log() )
{
(*buffer) << val;
}
return *this;
}
Log & Log::operator<<(float val)
{
if( can_put_log() )
{
(*buffer) << val;
}
return *this;
}
Log & Log::operator<<(double s)
{
@@ -281,10 +401,20 @@ Log & Log::operator<<(double s)
}
Log & Log::operator<<(const Space & s)
Log & Log::operator<<(long double val)
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
(*buffer) << val;
}
return *this;
}
Log & Log::operator<<(const void * s)
{
if( can_put_log() )
{
(*buffer) << s;
}
@@ -293,10 +423,31 @@ Log & Log::operator<<(const Space & s)
}
Log & Log::operator<<(const Stream & stream)
{
if( can_put_log() )
{
(*buffer) << stream;
}
return *this;
}
Log & Log::operator<<(const Space & s)
{
if( can_put_log() )
{
(*buffer) << s;
}
return *this;
}
Log & Log::operator<<(const Date & date)
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
(*buffer) << date;
}
@@ -314,13 +465,35 @@ Log & Log::operator<<(morm::Model & model)
#endif
Log & Log::write(const char * buf, size_t len)
{
if( can_put_log() )
{
buffer->write(buf, len);
}
return *this;
}
Log & Log::write(const wchar_t * buf, size_t len)
{
if( can_put_log() )
{
buffer->write(buf, len);
}
return *this;
}
Log & Log::operator<<(Manipulators m)
{
switch(m)
{
case lend:
case logend:
if( buffer && file_log && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
(*buffer) << '\n';
@@ -329,27 +502,22 @@ Log & Log::operator<<(Manipulators m)
}
break;
case lsave:
case logsave:
save_log_and_clear();
break;
case l1:
case log1:
current_level = 1;
break;
case l2:
case log2:
current_level = 2;
break;
case l3:
case log3:
current_level = 3;
break;
case l4:
case log4:
current_level = 4;
break;
@@ -362,20 +530,65 @@ Log & Log::operator<<(Manipulators m)
}
Log & Log::LogString(const std::string & value, size_t max_size)
void Log::set_log_buffer(WTextStream * buffer)
{
this->buffer = buffer;
}
WTextStream * Log::get_log_buffer()
{
return buffer;
}
void Log::set_max_buffer_length(size_t max_buffer_length)
{
this->max_buffer_length = max_buffer_length;
}
size_t Log::get_max_buffer_length()
{
return max_buffer_length;
}
void Log::set_file_log(FileLog * file_log)
{
this->file_log = file_log;
}
FileLog * Log::get_file_log()
{
return file_log;
}
Log & Log::int_min_width(size_t min_width)
{
if( buffer )
{
buffer->int_min_width(min_width);
}
return *this;
}
Log & Log::put_string(const std::string & value, size_t max_size)
{
return log_string_generic(value, max_size);
}
Log & Log::LogString(const std::wstring & value, size_t max_size)
Log & Log::put_string(const std::wstring & value, size_t max_size)
{
return log_string_generic(value, max_size);
}
char Log::get_hex_digit(unsigned char c)
{
if( c < 10 )
@@ -385,7 +598,6 @@ return c - 10 + 'A';
}
void Log::to_hex(char * buf, unsigned char c)
{
buf[0] = get_hex_digit(c >> 4);
@@ -394,12 +606,12 @@ void Log::to_hex(char * buf, unsigned char c)
}
Log & Log::LogBinary(const char * blob, size_t blob_len)
Log & Log::put_binary_blob(const char * blob, size_t blob_len)
{
size_t i=0;
char buf[3];
if( buffer && file_log && blob && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
while( i < blob_len )
{
@@ -446,13 +658,12 @@ char buf[3];
}
Log & Log::LogBinary(const std::string & blob)
Log & Log::put_binary_blob(const std::string & blob)
{
return LogBinary(blob.c_str(), blob.size());
return put_binary_blob(blob.c_str(), blob.size());
}
void Log::save_log_and_clear()
{
save_log();
@@ -475,7 +686,3 @@ void Log::save_log()
} // namespace

146
src/log/log.h
View File

@@ -45,22 +45,16 @@
namespace morm
{
class Model;
}
namespace pt
{
class Log
class Log : public Stream
{
public:
/*
log1 - the first level
log2
@@ -76,81 +70,91 @@ public:
log3,
log4,
l1,
l2,
l3,
l4,
logend,
lend,
logsave,
lsave,
};
Log();
virtual ~Log();
~Log();
virtual void SetLogBuffer(WTextStream * buffer);
virtual WTextStream * GetLogBuffer();
bool is_char_stream() const;
bool is_wchar_stream() const;
void SetFileLog(FileLog * file_log);
FileLog * GetFileLog();
void clear();
bool empty() const;
size_t size() const;
void reserve(size_t len);
size_t capacity() const;
void SetMaxBufferLength(size_t max_buffer_length);
size_t GetMaxBufferLength();
void to_str(std::string & str, bool clear_string = true) const;
void to_str(std::wstring & str, bool clear_string = true) const;
virtual Log & IntMinWidth(size_t min_width);
std::string to_str() const;
std::wstring to_wstr() const;
virtual Log & operator<<(const void * s);
char get_char(size_t index) const;
wchar_t get_wchar(size_t index) const;
virtual Log & operator<<(const char * s);
virtual Log & operator<<(const std::string * s);
virtual Log & operator<<(const std::string & s);
Log & operator<<(const char * s);
Log & operator<<(const std::string & s);
Log & operator<<(const wchar_t * s);
Log & operator<<(const std::wstring & s);
virtual Log & operator<<(const wchar_t * s);
virtual Log & operator<<(const std::wstring * s);
virtual Log & operator<<(const std::wstring & s);
Log & operator<<(char val);
Log & operator<<(unsigned char val);
Log & operator<<(wchar_t val);
Log & operator<<(bool val);
Log & operator<<(short val);
Log & operator<<(int s);
Log & operator<<(long s);
Log & operator<<(long long s);
Log & operator<<(unsigned short val);
Log & operator<<(unsigned int val);
Log & operator<<(unsigned long val);
Log & operator<<(unsigned long long val);
Log & operator<<(float val);
Log & operator<<(double s);
Log & operator<<(long double val);
Log & operator<<(const void * s);
virtual Log & operator<<(char s);
virtual Log & operator<<(wchar_t s);
virtual Log & operator<<(int s);
virtual Log & operator<<(long s);
virtual Log & operator<<(long long s);
// add unsigned long, unsigned int
virtual Log & operator<<(size_t s);
//virtual Log & operator<<(float s); // added
virtual Log & operator<<(double s);
virtual Log & operator<<(const Space & space);
virtual Log & operator<<(const Date & date);
Log & operator<<(const Stream & stream);
Log & operator<<(const Space & space);
Log & operator<<(const Date & date);
#ifdef PT_HAS_MORM_LIBRARY
virtual Log & operator<<(morm::Model & model);
#endif
template<typename arg_char_type, size_t arg_stack_size, size_t arg_heap_block_size>
Log & operator<<(const TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size> & arg);
Log & write(const char * buf, size_t len);
Log & write(const wchar_t * buf, size_t len);
/*
* methods specific to Log class
*
*/
virtual Log & operator<<(Manipulators m);
virtual void set_log_buffer(WTextStream * buffer);
virtual WTextStream * get_log_buffer();
void set_file_log(FileLog * file_log);
FileLog * get_file_log();
void set_max_buffer_length(size_t max_buffer_length);
size_t get_max_buffer_length();
virtual Log & LogString(const std::string & value, size_t max_size);
virtual Log & LogString(const std::wstring & value, size_t max_size);
virtual Log & int_min_width(size_t min_width);
virtual Log & put_string(const std::string & value, size_t max_size);
virtual Log & put_string(const std::wstring & value, size_t max_size);
template<typename char_type, size_t stack_size, size_t heap_block_size>
Log & operator<<(const TextStreamBase<char_type, stack_size, heap_block_size> & buf);
virtual Log & LogBinary(const char * blob, size_t blob_len);
virtual Log & LogBinary(const std::string & blob);
virtual Log & put_binary_blob(const char * blob, size_t blob_len);
virtual Log & put_binary_blob(const std::string & blob);
@@ -176,6 +180,7 @@ protected:
template<class StringType>
Log & log_string_generic(const StringType & value, size_t max_size);
virtual bool can_put_log();
virtual void save_log();
virtual void save_log_and_clear();
@@ -183,12 +188,24 @@ protected:
template<typename arg_char_type, size_t arg_stack_size, size_t arg_heap_block_size>
Log & Log::operator<<(const TextStreamBase<arg_char_type, arg_stack_size, arg_heap_block_size> & arg)
{
if( can_put_log() )
{
(*buffer) << arg;
}
return *this;
}
template<class StringType>
Log & Log::log_string_generic(const StringType & value, size_t max_size)
{
std::size_t min_size = value.size() < max_size ? value.size() : max_size;
if( buffer && file_log && current_level <= file_log->get_log_level() )
if( can_put_log() )
{
for(size_t i=0 ; i < min_size ; ++i)
{
@@ -204,19 +221,6 @@ Log & Log::log_string_generic(const StringType & value, size_t max_size)
template<typename char_type, size_t stack_size, size_t heap_block_size>
Log & Log::operator<<(const TextStreamBase<char_type, stack_size, heap_block_size> & buf)
{
if( buffer && file_log && current_level <= file_log->get_log_level() )
{
(*buffer) << buf;
}
return *this;
}
} // namespace