Commit 17461562 authored by Ramon Nou's avatar Ramon Nou
Browse files

merge errors

parent c6120d89

plugins/slurm/defaults.h.in

+0 −3
Original line number Diff line number Diff line
@@ -41,9 +41,6 @@ 
#define CARGO_PROTO_DEFAULT    SCORD_PROTO_DEFAULT

#define CARGO_PORT_DEFAULT     62000



#define CARGO_PROTO_DEFAULT    SCORD_PROTO_DEFAULT

#define CARGO_PORT_DEFAULT     62000



// clang-format on



#endif // SCORD_SLURM_PLUGIN_DEFAULTS_H

src/lib/types.c

+0 −5
Original line number Diff line number Diff line
@@ -822,11 +822,6 @@ ADM_adhoc_context_create(const char* ctl_address, const char* stager_address, 
        LOGGER_ERROR("The address to the controller cannot be NULL");

        return NULL;

    }

    /* We may continue if there is no transfers.. */

    if(!stg_address) {

        LOGGER_ERROR("The stager address is null");

    }





    if(!stager_address) {

        LOGGER_ERROR("The address to the stager cannot be NULL");

src/scord/transfer_manager.hpp

+5 −22
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct transfer_manager { 


        abt::unique_lock lock(m_transfer_mutex);



        if(const auto it = m_transfer.find(tx_id); it == m_transfer.end()) {

        if(const auto it = m_transfer.find(id); it == m_transfer.end()) {

            const auto& [it_transfer, inserted] = m_transfer.emplace(

                    id, std::make_shared<

                                internal::transfer_metadata<TransferHandle>>(
@@ -105,32 +105,15 @@ struct transfer_manager { 


        abt::unique_lock lock(m_transfer_mutex);



        if(m_transfer.count(id) != 0) {

            m_transfer.erase(id);

            return scord::error_code::success;

        if(const auto it = m_transfer.find(id); it != m_transfer.end()) {

            auto nh = m_transfer.extract(it);

            return nh.mapped();

        }





        LOGGER_ERROR("Transfer '{}' was not registered or was already deleted",

                     id);



        return scord::error_code::no_such_entity;

    }



    std::unordered_map<scord::transfer_id,

                       std::shared_ptr<scord::internal::transfer_info>>

    transfer() {

        return m_transfer;

    }



    void

    lock() {

        m_transfer_mutex.lock();

    }



    void

    unlock() {

        m_transfer_mutex.unlock();

        return tl::make_unexpected(scord::error_code::no_such_entity);

    }



private:

src/lib/scord/types.hpp

+4 −4

File changed.

Contains only whitespace changes.