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

Rename norns_status() to norns_error() 

We need to provide a nornsctl_status() function to check the status of
administrative data transfer tasks, but we already have
a nornsctl_status() function in the API that checks the global status of
the service. Thus, we decided to keep the current nornsctl_status() and
rename norns_status() to norns_error() and provide a nornsctl_error()
for simmetry.
parent 6983c1ff

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -209,9 +209,9 @@ test:coverage: 
        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./core -as

        - make -j$(nproc) api

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::NORNS_TASK]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_error]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_iotask_init]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_resource_init]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_status]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_submit]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_submit_copy_buffer_to_file]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_submit_copy_local_posix_files]"
@@ -325,9 +325,9 @@ test:optimized: 
        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./core -as

        - make -j$(nproc) api

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::NORNS_TASK]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_error]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_iotask_init]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_resource_init]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_status]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_submit]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_submit_copy_buffer_to_file]"

        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::norns_submit_copy_local_posix_files]"

include/norns/norns.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ norns_cancel(norns_iotask_t* task) __THROW; 


/* Check the status of a submitted I/O task */

norns_error_t 

norns_status(norns_iotask_t* task, norns_stat_t* stats) __THROW;

norns_error(norns_iotask_t* task, norns_stat_t* stats) __THROW;



/* Return a string describing the error number */

char* norns_strerror(norns_error_t errnum) __THROW;

lib/libnorns.c

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ norns_submit(norns_iotask_t* task) { 
}



norns_error_t

norns_status(norns_iotask_t* task, norns_stat_t* stats) {

norns_error(norns_iotask_t* task, norns_stat_t* stats) {



    if(task == NULL || stats == NULL) {

        return NORNS_EBADARGS;

tests/api-copy-local-data.cpp

+16 −16
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ SCENARIO("copy local POSIX file to local POSIX file", "[api::norns_submit_copy_l 


                    THEN("NORNS_ESYSTEMERROR and ENOENT are reported") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(rv == NORNS_SUCCESS);

                        REQUIRE(stats.st_status == NORNS_EFINISHEDWERROR);
@@ -194,7 +194,7 @@ SCENARIO("copy local POSIX file to local POSIX file", "[api::norns_submit_copy_l 


                    THEN("NORNS_ESYSTEMERROR and ENOENT are reported") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(rv == NORNS_SUCCESS);

                        REQUIRE(stats.st_status == NORNS_EFINISHEDWERROR);
@@ -228,7 +228,7 @@ SCENARIO("copy local POSIX file to local POSIX file", "[api::norns_submit_copy_l 


                    THEN("NORNS_SUCCESS and ENOENT are reported") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(rv == NORNS_SUCCESS);

                        REQUIRE(stats.st_status == NORNS_EFINISHED);
@@ -267,7 +267,7 @@ SCENARIO("copy local POSIX file to local POSIX file", "[api::norns_submit_copy_l 


                    THEN("NORNS_ESYSTEMERROR and EACCES|EPERM|EINVAL are reported") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(rv == NORNS_SUCCESS);

                        REQUIRE(stats.st_status == NORNS_EFINISHEDWERROR);
@@ -303,7 +303,7 @@ SCENARIO("copy local POSIX file to local POSIX file", "[api::norns_submit_copy_l 


                    THEN("NORNS_ESYSTEMERROR and EACCES|EPERM|EINVAL are reported") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(rv == NORNS_SUCCESS);

                        REQUIRE(stats.st_status == NORNS_EFINISHEDWERROR);
@@ -339,7 +339,7 @@ SCENARIO("copy local POSIX file to local POSIX file", "[api::norns_submit_copy_l 


                    THEN("NORNS_ESYSTEMERROR and EACCES|EPERM|EINVAL are reported") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(rv == NORNS_SUCCESS);

                        REQUIRE(stats.st_status == NORNS_EFINISHEDWERROR);
@@ -375,7 +375,7 @@ SCENARIO("copy local POSIX file to local POSIX file", "[api::norns_submit_copy_l 


                    THEN("NORNS_ESYSTEMERROR and EACCES|EPERM|EINVAL are reported") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(rv == NORNS_SUCCESS);

                        REQUIRE(stats.st_status == NORNS_EFINISHEDWERROR);
@@ -411,7 +411,7 @@ SCENARIO("copy local POSIX file to local POSIX file", "[api::norns_submit_copy_l 


                    THEN("NORNS_ESYSTEMERROR and EACCES|EPERM|EINVAL are reported") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(rv == NORNS_SUCCESS);

                        REQUIRE(stats.st_status == NORNS_EFINISHEDWERROR);
@@ -447,7 +447,7 @@ SCENARIO("copy local POSIX file to local POSIX file", "[api::norns_submit_copy_l 


                    THEN("NORNS_ESYSTEMERROR and EACCES|EPERM|EINVAL are reported") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(rv == NORNS_SUCCESS);

                        REQUIRE(stats.st_status == NORNS_EFINISHEDWERROR);
@@ -485,7 +485,7 @@ SCENARIO("copy local POSIX file to local POSIX file", "[api::norns_submit_copy_l 


                    THEN("NORNS_ESYSTEMERROR and ENOENT are reported") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(rv == NORNS_SUCCESS);

                        REQUIRE(stats.st_status == NORNS_EFINISHEDWERROR);
@@ -1296,9 +1296,9 @@ SCENARIO("copy local memory buffer to local POSIX file", "[api::norns_submit_cop 
                THEN("norns_wait() return NORNS_SUCCESS") {

                    REQUIRE(rv == NORNS_SUCCESS);



                    THEN("norns_status() reports NORNS_ESYSTEMERROR and EFAULT") {

                    THEN("norns_error() reports NORNS_ESYSTEMERROR and EFAULT") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(rv == NORNS_SUCCESS);

                        REQUIRE(stats.st_status == NORNS_EFINISHEDWERROR);
@@ -1419,9 +1419,9 @@ SCENARIO("copy local memory buffer to local POSIX file", "[api::norns_submit_cop 
                THEN("norns_wait() return NORNS_SUCCESS") {

                    REQUIRE(rv == NORNS_SUCCESS);



                    THEN("norns_status() reports NORNS_ESYSTEMERROR and EISDIR") {

                    THEN("norns_error() reports NORNS_ESYSTEMERROR and EISDIR") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(stats.st_status == NORNS_EFINISHEDWERROR);

                        REQUIRE(stats.st_task_error == NORNS_ESYSTEMERROR);
@@ -1466,9 +1466,9 @@ SCENARIO("copy local memory buffer to local POSIX file", "[api::norns_submit_cop 
                THEN("norns_wait() return NORNS_SUCCESS") {

                    REQUIRE(rv == NORNS_SUCCESS);



                    THEN("norns_status() reports NORNS_ESYSTEMERROR and EISDIR") {

                    THEN("norns_error() reports NORNS_ESYSTEMERROR and EISDIR") {

                        norns_stat_t stats;

                        rv = norns_status(&task, &stats);

                        rv = norns_error(&task, &stats);



                        REQUIRE(stats.st_status == NORNS_EFINISHEDWERROR);

                        REQUIRE(stats.st_task_error == NORNS_ESYSTEMERROR);

tests/api-copy-remote-data.cpp

+118 −118

File changed.

Preview size limit exceeded, changes collapsed.