Skip to content

D
dlib
Commit a31096bd authored by Davis King's avatar Davis King
Browse files
Options

Modified the logger's hook implementation so that it uses a special stream 

buffer instead of an std::ostringstream.  This way logging doesn't cause
memory allocations.  This breaks backwards compatibility with the previous
hook function API but only slightly.  The new hook functions must take a
const char* instead of std::string.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403395
parent cea9d020
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 18 deletions
dlib/logger/logger_kernel_1.cpp
View file @ a31096bd
......@@ -123,6 +123,9 @@ namespace dlib
auto_flush_table.val = true;
streambuf_table.val = std::cout.rdbuf();
header_table.val = print_default_logger_header;
// also allocate an initial buffer for hook based logging
hookbuf.buffer.reserve(1000);
}
logger::global_data::level_container::
......@@ -260,6 +263,18 @@ namespace dlib
assign_tables( streambuf_table, name, out_.rdbuf());
}
// ----------------------------------------------------------------------------------------
void logger::global_data::
set_output_stream (
const std::string& name,
std::streambuf& buf
)
{
auto_mutex M(m);
assign_tables( streambuf_table, name, &buf);
}
// ----------------------------------------------------------------------------------------
logger::hook_mfp logger::global_data::
......@@ -377,9 +392,9 @@ namespace dlib
}
else
{
// use the empty_string in hopes that it is generally faster than calling
// str("") since this avoids the construction of a new std::string object.
log.gd.sout.str(log.gd.empty_string);
// Make sure the hook buffer doesn't have any old data in it before we start
// logging a new message into it.
log.gd.hookbuf.buffer.resize(0);
}
been_used = true;
}
......@@ -402,8 +417,10 @@ namespace dlib
}
else
{
// Make sure the buffer is a proper C-string
log.gd.hookbuf.buffer.push_back('\0');
// call the output hook with all the info regarding this log message.
log.hook(log.name(), l, log.gd.get_thread_name(), log.gd.sout.str());
log.hook(log.name(), l, log.gd.get_thread_name(), &log.gd.hookbuf.buffer[0]);
}
}
......
dlib/logger/logger_kernel_1.h
View file @ a31096bd
......@@ -9,13 +9,14 @@
#include "logger_kernel_abstract.h"
#include <limits>
#include <cstring>
#include <sstream>
#include "../algs.h"
#include "../assert.h"
#include "../uintn.h"
#include "../map.h"
#include "../smart_pointers.h"
#include "../member_function_pointer.h"
#include <streambuf>
#include <vector>
namespace dlib
{
......@@ -84,7 +85,7 @@ namespace dlib
- if (hook.is_set() == false) then
- out.rdbuf() == output_streambuf()
- else
- out.rdbuf() == gd.sout.rdbuf()
- out.rdbuf() == &gd.hookbuf
- output_streambuf() == 0
- cur_level == level()
......@@ -98,6 +99,8 @@ namespace dlib
to a thread when we find that it isn't already in thread_names.
!*/
// ------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------
class logger_stream
{
......@@ -180,13 +183,16 @@ namespace dlib
logger& log;
bool been_used;
const bool enabled;
};
}; // end of class logger_stream
// ------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------
friend class logger_stream;
public:
typedef member_function_pointer<const std::string&, const log_level&,
const uint64, const std::string&>::kernel_1a_c hook_mfp;
const uint64, const char*>::kernel_1a_c hook_mfp;
logger (
const char* name_
......@@ -273,7 +279,7 @@ namespace dlib
void (T::*hook_)(const std::string& logger_name,
const log_level& l,
const uint64 thread_id,
const std::string& message_to_log)
const char* message_to_log)
)
{
auto_mutex M(gd.m);
......@@ -284,13 +290,13 @@ namespace dlib
{
if (gd.loggers.element()->is_child_of(*this))
{
gd.loggers.element()->out.rdbuf(gd.sout.rdbuf());
gd.loggers.element()->out.rdbuf(&gd.hookbuf);
gd.loggers.element()->hook = hook;
}
}
gd.set_output_hook(logger_name, hook);
gd.set_output_stream(logger_name, gd.sout);
gd.set_output_stream(logger_name, gd.hookbuf);
}
void set_output_stream (
......@@ -341,6 +347,8 @@ namespace dlib
private:
// ------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------
struct global_data
{
......@@ -348,8 +356,30 @@ namespace dlib
set<logger*>::kernel_1b loggers;
map<thread_id_type,uint64>::kernel_1b thread_names;
uint64 next_thread_name;
std::ostringstream sout;
const std::string empty_string;
// Make a very simple streambuf that writes characters into a std::vector<char>. We can
// use this as the output target for hooks. The reason we don't just use a std::ostringstream
// instead is that this way we can be guaranteed that logging doesn't perform memory allocations.
// This is because a std::vector never frees memory. I.e. its capacity() doesn't go down when
// you resize it back to 0. It just stays the same.
class hook_streambuf : public std::streambuf
{
public:
std::vector<char> buffer;
int_type overflow ( int_type c)
{
if (c != EOF) buffer.push_back(static_cast<char>(c));
return c;
}
std::streamsize xsputn ( const char* s, std::streamsize num)
{
buffer.insert(buffer.end(), s, s+num);
return num;
}
};
hook_streambuf hookbuf;
global_data (
);
......@@ -460,6 +490,19 @@ namespace dlib
- #output_streambuf(L) == out_.rdbuf()
!*/
void set_output_stream (
const std::string& name,
std::streambuf& buf
);
/*!
ensures
- for all children C of name:
- #output_streambuf(C) == &buf
- if name == "" then
- for all loggers L:
- #output_streambuf(L) == &buf
!*/
struct output_hook_container
{
hook_mfp val;
......@@ -520,6 +563,7 @@ namespace dlib
static global_data& get_global_data();
// ------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------
friend void set_all_logging_levels (
......@@ -538,7 +582,7 @@ namespace dlib
void (T::*hook_)(const std::string& logger_name,
const log_level& l,
const uint64 thread_id,
const std::string& message_to_log)
const char* message_to_log)
)
{
logger::hook_mfp hook;
......@@ -549,11 +593,11 @@ namespace dlib
gd.loggers.reset();
while (gd.loggers.move_next())
{
gd.loggers.element()->out.rdbuf(gd.sout.rdbuf());
gd.loggers.element()->out.rdbuf(&gd.hookbuf);
gd.loggers.element()->hook = hook;
}
gd.set_output_stream("",gd.sout);
gd.set_output_stream("",gd.hookbuf);
gd.set_output_hook("",hook);
}
......
dlib/logger/logger_kernel_abstract.h
View file @ a31096bd
......@@ -77,7 +77,7 @@ namespace dlib
void (T::*hook)(const std::string& logger_name,
const log_level& l,
const uint64 thread_id,
const std::string& message_to_log)
const char* message_to_log)
);
/*!
ensures
......@@ -141,6 +141,12 @@ namespace dlib
one implementation of this object at a time. Thus, to create instances
of the logger you would simply write logger my_logger("some_name");
Finally, note that the logger doesn't perform any memory allocations during
each logging action. It just writes directly into the user supplied output
stream. Alternatively, if you use a logging output hook no memory allocations
are performed either. Logging just goes straight into a memory buffer
which gets passed to the user supplied logging hook.
DEFAULTS
If the user hasn't specified values for the four inherited values level(),
output_streambuf(), logger_header(), or auto_flush() then the default
......@@ -288,7 +294,7 @@ namespace dlib
void (T::*hook)(const std::string& logger_name,
const log_level& l,
const uint64 thread_id,
const std::string& message_to_log)
const char* message_to_log)
);
/*!
requires
......
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