lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-28 20:02:00 +03:00
Code Activity

Renamed server_context to server_state.

Browse Source
This commit is contained in:
Teemu Ollakka
2018-06-17 10:07:48 +03:00
parent 790c2bec4e
commit ef4baa9f9d
29 changed files with 212 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wsrep/client_state.hpp
View File

@ -38,7 +38,7 @@
#ifndef WSREP_CLIENT_CONTEXT_HPP
#define WSREP_CLIENT_CONTEXT_HPP
#include "server_context.hpp"
#include "server_state.hpp"
#include "provider.hpp"
#include "transaction.hpp"
#include "client_id.hpp"
@ -51,7 +51,7 @@
namespace wsrep
{
class server_context;
class server_state;
class provider;
enum client_error
@ -475,8 +475,8 @@ namespace wsrep
*
* @return Reference to server context.
*/
wsrep::server_context& server_context() const
{ return server_context_; }
wsrep::server_state& server_state() const
{ return server_state_; }
/**
* Get reference to the Provider which is associated
@ -521,7 +521,7 @@ namespace wsrep
int debug_log_level() const
{
return std::max(debug_log_level_,
server_context_.debug_log_level());
server_state_.debug_log_level());
}
void reset_error()
@ -539,13 +539,13 @@ namespace wsrep
* can be called from derived class constructors only.
*/
client_state(wsrep::mutex& mutex,
wsrep::server_context& server_context,
wsrep::server_state& server_state,
wsrep::client_service& client_service,
const client_id& id,
enum mode mode)
: thread_id_(wsrep::this_thread::get_id())
, mutex_(mutex)
, server_context_(server_context)
, server_state_(server_state)
, client_service_(client_service)
, id_(id)
, mode_(mode)
@ -575,7 +575,7 @@ namespace wsrep
wsrep::thread::id thread_id_;
wsrep::mutex& mutex_;
wsrep::server_context& server_context_;
wsrep::server_state& server_state_;
wsrep::client_service& client_service_;
client_id id_;
enum mode mode_;

10
include/wsrep/provider.hpp
View File

@ -21,7 +21,7 @@
namespace wsrep
{
class server_context;
class server_state;
class stid
{
@ -195,8 +195,8 @@ namespace wsrep
static const int snapshot = (1 << 7);
};
provider(wsrep::server_context& server_context)
: server_context_(server_context)
provider(wsrep::server_state& server_state)
: server_state_(server_state)
{ }
virtual ~provider() { }
// Provider state management
@ -260,11 +260,11 @@ namespace wsrep
* @param provider_options Initial options to provider
*/
static provider* make_provider(
wsrep::server_context&,
wsrep::server_state&,
const std::string& provider_spec,
const std::string& provider_options);
protected:
wsrep::server_context& server_context_;
wsrep::server_state& server_state_;
};
static inline std::string flags_to_string(int flags)

42
include/wsrep/server_context.hpp → include/wsrep/server_state.hpp
View File

@ -2,7 +2,7 @@
// Copyright (C) 2018 Codership Oy <info@codership.com>
//
/** @file server_context.hpp
/** @file server_state.hpp
*
* Server Context Abstraction
* ==========================
@ -86,7 +86,7 @@ namespace wsrep
*
*
*/
class server_context
class server_state
{
public:
/**
@ -155,7 +155,7 @@ namespace wsrep
};
virtual ~server_context();
virtual ~server_state();
/**
* Return human readable server name.
*
@ -292,7 +292,7 @@ namespace wsrep
/**
* Wait until server reaches given state.
*/
void wait_until_state(wsrep::server_context::state) const;
void wait_until_state(wsrep::server_state::state) const;
/**
* Virtual method to return true if the configured SST
@ -403,7 +403,7 @@ namespace wsrep
* data files.
* @param rollback_mode Rollback mode which server operates on.
*/
server_context(wsrep::mutex& mutex,
server_state(wsrep::mutex& mutex,
wsrep::condition_variable& cond,
const std::string& name,
const std::string& id,
@ -426,8 +426,8 @@ namespace wsrep
private:
server_context(const server_context&);
server_context& operator=(const server_context&);
server_state(const server_state&);
server_state& operator=(const server_state&);
void state(wsrep::unique_lock<wsrep::mutex>&, enum state);
@ -449,30 +449,30 @@ namespace wsrep
class client_deleter
{
public:
client_deleter(wsrep::server_context& server_context)
: server_context_(server_context)
client_deleter(wsrep::server_state& server_state)
: server_state_(server_state)
{ }
void operator()(wsrep::client_state* client_state)
{
server_context_.release_client_state(client_state);
server_state_.release_client_state(client_state);
}
private:
wsrep::server_context& server_context_;
wsrep::server_state& server_state_;
};
static inline std::string to_string(enum wsrep::server_context::state state)
static inline std::string to_string(enum wsrep::server_state::state state)
{
switch (state)
{
case wsrep::server_context::s_disconnected: return "disconnected";
case wsrep::server_context::s_initializing: return "initilizing";
case wsrep::server_context::s_initialized: return "initilized";
case wsrep::server_context::s_connected: return "connected";
case wsrep::server_context::s_joiner: return "joiner";
case wsrep::server_context::s_joined: return "joined";
case wsrep::server_context::s_donor: return "donor";
case wsrep::server_context::s_synced: return "synced";
case wsrep::server_context::s_disconnecting: return "disconnecting";
case wsrep::server_state::s_disconnected: return "disconnected";
case wsrep::server_state::s_initializing: return "initilizing";
case wsrep::server_state::s_initialized: return "initilized";
case wsrep::server_state::s_connected: return "connected";
case wsrep::server_state::s_joiner: return "joiner";
case wsrep::server_state::s_joined: return "joined";
case wsrep::server_state::s_donor: return "donor";
case wsrep::server_state::s_synced: return "synced";
case wsrep::server_state::s_disconnecting: return "disconnecting";
}
return "unknown";
}

2
include/wsrep/transaction.hpp
View File

@ -6,7 +6,7 @@
#define WSREP_TRANSACTION_CONTEXT_HPP
#include "provider.hpp"
#include "server_context.hpp"
#include "server_state.hpp"
#include "transaction_id.hpp"
#include "streaming_context.hpp"
#include "lock.hpp"