Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
a4aa1c36
Commit
a4aa1c36
authored
Jun 29, 2017
by
Dominik Charousset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement format strings for log output
parent
a0462d6c
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
705 additions
and
287 deletions
+705
-287
examples/caf-application.ini
examples/caf-application.ini
+15
-0
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+1
-0
libcaf_core/caf/actor_system_config.hpp
libcaf_core/caf/actor_system_config.hpp
+10
-3
libcaf_core/caf/atom.hpp
libcaf_core/caf/atom.hpp
+13
-18
libcaf_core/caf/detail/pretty_type_name.hpp
libcaf_core/caf/detail/pretty_type_name.hpp
+52
-0
libcaf_core/caf/logger.hpp
libcaf_core/caf/logger.hpp
+150
-76
libcaf_core/caf/string_algorithms.hpp
libcaf_core/caf/string_algorithms.hpp
+1
-0
libcaf_core/caf/upstream_policy.hpp
libcaf_core/caf/upstream_policy.hpp
+7
-3
libcaf_core/src/actor_system_config.cpp
libcaf_core/src/actor_system_config.cpp
+19
-8
libcaf_core/src/event_based_actor.cpp
libcaf_core/src/event_based_actor.cpp
+3
-1
libcaf_core/src/logger.cpp
libcaf_core/src/logger.cpp
+225
-176
libcaf_core/src/pretty_type_name.cpp
libcaf_core/src/pretty_type_name.cpp
+77
-0
libcaf_core/test/logger.cpp
libcaf_core/test/logger.cpp
+130
-0
libcaf_core/test/manual_stream_management.cpp
libcaf_core/test/manual_stream_management.cpp
+1
-1
tools/caf-vec.cpp
tools/caf-vec.cpp
+1
-1
No files found.
examples/caf-application.ini
View file @
a4aa1c36
...
...
@@ -47,3 +47,18 @@ max-consecutive-reads=50
heartbeat-interval
=
0
; configures whether the MM detaches its internal utility actors
middleman-detach-utility-actors
=
true
; when compiling with logging enabled
[logger]
; file name template for output log file files (empty string disables logging)
file-name
=
"actor_log_[PID]_[TIMESTAMP]_[NODE].log"
; format for rendering individual log file entries
file-format
=
"%r %c %p %a %t %C %M %F:%L %m%n"
; mode for console log output generation (none|colored|uncolored)
console
=
'none'
; format for printing individual log entries to the console
console-format
=
"%m"
; excludes listed components from logging
component-filter
=
""
; configures the severity level for logs (quiet|error|warning|info|debug|trace)
verbosity
=
'trace'
libcaf_core/CMakeLists.txt
View file @
a4aa1c36
...
...
@@ -72,6 +72,7 @@ set (LIBCAF_CORE_SRCS
src/node_id.cpp
src/outgoing_stream_multiplexer.cpp
src/parse_ini.cpp
src/pretty_type_name.cpp
src/private_thread.cpp
src/proxy_registry.cpp
src/pull5.cpp
...
...
libcaf_core/caf/actor_system_config.hpp
View file @
a4aa1c36
...
...
@@ -266,10 +266,17 @@ public:
// -- config parameters for the logger ---------------------------------------
std
::
string
logger_filename
;
atom_value
logger_verbosity
;
std
::
string
logger_file
_
name
;
std
::
string
logger_file_format
;
atom_value
logger_console
;
std
::
string
logger_filter
;
std
::
string
logger_console_format
;
std
::
string
logger_component_filter
;
atom_value
logger_verbosity
;
// -- backward compatibility -------------------------------------------------
std
::
string
&
logger_filename
CAF_DEPRECATED
=
logger_file_name
;
std
::
string
&
logger_filter
CAF_DEPRECATED
=
logger_component_filter
;
// -- config parameters of the middleman -------------------------------------
...
...
libcaf_core/caf/atom.hpp
View file @
a4aa1c36
...
...
@@ -48,6 +48,19 @@ constexpr atom_value atom(char const (&str)[Size]) {
return
static_cast
<
atom_value
>
(
detail
::
atom_val
(
str
));
}
/// Creates an atom from given string literal and return an integer
/// representation of the atom..
template
<
size_t
Size
>
constexpr
uint64_t
atom_uint
(
char
const
(
&
str
)[
Size
])
{
static_assert
(
Size
<=
11
,
"only 10 characters are allowed"
);
return
detail
::
atom_val
(
str
);
}
/// Converts an atom to its integer representation.
constexpr
uint64_t
atom_uint
(
atom_value
x
)
{
return
static_cast
<
uint64_t
>
(
x
);
}
/// Lifts an `atom_value` to a compile-time constant.
template
<
atom_value
V
>
struct
atom_constant
{
...
...
@@ -155,24 +168,6 @@ using migrate_atom = atom_constant<atom("migrate")>;
/// Used for triggering periodic operations.
using
tick_atom
=
atom_constant
<
atom
(
"tick"
)
>
;
/// Used as config parameter for the `logger`.
using
trace_log_lvl_atom
=
atom_constant
<
atom
(
"TRACE"
)
>
;
/// Used as config parameter for the `logger`.
using
debug_log_lvl_atom
=
atom_constant
<
atom
(
"DEBUG"
)
>
;
/// Used as config parameter for the `logger`.
using
info_log_lvl_atom
=
atom_constant
<
atom
(
"INFO"
)
>
;
/// Used as config parameter for the `logger`.
using
warning_log_lvl_atom
=
atom_constant
<
atom
(
"WARNING"
)
>
;
/// Used as config parameter for the `logger`.
using
error_log_lvl_atom
=
atom_constant
<
atom
(
"ERROR"
)
>
;
/// Used as config parameter for the `logger`.
using
quiet_log_lvl_atom
=
atom_constant
<
atom
(
"QUIET"
)
>
;
}
// namespace caf
namespace
std
{
...
...
libcaf_core/caf/detail/pretty_type_name.hpp
0 → 100644
View file @
a4aa1c36
/******************************************************************************
* ____ _ _____ *
* / ___| / \ | ___| C++ *
* | | / _ \ | |_ Actor *
* | |___ / ___ \| _| Framework *
* \____/_/ \_|_| *
* *
* Copyright (C) 2011 - 2017 *
* Dominik Charousset <dominik.charousset (at) haw-hamburg.de> *
* *
* Distributed under the terms and conditions of the BSD 3-Clause License or *
* (at your option) under the terms and conditions of the Boost Software *
* License 1.0. See accompanying files LICENSE and LICENSE_ALTERNATIVE. *
* *
* If you did not receive a copy of the license files, see *
* http://opensource.org/licenses/BSD-3-Clause and *
* http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/
// The rationale of this header is to provide a serialization API
// that is compatbile to boost.serialization. In particular, the
// design goals are:
// - allow users to integrate existing boost.serialization-based code easily
// - allow to switch out this header with the actual boost header in boost.actor
//
// Differences in semantics are:
// - CAF does *not* respect class versions
// - the `unsigned int` argument is always 0 and ignored by CAF
//
// Since CAF requires all runtime instances to have the same types
// announced, different class versions in a single actor system would
// cause inconsistencies that are not recoverable.
#ifndef CAF_DETAIL_PRETTY_TYPE_NAME_HPP
#define CAF_DETAIL_PRETTY_TYPE_NAME_HPP
#include <string>
#include <typeinfo>
namespace
caf
{
namespace
detail
{
void
prettify_type_name
(
std
::
string
&
class_name
);
void
prettify_type_name
(
std
::
string
&
class_name
,
const
char
*
input_class_name
);
std
::
string
pretty_type_name
(
const
std
::
type_info
&
x
);
}
// namespace detail
}
// namespace caf
#endif // CAF_DETAIL_PRETTY_TYPE_NAME_HPP
libcaf_core/caf/logger.hpp
View file @
a4aa1c36
...
...
@@ -32,6 +32,7 @@
#include "caf/config.hpp"
#include "caf/unifyn.hpp"
#include "caf/type_nr.hpp"
#include "caf/timestamp.hpp"
#include "caf/ref_counted.hpp"
#include "caf/abstract_actor.hpp"
#include "caf/deep_to_string.hpp"
...
...
@@ -62,15 +63,59 @@ class logger : public ref_counted {
public:
friend
class
actor_system
;
/// Encapsulates a single logging event.
struct
event
{
/// Intrusive pointer to the next logging event.
event
*
next
;
/// Intrusive pointer to the previous logging event.
event
*
prev
;
/// Level/priority of the event.
int
level
;
std
::
string
prefix
;
std
::
string
msg
;
explicit
event
(
int
lvl
=
0
,
std
::
string
pfx
=
""
,
std
::
string
msg
=
""
);
/// Name of the category (component) logging the event.
const
char
*
category_name
;
/// Name of the current context as reported by `__PRETTY_FUNCTION__`.
const
char
*
pretty_fun
;
/// Name of the current file.
const
char
*
file_name
;
/// Current line in the file.
int
line_number
;
/// User-provided message.
std
::
string
message
;
/// Thread ID of the caller.
std
::
thread
::
id
tid
;
/// Actor ID of the caller.
actor_id
aid
;
/// Timestamp of the event.
timestamp
tstamp
;
};
/// Internal representation of format string entites.
enum
field_type
{
invalid_field
,
category_field
,
class_name_field
,
date_field
,
file_field
,
line_field
,
message_field
,
method_field
,
newline_field
,
priority_field
,
runtime_field
,
thread_field
,
actor_field
,
percent_sign_field
,
plain_text_field
};
struct
field
{
field_type
kind
;
const
char
*
first
;
const
char
*
last
;
};
using
line_format
=
std
::
vector
<
field
>
;
template
<
class
T
>
struct
arg_wrapper
{
const
char
*
name
;
...
...
@@ -124,13 +169,6 @@ public:
bool
behind_arg_
;
};
static
std
::
string
extract_class_name
(
const
char
*
prettyfun
,
size_t
strsize
);
template
<
size_t
N
>
static
std
::
string
extract_class_name
(
const
char
(
&
prettyfun
)[
N
])
{
return
extract_class_name
(
prettyfun
,
N
);
}
/// Returns the ID of the actor currently associated to the calling thread.
actor_id
thread_local_aid
();
...
...
@@ -138,9 +176,7 @@ public:
actor_id
thread_local_aid
(
actor_id
aid
);
/// Writes an entry to the log file.
void
log
(
int
level
,
const
char
*
component
,
const
std
::
string
&
class_name
,
const
char
*
function_name
,
const
char
*
c_full_file_name
,
int
line_num
,
const
std
::
string
&
msg
);
void
log
(
event
*
x
);
~
logger
()
override
;
...
...
@@ -150,16 +186,42 @@ public:
static
logger
*
current_logger
();
static
void
log_static
(
int
level
,
const
char
*
component
,
const
std
::
string
&
class_name
,
const
char
*
function_name
,
const
char
*
file_name
,
int
line_num
,
const
std
::
string
&
msg
);
bool
accepts
(
int
level
,
const
char
*
cname_begin
,
const
char
*
cname_end
);
static
bool
accepts
(
int
level
,
const
char
*
component
);
template
<
size_t
N
>
bool
accepts
(
int
level
,
const
char
(
&
component
)[
N
])
{
return
accepts
(
level
,
component
,
component
+
N
);
}
/** @endcond */
inline
const
line_format
&
file_format
()
const
{
return
file_format_
;
}
inline
const
line_format
&
console_format
()
const
{
return
console_format_
;
}
/// Renders the prefix (namespace and class) of a fully qualified function.
static
void
render_fun_prefix
(
std
::
ostream
&
out
,
const
char
*
pretty_fun
);
/// Renders the name of a fully qualified function.
static
void
render_fun_name
(
std
::
ostream
&
out
,
const
char
*
pretty_fun
);
/// Renders the difference between `t0` and `tn` in milliseconds.
static
void
render_time_diff
(
std
::
ostream
&
out
,
timestamp
t0
,
timestamp
tn
);
/// Renders the date of `x` in ISO 8601 format.
static
void
render_date
(
std
::
ostream
&
out
,
timestamp
x
);
/// Renders `x` using the line format `lf` to `out`.
void
render
(
std
::
ostream
&
out
,
const
line_format
&
lf
,
const
event
&
x
)
const
;
/// Parses `format_str` into a format description vector.
/// @warning The returned vector can have pointers into `format_str`.
static
line_format
parse_format
(
const
char
*
format_str
);
private:
logger
(
actor_system
&
sys
);
...
...
@@ -171,11 +233,6 @@ private:
void
stop
();
void
log_prefix
(
std
::
ostream
&
out
,
int
level
,
const
char
*
component
,
const
std
::
string
&
class_name
,
const
char
*
function_name
,
const
char
*
c_full_file_name
,
int
line_num
,
const
std
::
thread
::
id
&
tid
=
std
::
this_thread
::
get_id
());
actor_system
&
system_
;
int
level_
;
detail
::
shared_spinlock
aids_lock_
;
...
...
@@ -185,8 +242,17 @@ private:
std
::
condition_variable
queue_cv_
;
detail
::
single_reader_queue
<
event
>
queue_
;
std
::
thread
::
id
parent_thread_
;
timestamp
t0_
;
line_format
file_format_
;
line_format
console_format_
;
};
std
::
string
to_string
(
logger
::
field_type
x
);
std
::
string
to_string
(
const
logger
::
field
&
x
);
bool
operator
==
(
const
logger
::
field
&
x
,
const
logger
::
field
&
y
);
}
// namespace caf
#define CAF_VOID_STMT static_cast<void>(0)
...
...
@@ -202,9 +268,9 @@ private:
#define CAF_ARG(argument) caf::logger::make_arg_wrapper(#argument, argument)
#ifdef CAF_MSVC
#define CAF_
GET_CLASS_NAME caf::logger::extract_class_name(__FUNCSIG__)
#define CAF_
PRETTY_FUN __FUNCSIG__
#else // CAF_MSVC
#define CAF_
GET_CLASS_NAME caf::logger::extract_class_name(__PRETTY_FUNCTION__)
#define CAF_
PRETTY_FUN __PRETTY_FUNCTION__
#endif // CAF_MSVC
#ifndef CAF_LOG_LEVEL
...
...
@@ -226,19 +292,23 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; }
#else // CAF_LOG_LEVEL
#define CAF_DEFAULT_LOG_COMPONENT "caf"
#ifndef CAF_LOG_COMPONENT
#define CAF_LOG_COMPONENT
CAF_DEFAULT_LOG_COMPONENT
#endif
#define CAF_LOG_COMPONENT
"caf"
#endif
// CAF_LOG_COMPONENT
#define CAF_LOG_IMPL(component, loglvl, message) \
do { \
if (caf::logger::accepts(loglvl, component)) \
caf::logger::log_static(loglvl, component, CAF_GET_CLASS_NAME, \
__func__, __FILE__, __LINE__, \
(caf::logger::line_builder{} << message).get()); \
} while (0)
auto CAF_UNIFYN(caf_logger) = caf::logger::current_logger(); \
if (CAF_UNIFYN(caf_logger) != nullptr \
&& CAF_UNIFYN(caf_logger)->accepts(loglvl, component)) \
CAF_UNIFYN(caf_logger) \
->log(new ::caf::logger::event{ \
nullptr, nullptr, loglvl, component, CAF_PRETTY_FUN, __FILE__, \
__LINE__, (::caf::logger::line_builder{} << message).get(), \
::std::this_thread::get_id(), \
CAF_UNIFYN(caf_logger)->thread_local_aid(), \
::caf::make_timestamp()}); \
} while (false)
#define CAF_PUSH_AID(aarg) \
auto CAF_UNIFYN(caf_tmp_ptr) = caf::logger::current_logger(); \
...
...
@@ -269,30 +339,25 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; }
#else // CAF_LOG_LEVEL < CAF_LOG_LEVEL_TRACE
#define CAF_LOG_TRACE(entry_message) \
const char* CAF_UNIFYN(func_name_) = __func__; \
CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_TRACE, \
"ENTRY" << entry_message); \
auto CAF_UNIFYN(caf_log_trace_guard_) = ::caf::detail::make_scope_guard([=] {\
if (caf::logger::accepts(CAF_LOG_LEVEL_TRACE, CAF_LOG_COMPONENT)) \
caf::logger::log_static(CAF_LOG_LEVEL_TRACE, CAF_LOG_COMPONENT, \
CAF_GET_CLASS_NAME, CAF_UNIFYN(func_name_), \
__FILE__, __LINE__, "EXIT"); \
})
auto CAF_UNIFYN(caf_log_trace_guard_) = ::caf::detail::make_scope_guard( \
[=] { CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_TRACE, "EXIT"); })
#endif // CAF_LOG_LEVEL < CAF_LOG_LEVEL_TRACE
#if CAF_LOG_LEVEL >= CAF_LOG_LEVEL_DEBUG
#
define CAF_LOG_DEBUG(output)
\
#
define CAF_LOG_DEBUG(output)
\
CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_DEBUG, output)
#endif
#if CAF_LOG_LEVEL >= CAF_LOG_LEVEL_INFO
#
define CAF_LOG_INFO(output)
\
#
define CAF_LOG_INFO(output)
\
CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_INFO, output)
#endif
#if CAF_LOG_LEVEL >= CAF_LOG_LEVEL_WARNING
#
define CAF_LOG_WARNING(output)
\
#
define CAF_LOG_WARNING(output)
\
CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_WARNING, output)
#endif
...
...
@@ -320,19 +385,27 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; }
#ifdef CAF_LOG_LEVEL
#define CAF_LOG_DEBUG_IF(cond, output) \
if (cond) { CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_DEBUG, output); } \
if (cond) { \
CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_DEBUG, output); \
} \
CAF_VOID_STMT
#define CAF_LOG_INFO_IF(cond, output) \
if (cond) { CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_INFO, output); } \
if (cond) { \
CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_INFO, output); \
} \
CAF_VOID_STMT
#define CAF_LOG_WARNING_IF(cond, output) \
if (cond) { CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_WARNING, output); }\
if (cond) { \
CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_WARNING, output); \
} \
CAF_VOID_STMT
#define CAF_LOG_ERROR_IF(cond, output) \
if (cond) { CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_ERROR, output); } \
if (cond) { \
CAF_LOG_IMPL(CAF_LOG_COMPONENT, CAF_LOG_LEVEL_ERROR, output); \
} \
CAF_VOID_STMT
#else // CAF_LOG_LEVEL
...
...
@@ -346,20 +419,21 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; }
// -- Standardized CAF events according to SE-0001.
#define CAF_LOG_EVENT_COMPONENT "se-0001"
/// The log component responsible for logging control flow events that are
/// crucial for understanding happens-before relations. See RFC SE-0001.
#define CAF_LOG_FLOW_COMPONENT "caf.flow"
#define CAF_LOG_SPAWN_EVENT(aid, aargs) \
CAF_LOG_IMPL(CAF_LOG_
EVENT_COMPONENT, CAF_LOG_LEVEL_DEBUG,
\
CAF_LOG_IMPL(CAF_LOG_
FLOW_COMPONENT, CAF_LOG_LEVEL_DEBUG,
\
"SPAWN ; ID =" << aid \
<< "; ARGS =" << deep_to_string(aargs).c_str())
#define CAF_LOG_INIT_EVENT(aName, aHide) \
CAF_LOG_IMPL(CAF_LOG_
EVENT_COMPONENT, CAF_LOG_LEVEL_DEBUG,
\
CAF_LOG_IMPL(CAF_LOG_
FLOW_COMPONENT, CAF_LOG_LEVEL_DEBUG,
\
"INIT ; NAME =" << aName << "; HIDDEN =" << aHide)
/// Logs
#define CAF_LOG_SEND_EVENT(ptr) \
CAF_LOG_IMPL(CAF_LOG_
EVENT_COMPONENT, CAF_LOG_LEVEL_DEBUG,
\
CAF_LOG_IMPL(CAF_LOG_
FLOW_COMPONENT, CAF_LOG_LEVEL_DEBUG,
\
"SEND ; TO =" \
<< deep_to_string(strong_actor_ptr{this->ctrl()}).c_str() \
<< "; FROM =" << deep_to_string(ptr->sender).c_str() \
...
...
@@ -367,29 +441,29 @@ inline caf::actor_id caf_set_aid_dummy() { return 0; }
<< "; CONTENT =" << deep_to_string(ptr->content()).c_str())
#define CAF_LOG_RECEIVE_EVENT(ptr) \
CAF_LOG_IMPL(CAF_LOG_
EVENT_COMPONENT, CAF_LOG_LEVEL_DEBUG,
\
CAF_LOG_IMPL(CAF_LOG_
FLOW_COMPONENT, CAF_LOG_LEVEL_DEBUG,
\
"RECEIVE ; FROM =" \
<< deep_to_string(ptr->sender).c_str() \
<< "; STAGES =" << deep_to_string(ptr->stages).c_str() \
<< "; CONTENT =" << deep_to_string(ptr->content()).c_str())
#define CAF_LOG_REJECT_EVENT() \
CAF_LOG_IMPL(CAF_LOG_
EVENT
_COMPONENT, CAF_LOG_LEVEL_DEBUG, "REJECT")
CAF_LOG_IMPL(CAF_LOG_
FLOW
_COMPONENT, CAF_LOG_LEVEL_DEBUG, "REJECT")
#define CAF_LOG_ACCEPT_EVENT() \
CAF_LOG_IMPL(CAF_LOG_
EVENT
_COMPONENT, CAF_LOG_LEVEL_DEBUG, "ACCEPT")
CAF_LOG_IMPL(CAF_LOG_
FLOW
_COMPONENT, CAF_LOG_LEVEL_DEBUG, "ACCEPT")
#define CAF_LOG_DROP_EVENT() \
CAF_LOG_IMPL(CAF_LOG_
EVENT
_COMPONENT, CAF_LOG_LEVEL_DEBUG, "DROP")
CAF_LOG_IMPL(CAF_LOG_
FLOW
_COMPONENT, CAF_LOG_LEVEL_DEBUG, "DROP")
#define CAF_LOG_SKIP_EVENT() \
CAF_LOG_IMPL(CAF_LOG_
EVENT
_COMPONENT, CAF_LOG_LEVEL_DEBUG, "SKIP")
CAF_LOG_IMPL(CAF_LOG_
FLOW
_COMPONENT, CAF_LOG_LEVEL_DEBUG, "SKIP")
#define CAF_LOG_FINALIZE_EVENT() \
CAF_LOG_IMPL(CAF_LOG_
EVENT
_COMPONENT, CAF_LOG_LEVEL_DEBUG, "FINALIZE")
CAF_LOG_IMPL(CAF_LOG_
FLOW
_COMPONENT, CAF_LOG_LEVEL_DEBUG, "FINALIZE")
#define CAF_LOG_TERMINATE_EVENT(rsn) \
CAF_LOG_IMPL(CAF_LOG_
EVENT_COMPONENT, CAF_LOG_LEVEL_DEBUG,
\
CAF_LOG_IMPL(CAF_LOG_
FLOW_COMPONENT, CAF_LOG_LEVEL_DEBUG,
\
"TERMINATE ; REASON =" << deep_to_string(rsn).c_str())
#endif // CAF_LOGGER_HPP
libcaf_core/caf/string_algorithms.hpp
View file @
a4aa1c36
...
...
@@ -28,6 +28,7 @@
#include <algorithm>
#include <type_traits>
#include "caf/config.hpp"
#include "caf/detail/type_traits.hpp"
namespace
caf
{
...
...
libcaf_core/caf/upstream_policy.hpp
View file @
a4aa1c36
...
...
@@ -41,10 +41,10 @@ public:
using
path_uptr
=
std
::
unique_ptr
<
upstream_path
>
;
/// Stores all available paths.
using
path_uptr_
list
=
std
::
vector
<
path_uptr
>
;
using
path_uptr_
vec
=
std
::
vector
<
path_uptr
>
;
/// List of views to paths.
using
path_ptr_
list
=
std
::
vector
<
path_ptr
>
;
using
path_ptr_
vec
=
std
::
vector
<
path_ptr
>
;
/// Describes an assignment of credit to an upstream actor.
using
assignment_pair
=
std
::
pair
<
upstream_path
*
,
long
>
;
...
...
@@ -98,6 +98,10 @@ public:
upstream_path
*
find
(
const
strong_actor_ptr
&
x
)
const
;
inline
const
path_uptr_vec
&
paths
()
const
{
return
paths_
;
}
// -- required state ---------------------------------------------------------
inline
local_actor
*
self
()
const
{
...
...
@@ -149,7 +153,7 @@ protected:
local_actor
*
self_
;
/// List of all known paths.
path_uptr_
list
paths_
;
path_uptr_
vec
paths_
;
/// An assignment vector that's re-used whenever calling the policy.
assignment_vec
assignment_vec_
;
...
...
libcaf_core/src/actor_system_config.cpp
View file @
a4aa1c36
...
...
@@ -123,8 +123,11 @@ actor_system_config::actor_system_config()
work_stealing_moderate_sleep_duration_us
=
50
;
work_stealing_relaxed_steal_interval
=
1
;
work_stealing_relaxed_sleep_duration_us
=
10000
;
logger_filename
=
"actor_log_[PID]_[TIMESTAMP]_[NODE].log"
;
logger_console
=
atom
(
"NONE"
);
logger_file_name
=
"actor_log_[PID]_[TIMESTAMP]_[NODE].log"
;
logger_file_format
=
"%r %c %p %a %t %C %M %F:%L %m%n"
;
logger_console
=
atom
(
"none"
);
logger_console_format
=
"%m"
;
logger_verbosity
=
atom
(
"trace"
);
middleman_network_backend
=
atom
(
"default"
);
middleman_enable_automatic_connections
=
false
;
middleman_max_consecutive_reads
=
50
;
...
...
@@ -159,14 +162,22 @@ actor_system_config::actor_system_config()
.
add
(
work_stealing_relaxed_sleep_duration_us
,
"relaxed-sleep-duration"
,
"sets the sleep interval between poll attempts during relaxed polling"
);
opt_group
{
options_
,
"logger"
}
.
add
(
logger_file
name
,
"file
name"
,
.
add
(
logger_file
_name
,
"file-
name"
,
"sets the filesystem path of the log file"
)
.
add
(
logger_
verbosity
,
"verbosity
"
,
"sets the
verbosity (QUIET|ERROR|WARNING|INFO|DEBUG|TRACE)
"
)
.
add
(
logger_
file_format
,
"file-format
"
,
"sets the
line format for individual log file entires
"
)
.
add
(
logger_console
,
"console"
,
"enables logging to the console via std::clog"
)
.
add
(
logger_filter
,
"filter"
,
"sets a component filter for console log messages"
);
"sets the type of output to std::clog (none|colored|uncolored)"
)
.
add
(
logger_console_format
,
"console-format"
,
"sets the line format for printing individual log entires"
)
.
add
(
logger_component_filter
,
"component-filter"
,
"exclude all listed components from logging"
)
.
add
(
logger_verbosity
,
"verbosity"
,
"sets the verbosity (quiet|error|warning|info|debug|trace)"
)
.
add
(
logger_file_name
,
"filename"
,
"deprecated (use file-name instead)"
)
.
add
(
logger_component_filter
,
"filter"
,
"deprecated (use console-component-filter instead)"
);
opt_group
{
options_
,
"middleman"
}
.
add
(
middleman_network_backend
,
"network-backend"
,
"sets the network backend to either 'default' or 'asio' (if available)"
)
...
...
libcaf_core/src/event_based_actor.cpp
View file @
a4aa1c36
...
...
@@ -20,6 +20,8 @@
#include "caf/message_id.hpp"
#include "caf/event_based_actor.hpp"
#include "caf/detail/pretty_type_name.hpp"
namespace
caf
{
event_based_actor
::
event_based_actor
(
actor_config
&
cfg
)
:
extended_base
(
cfg
)
{
...
...
@@ -31,7 +33,7 @@ event_based_actor::~event_based_actor() {
}
void
event_based_actor
::
initialize
()
{
CAF_LOG_TRACE
(
"subtype ="
<<
logger
::
render
_type_name
(
typeid
(
*
this
)).
c_str
());
CAF_LOG_TRACE
(
"subtype ="
<<
detail
::
pretty
_type_name
(
typeid
(
*
this
)).
c_str
());
setf
(
is_initialized_flag
);
auto
bhvr
=
make_behavior
();
CAF_LOG_DEBUG_IF
(
!
bhvr
,
"make_behavior() did not return a behavior:"
...
...
libcaf_core/src/logger.cpp
View file @
a4aa1c36
...
...
@@ -21,28 +21,23 @@
#include <thread>
#include <cstring>
#include <iomanip>
#include <fstream>
#include <algorithm>
#include <condition_variable>
#include "caf/config.hpp"
#if defined(CAF_LINUX) || defined(CAF_MACOS)
#include <unistd.h>
#include <cxxabi.h>
#include <sys/types.h>
#endif
#include "caf/string_algorithms.hpp"
#include "caf/term.hpp"
#include "caf/locks.hpp"
#include "caf/timestamp.hpp"
#include "caf/actor_proxy.hpp"
#include "caf/actor_system.hpp"
#include "caf/string_algorithms.hpp"
#include "caf/actor_system_config.hpp"
#include "caf/detail/get_process_id.hpp"
#include "caf/detail/pretty_type_name.hpp"
#include "caf/detail/single_reader_queue.hpp"
namespace
caf
{
...
...
@@ -51,8 +46,8 @@ namespace {
constexpr
const
char
*
log_level_name
[]
=
{
"ERROR"
,
"WARN
"
,
"INFO
"
,
"WARN"
,
"INFO"
,
"DEBUG"
,
"TRACE"
};
...
...
@@ -115,52 +110,8 @@ inline logger* get_current_logger() {
}
#endif // CAF_LOG_LEVEL
void
prettify_type_name
(
std
::
string
&
class_name
)
{
//replace_all(class_name, " ", "");
replace_all
(
class_name
,
"::"
,
"."
);
replace_all
(
class_name
,
"(anonymousnamespace)"
,
"ANON"
);
replace_all
(
class_name
,
".__1."
,
"."
);
// gets rid of weird Clang-lib names
// hide CAF magic in logs
auto
strip_magic
=
[
&
](
const
char
*
prefix_begin
,
const
char
*
prefix_end
)
{
auto
last
=
class_name
.
end
();
auto
i
=
std
::
search
(
class_name
.
begin
(),
last
,
prefix_begin
,
prefix_end
);
auto
comma_or_angle_bracket
=
[](
char
c
)
{
return
c
==
','
||
c
==
'>'
;
};
auto
e
=
std
::
find_if
(
i
,
last
,
comma_or_angle_bracket
);
if
(
i
!=
e
)
{
std
::
string
substr
(
i
+
(
prefix_end
-
prefix_begin
),
e
);
class_name
.
swap
(
substr
);
}
};
char
prefix1
[]
=
"caf.detail.embedded<"
;
strip_magic
(
prefix1
,
prefix1
+
(
sizeof
(
prefix1
)
-
1
));
// finally, replace any whitespace with %20
replace_all
(
class_name
,
" "
,
"%20"
);
}
void
prettify_type_name
(
std
::
string
&
class_name
,
const
char
*
c_class_name
)
{
# if defined(CAF_LINUX) || defined(CAF_MACOS)
int
stat
=
0
;
std
::
unique_ptr
<
char
,
decltype
(
free
)
*>
real_class_name
{
nullptr
,
free
};
auto
tmp
=
abi
::
__cxa_demangle
(
c_class_name
,
nullptr
,
nullptr
,
&
stat
);
real_class_name
.
reset
(
tmp
);
class_name
=
stat
==
0
?
real_class_name
.
get
()
:
c_class_name
;
# else
class_name
=
c_class_name
;
# endif
prettify_type_name
(
class_name
);
}
}
// namespace <anonymous>
logger
::
event
::
event
(
int
lvl
,
std
::
string
pfx
,
std
::
string
content
)
:
next
(
nullptr
),
prev
(
nullptr
),
level
(
lvl
),
prefix
(
std
::
move
(
pfx
)),
msg
(
std
::
move
(
content
))
{
// nop
}
logger
::
line_builder
::
line_builder
()
:
behind_arg_
(
false
)
{
// nop
}
...
...
@@ -185,43 +136,6 @@ std::string logger::line_builder::get() const {
return
std
::
move
(
str_
);
}
std
::
string
logger
::
render_type_name
(
const
std
::
type_info
&
ti
)
{
std
::
string
result
;
prettify_type_name
(
result
,
ti
.
name
());
return
result
;
}
std
::
string
logger
::
extract_class_name
(
const
char
*
prettyfun
,
size_t
strsize
)
{
auto
first
=
prettyfun
;
// set end to beginning of arguments
auto
last
=
std
::
find
(
first
,
prettyfun
+
strsize
,
'('
);
auto
jump_to_next_whitespace
=
[
&
]
{
// leave `first` unchanged if no whitespaces is present,
// e.g., in constructor signatures
auto
tmp
=
std
::
find
(
first
,
last
,
' '
);
if
(
tmp
!=
last
)
first
=
tmp
+
1
;
};
// skip "virtual" prefix if present
if
(
strncmp
(
prettyfun
,
"virtual "
,
std
::
min
<
size_t
>
(
strsize
,
8
))
==
0
)
jump_to_next_whitespace
();
// skip return type
jump_to_next_whitespace
();
if
(
first
==
last
)
return
""
;
const
char
sep
[]
=
"::"
;
// separator for namespaces and classes
auto
sep_first
=
std
::
begin
(
sep
);
auto
sep_last
=
sep_first
+
2
;
// using end() includes \0
auto
colons
=
first
;
decltype
(
colons
)
nextcs
;
while
((
nextcs
=
std
::
search
(
colons
+
1
,
last
,
sep_first
,
sep_last
))
!=
last
)
colons
=
nextcs
;
std
::
string
result
;
result
.
assign
(
first
,
colons
);
prettify_type_name
(
result
);
return
result
;
}
// returns the actor ID for the current thread
actor_id
logger
::
thread_local_aid
()
{
shared_lock
<
detail
::
shared_spinlock
>
guard
{
aids_lock_
};
...
...
@@ -248,40 +162,9 @@ actor_id logger::thread_local_aid(actor_id aid) {
return
0
;
// was empty before
}
void
logger
::
log_prefix
(
std
::
ostream
&
out
,
int
level
,
const
char
*
component
,
const
std
::
string
&
class_name
,
const
char
*
function_name
,
const
char
*
c_full_file_name
,
int
line_num
,
const
std
::
thread
::
id
&
tid
)
{
std
::
string
file_name
;
std
::
string
full_file_name
=
c_full_file_name
;
auto
ri
=
find
(
full_file_name
.
rbegin
(),
full_file_name
.
rend
(),
'/'
);
if
(
ri
!=
full_file_name
.
rend
())
{
auto
i
=
ri
.
base
();
if
(
i
==
full_file_name
.
end
())
file_name
=
std
::
move
(
full_file_name
);
else
file_name
=
std
::
string
(
i
,
full_file_name
.
end
());
}
else
{
file_name
=
std
::
move
(
full_file_name
);
}
std
::
ostringstream
prefix
;
out
<<
timestamp_to_string
(
make_timestamp
())
<<
" "
<<
component
<<
" "
<<
log_level_name
[
level
]
<<
" "
<<
"actor"
<<
thread_local_aid
()
<<
" "
<<
tid
<<
" "
<<
class_name
<<
" "
<<
function_name
<<
" "
<<
file_name
<<
":"
<<
line_num
;
}
void
logger
::
log
(
int
level
,
const
char
*
component
,
const
std
::
string
&
class_name
,
const
char
*
function_name
,
const
char
*
c_full_file_name
,
int
line_num
,
const
std
::
string
&
msg
)
{
CAF_ASSERT
(
level
>=
0
&&
level
<=
4
);
std
::
ostringstream
prefix
;
log_prefix
(
prefix
,
level
,
component
,
class_name
,
function_name
,
c_full_file_name
,
line_num
);
queue_
.
synchronized_enqueue
(
queue_mtx_
,
queue_cv_
,
new
event
{
level
,
prefix
.
str
(),
msg
});
void
logger
::
log
(
event
*
x
)
{
CAF_ASSERT
(
x
->
level
>=
0
&&
x
->
level
<=
4
);
queue_
.
synchronized_enqueue
(
queue_mtx_
,
queue_cv_
,
x
);
}
void
logger
::
set_current_actor_system
(
actor_system
*
x
)
{
...
...
@@ -295,30 +178,14 @@ logger* logger::current_logger() {
return
get_current_logger
();
}
void
logger
::
log_static
(
int
level
,
const
char
*
component
,
const
std
::
string
&
class_name
,
const
char
*
function_name
,
const
char
*
file_name
,
int
line_num
,
const
std
::
string
&
msg
)
{
auto
ptr
=
get_current_logger
();
if
(
ptr
!=
nullptr
)
ptr
->
log
(
level
,
component
,
class_name
,
function_name
,
file_name
,
line_num
,
msg
);
}
bool
logger
::
accepts
(
int
level
,
const
char
*
component
)
{
CAF_ASSERT
(
component
!=
nullptr
);
bool
logger
::
accepts
(
int
level
,
const
char
*
cname_begin
,
const
char
*
cname_end
)
{
CAF_ASSERT
(
cname_begin
!=
nullptr
&&
cname_end
!=
nullptr
);
CAF_ASSERT
(
level
>=
0
&&
level
<=
4
);
auto
ptr
=
get_current_logger
();
if
(
ptr
==
nullptr
||
level
>
ptr
->
level_
)
return
false
;
// TODO: once we've phased out GCC 4.8, we can upgrade this to a regex.
// Until then, we just search for a substring in the filter.
auto
&
filter
=
ptr
->
system_
.
config
().
logger_filter
;
auto
&
filter
=
system_
.
config
().
logger_component_filter
;
if
(
!
filter
.
empty
())
{
auto
it
=
std
::
search
(
filter
.
begin
(),
filter
.
end
(),
component
,
component
+
std
::
strlen
(
component
));
if
(
it
==
filter
.
end
())
return
false
;
auto
it
=
std
::
search
(
filter
.
begin
(),
filter
.
end
(),
cname_begin
,
cname_end
);
return
it
!=
filter
.
end
();
}
return
true
;
}
...
...
@@ -338,40 +205,173 @@ logger::logger(actor_system& sys) : system_(sys) {
void
logger
::
init
(
actor_system_config
&
cfg
)
{
CAF_IGNORE_UNUSED
(
cfg
);
#if defined(CAF_LOG_LEVEL)
auto
lvl_atom
=
cfg
.
logger_verbosity
;
switch
(
static_cast
<
uint64_t
>
(
lvl_atom
))
{
case
error_log_lvl_atom
:
:
uint_value
()
:
// Parse the configured log leve.
switch
(
static_cast
<
uint64_t
>
(
cfg
.
logger_verbosity
))
{
case
atom_uint
(
"error"
):
case
atom_uint
(
"ERROR"
):
level_
=
CAF_LOG_LEVEL_ERROR
;
break
;
case
warning_log_lvl_atom
:
:
uint_value
()
:
case
atom_uint
(
"warning"
):
case
atom_uint
(
"WARNING"
):
level_
=
CAF_LOG_LEVEL_WARNING
;
break
;
case
info_log_lvl_atom
:
:
uint_value
()
:
case
atom_uint
(
"info"
):
case
atom_uint
(
"INFO"
):
level_
=
CAF_LOG_LEVEL_INFO
;
break
;
case
debug_log_lvl_atom
:
:
uint_value
()
:
case
atom_uint
(
"debug"
):
case
atom_uint
(
"DEBUG"
):
level_
=
CAF_LOG_LEVEL_DEBUG
;
break
;
case
trace_log_lvl_atom
:
:
uint_value
()
:
case
atom_uint
(
"trace"
):
case
atom_uint
(
"TRACE"
):
level_
=
CAF_LOG_LEVEL_TRACE
;
break
;
default:
{
level_
=
CAF_LOG_LEVEL
;
}
}
// Parse the format string.
file_format_
=
parse_format
(
cfg
.
logger_file_format
.
c_str
());
console_format_
=
parse_format
(
cfg
.
logger_console_format
.
c_str
());
#endif
}
void
logger
::
render_fun_prefix
(
std
::
ostream
&
out
,
const
char
*
pretty_fun
)
{
auto
first
=
pretty_fun
;
// set end to beginning of arguments
auto
last
=
std
::
find_if
(
first
,
static_cast
<
const
char
*>
(
nullptr
),
[](
char
x
)
{
return
x
==
'('
||
x
==
'\0'
;
});
auto
strsize
=
static_cast
<
size_t
>
(
last
-
first
);
auto
jump_to_next_whitespace
=
[
&
]
{
// leave `first` unchanged if no whitespaces is present,
// e.g., in constructor signatures
auto
tmp
=
std
::
find
(
first
,
last
,
' '
);
if
(
tmp
!=
last
)
first
=
tmp
+
1
;
};
// skip "virtual" prefix if present
if
(
strncmp
(
pretty_fun
,
"virtual "
,
std
::
min
<
size_t
>
(
strsize
,
8
))
==
0
)
jump_to_next_whitespace
();
// skip return type
jump_to_next_whitespace
();
if
(
first
==
last
)
return
;
const
char
sep
[]
=
"::"
;
// separator for namespaces and classes
auto
sep_first
=
std
::
begin
(
sep
);
auto
sep_last
=
sep_first
+
2
;
// using end() includes \0
auto
colons
=
first
;
decltype
(
colons
)
nextcs
;
while
((
nextcs
=
std
::
search
(
colons
+
1
,
last
,
sep_first
,
sep_last
))
!=
last
)
colons
=
nextcs
;
std
::
string
result
;
result
.
assign
(
first
,
colons
);
detail
::
prettify_type_name
(
result
);
out
<<
result
;
}
void
logger
::
render_fun_name
(
std
::
ostream
&
out
,
const
char
*
pretty_fun
)
{
// Find the end of the function name by looking for the opening parenthesis
// trailing it.
const
char
*
e
=
nullptr
;
// safe, because pretty_fun is null-terminated
auto
i
=
std
::
find_if
(
pretty_fun
,
e
,
[](
char
x
)
{
return
x
==
'('
||
x
==
'\0'
;
});
if
(
*
i
==
'\0'
)
return
;
/// Now look for the beginning of the function name.
using
rev_iter
=
std
::
reverse_iterator
<
const
char
*>
;
auto
b
=
std
::
find_if
(
rev_iter
(
i
),
rev_iter
(
pretty_fun
),
[](
char
x
)
{
return
x
==
':'
||
x
==
' '
;
});
out
.
write
(
b
.
base
(),
i
-
b
.
base
());
}
void
logger
::
render_time_diff
(
std
::
ostream
&
out
,
timestamp
t0
,
timestamp
tn
)
{
out
<<
std
::
chrono
::
duration_cast
<
std
::
chrono
::
milliseconds
>
(
tn
-
t0
).
count
();
}
void
logger
::
render_date
(
std
::
ostream
&
out
,
timestamp
x
)
{
auto
y
=
std
::
chrono
::
time_point_cast
<
timestamp
::
clock
::
duration
>
(
x
);
auto
z
=
timestamp
::
clock
::
to_time_t
(
y
);
out
<<
std
::
put_time
(
std
::
localtime
(
&
z
),
"%F %T"
);
}
void
logger
::
render
(
std
::
ostream
&
out
,
const
line_format
&
lf
,
const
event
&
x
)
const
{
for
(
auto
&
f
:
lf
)
switch
(
f
.
kind
)
{
case
category_field
:
out
<<
x
.
category_name
;
break
;
case
class_name_field
:
render_fun_prefix
(
out
,
x
.
pretty_fun
);
break
;
case
date_field
:
render_date
(
out
,
x
.
tstamp
);
break
;
case
file_field
:
out
<<
x
.
file_name
;
break
;
case
line_field
:
out
<<
x
.
line_number
;
break
;
case
message_field
:
out
<<
x
.
message
;
break
;
case
method_field
:
render_fun_name
(
out
,
x
.
pretty_fun
);
break
;
case
newline_field
:
out
<<
std
::
endl
;
break
;
case
priority_field
:
out
<<
log_level_name
[
x
.
level
];
break
;
case
runtime_field
:
render_time_diff
(
out
,
t0_
,
x
.
tstamp
);
break
;
case
thread_field
:
out
<<
x
.
tid
;
break
;
case
actor_field
:
out
<<
"actor"
<<
x
.
aid
;
break
;
case
percent_sign_field
:
out
<<
'%'
;
break
;
case
plain_text_field
:
out
.
write
(
f
.
first
,
f
.
last
-
f
.
first
);
break
;
default:
;
// nop
}
}
logger
::
line_format
logger
::
parse_format
(
const
char
*
format_str
)
{
std
::
vector
<
field
>
res
;
auto
i
=
format_str
;
auto
plain_text_first
=
i
;
bool
read_percent_sign
=
false
;
for
(;
*
i
!=
'\0'
;
++
i
)
{
if
(
read_percent_sign
)
{
field_type
ft
;
switch
(
*
i
)
{
case
'c'
:
ft
=
category_field
;
break
;
case
'C'
:
ft
=
class_name_field
;
break
;
case
'd'
:
ft
=
date_field
;
break
;
case
'F'
:
ft
=
file_field
;
break
;
case
'L'
:
ft
=
line_field
;
break
;
case
'm'
:
ft
=
message_field
;
break
;
case
'M'
:
ft
=
method_field
;
break
;
case
'n'
:
ft
=
newline_field
;
break
;
case
'p'
:
ft
=
priority_field
;
break
;
case
'r'
:
ft
=
runtime_field
;
break
;
case
't'
:
ft
=
thread_field
;
break
;
case
'a'
:
ft
=
actor_field
;
break
;
case
'%'
:
ft
=
percent_sign_field
;
break
;
default:
ft
=
invalid_field
;
std
::
cerr
<<
"invalid field specifier in format string: "
<<
*
i
<<
std
::
endl
;
}
if
(
ft
!=
invalid_field
)
res
.
emplace_back
(
field
{
ft
,
nullptr
,
nullptr
});
plain_text_first
=
i
+
1
;
read_percent_sign
=
false
;
}
else
{
if
(
*
i
==
'%'
)
{
if
(
plain_text_first
!=
i
)
res
.
emplace_back
(
field
{
plain_text_field
,
plain_text_first
,
i
});
read_percent_sign
=
true
;
}
}
}
if
(
plain_text_first
!=
i
)
res
.
emplace_back
(
field
{
plain_text_field
,
plain_text_first
,
i
});
return
res
;
}
void
logger
::
run
()
{
#if defined(CAF_LOG_LEVEL)
t0_
=
make_timestamp
();
std
::
fstream
file
;
if
(
system_
.
config
().
logger_filename
.
empty
())
{
//
If the console is also disabled, no need to continue
.
if
(
system_
.
config
().
logger_file
_
name
.
empty
())
{
//
No need to continue if console and log file are disabled
.
if
(
!
(
system_
.
config
().
logger_console
==
atom
(
"UNCOLORED"
)
||
system_
.
config
().
logger_console
==
atom
(
"COLORED"
)))
return
;
}
else
{
auto
f
=
system_
.
config
().
logger_filename
;
auto
f
=
system_
.
config
().
logger_file
_
name
;
// Replace placeholders.
const
char
pid
[]
=
"[PID]"
;
auto
i
=
std
::
search
(
f
.
begin
(),
f
.
end
(),
std
::
begin
(
pid
),
...
...
@@ -383,8 +383,8 @@ void logger::run() {
const
char
ts
[]
=
"[TIMESTAMP]"
;
i
=
std
::
search
(
f
.
begin
(),
f
.
end
(),
std
::
begin
(
ts
),
std
::
end
(
ts
)
-
1
);
if
(
i
!=
f
.
end
())
{
auto
now
=
timestamp_to_string
(
make_timestamp
()
);
f
.
replace
(
i
,
i
+
sizeof
(
ts
)
-
1
,
now
);
auto
t0_str
=
timestamp_to_string
(
t0_
);
f
.
replace
(
i
,
i
+
sizeof
(
ts
)
-
1
,
t0_str
);
}
const
char
node
[]
=
"[NODE]"
;
i
=
std
::
search
(
f
.
begin
(),
f
.
end
(),
std
::
begin
(
node
),
std
::
end
(
node
)
-
1
);
...
...
@@ -400,15 +400,22 @@ void logger::run() {
}
if
(
file
)
{
// log first entry
constexpr
atom_value
level_names
[]
=
{
error_log_lvl_atom
::
value
,
warning_log_lvl_atom
::
value
,
info_log_lvl_atom
::
value
,
debug_log_lvl_atom
::
value
,
trace_log_lvl_atom
::
value
};
auto
lvl_atom
=
level_names
[
CAF_LOG_LEVEL
];
log_prefix
(
file
,
CAF_LOG_LEVEL_INFO
,
"caf"
,
"caf.logger"
,
"start"
,
__FILE__
,
__LINE__
,
parent_thread_
);
file
<<
" level = "
<<
to_string
(
lvl_atom
)
<<
", node = "
<<
to_string
(
system_
.
node
())
<<
std
::
endl
;
std
::
string
msg
=
"level = "
;
msg
+=
to_string
(
system_
.
config
().
logger_verbosity
);
msg
+=
", node = "
;
msg
+=
to_string
(
system_
.
node
());
event
tmp
{
nullptr
,
nullptr
,
CAF_LOG_LEVEL_INFO
,
CAF_LOG_COMPONENT
,
CAF_PRETTY_FUN
,
__FILE__
,
__LINE__
,
std
::
move
(
msg
),
std
::
this_thread
::
get_id
(),
0
,
make_timestamp
()};
render
(
file
,
file_format_
,
tmp
);
}
// receive log entries from other threads and actors
std
::
unique_ptr
<
event
>
ptr
;
...
...
@@ -419,12 +426,13 @@ void logger::run() {
ptr
.
reset
(
queue_
.
try_pop
());
CAF_ASSERT
(
ptr
!=
nullptr
);
// empty message means: shut down
if
(
ptr
->
m
sg
.
empty
())
if
(
ptr
->
m
essage
.
empty
())
{
break
;
}
if
(
file
)
file
<<
ptr
->
prefix
<<
' '
<<
ptr
->
msg
<<
std
::
endl
;
render
(
file
,
file_format_
,
*
ptr
);
;
if
(
system_
.
config
().
logger_console
==
atom
(
"UNCOLORED"
))
{
std
::
clog
<<
ptr
->
msg
<<
std
::
endl
;
render
(
std
::
clog
,
console_format_
,
*
ptr
)
;
}
else
if
(
system_
.
config
().
logger_console
==
atom
(
"COLORED"
))
{
switch
(
ptr
->
level
)
{
default:
...
...
@@ -445,13 +453,23 @@ void logger::run() {
std
::
clog
<<
term
::
blue
;
break
;
}
std
::
clog
<<
ptr
->
msg
<<
term
::
reset
<<
std
::
endl
;
render
(
std
::
clog
,
console_format_
,
*
ptr
);
std
::
clog
<<
term
::
reset_endl
;
}
}
if
(
file
)
{
log_prefix
(
file
,
CAF_LOG_LEVEL_INFO
,
"caf"
,
"caf.logger"
,
"stop"
,
__FILE__
,
__LINE__
,
parent_thread_
);
file
<<
" EOF"
<<
std
::
endl
;
event
tmp
{
nullptr
,
nullptr
,
CAF_LOG_LEVEL_INFO
,
CAF_LOG_COMPONENT
,
CAF_PRETTY_FUN
,
__FILE__
,
__LINE__
,
"EOF"
,
std
::
this_thread
::
get_id
(),
0
,
make_timestamp
()};
render
(
file
,
file_format_
,
tmp
);
}
#endif
}
...
...
@@ -459,7 +477,8 @@ void logger::run() {
void
logger
::
start
()
{
#if defined(CAF_LOG_LEVEL)
parent_thread_
=
std
::
this_thread
::
get_id
();
if
(
system_
.
config
().
logger_verbosity
==
quiet_log_lvl_atom
::
value
)
auto
verbosity
=
system_
.
config
().
logger_verbosity
;
if
(
verbosity
==
atom
(
"quiet"
)
||
verbosity
==
atom
(
"QUIET"
))
return
;
thread_
=
std
::
thread
{[
this
]
{
this
->
run
();
}};
#endif
...
...
@@ -475,4 +494,34 @@ void logger::stop() {
#endif
}
std
::
string
to_string
(
logger
::
field_type
x
)
{
static
constexpr
const
char
*
names
[]
=
{
"invalid"
,
"category"
,
"class_name"
,
"date"
,
"file"
,
"line"
,
"message"
,
"method"
,
"newline"
,
"priority"
,
"runtime"
,
"thread"
,
"actor"
,
"percent_sign"
,
"plain_text"
};
return
names
[
static_cast
<
size_t
>
(
x
)];
}
std
::
string
to_string
(
const
logger
::
field
&
x
)
{
std
::
string
result
=
"field{"
;
result
+=
to_string
(
x
.
kind
);
if
(
x
.
first
!=
nullptr
)
{
result
+=
",
\"
"
;
result
.
insert
(
result
.
end
(),
x
.
first
,
x
.
last
);
result
+=
'\"'
;
}
result
+=
"}"
;
return
result
;
}
bool
operator
==
(
const
logger
::
field
&
x
,
const
logger
::
field
&
y
)
{
if
(
x
.
kind
==
y
.
kind
)
{
if
(
x
.
kind
==
logger
::
plain_text_field
)
return
std
::
distance
(
x
.
first
,
x
.
last
)
==
std
::
distance
(
y
.
first
,
y
.
last
)
&&
std
::
equal
(
x
.
first
,
x
.
last
,
y
.
first
);
return
true
;
}
return
false
;
}
}
// namespace caf
libcaf_core/src/pretty_type_name.cpp
0 → 100644
View file @
a4aa1c36
/******************************************************************************
* ____ _ _____ *
* / ___| / \ | ___| C++ *
* | | / _ \ | |_ Actor *
* | |___ / ___ \| _| Framework *
* \____/_/ \_|_| *
* *
* Copyright (C) 2011 - 2017 *
* Dominik Charousset <dominik.charousset (at) haw-hamburg.de> *
* *
* Distributed under the terms and conditions of the BSD 3-Clause License or *
* (at your option) under the terms and conditions of the Boost Software *
* License 1.0. See accompanying files LICENSE and LICENSE_ALTERNATIVE. *
* *
* If you did not receive a copy of the license files, see *
* http://opensource.org/licenses/BSD-3-Clause and *
* http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/
#include "caf/detail/pretty_type_name.hpp"
#include "caf/config.hpp"
#if defined(CAF_LINUX) || defined(CAF_MACOS)
#include <unistd.h>
#include <cxxabi.h>
#include <sys/types.h>
#endif
#include "caf/string_algorithms.hpp"
namespace
caf
{
namespace
detail
{
void
prettify_type_name
(
std
::
string
&
class_name
)
{
//replace_all(class_name, " ", "");
replace_all
(
class_name
,
"::"
,
"."
);
replace_all
(
class_name
,
"(anonymousnamespace)"
,
"ANON"
);
replace_all
(
class_name
,
".__1."
,
"."
);
// gets rid of weird Clang-lib names
// hide CAF magic in logs
auto
strip_magic
=
[
&
](
const
char
*
prefix_begin
,
const
char
*
prefix_end
)
{
auto
last
=
class_name
.
end
();
auto
i
=
std
::
search
(
class_name
.
begin
(),
last
,
prefix_begin
,
prefix_end
);
auto
comma_or_angle_bracket
=
[](
char
c
)
{
return
c
==
','
||
c
==
'>'
;
};
auto
e
=
std
::
find_if
(
i
,
last
,
comma_or_angle_bracket
);
if
(
i
!=
e
)
{
std
::
string
substr
(
i
+
(
prefix_end
-
prefix_begin
),
e
);
class_name
.
swap
(
substr
);
}
};
char
prefix1
[]
=
"caf.detail.embedded<"
;
strip_magic
(
prefix1
,
prefix1
+
(
sizeof
(
prefix1
)
-
1
));
// finally, replace any whitespace with %20
replace_all
(
class_name
,
" "
,
"%20"
);
}
void
prettify_type_name
(
std
::
string
&
class_name
,
const
char
*
c_class_name
)
{
# if defined(CAF_LINUX) || defined(CAF_MACOS)
int
stat
=
0
;
std
::
unique_ptr
<
char
,
decltype
(
free
)
*>
real_class_name
{
nullptr
,
free
};
auto
tmp
=
abi
::
__cxa_demangle
(
c_class_name
,
nullptr
,
nullptr
,
&
stat
);
real_class_name
.
reset
(
tmp
);
class_name
=
stat
==
0
?
real_class_name
.
get
()
:
c_class_name
;
# else
class_name
=
c_class_name
;
# endif
prettify_type_name
(
class_name
);
}
std
::
string
pretty_type_name
(
const
std
::
type_info
&
x
)
{
std
::
string
result
;
prettify_type_name
(
result
,
x
.
name
());
return
result
;
}
}
// namespace detail
}
// namespace caf
libcaf_core/test/logger.cpp
0 → 100644
View file @
a4aa1c36
/******************************************************************************
* ____ _ _____ *
* / ___| / \ | ___| C++ *
* | | / _ \ | |_ Actor *
* | |___ / ___ \| _| Framework *
* \____/_/ \_|_| *
* *
* Copyright (C) 2011 - 2017 *
* Dominik Charousset <dominik.charousset (at) haw-hamburg.de> *
* *
* Distributed under the terms and conditions of the BSD 3-Clause License or *
* (at your option) under the terms and conditions of the Boost Software *
* License 1.0. See accompanying files LICENSE and LICENSE_ALTERNATIVE. *
* *
* If you did not receive a copy of the license files, see *
* http://opensource.org/licenses/BSD-3-Clause and *
* http://www.boost.org/LICENSE_1_0.txt. *
******************************************************************************/
#include "caf/config.hpp"
#define CAF_SUITE logger
#include "caf/test/unit_test.hpp"
#include <string>
#include "caf/all.hpp"
using
namespace
caf
;
using
namespace
std
;
using
namespace
std
::
chrono
;
namespace
{
struct
fixture
{
fixture
()
{
cfg
.
scheduler_policy
=
caf
::
atom
(
"testing"
);
}
void
add
(
logger
::
field_type
kind
)
{
lf
.
emplace_back
(
logger
::
field
{
kind
,
nullptr
,
nullptr
});
}
template
<
size_t
N
>
void
add
(
logger
::
field_type
kind
,
const
char
(
&
str
)[
N
])
{
lf
.
emplace_back
(
logger
::
field
{
kind
,
str
,
str
+
(
N
-
1
)});
// exclude \0
}
template
<
class
F
,
class
...
Ts
>
string
render
(
F
f
,
Ts
&&
...
xs
)
{
ostringstream
oss
;
f
(
oss
,
forward
<
Ts
>
(
xs
)...);
return
oss
.
str
();
}
actor_system_config
cfg
;
logger
::
line_format
lf
;
};
}
// namespace <anonymous>
CAF_TEST_FIXTURE_SCOPE
(
logger_tests
,
fixture
)
// copy construction, copy assign, move construction, move assign
// and finally serialization round-trip
CAF_TEST
(
parse_default_format_strings
)
{
actor_system
sys
{
cfg
};
CAF_CHECK_EQUAL
(
cfg
.
logger_file_format
,
"%r %c %p %a %t %C %M %F:%L %m%n"
);
add
(
logger
::
runtime_field
);
add
(
logger
::
plain_text_field
,
" "
);
add
(
logger
::
category_field
);
add
(
logger
::
plain_text_field
,
" "
);
add
(
logger
::
priority_field
);
add
(
logger
::
plain_text_field
,
" "
);
add
(
logger
::
actor_field
);
add
(
logger
::
plain_text_field
,
" "
);
add
(
logger
::
thread_field
);
add
(
logger
::
plain_text_field
,
" "
);
add
(
logger
::
class_name_field
);
add
(
logger
::
plain_text_field
,
" "
);
add
(
logger
::
method_field
);
add
(
logger
::
plain_text_field
,
" "
);
add
(
logger
::
file_field
);
add
(
logger
::
plain_text_field
,
":"
);
add
(
logger
::
line_field
);
add
(
logger
::
plain_text_field
,
" "
);
add
(
logger
::
message_field
);
add
(
logger
::
newline_field
);
CAF_CHECK_EQUAL
(
sys
.
logger
().
file_format
(),
lf
);
CAF_CHECK_EQUAL
(
logger
::
parse_format
(
"%r %c %p %a %t %C %M %F:%L %m%n"
),
lf
);
}
CAF_TEST
(
rendering
)
{
// Rendering of type names and function names.
const
char
*
foobar
=
"void ns::foo::bar()"
;
CAF_CHECK_EQUAL
(
render
(
logger
::
render_fun_name
,
foobar
),
"bar"
);
CAF_CHECK_EQUAL
(
render
(
logger
::
render_fun_prefix
,
foobar
),
"ns.foo"
);
// Rendering of time points.
timestamp
t0
;
timestamp
t1
{
timestamp
::
duration
{
5000000
}};
// epoch + 5000000ns (5ms)
CAF_CHECK_EQUAL
(
render
(
logger
::
render_time_diff
,
t0
,
t1
),
"5"
);
ostringstream
t0_iso8601
;
auto
t0_t
=
system_clock
::
to_time_t
(
system_clock
::
time_point
{});
t0_iso8601
<<
put_time
(
localtime
(
&
t0_t
),
"%F %T"
);
CAF_CHECK_EQUAL
(
render
(
logger
::
render_date
,
t0
),
t0_iso8601
.
str
());
// Rendering of events.
logger
::
event
e
{
nullptr
,
nullptr
,
CAF_LOG_LEVEL_WARNING
,
"unit.test"
,
"void ns::foo::bar()"
,
"foo.cpp"
,
42
,
"hello world"
,
this_thread
::
get_id
(),
0
,
t0
};
// Exclude %r and %t from rendering test because they are nondeterministic.
actor_system
sys
{
cfg
};
auto
lf
=
logger
::
parse_format
(
"%c %p %a %C %M %F:%L %m"
);
auto
&
lg
=
sys
.
logger
();
using
namespace
std
::
placeholders
;
auto
render_event
=
bind
(
&
logger
::
render
,
&
lg
,
_1
,
_2
,
_3
);
CAF_CHECK_EQUAL
(
render
(
render_event
,
lf
,
e
),
"unit.test WARN actor0 ns.foo bar foo.cpp:42 hello world"
);
}
CAF_TEST_FIXTURE_SCOPE_END
()
libcaf_core/test/manual_stream_management.cpp
View file @
a4aa1c36
...
...
@@ -652,7 +652,7 @@ struct config : actor_system_config {
public:
config
()
{
add_message_type
<
element_type
>
(
"element"
);
logger_filename
=
"streamlog"
;
logger_file
_
name
=
"streamlog"
;
}
};
...
...
tools/caf-vec.cpp
View file @
a4aa1c36
...
...
@@ -758,7 +758,7 @@ struct config : public actor_system_config {
"Include hidden (system-level) actors"
)
.
add
(
verbosity
,
"verbosity,v"
,
"Debug output (from 0 to 2)"
);
// shutdown logging per default
logger_verbosity
=
quiet_log_lvl_atom
::
value
;
logger_verbosity
=
atom
(
"quiet"
)
;
}
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment