Commit 1dbd5331 authored by Ramon Nou's avatar Ramon Nou
Browse files

some changes from Marc nek branch (reduced waiting)

parent 6e37024f

src/master.cpp

+3 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ make_message(std::uint64_t tid, std::uint32_t seqno, 
    }



    return std::make_tuple(

            static_cast<int>(cargo::tag::sequential),

            static_cast<int>(cargo::tag::seq_mixed),

            cargo::transfer_message{tid, seqno, input.path(),

                                    static_cast<uint32_t>(input.get_type()),

                                    output.path(),
@@ -134,7 +134,7 @@ master_server::mpi_listener_ult() { 
        auto msg = world.iprobe();



        if(!msg) {

            std::this_thread::sleep_for(10ms);

            std::this_thread::sleep_for(1000us);

            // thallium::thread::self().sleep(m_network_engine, 10);

            continue;

        }
@@ -201,7 +201,7 @@ master_server::ftio_scheduling_ult() { 
        if(m_period > 0) {

            LOGGER_INFO("Waiting period : {}", m_period);

        } else {

            LOGGER_INFO("Waiting for run trigger ...");

            LOGGER_DEBUG("Waiting for run trigger ...");

        }

        // Wait in small periods, just in case we change it, This should be

        // mutexed...

src/net/server.cpp

+7 −0
Original line number Diff line number Diff line
@@ -336,6 +336,13 @@ server::run() { 


    install_signal_handlers();



    auto gkfs_hosts = std::getenv("LIBGKFS_HOSTS_FILE");

    if (gkfs_hosts == nullptr) {

        LOGGER_INFO("Error: The environment variable LIBGKFS_HOSTS_FILE is not set. Using default");

    } else {

		LOGGER_INFO("LIBGKFS_HOSTS_FILE env variable set to: {}", gkfs_hosts);

	}



    LOGGER_INFO("");

    LOGGER_INFO("[[ Start up successful, awaiting requests... ]]");