Commit 32b095b4 authored by Marc Vef's avatar Marc Vef
Browse files

Merge branch '28-cci-is-compiled-as-development-build'

parents ff8ccaf8 54e609db

ifs/CMakeLists.txt

+20 −9
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ if (NOT CMAKE_BUILD_TYPE) 
            CACHE STRING "Choose the type of build: Debug Release Memcheck

            FORCE")

ENDIF (NOT CMAKE_BUILD_TYPE)

message("* Current build type is : ${CMAKE_BUILD_TYPE}")

message("* Current daemon build type is : ${CMAKE_BUILD_TYPE}")



set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64")

set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -D_FILE_OFFSET_BITS=64 -O3")

# For debugging memory leaks.

#set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall --pedantic -g -pg -fsanitize=address -fno-omit-frame-pointer")

set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall --pedantic -g -pg")

set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall --pedantic -g -pg -no-pie -O0")



set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake" ${CMAKE_MODULE_PATH})
@@ -132,9 +132,20 @@ set(SOURCE_FILES main.cpp main.hpp include/configure.hpp configure_public.hpp ut 
        src/rpc/handler/h_preload.cpp

        include/rpc/rpc_utils.hpp src/rpc/rpc_utils.cpp include/global_defs.hpp)

add_executable(adafs_daemon ${SOURCE_FILES})



if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")

    target_link_libraries(adafs_daemon ${ROCKSDB_LIBRARIES}

            # rocksdb libs

            ${snappy_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${ZSTD_LIBRARIES} ${LZ4_LIBRARY} ${gflags_LIBRARIES}

            # margo libs

            ${NA_LIB} ${MERCURY_LIBRARIES} ${MERCURY_UTIL_LIBRARIES} ${ABT_LIBRARIES} ${ABT_SNOOZER_LIBRARIES} ${MARGO_LIBRARIES}

            -lpthread -lboost_system -lboost_filesystem -lboost_serialization -lboost_program_options -pg)

else ()

    target_link_libraries(adafs_daemon ${ROCKSDB_LIBRARIES}

            # rocksdb libs

            ${snappy_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${ZSTD_LIBRARIES} ${LZ4_LIBRARY} ${gflags_LIBRARIES}

            # margo libs

            ${NA_LIB} ${MERCURY_LIBRARIES} ${MERCURY_UTIL_LIBRARIES} ${ABT_LIBRARIES} ${ABT_SNOOZER_LIBRARIES} ${MARGO_LIBRARIES}

            -lpthread -lboost_system -lboost_filesystem -lboost_serialization -lboost_program_options)



endif ()
 
 No newline at end of file

ifs/scripts/compile_dep.sh

+7 −2
Original line number Diff line number Diff line
@@ -207,8 +207,10 @@ if [ "$NA_LAYER" == "cci" ] || [ "$NA_LAYER" == "all" ]; then 
    prepare_build_dir ${CURR}

    cd ${CURR}

    # patch hanging issue

    echo "########## Applying cci hanging patch"

    echo "########## ADA-FS injection: Applying cci hanging patch"

    git apply ${PATCH_DIR}/cci_hang_final.patch || exit 1

    echo "########## ADA-FS injection: Disabling cci debug mode/devel mode entirely"

    git apply ${PATCH_DIR}/cci_remove_devel_mode.patch || exit 1

    ./autogen.pl || exit 1

    cd ${CURR}/build

if [[ ("${CLUSTER}" == "mogon1") || ("${CLUSTER}" == "fh2") ]]; then
@@ -216,6 +218,9 @@ if [[ ("${CLUSTER}" == "mogon1") || ("${CLUSTER}" == "fh2") ]]; then 
else

    ../configure --prefix=${INSTALL} LIBS="-lpthread"  || exit 1

fi



    echo "########## ADA-FS injection: Replacing any remaining CFLAGS with '-g -O2' that are added by cci although debug mode is disabled with '-O3'"

    find . -type f -exec sed -i 's/-g -O2/-O3/g' {} \;

    make -j${CORES} || exit 1

    make install || exit 1

    make check || exit 1
@@ -291,7 +296,7 @@ prepare_build_dir ${CURR} 
cd ${CURR}

./prepare.sh || exit 1

cd ${CURR}/build

../configure --prefix=${INSTALL} PKG_CONFIG_PATH=${INSTALL}/lib/pkgconfig CFLAGS="-g -Wall" || exit 1

../configure --prefix=${INSTALL} PKG_CONFIG_PATH=${INSTALL}/lib/pkgconfig CFLAGS="-Wall -O3" || exit 1

make -j${CORES} || exit 1

make install || exit 1

make check || exit 1

ifs/scripts/patches/cci_remove_devel_mode.patch

0 → 100644
+24 −0
Original line number Diff line number Diff line 
diff --git a/config/cci.m4 b/config/cci.m4

index 7afc60c..15ddff1 100644

--- a/config/cci.m4

+++ b/config/cci.m4

@@ -5,18 +5,7 @@ dnl Copyright © 2012 UT-Battelle, LLC.  All rights reserved.

 dnl Copyright © 2012 Oak Ridge National Labs.  All rights reserved.

 dnl

 

-# Define CCI configure command line arguments

-AC_DEFUN([CCI_DEFINE_ARGS],[

-    AC_ARG_ENABLE([picky],

-        [AC_HELP_STRING([--enable-picky],

-                        [Turn on maintainer-level compiler pickyness])])

-    AS_IF([test -d $srcdir/.hg -o -d $srcdir/.svn -o -d $srcdir/.git],

-          [CCI_DEVEL_BUILD=yes

-           AS_IF([test "$enable_picky" = ""],

-                 [AC_MSG_WARN([Developer build: enabling pickyness by default])

-                  enable_picky=yes])])

-])

-

+CCI_DEVEL_BUILD=no

 # Main CCI m4 macro

 #

 # Expects two or three paramters:

ifs/src/preload/CMakeLists.txt

+12 −5
Original line number Diff line number Diff line
@@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.6) 
project(preload CXX C)



set(CMAKE_CXX_STANDARD 14)

set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -fPIC")

set(CMAKE_CXX_FLAGS_DEBUG "-Wall --pedantic -g -pg -fPIC")

set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -fPIC -O3")

set(CMAKE_CXX_FLAGS_DEBUG "-Wall --pedantic -g -pg -fPIC -no-pie -O0")

message("* Current library build type is : ${CMAKE_BUILD_TYPE}")





set(SOURCE_FILES_PRELOAD preload.cpp ../../include/configure.hpp ../../configure_public.hpp
@@ -15,6 +16,12 @@ set(SOURCE_FILES_PRELOAD preload.cpp ../../include/configure.hpp ../../configure 
        rpc/ld_rpc_data_ws.cpp rpc/ld_rpc_metadentry.cpp ../../include/preload/rpc/ld_rpc_data_ws.hpp ../../include/preload/rpc/ld_rpc_metadentry.hpp

        ../../include/rpc/rpc_utils.hpp ../rpc/rpc_utils.cpp intcp_functions.cpp passthrough.cpp ../../include/preload/passthrough.hpp ../../include/global_defs.hpp adafs_functions.cpp adafs_functions.cpp ../../include/preload/adafs_functions.hpp)

add_library(iointer SHARED ${SOURCE_FILES_PRELOAD})

if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")

    target_link_libraries(iointer dl ${NA_LIB} ${MERCURY_LIBRARIES} ${MERCURY_UTIL_LIBRARIES} ${ABT_LIBRARIES}

            ${ABT_SNOOZER_LIBRARIES} ${MARGO_LIBRARIES}

            -lpthread -lboost_system -pg)

else ()

    target_link_libraries(iointer dl ${NA_LIB} ${MERCURY_LIBRARIES} ${MERCURY_UTIL_LIBRARIES} ${ABT_LIBRARIES}

            ${ABT_SNOOZER_LIBRARIES} ${MARGO_LIBRARIES}

            -lpthread -lboost_system)

endif ()