Issue 727b - A second option

CMakeLists.txt

@@ -4,8 +4,6 @@
 PROJECT( fc )
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
 
-add_compile_options(-std=c++14)
-
 MESSAGE(STATUS "Configuring project fc located in: ${CMAKE_CURRENT_SOURCE_DIR}")
 SET( CMAKE_AUTOMOC OFF )
 
@@ -106,15 +104,15 @@ endif ( MSVC )
 
 # Configure editline
 if ( MSVC )
-    # autoconf won't work here, hard code the defines
-    set( EDITLINE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vendor/editline" )
-
-    file( GLOB EDITLINE_SOURCES "${EDITLINE_DIR}/src/editline.c" )
-    add_library( editline ${EDITLINE_SOURCES} )
-
-    target_include_directories( editline PRIVATE "${EDITLINE_DIR}" PUBLIC "${EDITLINE_DIR}/include" )
-
-    set_target_properties( editline PROPERTIES COMPILE_DEFINITIONS LINKER_LANGUAGE C )
+#    # autoconf won't work here, hard code the defines
+#    set( EDITLINE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vendor/editline" )
+#
+#    file( GLOB EDITLINE_SOURCES "${EDITLINE_DIR}/src/editline.c" )
+#    add_library( editline ${EDITLINE_SOURCES} )
+#
+#    target_include_directories( editline PRIVATE "${EDITLINE_DIR}" PUBLIC "${EDITLINE_DIR}/include" )
+#
+#    set_target_properties( editline PROPERTIES COMPILE_DEFINITIONS LINKER_LANGUAGE C )
 else ( MSVC )
     include(ExternalProject)
     if ( MINGW )
@@ -234,7 +232,6 @@ set( fc_sources
      src/io/varint.cpp
      src/io/console.cpp
      src/filesystem.cpp
-     src/interprocess/process.cpp
      src/interprocess/signals.cpp
      src/interprocess/file_mapping.cpp
      src/interprocess/mmap_struct.cpp
@@ -284,6 +281,7 @@ set( fc_sources
      src/network/url.cpp
      src/compress/smaz.cpp
      src/compress/zlib.cpp
+     src/stacktrace.cpp
      )
 
 file( GLOB_RECURSE fc_headers ${CMAKE_CURRENT_SOURCE_DIR} *.hpp *.h )
@@ -302,8 +300,10 @@ setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC )
 install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION include )
 
 # begin editline stuff
-target_compile_definitions (fc PRIVATE HAVE_EDITLINE)
-set(editline_libraries editline)
+if(NOT MSVC)
+  target_compile_definitions (fc PRIVATE HAVE_EDITLINE)
+  set(editline_libraries editline)
+endif(NOT MSVC)
 if(WIN32)
   target_compile_definitions( fc PRIVATE _CRT_NONSTDC_NO_DEPRECATE )
 endif(WIN32)
@@ -403,7 +403,6 @@ target_include_directories(fc
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/websocketpp
 
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/boost_1.51/include
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
   )
 

include/fc/crypto/sha256.hpp

@@ -3,6 +3,7 @@
 #include <fc/string.hpp>
 #include <fc/platform_independence.hpp>
 #include <fc/io/raw_fwd.hpp>
+#include <boost/functional/hash.hpp>
 
 namespace fc
 {
@@ -140,9 +141,10 @@ namespace boost
     {
        size_t operator()( const fc::sha256& s )const
        {
-           return  s._hash[3];//*((size_t*)&s);
+           return  s._hash[3];// *((size_t*)&s);
        }
     };
 }
+
 #include <fc/reflect/reflect.hpp>
 FC_REFLECT_TYPENAME( fc::sha256 )

include/fc/stacktrace.hpp

@@ -0,0 +1,16 @@
+// stacktrace.h (c) 2008, Timo Bingmann from http://idlebox.net/
+// published under the WTFPL v2.0
+
+// Downloaded from http://panthema.net/2008/0901-stacktrace-demangled/
+// and modified for C++ and FC by Steemit, Inc.
+
+#pragma once
+
+#include <iostream>
+
+namespace fc {
+
+void print_stacktrace(std::ostream& out);
+void print_stacktrace_on_segfault();
+
+}

src/log/file_appender.cpp

@@ -9,6 +9,7 @@
 #include <iomanip>
 #include <queue>
 #include <sstream>
+#include <iostream>
 
 namespace fc {
 

src/network/tcp_socket.cpp

@@ -183,7 +183,7 @@ namespace fc {
 #elif !defined(__clang__) || (__clang_major__ >= 6)
       // This should work for modern Linuxes and for OSX >= Mountain Lion
       int timeout_sec = interval.count() / fc::seconds(1).count();
-      if (setsockopt(my->_sock.native(), IPPROTO_TCP, 
+      if (setsockopt(my->_sock.native_handle(), IPPROTO_TCP,
       #if defined( __APPLE__ )
                      TCP_KEEPALIVE,
        #else
@@ -192,7 +192,7 @@ namespace fc {
                      (char*)&timeout_sec, sizeof(timeout_sec)) < 0)
         wlog("Error setting TCP keepalive idle time");
 # if !defined(__APPLE__) || defined(TCP_KEEPINTVL) // TCP_KEEPINTVL not defined before 10.9
-      if (setsockopt(my->_sock.native(), IPPROTO_TCP, TCP_KEEPINTVL, 
+      if (setsockopt(my->_sock.native_handle(), IPPROTO_TCP, TCP_KEEPINTVL,
                      (char*)&timeout_sec, sizeof(timeout_sec)) < 0)
         wlog("Error setting TCP keepalive interval");
 # endif // !__APPLE__ || TCP_KEEPINTVL
@@ -224,7 +224,7 @@ namespace fc {
     if (detail::have_so_reuseport)
     {
       int reuseport_value = 1;
-      if (setsockopt(my->_sock.native(), SOL_SOCKET, SO_REUSEPORT, 
+      if (setsockopt(my->_sock.native_handle(), SOL_SOCKET, SO_REUSEPORT,
                      (char*)&reuseport_value, sizeof(reuseport_value)) < 0)
       {
         if (errno == ENOPROTOOPT)
@@ -291,7 +291,7 @@ namespace fc {
     if (detail::have_so_reuseport)
     {
       int reuseport_value = 1;
-      if (setsockopt(my->_accept.native(), SOL_SOCKET, SO_REUSEPORT, 
+      if (setsockopt(my->_accept.native_handle(), SOL_SOCKET, SO_REUSEPORT,
                      (char*)&reuseport_value, sizeof(reuseport_value)) < 0)
       {
         if (errno == ENOPROTOOPT)

src/stacktrace.cpp

@@ -0,0 +1,31 @@
+//
+// A stacktrace handler for bitshares
+//
+
+#include <signal.h>
+#include <fc/log/logger.hpp>
+#include <boost/stacktrace.hpp>
+
+namespace fc
+{
+
+static void segfault_signal_handler(int signum)
+{
+   ::signal(signum, SIG_DFL);
+   std::stringstream ss;
+   ss << boost::stacktrace::stacktrace();
+   elog(ss.str());
+   ::raise(SIGABRT);
+}
+
+void print_stacktrace_on_segfault()
+{
+   ::signal(SIGSEGV, &segfault_signal_handler);
+}
+
+void print_stacktrace(std::ostream& out)
+{
+   out << boost::stacktrace::stacktrace();
+}
+
+}

tests/CMakeLists.txt

@@ -57,6 +57,7 @@ add_executable( all_tests all_tests.cpp
                           bloom_test.cpp
                           real128_test.cpp
                           serialization_test.cpp
+                          stacktrace_test.cpp
                           time_test.cpp
                           utf8_test.cpp
                           variant_test.cpp