From 7a98e6d0505eaffb6faf0d26ce868ff71ca798e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 16 Jun 2017 01:34:27 +0300 Subject: [PATCH] Remove redundant states The closed state is not required as a separate boolean is used to track it. --- include/maxscale/backend.hh | 3 +-- server/core/backend.cc | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/maxscale/backend.hh b/include/maxscale/backend.hh index 8f788b352..092c33700 100644 --- a/include/maxscale/backend.hh +++ b/include/maxscale/backend.hh @@ -238,8 +238,7 @@ private: { IN_USE = 0x01, /**< Backend has been taken into use */ WAITING_RESULT = 0x02, /**< Waiting for a reply */ - CLOSED = 0x04, /**< Backend is no longer in use */ - FATAL_FAILURE = 0x08 /**< Backend references that should be dropped */ + FATAL_FAILURE = 0x04 /**< Backend references that should be dropped */ }; /** diff --git a/server/core/backend.cc b/server/core/backend.cc index fee730c88..917a978de 100644 --- a/server/core/backend.cc +++ b/server/core/backend.cc @@ -51,7 +51,6 @@ void Backend::close(close_type type) clear_state(WAITING_RESULT); } clear_state(IN_USE); - set_state(CLOSED); if (type == CLOSE_FATAL) { @@ -189,6 +188,7 @@ bool Backend::connect(MXS_SESSION* session) if ((m_dcb = dcb_connect(m_backend->server, session, m_backend->server->protocol))) { + m_closed = false; m_state = IN_USE; atomic_add(&m_backend->connections, 1); rval = true; @@ -276,7 +276,7 @@ bool Backend::is_waiting_result() const bool Backend::is_closed() const { - return m_state & CLOSED; + return m_closed; } bool Backend::has_failed() const