updated to c++14 and cleanup

Author: skarlsson

CMakeLists.txt

@@ -1,25 +1,58 @@
 cmake_minimum_required(VERSION 2.8.1)
 cmake_policy(SET CMP0015 NEW)
 
-include_directories(${CSI_INCLUDE_PATH} ${CMAKE_SOURCE_DIR} ${Boost_INCLUDE_DIRS})
+option(BUILD_SAMPLES "build examples" ON)
+
+set(CMAKE_CXX_STANDARD 14)
+
+find_package(Boost COMPONENTS log_setup log thread program_options filesystem system REQUIRED)
+set(BOOST_LIBS
+        ${Boost_LOG_LIBRARY}
+        ${Boost_LOG_SETUP_LIBRARY}
+        ${Boost_PROGRAM_OPTIONS_LIBRARY}
+        ${Boost_THREAD_LIBRARY}
+        ${Boost_SYSTEM_LIBRARY}
+        pthread
+        rt
+        c
+        )
 
 if(WIN32)
-	if (NOT DEFINED PGSQLSRC)
-		SET (PGSQLSRC "C:/Program Files/PostgreSQL/9.5")
-	endif()
-    include_directories(${PGSQLSRC}/include)
-	link_directories(${PGSQLSRC}/lib ${Boost_LIBRARY_DIRS}/$(Platform)/lib)
-	set(EXT_LIBS postgres_asio libpq libeay32 ssleay32 Ws2_32) 
-else()    
-	link_directories(${Boost_LIBRARY_DIRS})
-    set(EXT_LIBS postgres_asio boost_log boost_thread boost_system pthread pq)
-endif()
+  if (NOT DEFINED PGSQLSRC)
+    SET(PGSQLSRC "C:/Program Files/PostgreSQL/9.5")
+  endif ()
+  include_directories(${PGSQLSRC}/include ${CMAKE_SOURCE_DIR} ${Boost_INCLUDE_DIR})
+  link_directories(${PGSQLSRC}/lib ${Boost_LIBRARY_DIRS}/$(Platform)/lib)
+  set(EXT_LIBS postgres_asio libpq libeay32 ssleay32 Ws2_32)
+else ()
+  SET(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/lib)
+  SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin)
+  include_directories(${CMAKE_SOURCE_DIR} ${Boost_INCLUDE_DIR})
+  link_directories(${Boost_LIBRARY_DIRS})
+  set(EXT_LIBS postgres_asio pq ${BOOST_LIBS})
 
-add_subdirectory(postgres_asio)
+  add_definitions(-D_FILE_OFFSET_BITS=64 -D_REENTRANT -DEXTERNAL_LOCKS -DMULTITHREAD)
+  add_definitions(-fPIC)
+  add_definitions(-DBOOST_LOG_DYN_LINK)
 
-if(__BUILD_EXAMPLES__)
-add_subdirectory(samples)
 endif()
 
+SET(LIB_SRCS
+        postgres_asio/postgres_asio.h
+        postgres_asio/postgres_asio.cpp
+        )
+
+add_library(postgres_asio STATIC ${LIB_SRCS})
+
+add_executable(cursor_sample samples/cursor_sample.cpp)
+target_link_libraries(cursor_sample ${EXT_LIBS})
+
+add_executable(insert_sample samples/insert_sample.cpp)
+target_link_libraries(insert_sample ${EXT_LIBS})
+
+add_executable(query_sample samples/query_sample.cpp)
+target_link_libraries(query_sample ${EXT_LIBS})
+
+
 
 

build_linux.sh

@@ -1,6 +1,6 @@
 #include <future>
-#include <boost/bind.hpp>
 #include "postgres_asio.h"
+#include <boost/bind.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
@@ -30,8 +30,10 @@ namespace postgres_asio {
     _pg_conn(NULL),
     _warn_timeout(60000),
     _trace_id(trace_id) {
-    if(!_trace_id.size())
-      _trace_id = to_string(boost::uuids::random_generator()());
+    if (!_trace_id.size()) {
+      auto uuid = boost::uuids::random_generator();
+      _trace_id = to_string(uuid());
+    }
     BOOST_LOG_TRIVIAL(trace) << _trace_id << ", " << BOOST_CURRENT_FUNCTION;
   }
 

postgres_asio/CMakeLists.txt

@@ -1,31 +1,25 @@
 #pragma once
 #include <memory>
 #include <utility>
+#include <functional>
+#include <deque>
 #include <boost/asio.hpp>
-#include <boost/function.hpp>
 #include <boost/chrono/system_clocks.hpp>
-#include <deque>
 
 #ifdef WIN32
 #include <libpq-fe.h>
-#endif
-
-#ifdef __LINUX__
-#ifdef __CENTOS__
-#include <libpq-fe.h>
 #else
 #include <postgresql/libpq-fe.h>
 #endif
-#endif
 
 //inspiration
 //https://github.com/brianc/node-libpq
 
 namespace postgres_asio {
   class connection : public std::enable_shared_from_this<connection> {
   public:
-    typedef boost::function<void(int ec)>                            on_connect_callback;
-    typedef boost::function<void(int ec, std::shared_ptr<PGresult>)> on_query_callback;
+    typedef std::function<void(int ec)> on_connect_callback;
+    typedef std::function<void(int ec, std::shared_ptr<PGresult>)> on_query_callback;
 
     connection(boost::asio::io_service& fg, boost::asio::io_service& bg, std::string trace_id = "");
     ~connection();

postgres_asio/postgres_asio.cpp

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+rm -rf bin
+rm -rf lib
+rm -rf build
+mkdir build
+cd build
+cmake -DCMAKE_BUILD_TYPE=Release .. 
+make -j8
+cd ..
+

postgres_asio/postgres_asio.h

@@ -1,13 +1,11 @@
 #include <iostream>
+#include <memory>
+#include <thread>
 #include <postgres_asio/postgres_asio.h>
-#include <boost/thread.hpp>
-#include <boost/bind.hpp>
-#include <boost/make_shared.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
 
-
 void handle_fetch1000(std::shared_ptr<postgres_asio::connection> connection, size_t total_count, int ec, std::shared_ptr<PGresult> res) {
   if(ec)
     return;
@@ -37,10 +35,13 @@ int main(int argc, char *argv[]) {
 
   boost::asio::io_service fg_ios;
   boost::asio::io_service bg_ios;
-  std::auto_ptr<boost::asio::io_service::work> fg_work(new boost::asio::io_service::work(fg_ios)); // this keeps the fg_ios alive 
-  std::auto_ptr<boost::asio::io_service::work> bg_work(new boost::asio::io_service::work(bg_ios)); // this keeps the bg_ios alive
-  boost::thread fg(boost::bind(&boost::asio::io_service::run, &fg_ios));
-  boost::thread bg(boost::bind(&boost::asio::io_service::run, &bg_ios));
+  auto fg_work(std::make_unique<boost::asio::io_service::work>(fg_ios)); // this keeps the fg_ios alive
+  auto bg_work(std::make_unique<boost::asio::io_service::work>(bg_ios)); // this keeps the bg_ios alive
+  std::thread fg([&] { fg_ios.run(); });
+  std::thread bg([&] { bg_ios.run(); });
+
+  //boost::thread fg(boost::bind(&boost::asio::io_service::run, &fg_ios));
+  //boost::thread bg(boost::bind(&boost::asio::io_service::run, &bg_ios));
 
   auto connection = std::make_shared<postgres_asio::connection>(fg_ios, bg_ios);
   connection->set_warning_timout(100);

rebuild.sh

@@ -1,8 +1,6 @@
 #include <iostream>
+#include <thread>
 #include <postgres_asio/postgres_asio.h>
-#include <boost/thread.hpp>
-#include <boost/bind.hpp>
-#include <boost/make_shared.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
@@ -21,10 +19,10 @@ int main(int argc, char *argv[]) {
 
   boost::asio::io_service fg_ios;
   boost::asio::io_service bg_ios;
-  std::auto_ptr<boost::asio::io_service::work> fg_work(new boost::asio::io_service::work(fg_ios)); // this keeps the fg_ios alive 
-  std::auto_ptr<boost::asio::io_service::work> bg_work(new boost::asio::io_service::work(bg_ios)); // this keeps the bg_ios alive
-  boost::thread fg(boost::bind(&boost::asio::io_service::run, &fg_ios));
-  boost::thread bg(boost::bind(&boost::asio::io_service::run, &bg_ios));
+  auto fg_work(std::make_unique<boost::asio::io_service::work>(fg_ios)); // this keeps the fg_ios alive
+  auto bg_work(std::make_unique<boost::asio::io_service::work>(bg_ios)); // this keeps the bg_ios alive
+  std::thread fg([&] { fg_ios.run(); });
+  std::thread bg([&] { bg_ios.run(); });
 
   // precondition CREATE TABLE postgres_asio_sample  ( id integer, val text )
 
@@ -35,9 +33,10 @@ int main(int argc, char *argv[]) {
       if(!ec) {
         std::string statement = "insert into postgres_asio_sample (id, val) VALUES\n";
         size_t items = 100;
-        for(int i = 0; i != items; ++i) {
-          const char* ch = i < (items - 1) ? ",\n" : ";\n";
-          std::string val = to_string(boost::uuids::random_generator()());
+        for (int j = 0; j != items; ++j) {
+          const char *ch = j < (items - 1) ? ",\n" : ";\n";
+          auto uuid = boost::uuids::random_generator();
+          std::string val = to_string(uuid());
           statement += " (" + std::to_string(i) + ", '" + val + "')" + ch;
         }
 

samples/CMakeLists.txt

@@ -1,8 +1,6 @@
 #include <iostream>
+#include <thread>
 #include <postgres_asio/postgres_asio.h>
-#include <boost/thread.hpp>
-#include <boost/bind.hpp>
-#include <boost/make_shared.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>
@@ -17,10 +15,10 @@ int main(int argc, char *argv[]) {
 
   boost::asio::io_service fg_ios;
   boost::asio::io_service bg_ios;
-  std::auto_ptr<boost::asio::io_service::work> fg_work(new boost::asio::io_service::work(fg_ios)); // this keeps the fg_ios alive 
-  std::auto_ptr<boost::asio::io_service::work> bg_work(new boost::asio::io_service::work(bg_ios)); // this keeps the bg_ios alive
-  boost::thread fg(boost::bind(&boost::asio::io_service::run, &fg_ios));
-  boost::thread bg(boost::bind(&boost::asio::io_service::run, &bg_ios));
+  auto fg_work(std::make_unique<boost::asio::io_service::work>(fg_ios)); // this keeps the fg_ios alive
+  auto bg_work(std::make_unique<boost::asio::io_service::work>(bg_ios)); // this keeps the bg_ios alive
+  std::thread fg([&] { fg_ios.run(); });
+  std::thread bg([&] { bg_ios.run(); });
 
   auto connection = std::make_shared<postgres_asio::connection>(fg_ios, bg_ios);
   connection->connect(connect_string, [connection](int ec) {