Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)

PROJECT(Concurrent_utils CXX)
ENABLE_TESTING()

IF(WIN32)
add_definitions(-DBOOST_ALL_DYN_LINK)
ENDIF(WIN32)

set(Boost_USE_STATIC_LIBS OFF)
set(Boost_USE_MULTITHREADED ON)
SET(BOOST_MIN_VERSION "1.40.0")
FIND_PACKAGE(Boost ${BOOST_MIN_VERSION} COMPONENTS thread date_time unit_test_framework REQUIRED)
IF(Boost_FOUND)
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
IF(UNIX)
list( APPEND Boost_LIBRARIES pthread)
ENDIF(UNIX)
ELSE(Boost_FOUND)
MESSAGE(FATAL_ERROR
"Can't find BOOST libraries")
ENDIF(Boost_FOUND)

INCLUDE_DIRECTORIES(./)
ADD_SUBDIRECTORY(examples)
ADD_SUBDIRECTORY(tests)

2 changes: 1 addition & 1 deletion concurrent/cache/lookahead_cache.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ struct lookahead_cache {
boost::mutex::scoped_lock lock(m_WorkerMutex);
do {
unit = nextWorkUnit();
D_( std::cout << "next unit is : " << unit.filename << std::endl);
D_( std::cout << "next unit is : " << unit << std::endl);
boost::mutex::scoped_lock lock(m_CacheMutex);
switch (m_SharedCache.update(unit)) {
case FULL:
Expand Down
12 changes: 12 additions & 0 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
ADD_EXECUTABLE(BoundedQueueSingleWorker BoundedQueueSingleWorker.cpp)
ADD_EXECUTABLE(ConcurrentSlot ConcurrentSlot.cpp)
ADD_EXECUTABLE(LookAheadCache LookAheadCache.cpp)
ADD_EXECUTABLE(QueueManyWorkers QueueManyWorkers.cpp)
ADD_EXECUTABLE(QueueSingleWorker QueueSingleWorker.cpp)

#LINK libraries
TARGET_LINK_LIBRARIES(BoundedQueueSingleWorker ${Boost_LIBRARIES})
TARGET_LINK_LIBRARIES(ConcurrentSlot ${Boost_LIBRARIES})
TARGET_LINK_LIBRARIES(LookAheadCache ${Boost_LIBRARIES})
TARGET_LINK_LIBRARIES(QueueManyWorkers ${Boost_LIBRARIES})
TARGET_LINK_LIBRARIES(QueueSingleWorker ${Boost_LIBRARIES})
14 changes: 14 additions & 0 deletions tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

ADD_EXECUTABLE(concurrent_slot_tests concurrent_slot_tests.cpp)
ADD_EXECUTABLE(concurrent_queue_tests concurrent_queue_tests.cpp)
ADD_EXECUTABLE(cache_tests cache_tests.cpp)

TARGET_LINK_LIBRARIES(concurrent_slot_tests ${Boost_LIBRARIES})
TARGET_LINK_LIBRARIES(concurrent_queue_tests ${Boost_LIBRARIES})
TARGET_LINK_LIBRARIES(cache_tests ${Boost_LIBRARIES})

ADD_TEST(concurrent_slot_tests concurrent_slot_tests)
ADD_TEST(concurrent_queue_tests concurrent_queue_tests)
ADD_TEST(cache_tests cache_tests)

ADD_SUBDIRECTORY(benchmark)
4 changes: 4 additions & 0 deletions tests/benchmark/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

ADD_EXECUTABLE(cache_benchmark_tests cache_benchmark_tests.cpp)
TARGET_LINK_LIBRARIES(cache_benchmark_tests ${Boost_LIBRARIES})
ADD_TEST(cache_benchmark_tests cache_benchmark_tests)
2 changes: 1 addition & 1 deletion tests/cache_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <iostream>

#define BOOST_TEST_MODULE CacheTestModule
#include <boost/test/included/unit_test.hpp>
#include <boost/test/unit_test.hpp>

using namespace std;
using namespace concurrent::cache;
Expand Down
2 changes: 1 addition & 1 deletion tests/concurrent_queue_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <boost/assign/list_of.hpp>

#define BOOST_TEST_MODULE ConcurrentQueueTestModule
#include <boost/test/included/unit_test.hpp>
#include <boost/test/unit_test.hpp>

using namespace std;

Expand Down
2 changes: 1 addition & 1 deletion tests/concurrent_slot_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <concurrent/slot.hpp>

#define BOOST_TEST_MODULE ConcurrentSlotTestModule
#include <boost/test/included/unit_test.hpp>
#include <boost/test/unit_test.hpp>

using namespace concurrent;

Expand Down