Verified Commit 6368b88f authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Rename ADM_storage_handle_t to ADM_storage_t

parent dfe0df64

examples/cxx/ADM_set_io_resources.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ main(int argc, char* argv[]) { 
    admire::server server{"tcp", argv[1]};



    ADM_job_t job{};

    ADM_storage_handle_t tier{};

    ADM_storage_t tier{};

    ADM_storage_resources_t resources{};

    ADM_return_t ret = ADM_SUCCESS;

src/lib/admire.cpp

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ set_dataset_information(const server& srv, ADM_job_t job, ADM_dataset_t target, 
}



ADM_return_t

set_io_resources(const server& srv, ADM_job_t job, ADM_storage_handle_t tier,

set_io_resources(const server& srv, ADM_job_t job, ADM_storage_t tier,

                 ADM_storage_resources_t resources) {

    (void) srv;

    (void) job;

src/lib/admire.h

+3 −4
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ ADM_dataset_info_destroy(ADM_dataset_info_t dataset_info); 
/** A storage tier handle */

typedef struct {

    // TODO: empty for now

} ADM_storage_handle_t;

} ADM_storage_t;



/** Information about resources assigned to a storage tier */

typedef struct {
@@ -467,15 +467,14 @@ ADM_set_dataset_information(ADM_server_t server, ADM_job_t job, 
 *

 * @param[in] server The server to which the request is directed

 * @param[in] job An ADM_JOB identifying the originating job.

 * @param[in] tier A STORAGE_HANDLE referring to the target storage tier.

 * @param[in] tier A ADM_STORAGE_TIER referring to the target storage tier.

 * @param[in] resources A RESOURCES argument containing information

 * about the I/O resources to set (e.g. number of I/O nodes.).

 * @return Returns ADM_SUCCESS if the remote procedure has completed

 * successfully.

 */

ADM_return_t

ADM_set_io_resources(ADM_server_t server, ADM_job_t job,

                     ADM_storage_handle_t tier,

ADM_set_io_resources(ADM_server_t server, ADM_job_t job, ADM_storage_t tier,

                     ADM_storage_resources_t resources);

src/lib/admire.hpp

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ set_dataset_information(const server& srv, ADM_job_t job, ADM_dataset_t target, 
                        ADM_dataset_info_t info);



ADM_return_t

set_io_resources(const server& srv, ADM_job_t job, ADM_storage_handle_t tier,

set_io_resources(const server& srv, ADM_job_t job, ADM_storage_t tier,

                 ADM_storage_resources_t resources);



ADM_return_t

src/lib/c_wrapper.cpp

+1 −2
Original line number Diff line number Diff line
@@ -452,8 +452,7 @@ ADM_set_dataset_information(ADM_server_t server, ADM_job_t job, 
}



ADM_return_t

ADM_set_io_resources(ADM_server_t server, ADM_job_t job,

                     ADM_storage_handle_t tier,

ADM_set_io_resources(ADM_server_t server, ADM_job_t job, ADM_storage_t tier,

                     ADM_storage_resources_t resources) {



    const admire::server srv{server->s_protocol, server->s_address};