Compare revisions

Alberto Miranda · Alberto Miranda · Ramon Nou · Ramon Nou · Ramon Nou · Ramon Nou
--- a/examples/c/ADM_cancel_transfer.c
+++ b/examples/c/ADM_cancel_transfer.c
@@ -70,9 +70,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,

--- a/examples/c/ADM_connect_data_operation.c
+++ b/examples/c/ADM_connect_data_operation.c
@@ -66,9 +66,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,

--- a/examples/c/ADM_define_data_operation.c
+++ b/examples/c/ADM_define_data_operation.c
@@ -71,9 +71,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,

--- a/examples/c/ADM_deploy_adhoc_storage.c
+++ b/examples/c/ADM_deploy_adhoc_storage.c
@@ -51,7 +51,7 @@ main(int argc, char* argv[]) {
    ADM_adhoc_resources_t adhoc_resources = NULL;
    ADM_adhoc_context_t adhoc_ctx = NULL;
    ADM_adhoc_context_t new_adhoc_ctx = NULL;
-    ADM_storage_t adhoc_storage = NULL;
+    ADM_adhoc_storage_t adhoc_storage = NULL;


    // Let's prepare all the information required by the API calls.
@@ -96,8 +96,9 @@ main(int argc, char* argv[]) {
    }

    // 2. Register the adhoc storage
-    if(ADM_register_adhoc_storage(server, adhoc_name, ADM_STORAGE_GEKKOFS,
-                                  adhoc_ctx, &adhoc_storage) != ADM_SUCCESS) {
+    if(ADM_register_adhoc_storage(server, adhoc_name,
+                                  ADM_ADHOC_STORAGE_DATACLAY, adhoc_ctx,
+                                  &adhoc_storage) != ADM_SUCCESS) {
        fprintf(stderr, "ADM_register_adhoc_storage() failed: %s\n",
                ADM_strerror(ret));
        goto cleanup;

--- a/examples/c/ADM_finalize_data_operation.c
+++ b/examples/c/ADM_finalize_data_operation.c
@@ -67,9 +67,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,

--- a/examples/c/ADM_get_pending_transfers.c
+++ b/examples/c/ADM_get_pending_transfers.c
@@ -70,9 +70,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,

--- a/examples/c/ADM_get_qos_constraints.c
+++ b/examples/c/ADM_get_qos_constraints.c
@@ -66,9 +66,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,

--- a/examples/c/ADM_get_statistics.c
+++ b/examples/c/ADM_get_statistics.c
@@ -66,9 +66,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,

--- a/examples/c/ADM_get_transfer_priority.c
+++ b/examples/c/ADM_get_transfer_priority.c
@@ -70,9 +70,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,

--- a/examples/c/ADM_link_transfer_to_data_operation.c
+++ b/examples/c/ADM_link_transfer_to_data_operation.c
@@ -67,9 +67,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,

--- a/examples/c/ADM_register_adhoc_storage.c
+++ b/examples/c/ADM_register_adhoc_storage.c
@@ -49,7 +49,7 @@ main(int argc, char* argv[]) {
    ADM_node_t* adhoc_nodes = NULL;
    ADM_adhoc_resources_t adhoc_resources = NULL;
    ADM_adhoc_context_t adhoc_ctx = NULL;
-    ADM_storage_t adhoc_storage = NULL;
+    ADM_adhoc_storage_t adhoc_storage = NULL;

    // Let's prepare all the information required by the API calls.
    // ADM_register_adhoc_storage() requires a set of nodes for the adhoc
@@ -92,7 +92,7 @@ main(int argc, char* argv[]) {
    }

    // 2. Register the adhoc storage
-    if(ADM_register_adhoc_storage(server, adhoc_name, ADM_STORAGE_GEKKOFS,
+    if(ADM_register_adhoc_storage(server, adhoc_name, ADM_ADHOC_STORAGE_GEKKOFS,
                                  adhoc_ctx, &adhoc_storage) != ADM_SUCCESS) {
        fprintf(stderr, "ADM_register_adhoc_storage() failed: %s\n",
                ADM_strerror(ret));

--- a/examples/c/ADM_register_job.c
+++ b/examples/c/ADM_register_job.c
@@ -50,7 +50,7 @@ main(int argc, char* argv[]) {
    ADM_node_t* adhoc_nodes = NULL;
    ADM_adhoc_resources_t adhoc_resources = NULL;
    ADM_adhoc_context_t adhoc_ctx = NULL;
-    ADM_storage_t adhoc_storage = NULL;
+    ADM_adhoc_storage_t adhoc_storage = NULL;

    // job information
    ADM_node_t* job_nodes = NULL;
@@ -103,7 +103,7 @@ main(int argc, char* argv[]) {
    }

    // 2. Register the adhoc storage
-    if(ADM_register_adhoc_storage(server, adhoc_name, ADM_STORAGE_GEKKOFS,
+    if(ADM_register_adhoc_storage(server, adhoc_name, ADM_ADHOC_STORAGE_GEKKOFS,
                                  adhoc_ctx, &adhoc_storage) != ADM_SUCCESS) {
        fprintf(stderr, "ADM_register_adhoc_storage() failed: %s\n",
                ADM_strerror(ret));

--- a/examples/c/ADM_register_pfs_storage.c
+++ b/examples/c/ADM_register_pfs_storage.c
@@ -43,7 +43,7 @@ main(int argc, char* argv[]) {
    int exit_status = EXIT_SUCCESS;
    ADM_server_t server = ADM_server_create("tcp", argv[1]);

-    ADM_storage_t pfs_storage;
+    ADM_pfs_storage_t pfs_storage;

    ADM_pfs_context_t ctx = ADM_pfs_context_create("/gpfs");
    assert(ctx);

--- a/examples/c/ADM_remove_adhoc_storage.c
+++ b/examples/c/ADM_remove_adhoc_storage.c
@@ -50,7 +50,7 @@ main(int argc, char* argv[]) {
    ADM_node_t* adhoc_nodes = NULL;
    ADM_adhoc_resources_t adhoc_resources = NULL;
    ADM_adhoc_context_t adhoc_ctx = NULL;
-    ADM_storage_t adhoc_storage = NULL;
+    ADM_adhoc_storage_t adhoc_storage = NULL;


    // Let's prepare all the information required by the API calls.
@@ -95,7 +95,7 @@ main(int argc, char* argv[]) {
    }

    // 2. Register the adhoc storage
-    if(ADM_register_adhoc_storage(server, adhoc_name, ADM_STORAGE_GEKKOFS,
+    if(ADM_register_adhoc_storage(server, adhoc_name, ADM_ADHOC_STORAGE_GEKKOFS,
                                  adhoc_ctx, &adhoc_storage) != ADM_SUCCESS) {
        fprintf(stderr, "ADM_register_adhoc_storage() failed: %s\n",
                ADM_strerror(ret));

--- a/examples/c/ADM_remove_job.c
+++ b/examples/c/ADM_remove_job.c
@@ -70,9 +70,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,

--- a/examples/c/ADM_remove_pfs_storage.c
+++ b/examples/c/ADM_remove_pfs_storage.c
@@ -42,7 +42,7 @@ main(int argc, char* argv[]) {
    ADM_pfs_context_t ctx = ADM_pfs_context_create("/gpfs");
    assert(ctx);

-    ADM_storage_t pfs_storage;
+    ADM_pfs_storage_t pfs_storage;
    ADM_return_t ret = ADM_register_pfs_storage(server, ctx, &pfs_storage);

    if(ret != ADM_SUCCESS) {

--- a/examples/c/ADM_set_dataset_information.c
+++ b/examples/c/ADM_set_dataset_information.c
@@ -67,9 +67,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,

--- a/examples/c/ADM_set_io_resources.c
+++ b/examples/c/ADM_set_io_resources.c
@@ -66,9 +66,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,
@@ -99,7 +99,7 @@ main(int argc, char* argv[]) {
        goto cleanup;
    }

-    ADM_storage_t tier = NULL;
+    ADM_adhoc_storage_t tier = NULL;
    ADM_adhoc_resources_t resources = NULL;
    ret = ADM_set_io_resources(server, job, tier, resources);


--- a/examples/c/ADM_set_qos_constraints.c
+++ b/examples/c/ADM_set_qos_constraints.c
@@ -70,9 +70,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,

--- a/examples/c/ADM_set_transfer_priority.c
+++ b/examples/c/ADM_set_transfer_priority.c
@@ -70,9 +70,9 @@ main(int argc, char* argv[]) {

    const char* name = "adhoc_storage_42";

-    ADM_storage_t adhoc_storage;
+    ADM_adhoc_storage_t adhoc_storage;
    ADM_return_t ret = ADM_register_adhoc_storage(
-            server, name, ADM_STORAGE_GEKKOFS, ctx, &adhoc_storage);
+            server, name, ADM_ADHOC_STORAGE_GEKKOFS, ctx, &adhoc_storage);

    if(ret != ADM_SUCCESS) {
        fprintf(stderr,
No results found