Commit f2927d77 authored by Marc Vef's avatar Marc Vef Committed by Alberto Miranda
Browse files

daemon: changing terminology from async to nonblock

parent f00581ef

include/daemon/ops/data.hpp

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ public: 


    ~ChunkWriteOperation() = default;



    void write_async(size_t idx, uint64_t chunk_id, const char* bulk_buf_ptr, size_t size, off64_t offset);

    void write_nonblock(size_t idx, uint64_t chunk_id, const char* bulk_buf_ptr, size_t size, off64_t offset);



    std::pair<int, size_t> wait_for_tasks();
@@ -204,7 +204,7 @@ public: 


    ~ChunkReadOperation() = default;



    void read_async(size_t idx, uint64_t chunk_id, char* bulk_buf_ptr, size_t size, off64_t offset);

    void read_nonblock(size_t idx, uint64_t chunk_id, char* bulk_buf_ptr, size_t size, off64_t offset);



    std::pair<int, size_t>

    wait_for_tasks_and_push_back(const bulk_args& args);

src/daemon/handler/srv_data.cpp

+7 −7
Original line number Diff line number Diff line
@@ -167,11 +167,11 @@ static hg_return_t rpc_srv_write(hg_handle_t handle) { 
        }

        try {

            // start tasklet for writing chunk

            chunk_op.write_async(chnk_id_curr, chnk_ids_host[chnk_id_curr], bulk_buf_ptrs[chnk_id_curr],

            chunk_op.write_nonblock(chnk_id_curr, chnk_ids_host[chnk_id_curr], bulk_buf_ptrs[chnk_id_curr],

                                    chnk_sizes[chnk_id_curr], (chnk_id_file == in.chunk_start) ? in.offset : 0);

        } catch (const gkfs::data::ChunkWriteOpException& e) {

            // This exception is caused by setup of Argobots variables. If this fails, something is really wrong

            GKFS_DATA->spdlogger()->error("{}() while write_async err '{}'", __func__, e.what());

            GKFS_DATA->spdlogger()->error("{}() while write_nonblock err '{}'", __func__, e.what());

            return gkfs::rpc::cleanup_respond(&handle, &in, &out, &bulk_handle);

        }

        // next chunk
@@ -323,11 +323,11 @@ static hg_return_t rpc_srv_read(hg_handle_t handle) { 
        }

        try {

            // start tasklet for read operation

            chunk_read_op.read_async(chnk_id_curr, chnk_ids_host[chnk_id_curr], bulk_buf_ptrs[chnk_id_curr],

            chunk_read_op.read_nonblock(chnk_id_curr, chnk_ids_host[chnk_id_curr], bulk_buf_ptrs[chnk_id_curr],

                                        chnk_sizes[chnk_id_curr], (chnk_id_file == in.chunk_start) ? in.offset : 0);

        } catch (const gkfs::data::ChunkReadOpException& e) {

            // This exception is caused by setup of Argobots variables. If this fails, something is really wrong

            GKFS_DATA->spdlogger()->error("{}() while read_async err '{}'", __func__, e.what());

            GKFS_DATA->spdlogger()->error("{}() while read_nonblock err '{}'", __func__, e.what());

            return gkfs::rpc::cleanup_respond(&handle, &in, &out, &bulk_handle);

        }

        chnk_id_curr++;
@@ -385,7 +385,7 @@ static hg_return_t rpc_srv_truncate(hg_handle_t handle) { 
        chunk_op.truncate(in.length);

    } catch (const gkfs::data::ChunkMetaOpException& e) {

        // This exception is caused by setup of Argobots variables. If this fails, something is really wrong

        GKFS_DATA->spdlogger()->error("{}() while read_async err '{}'", __func__, e.what());

        GKFS_DATA->spdlogger()->error("{}() while truncate err '{}'", __func__, e.what());

        return gkfs::rpc::cleanup_respond(&handle, &in, &out);

    }

src/daemon/ops/data.cpp

+5 −5
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ ChunkWriteOperation::ChunkWriteOperation(const string& path, size_t n) : ChunkOp 
 * @throws ChunkWriteOpException

 */

void

ChunkWriteOperation::write_async(size_t idx, const uint64_t chunk_id, const char* bulk_buf_ptr,

ChunkWriteOperation::write_nonblock(size_t idx, const uint64_t chunk_id, const char* bulk_buf_ptr,

                                    const size_t size,

                                    const off64_t offset) {

    assert(idx < task_args_.size());
@@ -300,7 +300,7 @@ ChunkReadOperation::ChunkReadOperation(const string& path, size_t n) : ChunkOper 
 * @param offset

 */

void

ChunkReadOperation::read_async(size_t idx, const uint64_t chunk_id, char* bulk_buf_ptr, const size_t size,

ChunkReadOperation::read_nonblock(size_t idx, const uint64_t chunk_id, char* bulk_buf_ptr, const size_t size,

                                  const off64_t offset) {

    assert(idx < task_args_.size());

    GKFS_DATA->spdlogger()->trace("ChunkReadOperation::{}() enter: idx '{}' path '{}' size '{}' offset '{}'", __func__,