Verified Commit 71b2a557 authored by ANA MANZANO RODRIGUEZ's avatar ANA MANZANO RODRIGUEZ Committed by Alberto Miranda
Browse files

Rebase of main done

parent 3d4fc97d

examples/c/ADM_update_adhoc_storage.c

+3 −1
Original line number Diff line number Diff line
@@ -82,7 +82,9 @@ main(int argc, char* argv[]) { 
            ADM_ADHOC_MODE_SEPARATE_NEW, ADM_ADHOC_ACCESS_RDWR, 42, 200, false);

    assert(ctx_updated);



    ret = ADM_update_adhoc_storage(server, ctx_updated, adhoc_storage);

    const auto adhoc_storage_id = "id";



    ret = ADM_update_adhoc_storage(server, ctx_updated, adhoc_storage_id);



    if(ret != ADM_SUCCESS) {

        fprintf(stderr,

examples/cxx/ADM_update_adhoc_storage.cpp

+2 −2
Original line number Diff line number Diff line
@@ -67,8 +67,8 @@ main(int argc, char* argv[]) { 
        const auto adhoc_storage = admire::register_adhoc_storage(

                server, job, user_id, adhoc_storage_ctx);



        const auto adhoc_storage_updated = admire::update_adhoc_storage(

                server, adhoc_storage_ctx_updated, adhoc_storage);

        /*const auto adhoc_storage_updated = admire::update_adhoc_storage(

                server, adhoc_storage_ctx_updated, adhoc_storage);*/

    } catch(const std::exception& e) {

        fmt::print(stderr, "FATAL: ADM_update_adhoc_storage() failed: {}\n",

                   e.what());

src/common/api/admire_types.hpp

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ struct adhoc_storage : public storage { 
                  execution_mode exec_mode, access_type access_type,

                  adhoc_storage::resources res, std::uint32_t walltime,

                  bool should_flush);

    explicit adhoc_storage(ADM_storage_t storage);

    adhoc_storage(enum storage::type type, std::string name, std::uint64_t id,

                  ADM_adhoc_context_t ctx);

    adhoc_storage(enum storage::type type, std::string name, std::uint64_t id,

src/common/api/types.cpp

+16 −0
Original line number Diff line number Diff line
@@ -1380,6 +1380,21 @@ private: 
    adhoc_storage::ctx m_ctx;

};



void

foo(ADM_storage_t storage) { // donde se coloca? como ayuda eso a c_wrapper?

    switch(storage->s_type) {

        case ADM_STORAGE_GEKKOFS:

        case ADM_STORAGE_DATACLAY:

        case ADM_STORAGE_EXPAND:

        case ADM_STORAGE_HERCULES:

            break;



        case ADM_STORAGE_LUSTRE:

        case ADM_STORAGE_GPFS:

            // lanzar excepcion

            break;

    }

}



adhoc_storage::adhoc_storage(enum storage::type type, std::string name,

                             std::uint64_t id, execution_mode exec_mode,
@@ -1390,6 +1405,7 @@ adhoc_storage::adhoc_storage(enum storage::type type, std::string name, 
      m_pimpl(std::make_unique<impl>(

              adhoc_storage::ctx{exec_mode, access_type, std::move(res),

                                 walltime, should_flush})) {}

adhoc_storage::adhoc_storage(ADM_storage_t storage) : m_pimpl(storage) {}



adhoc_storage::adhoc_storage(enum storage::type type, std::string name,

                             std::uint64_t id, ADM_adhoc_context_t ctx)

src/common/net/proto/rpc_types.h

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ MERCURY_GEN_PROC( 
MERCURY_GEN_PROC(

    ADM_update_adhoc_storage_in_t,

        ((ADM_adhoc_context_t)(adhoc_storage_ctx))

        ((ADM_storage_t)(adhoc_storage))

        ((hg_string_t)(adhoc_storage_id))

);



MERCURY_GEN_PROC(