Commit eaaf3027 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Merge branch '50-adm_register_-_storage-apis-should-not-require-an-adm_job_t-argument' into 'main' 

Resolve "ADM_register_*_storage APIs should not require an `ADM_job_t` argument"

This MR removes the necessity to provide a `job` argument when registering or manipulating an `adhoc_storage` or `pfs_storage` instance.

Closes #50

See merge request !34
parents 5c480c7c 7bfc5cb1

examples/c/ADM_deploy_adhoc_storage.c

+2 −36
Original line number Diff line number Diff line
@@ -42,28 +42,6 @@ main(int argc, char* argv[]) { 
    int exit_status = EXIT_SUCCESS;

    ADM_server_t server = ADM_server_create("tcp", argv[1]);



    ADM_job_t job;



    ADM_dataset_t inputs[NINPUTS];



    for(int i = 0; i < NINPUTS; ++i) {

        const char* pattern = "input-dataset-%d";

        size_t n = snprintf(NULL, 0, pattern, i);

        char* id = (char*) alloca(n + 1);

        snprintf(id, n + 1, pattern, i);

        inputs[i] = ADM_dataset_create(id);

    }



    ADM_dataset_t outputs[NOUTPUTS];



    for(int i = 0; i < NOUTPUTS; ++i) {

        const char* pattern = "output-dataset-%d";

        size_t n = snprintf(NULL, 0, pattern, i);

        char* id = (char*) alloca(n + 1);

        snprintf(id, n + 1, pattern, i);

        outputs[i] = ADM_dataset_create(id);

    }



    ADM_adhoc_context_t ctx = ADM_adhoc_context_create(

            ADM_ADHOC_MODE_SEPARATE_NEW, ADM_ADHOC_ACCESS_RDWR, 42, 100, false);

    assert(ctx);
@@ -71,21 +49,9 @@ main(int argc, char* argv[]) { 
    ADM_storage_t st = ADM_storage_create("foobar", ADM_STORAGE_GEKKOFS, ctx);

    assert(st);



    ADM_job_requirements_t reqs =

            ADM_job_requirements_create(inputs, NINPUTS, outputs, NOUTPUTS, st);

    assert(reqs);



    ADM_return_t ret = ADM_register_job(server, reqs, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "

                        "successfully\n");

        exit_status = EXIT_FAILURE;

    }



    ADM_storage_t adhoc_storage;



    ret = ADM_register_adhoc_storage(server, job, ctx, &adhoc_storage);

    ADM_return_t ret = ADM_register_adhoc_storage(server, ctx, &adhoc_storage);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout,
@@ -98,7 +64,7 @@ main(int argc, char* argv[]) { 
    fprintf(stdout, "ADM_register_adhoc_storage() remote procedure completed "

                    "successfully\n");



    ret = ADM_deploy_adhoc_storage(server, job, adhoc_storage);

    ret = ADM_deploy_adhoc_storage(server, adhoc_storage);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout,

examples/c/ADM_register_adhoc_storage.c

+1 −12
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ main(int argc, char* argv[]) { 
    int exit_status = EXIT_SUCCESS;

    ADM_server_t server = ADM_server_create("tcp", argv[1]);





    ADM_job_t job;



    ADM_dataset_t inputs[NINPUTS];



    for(int i = 0; i < NINPUTS; ++i) {
@@ -76,17 +73,9 @@ main(int argc, char* argv[]) { 
            ADM_job_requirements_create(inputs, NINPUTS, outputs, NOUTPUTS, st);

    assert(reqs);



    ADM_return_t ret = ADM_register_job(server, reqs, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "

                        "successfully\n");

        exit_status = EXIT_FAILURE;

    }



    ADM_storage_t adhoc_storage;



    ret = ADM_register_adhoc_storage(server, job, ctx, &adhoc_storage);

    ADM_return_t ret = ADM_register_adhoc_storage(server, ctx, &adhoc_storage);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout,

examples/c/ADM_remove_adhoc_storage.c

+2 −36
Original line number Diff line number Diff line
@@ -42,28 +42,6 @@ main(int argc, char* argv[]) { 
    int exit_status = EXIT_SUCCESS;

    ADM_server_t server = ADM_server_create("tcp", argv[1]);





    ADM_job_t job;

    ADM_dataset_t inputs[NINPUTS];



    for(int i = 0; i < NINPUTS; ++i) {

        const char* pattern = "input-dataset-%d";

        size_t n = snprintf(NULL, 0, pattern, i);

        char* id = (char*) alloca(n + 1);

        snprintf(id, n + 1, pattern, i);

        inputs[i] = ADM_dataset_create(id);

    }



    ADM_dataset_t outputs[NOUTPUTS];



    for(int i = 0; i < NOUTPUTS; ++i) {

        const char* pattern = "output-dataset-%d";

        size_t n = snprintf(NULL, 0, pattern, i);

        char* id = (char*) alloca(n + 1);

        snprintf(id, n + 1, pattern, i);

        outputs[i] = ADM_dataset_create(id);

    }



    ADM_adhoc_context_t ctx = ADM_adhoc_context_create(

            ADM_ADHOC_MODE_SEPARATE_NEW, ADM_ADHOC_ACCESS_RDWR, 42, 100, false);

    assert(ctx);
@@ -71,20 +49,8 @@ main(int argc, char* argv[]) { 
    ADM_storage_t st = ADM_storage_create("foobar", ADM_STORAGE_GEKKOFS, ctx);

    assert(st);



    ADM_job_requirements_t reqs =

            ADM_job_requirements_create(inputs, NINPUTS, outputs, NOUTPUTS, st);

    assert(reqs);



    ADM_return_t ret = ADM_register_job(server, reqs, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "

                        "successfully\n");

        exit_status = EXIT_FAILURE;

    }



    ADM_storage_t adhoc_storage;

    ret = ADM_register_adhoc_storage(server, job, ctx, &adhoc_storage);

    ADM_return_t ret = ADM_register_adhoc_storage(server, ctx, &adhoc_storage);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout,
@@ -97,7 +63,7 @@ main(int argc, char* argv[]) { 
    fprintf(stdout, "ADM_register_adhoc_storage() remote procedure completed "

                    "successfully\n");



    ret = ADM_remove_adhoc_storage(server, job, adhoc_storage);

    ret = ADM_remove_adhoc_storage(server, adhoc_storage);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout,

examples/c/ADM_update_adhoc_storage.c

+2 −35
Original line number Diff line number Diff line
@@ -42,27 +42,6 @@ main(int argc, char* argv[]) { 
    int exit_status = EXIT_SUCCESS;

    ADM_server_t server = ADM_server_create("tcp", argv[1]);



    ADM_job_t job;

    ADM_dataset_t inputs[NINPUTS];



    for(int i = 0; i < NINPUTS; ++i) {

        const char* pattern = "input-dataset-%d";

        size_t n = snprintf(NULL, 0, pattern, i);

        char* id = (char*) alloca(n + 1);

        snprintf(id, n + 1, pattern, i);

        inputs[i] = ADM_dataset_create(id);

    }



    ADM_dataset_t outputs[NOUTPUTS];



    for(int i = 0; i < NOUTPUTS; ++i) {

        const char* pattern = "output-dataset-%d";

        size_t n = snprintf(NULL, 0, pattern, i);

        char* id = (char*) alloca(n + 1);

        snprintf(id, n + 1, pattern, i);

        outputs[i] = ADM_dataset_create(id);

    }



    ADM_adhoc_context_t ctx = ADM_adhoc_context_create(

            ADM_ADHOC_MODE_SEPARATE_NEW, ADM_ADHOC_ACCESS_RDWR, 42, 100, false);

    assert(ctx);
@@ -70,20 +49,8 @@ main(int argc, char* argv[]) { 
    ADM_storage_t st = ADM_storage_create("foobar", ADM_STORAGE_GEKKOFS, ctx);

    assert(st);



    ADM_job_requirements_t reqs =

            ADM_job_requirements_create(inputs, NINPUTS, outputs, NOUTPUTS, st);

    assert(reqs);



    ADM_return_t ret = ADM_register_job(server, reqs, &job);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout, "ADM_register_job() remote procedure not completed "

                        "successfully\n");

        exit_status = EXIT_FAILURE;

    }



    ADM_storage_t adhoc_storage;

    ret = ADM_register_adhoc_storage(server, job, ctx, &adhoc_storage);

    ADM_return_t ret = ADM_register_adhoc_storage(server, ctx, &adhoc_storage);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout,
@@ -96,7 +63,7 @@ main(int argc, char* argv[]) { 
    fprintf(stdout, "ADM_register_adhoc_storage() remote procedure completed "

                    "successfully\n");



    ret = ADM_update_adhoc_storage(server, job, ctx, adhoc_storage);

    ret = ADM_update_adhoc_storage(server, ctx, adhoc_storage);



    if(ret != ADM_SUCCESS) {

        fprintf(stdout,

examples/cxx/ADM_deploy_adhoc_storage.cpp

+1 −2
Original line number Diff line number Diff line
@@ -38,12 +38,11 @@ main(int argc, char* argv[]) { 


    admire::server server{"tcp", argv[1]};



    ADM_job_t job{};

    ADM_storage_t adhoc_storage{};

    ADM_return_t ret = ADM_SUCCESS;



    try {

        ret = admire::deploy_adhoc_storage(server, job, adhoc_storage);

        ret = admire::deploy_adhoc_storage(server, adhoc_storage);

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

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

                   e.what());