Move the complete library to stlab/concurrency

stlab · Jun 5, 2017 · fdbfacb · fdbfacb
1 parent 00725f7
commit fdbfacb
Show file tree

Hide file tree

Showing 35 changed files with 106 additions and 93 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,39 +5,35 @@ project(stlab C CXX)
 
 set(CMAKE_SKIP_RPATH OFF)
 
-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")  
-    #set(CMAKE_CXX_FLAGS "-g -Wall -O3 -std=c++14 -fsanitize=thread -fexceptions -D_GLIBCXX_USE_CXX11_ABI=0")
+  #set(CMAKE_CXX_FLAGS "-g -Wall -O3 -std=c++14 -fsanitize=thread -fexceptions -D_GLIBCXX_USE_CXX11_ABI=0")
-    set(CMAKE_CXX_FLAGS "-O3 -g -Wall -std=c++14 -fexceptions -ftemplate-backtrace-limit=0 -D_GLIBCXX_USE_CXX11_ABI=0")
+  set(CMAKE_CXX_FLAGS "-O3 -g -Wall -std=c++14 -fexceptions -ftemplate-backtrace-limit=0 -D_GLIBCXX_USE_CXX11_ABI=0")
-    set(CMAKE_LINK_FLAGS "-pthreads")
+  set(CMAKE_LINK_FLAGS "-pthreads")
-    SET (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_INIT} $ENV{LDFLAGS})
+  SET (CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_INIT} $ENV{LDFLAGS})
 endif()
 
-set (Boost_MULTITHREADED ON)
+set (Boost_MULTITHREADED ON) 
 
 if(WIN32)
-    add_definitions(-D_WIN32_WINNT=0x0601)
+  add_definitions(-D_WIN32_WINNT=0x0601)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
+  set(Boost_USE_STATIC_LIBS ON)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
+else()
+  set (Boost_USE_STATIC_LIBS ON)
 endif(WIN32)
 
 if(EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
     include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
     set(CONAN_SYSTEM_INCLUDES ON)
     conan_basic_setup()
 else()
-    if(MSVC)
-        set(Boost_USE_STATIC_LIBS TRUE)
-    endif()
-
     find_package(Boost 1.60.0 COMPONENTS unit_test_framework)
-
+
-    if(UNIX)
-        add_definitions("-DBOOST_TEST_DYN_LINK")
-    endif()
     include_directories(SYSTEM ${Boost_INCLUDE_DIR})
     link_directories(${Boost_LIBRARY_DIR})
 endif()
 
-set (Boost_MULTITHREADED ON)
+set (Boost_MULTITHREADED ON) 
 
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
 
@@ -50,4 +46,4 @@ endif()
 include_directories(.)
 
 add_subdirectory(test)
-add_subdirectory(playground)
+add_subdirectory(playground)
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Once they're set up, run either `setup_xcode.sh` or `setup_msvc.bat` for the pla
 
 # Build Status: [![Build Status](https://travis-ci.org/stlab/libraries.svg?branch=develop)](https://travis-ci.org/stlab/libraries)
 
-## <stlab/future>
+## <stlab/concurrency/future>
 
 This is a proof of concept implementation of a packaged task and future to replace the standard components. This is a list of some of the differences from standard (as of C++17) and boost (as of boost 1.60.0):
 

diff --git a/playground/CMakeLists.txt b/playground/CMakeLists.txt
@@ -13,10 +13,9 @@ include_directories(${Boost_INCLUDE_DIRS})
 
 target_link_libraries(
     playground
-#    future
+    ${Boost_LIBRARIES} 
-    ${Boost_SYSTEM_LIBRARY}
+    ${CMAKE_THREAD_LIBS_INIT} 
-    ${Boost_THREAD_LIBRARY}
+    ${CONAN_LIBS})
-    ${CMAKE_THREAD_LIBS_INIT})
 
 
 set_property(TARGET playground PROPERTY CXX_STANDARD 14)

diff --git a/playground/main.cpp b/playground/main.cpp
@@ -13,9 +13,7 @@ struct IUnknown;
 #include <sstream>
 #include <utility>
 
-#include <stlab/channel.hpp>
+#include <stlab/concurrency/concurrency.hpp>
-#include <stlab/default_executor.hpp>
-#include <stlab/future.hpp>
 
 using namespace stlab;
 using namespace std;
@@ -239,8 +237,7 @@ void activeProgressExample()
 #include <tuple>
 #include <iostream>
 
-#include <stlab/future.hpp>
+#include <stlab/concurrency/concurrency.hpp>
-#include <stlab/channel.hpp>
 
 using namespace stlab;
 using namespace std;

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -6,23 +6,17 @@ include_directories("${PROJECT_SOURCE_DIR}/..")
 #)
 
 set(HEADERS
-  ../stlab/channel.hpp
+  ../stlab/concurrency/channel.hpp
-  ../stlab/config.hpp
+  ../stlab/concurrency/config.hpp
-  ../stlab/default_executor.hpp
+  ../stlab/concurrency/default_executor.hpp
-  ../stlab/executor_base.hpp
+  ../stlab/concurrency/executor_base.hpp
-  ../stlab/expected.hpp
+  ../stlab/concurrency/future.hpp
-  ../stlab/future.hpp
+  ../stlab/concurrency/immediate_executor.hpp
-  ../stlab/immediate_executor.hpp
+  ../stlab/concurrency/main_executor.hpp
-  ../stlab/main_executor.hpp
+  ../stlab/concurrency/progress.hpp
-  ../stlab/progress.hpp
+  ../stlab/concurrency/system_timer.hpp
-  ../stlab/traits.hpp
+  ../stlab/concurrency/traits.hpp
-  ../stlab/tuple_algorithm.hpp
+  ../stlab/concurrency/tuple_algorithm.hpp
-  ../stlab/system_timer.hpp
+  ../stlab/concurrency/utility.hpp)
-  ../stlab/utility.hpp)
 
 include_directories(${Boost_INCLUDE_DIRS})
-
-#add_library(future ${SOURCE} ${HEADERS})
-#set_property(TARGET future PROPERTY CXX_STANDARD 14)
-#set_property(TARGET future PROPERTY CXX_STANDARD_REQUIRED ON)
-
diff --git a/stlab/channel.hpp → stlab/concurrency/channel.hpp b/stlab/channel.hpp → stlab/concurrency/channel.hpp
@@ -22,9 +22,9 @@
 #include <boost/optional.hpp>
 #include <boost/variant.hpp>
 
-#include <stlab/executor_base.hpp>
+#include "executor_base.hpp"
-#include <stlab/traits.hpp>
+#include "traits.hpp"
-#include <stlab/tuple_algorithm.hpp>
+#include "tuple_algorithm.hpp"
 
 
 #ifdef max

diff --git a/stlab/concurrency/concurrency.hpp b/stlab/concurrency/concurrency.hpp
@@ -0,0 +1,22 @@
+/*
+    Copyright 2017 Adobe
+    Distributed under the Boost Software License, Version 1.0.
+    (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+*/
+
+/**************************************************************************************************/
+
+#ifndef STLAB_CONCURRENCY_HPP
+#define STLAB_CONCURRENCY_HPP
+
+#include "channel.hpp"
+#include "default_executor.hpp"
+#include "executor_base.hpp"
+#include "future.hpp"
+#include "immediate_executor.hpp"
+#include "main_executor.hpp"
+#include "system_timer.hpp"
+#include "utility.hpp"
+
+#endif
+
diff --git a/stlab/config.hpp → stlab/concurrency/config.hpp b/stlab/config.hpp → stlab/concurrency/config.hpp
diff --git a/stlab/default_executor.hpp → stlab/concurrency/default_executor.hpp b/stlab/default_executor.hpp → stlab/concurrency/default_executor.hpp
diff --git a/stlab/executor_base.hpp → stlab/concurrency/executor_base.hpp b/stlab/executor_base.hpp → stlab/concurrency/executor_base.hpp
@@ -9,7 +9,7 @@
 
 #include <chrono>
 #include <functional>
-#include <stlab/system_timer.hpp>
+#include "system_timer.hpp"
 
 /**************************************************************************************************/
 

diff --git a/stlab/future.hpp → stlab/concurrency/future.hpp b/stlab/future.hpp → stlab/concurrency/future.hpp
@@ -17,9 +17,9 @@
 #include <vector>
 
 #include <boost/optional.hpp>
-#include <stlab/config.hpp>
+#include "config.hpp"
-#include <stlab/executor_base.hpp>
+#include "executor_base.hpp"
-#include <stlab/traits.hpp>
+#include "traits.hpp"
 
 /**************************************************************************************************/
 

diff --git a/stlab/immediate_executor.hpp → stlab/concurrency/immediate_executor.hpp b/stlab/immediate_executor.hpp → stlab/concurrency/immediate_executor.hpp
@@ -27,7 +27,7 @@ struct immediate_executor
     }
 
     template <typename F>
-    void operator()(std::chrono::system_clock::time_point, && f) {
+    void operator()(std::chrono::system_clock::time_point, F&& f) {
         std::forward<F>(f)();
     }
 };

diff --git a/stlab/main_executor.hpp → stlab/concurrency/main_executor.hpp b/stlab/main_executor.hpp → stlab/concurrency/main_executor.hpp
diff --git a/stlab/progress.hpp → stlab/concurrency/progress.hpp b/stlab/progress.hpp → stlab/concurrency/progress.hpp
diff --git a/stlab/system_timer.hpp → stlab/concurrency/system_timer.hpp b/stlab/system_timer.hpp → stlab/concurrency/system_timer.hpp
diff --git a/stlab/traits.hpp → stlab/concurrency/traits.hpp b/stlab/traits.hpp → stlab/concurrency/traits.hpp
diff --git a/stlab/tuple_algorithm.hpp → stlab/concurrency/tuple_algorithm.hpp b/stlab/tuple_algorithm.hpp → stlab/concurrency/tuple_algorithm.hpp
diff --git a/stlab/utility.hpp → stlab/concurrency/utility.hpp b/stlab/utility.hpp → stlab/concurrency/utility.hpp
@@ -19,7 +19,7 @@
 
 #endif
 
-#include <stlab/default_executor.hpp>
+#include "default_executor.hpp"
 
 /**************************************************************************************************/
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -21,18 +21,18 @@ set(SOURCE
 )
 
 set(HEADERS
-  ../stlab/channel.hpp
+  ../stlab/concurrency/channel.hpp
-  ../stlab/config.hpp
+  ../stlab/concurrency/config.hpp
-  ../stlab/default_executor.hpp
+  ../stlab/concurrency/default_executor.hpp
-  ../stlab/executor_base.hpp
+  ../stlab/concurrency/executor_base.hpp
-  ../stlab/future.hpp
+  ../stlab/concurrency/future.hpp
-  ../stlab/immediate_executor.hpp
+  ../stlab/concurrency/immediate_executor.hpp
-  ../stlab/main_executor.hpp
+  ../stlab/concurrency/main_executor.hpp
-  ../stlab/progress.hpp
+  ../stlab/concurrency/progress.hpp
-  ../stlab/traits.hpp
+  ../stlab/concurrency/system_timer.hpp
-  ../stlab/tuple_algorithm.hpp
+  ../stlab/concurrency/traits.hpp
-  ../stlab/system_timer.hpp
+  ../stlab/concurrency/tuple_algorithm.hpp
-  ../stlab/utility.hpp
+  ../stlab/concurrency/utility.hpp
   channel_test_helper.hpp
   test_helper.hpp
 )

diff --git a/test/channel_functor_tests.cpp b/test/channel_functor_tests.cpp
@@ -8,8 +8,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <stlab/channel.hpp>
+#include <stlab/concurrency/concurrency.hpp>
-#include <stlab/future.hpp>
 
 #include <vector>
 

diff --git a/test/channel_join_tests.cpp b/test/channel_join_tests.cpp
@@ -8,8 +8,8 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <stlab/channel.hpp>
+#include <stlab/concurrency/concurrency.hpp>
-#include <stlab/future.hpp>
+
 #include <string>
 
 #include "channel_test_helper.hpp"

diff --git a/test/channel_merge_tests.cpp b/test/channel_merge_tests.cpp
@@ -8,8 +8,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <stlab/channel.hpp>
+#include <stlab/concurrency/concurrency.hpp>
-#include <stlab/future.hpp>
 
 #include "channel_test_helper.hpp"
 

diff --git a/test/channel_process_tests.cpp b/test/channel_process_tests.cpp
@@ -8,8 +8,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <stlab/channel.hpp>
+#include <stlab/concurrency/concurrency.hpp>
-#include <stlab/future.hpp>
 
 #include <vector>
 #include <algorithm>

diff --git a/test/channel_test_helper.hpp b/test/channel_test_helper.hpp
@@ -9,8 +9,7 @@
 #ifndef _CHANNEL_TEST_HELPER_
 #define _CHANNEL_TEST_HELPER_
 
-#include <stlab/channel.hpp>
+#include <stlab/concurrency/concurrency.hpp>
-#include <stlab/default_executor.hpp>
 
 #include <queue>
 #include <thread>

diff --git a/test/channel_tests.cpp b/test/channel_tests.cpp
@@ -8,8 +8,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <stlab/channel.hpp>
+#include <stlab/concurrency/concurrency.hpp>
-#include <stlab/future.hpp>
 
 #include "channel_test_helper.hpp"
 

diff --git a/test/channel_zip_tests.cpp b/test/channel_zip_tests.cpp
@@ -8,8 +8,7 @@
 
 #include <boost/test/unit_test.hpp>
 
-#include <stlab/channel.hpp>
+#include <stlab/concurrency/concurrency.hpp>
-#include <stlab/future.hpp>
 
 #include <string>
 

diff --git a/test/future_recover_tests.cpp b/test/future_recover_tests.cpp
@@ -7,7 +7,8 @@
 /**************************************************************************************************/
 
 #include <boost/test/unit_test.hpp>
-#include <stlab/future.hpp>
+
+#include <stlab/concurrency/concurrency.hpp>
 
 #include "test_helper.hpp"
 

diff --git a/test/future_tests.cpp b/test/future_tests.cpp
@@ -8,7 +8,8 @@
 
 #include <boost/test/unit_test.hpp>
 #include <boost/mpl/list.hpp>
-#include <stlab/future.hpp>
+
+#include <stlab/concurrency/concurrency.hpp>
 
 #include "test_helper.hpp"
 

diff --git a/test/future_then_tests.cpp b/test/future_then_tests.cpp
@@ -7,7 +7,8 @@
 /**************************************************************************************************/
 
 #include <boost/test/unit_test.hpp>
-#include <stlab/future.hpp>
+
+#include <stlab/concurrency/concurrency.hpp>
 
 #include "test_helper.hpp"
 

diff --git a/test/future_when_all_arguments_tests.cpp b/test/future_when_all_arguments_tests.cpp
@@ -7,7 +7,9 @@
 /**************************************************************************************************/
 
 #include <boost/test/unit_test.hpp>
-#include <stlab/future.hpp>
+
+#include <stlab/concurrency/concurrency.hpp>
+
 #include <string>
 
 #include "test_helper.hpp"

diff --git a/test/future_when_all_range_tests.cpp b/test/future_when_all_range_tests.cpp
@@ -7,7 +7,8 @@
 /**************************************************************************************************/
 
 #include <boost/test/unit_test.hpp>
-#include <stlab/future.hpp>
+
+#include <stlab/concurrency/concurrency.hpp>
 
 #include "test_helper.hpp"
 

diff --git a/test/future_when_any_arguments_tests.cpp b/test/future_when_any_arguments_tests.cpp
@@ -6,9 +6,12 @@
 
 /**************************************************************************************************/
 
-#include <array>
+
 #include <boost/test/unit_test.hpp>
-#include <stlab/future.hpp>
+
+#include <stlab/concurrency/concurrency.hpp>
+
+#include <array>
 
 #include "test_helper.hpp"
 

diff --git a/test/future_when_any_range_tests.cpp b/test/future_when_any_range_tests.cpp
@@ -6,9 +6,12 @@
 
 /**************************************************************************************************/
 
-#include <array>
+
 #include <boost/test/unit_test.hpp>
-#include <stlab/future.hpp>
+
+#include <stlab/concurrency/concurrency.hpp>
+
+#include <array>
 
 #include "test_helper.hpp"