Commit 3e6b5672 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Rename NORNSCTL_CMD_RESUME_ACCEPT to NORNSCTL_CMD_RESUME_LISTEN

parent 14df53e0

include/norns/nornsctl_types.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ typedef uint32_t nornsctl_backend_flags_t; 
typedef enum {

    NORNSCTL_CMD_PING = 1000,

    NORNSCTL_CMD_PAUSE_LISTEN,

    NORNSCTL_CMD_RESUME_ACCEPT,

    NORNSCTL_CMD_RESUME_LISTEN,

    NORNSCTL_CMD_SHUTDOWN,

} nornsctl_command_t;

src/api/request.cpp

+4 −4
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ norns::command_type decode_command(::google::protobuf::uint32 type) { 
            return command_type::ping;

        case NORNSCTL_CMD_PAUSE_LISTEN:

            return command_type::pause_listen;

        case NORNSCTL_CMD_RESUME_ACCEPT:

            return command_type::resume_accept;

        case NORNSCTL_CMD_RESUME_LISTEN:

            return command_type::resume_listen;

        case NORNSCTL_CMD_SHUTDOWN:

            return command_type::shutdown;

        default:
@@ -431,8 +431,8 @@ std::string command_request::to_string() const { 
            return "PING";

        case command_type::pause_listen:

            return "PAUSE_LISTEN";

        case command_type::resume_accept:

            return "RESUME_ACCEPT";

        case command_type::resume_listen:

            return "RESUME_LISTEN";

        case command_type::shutdown:

            return "SHUTDOWN";

        default:

src/common/types.hpp

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ enum class backend_type { 
enum class command_type {

    ping,

    pause_listen,

    resume_accept,

    resume_listen,

    shutdown,

    unknown

};

src/urd.cpp

+4 −4
Original line number Diff line number Diff line
@@ -588,8 +588,8 @@ urd::command_handler(const request_ptr base_request) { 
        case command_type::pause_listen:

            pause_listening();

            break;

        case command_type::resume_accept:

            resume_accept();

        case command_type::resume_listen:

            resume_listening();

            break;

        case command_type::shutdown:

        {
@@ -600,7 +600,7 @@ urd::command_handler(const request_ptr base_request) { 
            resp->set_error_code(rv);



            if(rv != urd_error::success) {

                resume_accept();

                resume_listening();

                break;

            }

            shutdown();
@@ -1039,7 +1039,7 @@ void urd::pause_listening() { 
    LOGGER_WARN("Daemon locked: incoming requests will be rejected");

}



void urd::resume_accept() {

void urd::resume_listening() {

    bool expected = true;

    while(!m_is_paused.compare_exchange_weak(expected, false) && expected);

src/urd.hpp

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ private: 
                               uint32_t quota);



    void pause_listening();

    void resume_accept();

    void resume_listening();

    urd_error check_shutdown();