Move header files to specific include directories

bindings/c/CMakeLists.txt

@@ -137,7 +137,6 @@ if(NOT WIN32)
     test/apitester/TesterUtil.h
     test/apitester/TesterWorkload.cpp
     test/apitester/TesterWorkload.h
-    ../../flow/SimpleOpt.h
   )
 
   if(OPEN_FOR_IDE)
@@ -193,7 +192,8 @@ if(NOT WIN32)
   else()
     target_link_libraries(fdb_c_api_tester PRIVATE fdb_c fdb_cpp toml11_target Threads::Threads fmt::fmt boost_target)
   endif()
-  target_include_directories(fdb_c_api_tester PRIVATE "${CMAKE_BINARY_DIR}/flow/include")
+  target_include_directories(fdb_c_api_tester PRIVATE "${CMAKE_SOURCE_DIR}/flow/include" "${CMAKE_BINARY_DIR}/flow/include")
+  target_link_libraries(fdb_c_api_tester PRIVATE SimpleOpt)
 
   # do not set RPATH for mako
   set_property(TARGET mako PROPERTY SKIP_BUILD_RPATH TRUE)

bindings/c/test/apitester/fdb_c_api_tester.cpp

@@ -24,7 +24,7 @@
 #include "TesterTransactionExecutor.h"
 #include "TesterTestSpec.h"
 #include "TesterUtil.h"
-#include "flow/SimpleOpt.h"
+#include "SimpleOpt/SimpleOpt.h"
 #include "test/fdb_api.hpp"
 
 #include <memory>

bindings/flow/CMakeLists.txt

@@ -16,7 +16,7 @@ set(SRCS
   fdb_flow.actor.cpp
   fdb_flow.h)
 
-add_flow_target(STATIC_LIBRARY NAME fdb_flow SRCS ${SRCS} NO_COPY_HDR)
+add_flow_target(STATIC_LIBRARY NAME fdb_flow SRCS ${SRCS})
 target_link_libraries(fdb_flow PUBLIC fdb_c)
 target_link_libraries(fdb_flow PUBLIC fdbclient)
 target_include_directories(fdb_flow PUBLIC

cmake/FlowCommands.cmake

@@ -64,9 +64,8 @@ function(generate_coverage_xml)
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
       COMMENT "Generate coverage xml")
   endif()
-  add_custom_target(coverage_${target_name} DEPENDS ${target_file})
+  add_custom_target(coverage_${target_name} ALL DEPENDS ${target_file})
   add_dependencies(coverage_${target_name} coveragetool)
-  add_dependencies(${target_name} coverage_${target_name})
 endfunction()
 
 # This function asserts that `versions.h` does not exist in the source
@@ -190,7 +189,7 @@ endfunction()
 
 function(add_flow_target)
   set(options EXECUTABLE STATIC_LIBRARY
-    DYNAMIC_LIBRARY NO_COPY_HDR)
+    DYNAMIC_LIBRARY)
   set(oneValueArgs NAME)
   set(multiValueArgs SRCS COVERAGE_FILTER_OUT DISABLE_ACTOR_DIAGNOSTICS ADDL_SRCS)
   cmake_parse_arguments(AFT "${options}" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}")
@@ -200,9 +199,6 @@ function(add_flow_target)
   if(NOT AFT_SRCS)
     message(FATAL_ERROR "No sources provided")
   endif()
-  if(NOT AFT_NO_COPY_HDR)
-    copy_headers(NAME ${AFT_NAME} SRCS "${AFT_SRCS};${AFT_DISABLE_ACTOR_DIAGNOSTICS}" OUT_DIR incl_dir INC_DIR include_dir)
-  endif()
   #foreach(src IN LISTS AFT_SRCS)
   #  is_header(h "${src}")
   #  if(NOT h)
@@ -214,6 +210,7 @@ function(add_flow_target)
     set(sources ${AFT_SRCS} ${AFT_ADDL_SRCS})
     add_library(${AFT_NAME} OBJECT ${sources})
   else()
+    create_build_dirs(${AFT_SRCS} ${AFT_DISABLE_ACTOR_DIAGNOSTICS})
     foreach(src IN LISTS AFT_SRCS AFT_DISABLE_ACTOR_DIAGNOSTICS)
       is_header(hdr ${src})
       set(in_filename "${src}")
@@ -229,26 +226,11 @@ function(add_flow_target)
         set(out_filename "${src}")
       endif()
 
-      if(hdr AND NOT AFT_NO_COPY_HDR)
-        set(in_file "${incl_dir}/${in_filename}")
-        set(out_file "${incl_dir}/${out_filename}")
+      set(in_file "${CMAKE_CURRENT_SOURCE_DIR}/${in_filename}")
+      if(is_actor_file)
+        set(out_file "${CMAKE_CURRENT_BINARY_DIR}/${out_filename}")
       else()
-        set(in_file "${CMAKE_CURRENT_SOURCE_DIR}/${in_filename}")
-        if(is_actor_file)
-          set(out_file "${CMAKE_CURRENT_BINARY_DIR}/${out_filename}")
-        else()
-          set(out_file "${in_file}")
-        endif()
-      endif()
-
-      is_prefix(in_src_dir "${CMAKE_CURRENT_SOURCE_DIR}" ${src})
-      is_prefix(in_bin_dir "${CMAKE_CURRENT_BINARY_DIR}" ${src})
-      if(NOT AFT_NO_COPY_HDR)
-        is_prefix(in_incl_dir "${incl_dir}" ${src})
-      endif()
-      if(in_src_dir OR in_bin_dir)
-        set(in_file "${src}")
-        set(out_file "${src}")
+        set(out_file "${in_file}")
       endif()
 
       list(APPEND sources ${out_file})
@@ -307,10 +289,6 @@ function(add_flow_target)
     set_property(TARGET ${AFT_NAME} PROPERTY COVERAGE_FILTERS ${AFT_SRCS})
 
     add_custom_target(${AFT_NAME}_actors DEPENDS ${generated_files})
-    if(NOT AFT_NO_COPY_HDR)
-      target_include_directories("${AFT_NAME}" PUBLIC "${include_dir}")
-      add_dependencies(${AFT_NAME}_actors actorcompiler "${AFT_NAME}_incl")
-    endif()
     add_dependencies(${AFT_NAME} ${AFT_NAME}_actors)
     if(NOT WIN32)
       assert_no_version_h(${AFT_NAME}_actors)

cmake/utils.cmake

@@ -29,3 +29,40 @@ function(is_prefix out prefix str)
   endif()
   set(${out} ${res} PARENT_SCOPE)
 endfunction()
+
+function(create_build_dirs)
+  foreach(src IN LISTS ARGV)
+    get_filename_component(d "${src}" DIRECTORY)
+    if(IS_ABSOLUTE "${d}")
+      file(RELATIVE_PATH d "${CMAKE_CURRENT_SOURCE_DIR}" "${src}")
+    endif()
+    list(APPEND dirs "${d}")
+  endforeach()
+  list(REMOVE_DUPLICATES dirs)
+  foreach(dir IN LISTS dirs)
+    make_directory("${CMAKE_CURRENT_BINARY_DIR}/${dir}")
+  endforeach()
+endfunction()
+
+function(fdb_find_sources out)
+  file(GLOB res
+    LIST_DIRECTORIES false
+    RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+    CONFIGURE_DEPENDS "*.cpp" "*.c" "*.h" "*.hpp")
+  file(GLOB_RECURSE res_includes
+    LIST_DIRECTORIES false
+    RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/include"
+    CONFIGURE_DEPENDS "include/*.cpp" "include/*.c" "include/*.h" "include/*.hpp")
+  file(GLOB_RECURSE res_workloads
+    LIST_DIRECTORIES false
+    RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/workloads"
+    CONFIGURE_DEPENDS "workloads/*.cpp" "workloads/*.c" "workloads/*.h" "workloads/*.hpp")
+
+  foreach(f IN LISTS res_includes)
+    list(APPEND res "include/${f}")
+  endforeach()
+  foreach(f IN LISTS res_workloads)
+    list(APPEND res "workloads/${f}")
+  endforeach()
+  set(${out} "${res}" PARENT_SCOPE)
+endfunction()

contrib/CMakeLists.txt

@@ -1,8 +1,14 @@
 add_library(rapidjson INTERFACE)
 target_include_directories(rapidjson INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/rapidjson)
 
+add_subdirectory(crc32)
+add_subdirectory(stacktrace)
+add_subdirectory(folly_memcpy)
+add_subdirectory(sqlite)
+add_subdirectory(SimpleOpt)
 add_subdirectory(fmt-8.1.1)
 if(NOT WIN32)
+  add_subdirectory(linenoise)
   add_subdirectory(debug_determinism)
   add_subdirectory(monitoring)
   add_subdirectory(TraceLogHelper)

contrib/SimpleOpt/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_library(SimpleOpt INTERFACE)
+target_include_directories(SimpleOpt INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")

flow/SimpleOpt.h → contrib/SimpleOpt/include/SimpleOpt/SimpleOpt.h

@@ -78,7 +78,7 @@
     <li> Include the SimpleOpt.h header file
 
         <pre>
-        \#include "flow/SimpleOpt.h"
+        \#include "SimpleOpt/SimpleOpt.h"
         </pre>
 
     <li> Define an array of valid options for your program.

contrib/crc32/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_library(crc32 STATIC crc32.S crc32_wrapper.c crc32c.cpp)
+target_include_directories(crc32 PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")

flow/crc32.S → contrib/crc32/crc32.S

@@ -58,7 +58,7 @@
 #ifdef CRC32_CONSTANTS_HEADER
 #include CRC32_CONSTANTS_HEADER
 #else
-#include "crc32_constants.h"
+#include "crc32/crc32_constants.h"
 #endif
 
 	.text

flow/crc32_wrapper.c → contrib/crc32/crc32_wrapper.c

@@ -15,7 +15,7 @@
 #ifdef CRC32_CONSTANTS_HEADER
 #include CRC32_CONSTANTS_HEADER
 #else
-#include "crc32_constants.h"
+#include "crc32/crc32_constants.h"
 #endif
 
 #define VMX_ALIGN 16

flow/crc32c.cpp → contrib/crc32/crc32c.cpp

@@ -25,7 +25,17 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include "flow/crc32c.h"
+#if (defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__))
+#define __unixish__ 1
+#endif
+
+#ifdef __unixish__
+#if !defined(__aarch64__) && !defined(__powerpc64__)
+#include <cpuid.h>
+#endif
+#endif
+
+#include "crc32/crc32c.h"
 
 #if !defined(__aarch64__) && !defined(__powerpc64__)
 #include <nmmintrin.h>
@@ -34,9 +44,40 @@
 #include <stdlib.h>
 #include <random>
 #include <algorithm>
-#include "flow/Platform.h"
 #include "crc32c-generated-constants.cpp"
 
+// CRC32C
+#ifdef __aarch64__
+// aarch64
+#include <inttypes.h>
+static inline uint32_t hwCrc32cU8(unsigned int crc, unsigned char v) {
+	uint32_t ret;
+	asm volatile("crc32cb %w[r], %w[c], %w[v]" : [r] "=r"(ret) : [c] "r"(crc), [v] "r"(v));
+	return ret;
+}
+static inline uint32_t hwCrc32cU32(unsigned int crc, unsigned int v) {
+	uint32_t ret;
+	asm volatile("crc32cw %w[r], %w[c], %w[v]" : [r] "=r"(ret) : [c] "r"(crc), [v] "r"(v));
+	return ret;
+}
+#ifdef _M_X64
+static inline uint64_t hwCrc32cU64(uint64_t crc, uint64_t v) {
+	uint64_t ret;
+	asm volatile("crc32cx %w[r], %w[c], %x[v]" : [r] "=r"(ret) : [c] "r"(crc), [v] "r"(v));
+	return ret;
+}
+#endif
+#else
+#ifndef __powerpc64__
+// Intel
+#define hwCrc32cU8(c, v) _mm_crc32_u8(c, v)
+#define hwCrc32cU32(c, v) _mm_crc32_u32(c, v)
+#ifdef _M_X64
+#define hwCrc32cU64(c, v) _mm_crc32_u64(c, v)
+#endif
+#endif
+#endif
+
 [[maybe_unused]] static uint32_t append_trivial(uint32_t crc, const uint8_t* input, size_t length) {
 	for (size_t i = 0; i < length; ++i) {
 		crc = crc ^ input[i];
@@ -278,7 +319,25 @@ uint32_t ppc_hw(uint32_t crc, const uint8_t* input, size_t length) {
 }
 #endif
 
-static bool hw_available = platform::isHwCrcSupported();
+bool isHwCrcSupported() {
+#if defined(_WIN32)
+	int info[4];
+	__cpuid(info, 1);
+	return (info[2] & (1 << 20)) != 0;
+#elif defined(__aarch64__)
+	return true; /* force to use crc instructions */
+#elif defined(__powerpc64__)
+	return false; /* force not to use crc instructions */
+#elif defined(__unixish__)
+	uint32_t eax, ebx, ecx, edx, level = 1, count = 0;
+	__cpuid_count(level, count, eax, ebx, ecx, edx);
+	return ((ecx >> 20) & 1) != 0;
+#else
+#error Port me!
+#endif
+}
+
+static bool hw_available = isHwCrcSupported();
 
 extern "C" uint32_t crc32c_append(uint32_t crc, const uint8_t* input, size_t length) {
 	if (hw_available) {

contrib/folly_memcpy/CMakeLists.txt

@@ -0,0 +1,4 @@
+if(UNIX AND NOT APPLE)
+  add_library(folly_memcpy STATIC folly_memcpy.S)
+  target_include_directories(folly_memcpy PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
+endif()

contrib/linenoise/CMakeLists.txt

@@ -0,0 +1,2 @@
+add_library(linenoise STATIC linenoise.c)
+target_include_directories(linenoise PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")

fdbcli/linenoise/linenoise.c → contrib/linenoise/linenoise.c

@@ -115,7 +115,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <unistd.h>
-#include "linenoise.h"
+#include "linenoise/linenoise.h"
 
 #define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100
 #define LINENOISE_MAX_LINE 4096

contrib/sqlite/CMakeLists.txt

@@ -0,0 +1,16 @@
+add_library(sqlite STATIC
+  btree.h
+  hash.h
+  sqlite3.h
+  sqlite3ext.h
+  sqliteInt.h
+  sqliteLimit.h
+  sqlite3.amalgamation.c)
+
+
+target_include_directories(sqlite PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+# Suppress warnings in sqlite since it's third party
+if(NOT WIN32)
+  target_compile_definitions(sqlite PRIVATE $<$<CONFIG:Debug>:NDEBUG>)
+  target_compile_options(sqlite BEFORE PRIVATE -w) # disable warnings for third party
+endif()

contrib/stacktrace/CMakeLists.txt

@@ -0,0 +1,11 @@
+add_library(stacktrace STATIC stacktrace.amalgamation.cpp)
+target_include_directories(stacktrace PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
+if (USE_ASAN)
+  target_compile_definitions(stacktrace PRIVATE ADDRESS_SANITIZER)
+elseif(USE_MSAN)
+  target_compile_definitions(stacktrace PRIVATE MEMORY_SANITIZER)
+elseif(USE_UBSAN)
+  target_compile_definitions(stacktrace PRIVATE UNDEFINED_BEHAVIOR_SANITIZER)
+elseif(USE_TSAN)
+  target_compile_definitions(stacktrace PRIVATE THREAD_SANITIZER DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL=1)
+endif()

fdbbackup/CMakeLists.txt

@@ -1,23 +1,22 @@
 set(FDBBACKUP_SRCS
-	BackupTLSConfig.h
 	BackupTLSConfig.cpp
 	backup.actor.cpp)
 
 add_flow_target(EXECUTABLE NAME fdbbackup SRCS ${FDBBACKUP_SRCS})
+target_include_directories(fdbbackup PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include")
 target_link_libraries(fdbbackup PRIVATE fdbclient)
 
 set(FDBCONVERT_SRCS
-	FileConverter.actor.cpp
-	FileConverter.h)
+	FileConverter.actor.cpp)
 add_flow_target(EXECUTABLE NAME fdbconvert SRCS ${FDBCONVERT_SRCS})
+target_include_directories(fdbconvert PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include")
 target_link_libraries(fdbconvert PRIVATE fdbclient)
 
 set(FDBDECODE_SRCS
-	BackupTLSConfig.h
 	BackupTLSConfig.cpp
-	FileDecoder.actor.cpp
-	FileConverter.h)
+	FileDecoder.actor.cpp)
 add_flow_target(EXECUTABLE NAME fdbdecode SRCS ${FDBDECODE_SRCS})
+target_include_directories(fdbdecode PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include")
 target_link_libraries(fdbdecode PRIVATE fdbclient)
 
 if(NOT OPEN_FOR_IDE)

fdbbackup/backup.actor.cpp

@@ -74,7 +74,7 @@
 #include "fdbclient/versions.h"
 #include "fdbclient/BuildFlags.h"
 
-#include "flow/SimpleOpt.h"
+#include "SimpleOpt/SimpleOpt.h"
 #include "flow/actorcompiler.h" // This must be the last #include.
 
 // Type of program being executed

fdbbackup/FileConverter.h → fdbbackup/include/fdbbackup/FileConverter.h

@@ -23,7 +23,7 @@
 #pragma once
 
 #include <cinttypes>
-#include "flow/SimpleOpt.h"
+#include "SimpleOpt/SimpleOpt.h"
 #include "flow/TLSConfig.actor.h"
 
 namespace file_converter {