Unverified Commit 0625abb5 authored by Tommaso Tocci's avatar Tommaso Tocci
Browse files

Drop MARGODIAG code

parent fc3f00e9

src/client/preload.cpp

+0 −7
Original line number Diff line number Diff line
@@ -128,9 +128,6 @@ bool init_margo_client(const std::string& na_plugin) { 
        return false;

    }

    register_client_rpcs(ld_margo_rpc_id);

#ifdef MARGODIAG

    margo_diag_start(ld_margo_rpc_id);

#endif

    return true;

}
@@ -252,10 +249,6 @@ void destroy_preload() { 
        CTX->log()->debug("{}() No services in preload library used. Nothing to shut down.", __func__);

        return;

    }

#ifdef MARGODIAG

    std::cout << "\n####################\n\nMargo RPC client stats: " << std::endl;

    margo_diag_dump(ld_margo_rpc_id, "-", 0);

#endif

    cleanup_addresses();

    CTX->log()->debug("{}() About to finalize the margo RPC client", __func__);

    // XXX Sometimes this hangs on the cluster. Investigate.

src/daemon/main.cpp

+0 −7
Original line number Diff line number Diff line
@@ -119,10 +119,6 @@ bool init_environment() { 
 * Destroys the margo, argobots, and mercury environments

 */

void destroy_enviroment() {

#ifdef MARGODIAG

    cout << "\n####################\n\nMargo RPC server stats: " << endl;

    margo_diag_dump(RPC_DATA->server_rpc_mid(), "-", 0);

#endif

    bfs::remove_all(ADAFS_DATA->mountdir());

    for (unsigned int i = 0; i < RPC_DATA->io_streams().size(); i++) {

        ABT_xstream_join(RPC_DATA->io_streams().at(i));
@@ -198,9 +194,6 @@ bool init_rpc_server() { 
        ADAFS_DATA->spdlogger()->error("{}() margo_init failed to initialize the Margo RPC server", __func__);

        return false;

    }

#ifdef MARGODIAG

    margo_diag_start(mid);

#endif

    // Figure out what address this server is listening on (must be freed when finished)

    auto hret = margo_addr_self(mid, &addr_self);

    if (hret != HG_SUCCESS) {