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

Rename ctl_status to global_status

parent 05584bc0

lib/communication.c

+3 −3
Original line number Diff line number Diff line
@@ -113,12 +113,12 @@ send_control_status_request(nornsctl_stat_t* stats) { 
    int res;

    norns_response_t resp;



    if((res = send_request(NORNSCTL_STATUS, &resp)) 

    if((res = send_request(NORNSCTL_GLOBAL_STATUS, &resp)) 

            != NORNS_SUCCESS) {

        return res;

    }



    if(resp.r_type != NORNSCTL_STATUS) {

    if(resp.r_type != NORNSCTL_GLOBAL_STATUS) {

        return NORNS_ESNAFU;

    }
@@ -245,7 +245,7 @@ send_request(norns_rpc_type_t type, norns_response_t* resp, ...) { 
            break;

        }



        case NORNSCTL_STATUS:

        case NORNSCTL_GLOBAL_STATUS:

        case NORNS_PING:

        {

            if((res = pack_to_buffer(type, &req_buf)) != NORNS_SUCCESS) {

lib/requests.c

+6 −6
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ encode_request_type(norns_rpc_type_t type) { 
            return NORNS__RPC__REQUEST__TYPE__NAMESPACE_UPDATE;

        case NORNS_NAMESPACE_UNREGISTER:

            return NORNS__RPC__REQUEST__TYPE__NAMESPACE_UNREGISTER;

        case NORNSCTL_STATUS:

            return NORNS__RPC__REQUEST__TYPE__CTL_STATUS;

        case NORNSCTL_GLOBAL_STATUS:

            return NORNS__RPC__REQUEST__TYPE__GLOBAL_STATUS;

        default:

            return -1;

    }
@@ -139,8 +139,8 @@ decode_response_type(int norns_rpc_type) { 
            return NORNS_NAMESPACE_UPDATE;

        case NORNS__RPC__RESPONSE__TYPE__NAMESPACE_UNREGISTER:

            return NORNS_NAMESPACE_UNREGISTER;

        case NORNS__RPC__RESPONSE__TYPE__CTL_STATUS:

            return NORNSCTL_STATUS;

        case NORNS__RPC__RESPONSE__TYPE__GLOBAL_STATUS:

            return NORNSCTL_GLOBAL_STATUS;

        case NORNS__RPC__RESPONSE__TYPE__BAD_REQUEST:

            // intentionally fall through

        default:
@@ -177,7 +177,7 @@ build_request_msg(norns_rpc_type_t type, va_list ap) { 
            break;

        }



        case NORNSCTL_STATUS:

        case NORNSCTL_GLOBAL_STATUS:

        case NORNS_PING:

        {

            break;
@@ -780,7 +780,7 @@ unpack_from_buffer(msgbuffer_t* buf, norns_response_t* response) { 
            response->r_errno = rpc_resp->stats->sys_errnum;

            break;



        case NORNSCTL_STATUS:

        case NORNSCTL_GLOBAL_STATUS:

            if(rpc_resp->gstats == NULL) {

                return NORNS_ERPCRECVFAILED;

            }

lib/requests.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ typedef enum { 
    NORNS_IOTASK_SUBMIT,

    NORNS_IOTASK_STATUS,



    NORNSCTL_STATUS,

    NORNSCTL_GLOBAL_STATUS,



    NORNS_PING,

rpc/messages.proto

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ message Request { 
        NAMESPACE_UPDATE = 10;

        NAMESPACE_UNREGISTER = 11;



        CTL_STATUS = 12;

        GLOBAL_STATUS = 12;

    }



    // I/O task descriptor
@@ -105,7 +105,7 @@ message Response { 
        NAMESPACE_UPDATE = 10;

        NAMESPACE_UNREGISTER = 11;



        CTL_STATUS = 12;

        GLOBAL_STATUS = 12;

        BAD_REQUEST = 13;

    }

src/api/request.cpp

+3 −3
Original line number Diff line number Diff line
@@ -213,8 +213,8 @@ request_ptr request::create_from_buffer(const std::vector<uint8_t>& buffer, int 
            case norns::rpc::Request::PING:

                return std::make_unique<ping_request>();



            case norns::rpc::Request::CTL_STATUS:

                return std::make_unique<ctl_status_request>();

            case norns::rpc::Request::GLOBAL_STATUS:

                return std::make_unique<global_status_request>();



            case norns::rpc::Request::JOB_REGISTER:

            case norns::rpc::Request::JOB_UPDATE:
@@ -353,7 +353,7 @@ std::string iotask_status_request::to_string() const { 
}



template<>

std::string ctl_status_request::to_string() const {

std::string global_status_request::to_string() const {

    return "GLOBAL_STATUS";

}