Skip to content

Commit

Permalink
Update CC README.md; also update CMakeLists.txt variable names
Browse files Browse the repository at this point in the history
Corrected references to "FAST/cc" to refer to "FASTER/cc"; corrected
CMakeLists.txt variable names from "...FAST_..." to "...FASTER_..."
  • Loading branch information
jahunter-m committed Aug 15, 2018
1 parent 6d19804 commit 0e55be7
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 33 deletions.
20 changes: 10 additions & 10 deletions cc/CMakeLists.txt
Expand Up @@ -60,38 +60,38 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

set (FAST_LINK_LIBS
set (FASTER_LINK_LIBS
faster
)

# Set the link libraries to for test compilation
set (FAST_TEST_LINK_LIBS ${FAST_LINK_LIBS} gtest)
set (FASTER_TEST_LINK_LIBS ${FASTER_LINK_LIBS} gtest)
if(WIN32)
else()
set (FAST_TEST_LINK_LIBS ${FAST_TEST_LINK_LIBS} stdc++fs uuid tbb gcc aio m stdc++ pthread)
set (FASTER_TEST_LINK_LIBS ${FASTER_TEST_LINK_LIBS} stdc++fs uuid tbb gcc aio m stdc++ pthread)
endif()

# Set the link libraries to for benchmark binary compilation
set (FAST_BENCHMARK_LINK_LIBS ${FAST_LINK_LIBS})
set (FASTER_BENCHMARK_LINK_LIBS ${FASTER_LINK_LIBS})
if(WIN32)
set (FAST_BENCHMARK_LINK_LIBS ${FAST_LINK_LIBS} wsock32 Ws2_32)
set (FASTER_BENCHMARK_LINK_LIBS ${FASTER_LINK_LIBS} wsock32 Ws2_32)
else()
set (FAST_BENCHMARK_LINK_LIBS ${FAST_BENCHMARK_LINK_LIBS} stdc++fs uuid tbb gcc aio m stdc++ pthread)
set (FASTER_BENCHMARK_LINK_LIBS ${FASTER_BENCHMARK_LINK_LIBS} stdc++fs uuid tbb gcc aio m stdc++ pthread)
endif()

#Function to automate building test binaries
FUNCTION(ADD_FAST_TEST TEST_NAME HEADERS)
FUNCTION(ADD_FASTER_TEST TEST_NAME HEADERS)
add_executable(${TEST_NAME} ${HEADERS} ${TEST_NAME}.cc)

target_link_libraries(${TEST_NAME} ${FAST_TEST_LINK_LIBS})
target_link_libraries(${TEST_NAME} ${FASTER_TEST_LINK_LIBS})
add_test(${TEST_NAME} ${CMAKE_BINARY_DIR}/${TEST_NAME})
ENDFUNCTION()

#Function to automate building benchmark binaries
FUNCTION(ADD_FAST_BENCHMARK BENCHMARK_NAME)
FUNCTION(ADD_FASTER_BENCHMARK BENCHMARK_NAME)
add_executable(${BENCHMARK_NAME} ${BENCHMARK_HEADERS} ${BENCHMARK_NAME}.cc)

target_link_libraries(${BENCHMARK_NAME} ${FAST_BENCHMARK_LINK_LIBS})
target_link_libraries(${BENCHMARK_NAME} ${FASTER_BENCHMARK_LINK_LIBS})
ENDFUNCTION()

# Build each subdirectory
Expand Down
14 changes: 7 additions & 7 deletions cc/README.md
Expand Up @@ -7,7 +7,7 @@ them, as needed, during ordinary build.

Building on Windows
-------------------
Create new directory "build" off the root directory (FAST\cc). From the new
Create new directory "build" off the root directory (FASTER\cc). From the new
"build" directory, execute:

cmake .. -G "<MSVC compiler> Win64"
Expand All @@ -24,7 +24,7 @@ build profiles to FASTER.sln, including Debug/x64 and Release/x64.
Building on Linux
-----------------
The Linux build requires several packages (both libraries and header files);
see "CMakeFiles.txt" in the root directory (FAST/cc) for the list of libraries
see "CMakeFiles.txt" in the root directory (FASTER/cc) for the list of libraries
being linked to, on Linux.

As of this writing, the required libraries are:
Expand All @@ -42,7 +42,7 @@ Debug or Release build, but not both; so you'll have to run CMake twice, in two
different directories, to get both Debug and Release build scripts.

Create new directories "build/Debug" and "build/Release" off the root directory
(FAST/cc). From "build/Debug", run:
(FASTER/cc). From "build/Debug", run:

cmake -DCMAKE_BUILD_TYPE=Debug ../..

Expand All @@ -56,13 +56,13 @@ relevant build directory.
Other options
-------------
You can try other generators (compilers) supported by CMake. The main CMake
build script is the CMakeLists.txt located in the root directory (FAST/cc).
build script is the CMakeLists.txt located in the root directory (FASTER/cc).

Examples
========
There are some unit tests in FAST/cc/test.
There are some unit tests in FASTER/cc/test.

Sum-store, located in FAST/cc/playground/sum_store-dir, is a good example of
Sum-store, located in FASTER/cc/playground/sum_store-dir, is a good example of
checkpointing and recovery.

There's a basic YCSB test driver in FAST/cc/benchmark-dir.
There's a basic YCSB test driver in FASTER/cc/benchmark-dir.
2 changes: 1 addition & 1 deletion cc/benchmark-dir/CMakeLists.txt
Expand Up @@ -5,6 +5,6 @@ set(BENCHMARK_HEADERS
set(BENCHMARK_SOURCES
)

ADD_FAST_BENCHMARK(benchmark)
ADD_FASTER_BENCHMARK(benchmark)

add_executable(process_ycsb process_ycsb.cc)
2 changes: 1 addition & 1 deletion cc/playground/sum_store-dir/CMakeLists.txt
Expand Up @@ -5,5 +5,5 @@ set(SUM_STORE_HEADERS
)

add_executable(sum_store ${SUM_STORE_HEADERS} sum_store.cc)
target_link_libraries(sum_store ${FAST_BENCHMARK_LINK_LIBS})
target_link_libraries(sum_store ${FASTER_BENCHMARK_LINK_LIBS})

This comment has been minimized.

Copy link
@MOSSSKITO

14 changes: 7 additions & 7 deletions cc/src/CMakeLists.txt
@@ -1,5 +1,5 @@
# Build the FASTER library.
set (FAST_HEADERS
set (FASTER_HEADERS
core/address.h
core/alloc.h
core/async.h
Expand Down Expand Up @@ -35,29 +35,29 @@ set (FAST_HEADERS
)

if (MSVC)
set (FAST_HEADERS ${FAST_HEADERS}
set (FASTER_HEADERS ${FASTER_HEADERS}
environment/file_windows.h
)
else()
set (FAST_HEADERS ${FAST_HEADERS}
set (FASTER_HEADERS ${FASTER_HEADERS}
environment/file_linux.h
)
endif()

set (FAST_SOURCES
set (FASTER_SOURCES
core/address.cc
core/lss_allocator.cc
core/thread.cc
)

if (MSVC)
set (FAST_SOURCES ${FAST_SOURCES}
set (FASTER_SOURCES ${FASTER_SOURCES}
environment/file_windows.cc
)
else()
set (FAST_SOURCES ${FAST_SOURCES}
set (FASTER_SOURCES ${FASTER_SOURCES}
environment/file_linux.cc
)
endif()

add_library(faster STATIC ${FAST_SOURCES} ${FAST_HEADERS})
add_library(faster STATIC ${FASTER_SOURCES} ${FASTER_HEADERS})
14 changes: 7 additions & 7 deletions cc/test/CMakeLists.txt
@@ -1,11 +1,11 @@
ADD_FAST_TEST(in_memory_test "")
ADD_FAST_TEST(malloc_fixed_page_size_test "")
ADD_FAST_TEST(paging_queue_test "paging_test.h")
ADD_FASTER_TEST(in_memory_test "")
ADD_FASTER_TEST(malloc_fixed_page_size_test "")
ADD_FASTER_TEST(paging_queue_test "paging_test.h")
if(MSVC)
ADD_FAST_TEST(paging_threadpool_test "paging_test.h")
ADD_FASTER_TEST(paging_threadpool_test "paging_test.h")
endif()
ADD_FAST_TEST(recovery_queue_test "recovery_test.h")
ADD_FASTER_TEST(recovery_queue_test "recovery_test.h")
if(MSVC)
ADD_FAST_TEST(recovery_threadpool_test "recovery_test.h")
ADD_FASTER_TEST(recovery_threadpool_test "recovery_test.h")
endif()
ADD_FAST_TEST(utility_test "")
ADD_FASTER_TEST(utility_test "")

0 comments on commit 0e55be7

Please sign in to comment.