Verified Commit 481cbbcf authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

ADM_register_job, ADM_update_job: Add new ADM_job_resources_t argument

parent f781ac56

examples/c/ADM_cancel_transfer.c

+8 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <assert.h>

#include "common.h"



#define NJOB_NODES   50

#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5
@@ -45,6 +46,8 @@ main(int argc, char* argv[]) { 
    ADM_server_t server = ADM_server_create("tcp", argv[1]);



    ADM_job_t job;

    ADM_node_t* job_nodes = prepare_nodes(NJOB_NODES);

    assert(job_nodes);

    ADM_node_t* adhoc_nodes = prepare_nodes(NADHOC_NODES);

    assert(adhoc_nodes);

    ADM_dataset_t* inputs = prepare_datasets("input-dataset-%d", NINPUTS);
@@ -52,6 +55,10 @@ main(int argc, char* argv[]) { 
    ADM_dataset_t* outputs = prepare_datasets("output-dataset-%d", NOUTPUTS);

    assert(outputs);



    ADM_job_resources_t job_resources =

            ADM_job_resources_create(job_nodes, NJOB_NODES);

    assert(job_resources);



    ADM_adhoc_resources_t adhoc_resources =

            ADM_adhoc_resources_create(adhoc_nodes, NADHOC_NODES);

    assert(adhoc_resources);
@@ -68,7 +75,7 @@ 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);

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



    if(ret != ADM_SUCCESS) {

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

examples/c/ADM_connect_data_operation.c

+8 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <assert.h>

#include "common.h"



#define NJOB_NODES   50

#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5
@@ -45,6 +46,8 @@ main(int argc, char* argv[]) { 
    ADM_server_t server = ADM_server_create("tcp", argv[1]);



    ADM_job_t job;

    ADM_node_t* job_nodes = prepare_nodes(NJOB_NODES);

    assert(job_nodes);

    ADM_node_t* adhoc_nodes = prepare_nodes(NADHOC_NODES);

    assert(adhoc_nodes);

    ADM_dataset_t* inputs = prepare_datasets("input-dataset-%d", NINPUTS);
@@ -64,11 +67,15 @@ main(int argc, char* argv[]) { 
    ADM_storage_t st = ADM_storage_create("foobar", ADM_STORAGE_GEKKOFS, ctx);

    assert(st);



    ADM_job_resources_t job_resources =

            ADM_job_resources_create(job_nodes, NJOB_NODES);

    assert(job_resources);



    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);

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



    if(ret != ADM_SUCCESS) {

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

examples/c/ADM_define_data_operation.c

+8 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <assert.h>

#include "common.h"



#define NJOB_NODES   50

#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5
@@ -46,6 +47,8 @@ main(int argc, char* argv[]) { 
    ADM_server_t server = ADM_server_create("tcp", argv[1]);



    ADM_job_t job;

    ADM_node_t* job_nodes = prepare_nodes(NJOB_NODES);

    assert(job_nodes);

    ADM_node_t* adhoc_nodes = prepare_nodes(NADHOC_NODES);

    assert(adhoc_nodes);

    ADM_dataset_t* inputs = prepare_datasets("input-dataset-%d", NINPUTS);
@@ -53,6 +56,10 @@ main(int argc, char* argv[]) { 
    ADM_dataset_t* outputs = prepare_datasets("output-dataset-%d", NOUTPUTS);

    assert(outputs);



    ADM_job_resources_t job_resources =

            ADM_job_resources_create(job_nodes, NJOB_NODES);

    assert(job_resources);



    ADM_adhoc_resources_t adhoc_resources =

            ADM_adhoc_resources_create(adhoc_nodes, NADHOC_NODES);

    assert(adhoc_resources);
@@ -69,7 +76,7 @@ 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);

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



    if(ret != ADM_SUCCESS) {

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

examples/c/ADM_deploy_adhoc_storage.c

+8 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <assert.h>

#include "common.h"



#define NJOB_NODES   50

#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5
@@ -45,6 +46,8 @@ main(int argc, char* argv[]) { 
    ADM_server_t server = ADM_server_create("tcp", argv[1]);



    ADM_job_t job;

    ADM_node_t* job_nodes = prepare_nodes(NJOB_NODES);

    assert(job_nodes);

    ADM_node_t* adhoc_nodes = prepare_nodes(NADHOC_NODES);

    assert(adhoc_nodes);

    ADM_dataset_t* inputs = prepare_datasets("input-dataset-%d", NINPUTS);
@@ -52,6 +55,10 @@ main(int argc, char* argv[]) { 
    ADM_dataset_t* outputs = prepare_datasets("output-dataset-%d", NOUTPUTS);

    assert(outputs);



    ADM_job_resources_t job_resources =

            ADM_job_resources_create(job_nodes, NJOB_NODES);

    assert(job_resources);



    ADM_adhoc_resources_t adhoc_resources =

            ADM_adhoc_resources_create(adhoc_nodes, NADHOC_NODES);

    assert(adhoc_resources);
@@ -68,7 +75,7 @@ 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);

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



    if(ret != ADM_SUCCESS) {

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

examples/c/ADM_finalize_data_operation.c

+8 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <assert.h>

#include "common.h"



#define NJOB_NODES   50

#define NADHOC_NODES 25

#define NINPUTS      10

#define NOUTPUTS     5
@@ -46,6 +47,8 @@ main(int argc, char* argv[]) { 
    ADM_server_t server = ADM_server_create("tcp", argv[1]);



    ADM_job_t job;

    ADM_node_t* job_nodes = prepare_nodes(NJOB_NODES);

    assert(job_nodes);

    ADM_node_t* adhoc_nodes = prepare_nodes(NADHOC_NODES);

    assert(adhoc_nodes);

    ADM_dataset_t* inputs = prepare_datasets("input-dataset-%d", NINPUTS);
@@ -65,11 +68,15 @@ main(int argc, char* argv[]) { 
    ADM_storage_t st = ADM_storage_create("foobar", ADM_STORAGE_GEKKOFS, ctx);

    assert(st);



    ADM_job_resources_t job_resources =

            ADM_job_resources_create(job_nodes, NJOB_NODES);

    assert(job_resources);



    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);

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



    if(ret != ADM_SUCCESS) {

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