Commit befc807f authored by Marc Vef's avatar Marc Vef
Browse files

CMake changes for debug + better client shutdown process

parent 482d22c2

ifs/CMake/FindMercury.cmake

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ find_path(MERCURY_INCLUDE_DIR mercury.h 
        )



find_library(MERCURY_LIBRARY

        NAMES mercury

        NAMES mercury mercury_debug

        HINTS

        $ENV{HOME}/adafs/install/lib

        ${MERCURY_DIR}

ifs/CMake/FindMercuryUtil.cmake

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ find_path(MERCURY_UTIL_DIR 
        )



find_library(MERCURY_UTIL_LIBRARY

        NAMES mercury_util

        NAMES mercury_util mercury_util_debug

        HINTS

        $ENV{HOME}/adafs/install/lib

        ${MERCURY_UTIL_DIR}

ifs/scripts/compile_dep.sh

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ make install || exit 1 
make check || exit 1



echo "############################################################ Installing:  Rocksdb"

# Margo

# Rocksdb

CURR=$GIT/rocksdb

cd $CURR

make clean || exit 1

ifs/scripts/startup_adafs.py

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ def init_system(daemon_path, rootdir, mountdir, nodelist, cleanroot): 
                print line

            else:

                # check for errors in log

                if 'ERROR' in line[line.strip().find('\n') + 1:] or 'Assertion `err\'' in line[

                if '[E]' in line[line.strip().find('\n') + 1:] or 'Assertion `err\'' in line[

                                                                                          line.strip().find('\n') + 1:]:

                    fs_err = True

                    print '------------------------- ERROR pssh -- Host "%s" -------------------------' % \

ifs/src/preload/preload.cpp

+11 −22
Original line number Diff line number Diff line
@@ -232,32 +232,21 @@ void destroy_preload() { 
    cout << "\n####################\n\nMargo RPC client stats: " << endl;

    margo_diag_dump(margo_rpc_id_, "-", 0);

#endif

    ld_logger->info("Freeing Mercury daemon addr ...");

    HG_Addr_free(margo_get_class(ld_margo_ipc_id), daemon_svr_addr);

    ld_logger->info("Finalizing Margo IPC client ...");

    auto mercury_ipc_class = margo_get_class(ld_margo_ipc_id);

    auto mercury_ipc_context = margo_get_context(ld_margo_ipc_id);

    margo_finalize(ld_margo_ipc_id);

    ld_logger->info("{}() Freeing Margo daemon addr ...", __func__);

    auto ret = margo_addr_free(ld_margo_ipc_id, daemon_svr_addr);

    ld_logger->info("{}() ret {}", __func__, ret);



    ld_logger->info("Freeing Mercury RPC addresses ...");

    // free all rpc addresses in LRU map and finalize margo rpc

    ld_logger->info("{}() Freeing Mercury RPC addresses ...", __func__);

    auto free_all_addr = [&](const KVCache::node_type& n) {

        HG_Addr_free(margo_get_class(ld_margo_rpc_id), n.value);

        ret = margo_addr_free(ld_margo_rpc_id, n.value);

        ld_logger->info("{}() ret {}", __func__, ret);

    };

    rpc_address_cache.cwalk(free_all_addr);

    ld_logger->info("Finalizing Margo RPC client ...");

    auto mercury_rpc_class = margo_get_class(ld_margo_rpc_id);

    auto mercury_rpc_context = margo_get_context(ld_margo_rpc_id);

    ld_logger->info("{}() About to finalize the margo client", __func__);

    margo_finalize(ld_margo_rpc_id);



    ld_logger->info("Destroying Mercury context ...");

    HG_Context_destroy(mercury_ipc_context);

    HG_Context_destroy(mercury_rpc_context);

    ld_logger->info("Finalizing Mercury class ...");

    HG_Finalize(mercury_ipc_class);

    HG_Finalize(mercury_rpc_class);

    ld_logger->info("Preload library shut down.");



    ld_logger->info("Finalizing Argobots ...");

    ABT_finalize();

    ld_logger->info("{}() Shut down Margo RPC client successful", __func__);

    margo_finalize(ld_margo_ipc_id);

    ld_logger->info("{}() Shut down Margo IPC client successful", __func__);

    ld_logger->info("{}() All services shut down. Client shutdown complete.", __func__);

}
 
 No newline at end of file