Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge latest fc changes into develop branch #11

Merged
pbsa-gitlab merged 19 commits from latest-fc into develop 2019-12-16 18:09:04 +00:00
Conversation 0 Commits 19 Files changed 89 +186 -157
6 changed files with 186 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6bc240a80d - Show all commits

19
include/fc/fixed_string.hpp
View file

@ -121,11 +121,30 @@ namespace fc {
left -= 1024;
}
s.read( buf, left );
/*
s.seekp( s.tellp() + (size.value - sizeof(Storage)) );
char tmp;
size.value -= sizeof(storage);
while( size.value ){ s.read( &tmp, 1 ); --size.value; }
*/
// s.skip( size.value - sizeof(Storage) );
} else {
s.read( (char*)&u.data, size.value );
}
}
}
/*
template<typename Stream, typename... Args>
inline void pack( Stream& s, const boost::multiprecision::number<Args...>& d ) {
s.write( (const char*)&d, sizeof(d) );
}
template<typename Stream, typename... Args>
inline void unpack( Stream& s, boost::multiprecision::number<Args...>& u ) {
s.read( (const char*)&u, sizeof(u) );
}
*/
}
}

2
include/fc/interprocess/container.hpp
View file

@ -104,6 +104,8 @@ namespace fc {
size_t r = fc::from_hex( str, d.data(), d.size() );
FC_ASSERT( r == d.size() );
}
// std::string b64 = base64_decode( var.as_string() );
// vo = std::vector<char>( b64.c_str(), b64.c_str() + b64.size() );
}
namespace raw {

12
include/fc/io/raw.hpp
View file

@ -667,6 +667,18 @@ namespace fc {
return vec;
}
template<typename T, typename... Next>
inline std::vector<char> pack( const T& v, Next... next ) {
datastream<size_t> ps;
fc::raw::pack(ps,v,next...);
std::vector<char> vec(ps.tellp());
if( vec.size() ) {
datastream<char*> ds( vec.data(), size_t(vec.size()) );
fc::raw::pack(ds,v,next...);
}
return vec;
}
template<typename T>
inline T unpack( const std::vector<char>& s, uint32_t _max_depth )

3
include/fc/io/raw_fwd.hpp
View file

@ -62,9 +62,6 @@ namespace fc {
template<typename Stream, typename K, typename V> inline void pack( Stream& s, const std::map<K,V>& value, uint32_t _max_depth=FC_PACK_MAX_DEPTH );
template<typename Stream, typename K, typename V> inline void unpack( Stream& s, std::map<K,V>& value, uint32_t _max_depth=FC_PACK_MAX_DEPTH );
//template<typename Stream, typename K, typename... V> inline void pack( Stream& s, const flat_map<K,V...>& value, uint32_t _max_depth=FC_PACK_MAX_DEPTH );
//template<typename Stream, typename K, typename V, typename... A> inline void unpack( Stream& s, flat_map<K,V,A...>& value, uint32_t _max_depth=FC_PACK_MAX_DEPTH );
template<typename Stream, typename K, typename V> inline void pack( Stream& s, const std::pair<K,V>& value, uint32_t _max_depth=FC_PACK_MAX_DEPTH );
template<typename Stream, typename K, typename V> inline void unpack( Stream& s, std::pair<K,V>& value, uint32_t _max_depth=FC_PACK_MAX_DEPTH );

306
src/log/console_appender.cpp
View file

@ -1,153 +1,153 @@
#include <fc/log/console_appender.hpp>
#include <fc/log/log_message.hpp>
#include <fc/thread/unique_lock.hpp>
#include <fc/string.hpp>
#include <fc/variant.hpp>
#include <fc/reflect/variant.hpp>
#ifndef WIN32
#include <unistd.h>
#endif
#include <boost/thread/mutex.hpp>
#define COLOR_CONSOLE 1
#include "console_defines.h"
#include <fc/io/stdio.hpp>
#include <fc/exception/exception.hpp>
#include <iomanip>
#include <sstream>
#include <mutex>
namespace fc {
class console_appender::impl {
public:
config cfg;
color::type lc[log_level::off+1];
#ifdef WIN32
HANDLE console_handle;
#endif
};
console_appender::console_appender( const variant& args )
:my(new impl)
{
configure( args.as<config>( FC_MAX_LOG_OBJECT_DEPTH ) );
}
console_appender::console_appender( const config& cfg )
:my(new impl)
{
configure( cfg );
}
console_appender::console_appender()
:my(new impl){}
void console_appender::configure( const config& console_appender_config )
{ try {
#ifdef WIN32
my->console_handle = INVALID_HANDLE_VALUE;
#endif
my->cfg = console_appender_config;
#ifdef WIN32
if (my->cfg.stream = stream::std_error)
my->console_handle = GetStdHandle(STD_ERROR_HANDLE);
else if (my->cfg.stream = stream::std_out)
my->console_handle = GetStdHandle(STD_OUTPUT_HANDLE);
#endif
for( int i = 0; i < log_level::off+1; ++i )
my->lc[i] = color::console_default;
for( auto itr = my->cfg.level_colors.begin(); itr != my->cfg.level_colors.end(); ++itr )
my->lc[itr->level] = itr->color;
} FC_CAPTURE_AND_RETHROW( (console_appender_config) ) }
console_appender::~console_appender() {}
#ifdef WIN32
static WORD
#else
static const char*
#endif
get_console_color(console_appender::color::type t ) {
switch( t ) {
case console_appender::color::red: return CONSOLE_RED;
case console_appender::color::green: return CONSOLE_GREEN;
case console_appender::color::brown: return CONSOLE_BROWN;
case console_appender::color::blue: return CONSOLE_BLUE;
case console_appender::color::magenta: return CONSOLE_MAGENTA;
case console_appender::color::cyan: return CONSOLE_CYAN;
case console_appender::color::white: return CONSOLE_WHITE;
case console_appender::color::console_default:
default:
return CONSOLE_DEFAULT;
}
}
boost::mutex& log_mutex() {
static boost::mutex m; return m;
}
void console_appender::log( const log_message& m ) {
FILE* out = stream::std_error ? stderr : stdout;
std::stringstream file_line;
file_line << m.get_context().get_file() <<":"<<m.get_context().get_line_number() <<" ";
///////////////
std::stringstream line;
line << (m.get_context().get_timestamp().time_since_epoch().count() % (1000ll*1000ll*60ll*60))/1000 <<"ms ";
line << std::setw( 10 ) << std::left << m.get_context().get_thread_name().substr(0,9).c_str() <<" "<<std::setw(30)<< std::left <<file_line.str();
auto me = m.get_context().get_method();
// strip all leading scopes...
if( me.size() )
{
uint32_t p = 0;
for( uint32_t i = 0;i < me.size(); ++i )
{
if( me[i] == ':' ) p = i;
}
if( me[p] == ':' ) ++p;
line << std::setw( 20 ) << std::left << m.get_context().get_method().substr(p,20).c_str() <<" ";
}
line << "] ";
fc::string message = fc::format_string( m.get_format(), m.get_data(), my->cfg.max_object_depth );
line << message;
fc::unique_lock<boost::mutex> lock(log_mutex());
print( line.str(), my->lc[m.get_context().get_log_level()] );
fprintf( out, "\n" );
if( my->cfg.flush ) fflush( out );
}
void console_appender::print( const std::string& text, color::type text_color )
{
FILE* out = stream::std_error ? stderr : stdout;
#ifdef WIN32
if (my->console_handle != INVALID_HANDLE_VALUE)
SetConsoleTextAttribute(my->console_handle, get_console_color(text_color));
#else
if(isatty(fileno(out))) fprintf( out, "\r%s", get_console_color( text_color ) );
#endif
if( text.size() )
fprintf( out, "%s", text.c_str() );
#ifdef WIN32
if (my->console_handle != INVALID_HANDLE_VALUE)
SetConsoleTextAttribute(my->console_handle, CONSOLE_DEFAULT);
#else
if(isatty(fileno(out))) fprintf( out, "\r%s", CONSOLE_DEFAULT );
#endif
if( my->cfg.flush ) fflush( out );
}
}
#include <fc/log/console_appender.hpp>
#include <fc/log/log_message.hpp>
#include <fc/thread/unique_lock.hpp>
#include <fc/string.hpp>
#include <fc/variant.hpp>
#include <fc/reflect/variant.hpp>
#ifndef WIN32
#include <unistd.h>
#endif
#include <boost/thread/mutex.hpp>
#define COLOR_CONSOLE 1
#include "console_defines.h"
#include <fc/io/stdio.hpp>
#include <fc/exception/exception.hpp>
#include <iomanip>
#include <sstream>
#include <mutex>
namespace fc {
class console_appender::impl {
public:
config cfg;
color::type lc[log_level::off+1];
#ifdef WIN32
HANDLE console_handle;
#endif
};
console_appender::console_appender( const variant& args )
:my(new impl)
{
configure( args.as<config>( FC_MAX_LOG_OBJECT_DEPTH ) );
}
console_appender::console_appender( const config& cfg )
:my(new impl)
{
configure( cfg );
}
console_appender::console_appender()
:my(new impl){}
void console_appender::configure( const config& console_appender_config )
{ try {
#ifdef WIN32
my->console_handle = INVALID_HANDLE_VALUE;
#endif
my->cfg = console_appender_config;
#ifdef WIN32
if (my->cfg.stream = stream::std_error)
my->console_handle = GetStdHandle(STD_ERROR_HANDLE);
else if (my->cfg.stream = stream::std_out)
my->console_handle = GetStdHandle(STD_OUTPUT_HANDLE);
#endif
for( int i = 0; i < log_level::off+1; ++i )
my->lc[i] = color::console_default;
for( auto itr = my->cfg.level_colors.begin(); itr != my->cfg.level_colors.end(); ++itr )
my->lc[itr->level] = itr->color;
} FC_CAPTURE_AND_RETHROW( (console_appender_config) ) }
console_appender::~console_appender() {}
#ifdef WIN32
static WORD
#else
static const char*
#endif
get_console_color(console_appender::color::type t ) {
switch( t ) {
case console_appender::color::red: return CONSOLE_RED;
case console_appender::color::green: return CONSOLE_GREEN;
case console_appender::color::brown: return CONSOLE_BROWN;
case console_appender::color::blue: return CONSOLE_BLUE;
case console_appender::color::magenta: return CONSOLE_MAGENTA;
case console_appender::color::cyan: return CONSOLE_CYAN;
case console_appender::color::white: return CONSOLE_WHITE;
case console_appender::color::console_default:
default:
return CONSOLE_DEFAULT;
}
}
boost::mutex& log_mutex() {
static boost::mutex m; return m;
}
void console_appender::log( const log_message& m ) {
FILE* out = stream::std_error ? stderr : stdout;
std::stringstream file_line;
file_line << m.get_context().get_file() <<":"<<m.get_context().get_line_number() <<" ";
///////////////
std::stringstream line;
line << (m.get_context().get_timestamp().time_since_epoch().count() % (1000ll*1000ll*60ll*60))/1000 <<"ms ";
line << std::setw( 10 ) << std::left << m.get_context().get_thread_name().substr(0,9).c_str() <<" "<<std::setw(30)<< std::left <<file_line.str();
auto me = m.get_context().get_method();
// strip all leading scopes...
if( me.size() )
{
uint32_t p = 0;
for( uint32_t i = 0;i < me.size(); ++i )
{
if( me[i] == ':' ) p = i;
}
if( me[p] == ':' ) ++p;
line << std::setw( 20 ) << std::left << m.get_context().get_method().substr(p,20).c_str() <<" ";
}
line << "] ";
fc::string message = fc::format_string( m.get_format(), m.get_data(), my->cfg.max_object_depth );
line << message;
fc::unique_lock<boost::mutex> lock(log_mutex());
print( line.str(), my->lc[m.get_context().get_log_level()] );
fprintf( out, "\n" );
if( my->cfg.flush ) fflush( out );
}
void console_appender::print( const std::string& text, color::type text_color )
{
FILE* out = stream::std_error ? stderr : stdout;
#ifdef WIN32
if (my->console_handle != INVALID_HANDLE_VALUE)
SetConsoleTextAttribute(my->console_handle, get_console_color(text_color));
#else
if(isatty(fileno(out))) fprintf( out, "\r%s", get_console_color( text_color ) );
#endif
if( text.size() )
fprintf( out, "%s", text.c_str() );
#ifdef WIN32
if (my->console_handle != INVALID_HANDLE_VALUE)
SetConsoleTextAttribute(my->console_handle, CONSOLE_DEFAULT);
#else
if(isatty(fileno(out))) fprintf( out, "\r%s", CONSOLE_DEFAULT );
#endif
if( my->cfg.flush ) fflush( out );
}
}

1
src/string.cpp
View file

@ -312,7 +312,6 @@ namespace fc {
}
return ss.str();
}
} // namespace fc