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

Remove deprecated nornsctl_ping() function 

It has been decided to remove the deprectated nornsctl_ping() function from
libnornsctl.so, since an equivalent functionality is now supported using
the new nornsctl_send_command() function and its NORNSCTL_COMMAND_PING
argument.

Therefore, any such invocation:

    norns_error_t rv = nornsctl_ping();

can now be replicated as:

    norns_error_t rv = nornsctl_send_command(NORNSCTL_COMMAND_PING, NULL);
parent 1f57d2cd

.gitlab-ci.yml

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ test:ubuntu:latest: 
        - NORNS_DEBUG_CONFIG_FILE_OVERRIDE=1 ./api -as "[api::nornsctl_register_job]"

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

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

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

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

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

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

include/norns/nornsctl.h

+0 −4
Original line number Diff line number Diff line
@@ -120,10 +120,6 @@ nornsctl_job_init(nornsctl_job_t* job, 
                  nornsctl_job_limit_t** limits, 

                  size_t nlimits) __THROW;



/* Check if the service daemon is running */

norns_error_t 

nornsctl_ping(void) __THROW __attribute__((deprecated));



/* Send a command to the service daemon */

norns_error_t

nornsctl_send_command(nornsctl_command_t command,

lib/communication.c

+0 −17
Original line number Diff line number Diff line
@@ -148,23 +148,6 @@ send_control_status_request(nornsctl_stat_t* stats) { 
    return resp.r_error_code;

}



norns_error_t

send_ping_request() {



    int res;

    norns_response_t resp;



    if((res = send_request(NORNS_PING, &resp)) != NORNS_SUCCESS) {

        return res;

    }



    if(resp.r_type != NORNS_PING) {

        return NORNS_ESNAFU;

    }



    return resp.r_error_code;

}



norns_error_t

send_job_request(norns_msgtype_t type, uint32_t jobid, nornsctl_job_t* job) {

lib/communication.h

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ norns_error_t send_process_request(norns_msgtype_t type, uint32_t jobid, 
norns_error_t send_namespace_request(norns_msgtype_t type, const char* nsid, 

                                     nornsctl_backend_t* backend);

norns_error_t send_control_status_request(nornsctl_stat_t* stats);

norns_error_t send_ping_request() __attribute__((deprecated));



#pragma GCC visibility pop

lib/libnornsctl.c

+0 −5
Original line number Diff line number Diff line
@@ -148,11 +148,6 @@ libnornsctl_reload_config_file(void) { 
#endif



/* Control API */

norns_error_t

nornsctl_ping(void) {

    return send_ping_request();

}



norns_error_t

nornsctl_send_command(nornsctl_command_t command, 

                      void* args) {