Skip to content
This repository was archived by the owner on Apr 6, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# compilation options
###
IF (NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++11")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
ENDIF (NOT WIN32)


Expand Down Expand Up @@ -60,3 +60,22 @@ target_link_libraries(cpp_redis_kill cpp_redis)

add_executable(cpp_redis_high_availability_client cpp_redis_high_availability_client.cpp)
target_link_libraries(cpp_redis_high_availability_client cpp_redis)

###
# link libs
###
IF (WIN32)
target_link_libraries(cpp_redis_client ws2_32)
target_link_libraries(cpp_redis_future_client ws2_32)
target_link_libraries(cpp_redis_subscriber ws2_32)
target_link_libraries(cpp_redis_logger ws2_32)
target_link_libraries(cpp_redis_kill ws2_32)
target_link_libraries(cpp_redis_high_availability_client ws2_32)
ELSE ()
target_link_libraries(cpp_redis_client pthread)
target_link_libraries(cpp_redis_future_client pthread)
target_link_libraries(cpp_redis_subscriber pthread)
target_link_libraries(cpp_redis_logger pthread)
target_link_libraries(cpp_redis_kill pthread)
target_link_libraries(cpp_redis_high_availability_client pthread)
ENDIF (WIN32)
6 changes: 3 additions & 3 deletions includes/cpp_redis/core/client.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1091,11 +1091,11 @@ class client {
//!
//! reconnection status
//!
std::atomic_bool m_reconnecting = ATOMIC_VAR_INIT(false);
std::atomic_bool m_reconnecting;
//!
//! to force cancel reconnection
//!
std::atomic_bool m_cancel = ATOMIC_VAR_INIT(false);
std::atomic_bool m_cancel;

//!
//! sent commands waiting to be executed
Expand All @@ -1120,7 +1120,7 @@ class client {
//!
//! number of callbacks currently being running
//!
std::atomic<unsigned int> m_callbacks_running = ATOMIC_VAR_INIT(0);
std::atomic<unsigned int> m_callbacks_running;
}; // namespace cpp_redis

} // namespace cpp_redis
Expand Down
2 changes: 1 addition & 1 deletion includes/cpp_redis/core/sentinel.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ class sentinel {
//!
//! number of callbacks currently being running
//!
std::atomic<unsigned int> m_callbacks_running = ATOMIC_VAR_INIT(0);
std::atomic<unsigned int> m_callbacks_running;
};

}; // namespace cpp_redis
4 changes: 2 additions & 2 deletions includes/cpp_redis/core/subscriber.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,11 @@ class subscriber {
//!
//! reconnection status
//!
std::atomic_bool m_reconnecting = ATOMIC_VAR_INIT(false);
std::atomic_bool m_reconnecting;
//!
//! to force cancel reconnection
//!
std::atomic_bool m_cancel = ATOMIC_VAR_INIT(false);
std::atomic_bool m_cancel;

//!
//! subscribed channels and their associated channels
Expand Down
10 changes: 8 additions & 2 deletions sources/core/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,19 @@
namespace cpp_redis {

#ifndef __CPP_REDIS_USE_CUSTOM_TCP_CLIENT
client::client(void) {
client::client(void)
: m_reconnecting(false)
, m_cancel(false)
, m_callbacks_running(0) {
__CPP_REDIS_LOG(debug, "cpp_redis::client created");
}
#endif /* __CPP_REDIS_USE_CUSTOM_TCP_CLIENT */

client::client(const std::shared_ptr<network::tcp_client_iface>& tcp_client)
: m_client(tcp_client) {
: m_client(tcp_client)
, m_reconnecting(false)
, m_cancel(false)
, m_callbacks_running(0) {
__CPP_REDIS_LOG(debug, "cpp_redis::client created");
}

Expand Down
6 changes: 4 additions & 2 deletions sources/core/sentinel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@
namespace cpp_redis {

#ifndef __CPP_REDIS_USE_CUSTOM_TCP_CLIENT
sentinel::sentinel(void) {
sentinel::sentinel(void)
: m_callbacks_running(0) {
__CPP_REDIS_LOG(debug, "cpp_redis::sentinel created");
}
#endif /* __CPP_REDIS_USE_CUSTOM_TCP_CLIENT */

sentinel::sentinel(const std::shared_ptr<network::tcp_client_iface>& tcp_client)
: m_client(tcp_client) {
: m_client(tcp_client)
, m_callbacks_running(0) {
__CPP_REDIS_LOG(debug, "cpp_redis::sentinel created");
}

Expand Down
8 changes: 6 additions & 2 deletions sources/core/subscriber.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,18 @@ namespace cpp_redis {

#ifndef __CPP_REDIS_USE_CUSTOM_TCP_CLIENT
subscriber::subscriber(void)
: m_auth_reply_callback(nullptr) {
: m_auth_reply_callback(nullptr)
, m_reconnecting(false)
, m_cancel(false) {
__CPP_REDIS_LOG(debug, "cpp_redis::subscriber created");
}
#endif /* __CPP_REDIS_USE_CUSTOM_TCP_CLIENT */

subscriber::subscriber(const std::shared_ptr<network::tcp_client_iface>& tcp_client)
: m_client(tcp_client)
, m_auth_reply_callback(nullptr) {
, m_auth_reply_callback(nullptr)
, m_reconnecting(false)
, m_cancel(false) {
__CPP_REDIS_LOG(debug, "cpp_redis::subscriber created");
}

Expand Down