Skip to content

Changed closedTime to closedTimeDuration to support correct atomic initialization #593

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 11, 2020
Merged

Changed closedTime to closedTimeDuration to support correct atomic initialization #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58ad811
Changed closedTime to closedTimeDuration to support correct atomic in…
RikeVoltz May 8, 2020
902c08f
Added fix for lastReadTime too
RikeVoltz May 8, 2020
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
2 changes: 1 addition & 1 deletion hazelcast/include/hazelcast/client/connection/Connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ namespace hazelcast {
void innerClose();

std::chrono::steady_clock::time_point startTime;
std::atomic<std::chrono::steady_clock::time_point> closedTime;
std::atomic<std::chrono::steady_clock::duration> closedTimeDuration;
spi::ClientContext &clientContext;
protocol::IMessageHandler &invocationService;
std::unique_ptr<Socket> socket;
Expand Down
2 changes: 1 addition & 1 deletion hazelcast/include/hazelcast/client/connection/ReadHandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace hazelcast {
private:

protocol::ClientMessageBuilder builder;
std::atomic<std::chrono::steady_clock::time_point> lastReadTime;
std::atomic<std::chrono::steady_clock::duration> lastReadTimeDuration;
};
}
}
Expand Down
11 changes: 6 additions & 5 deletions hazelcast/src/hazelcast/client/network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,15 +863,15 @@ namespace hazelcast {

ReadHandler::ReadHandler(Connection &connection, size_t bufferSize)
: buffer(new char[bufferSize]), byteBuffer(buffer, bufferSize), builder(connection),
lastReadTime(std::chrono::steady_clock::now()) {
lastReadTimeDuration(std::chrono::steady_clock::now().time_since_epoch()) {
}

ReadHandler::~ReadHandler() {
delete[] buffer;
}

void ReadHandler::handle() {
lastReadTime = std::chrono::steady_clock::now();
lastReadTimeDuration = std::chrono::steady_clock::now().time_since_epoch();

if (byteBuffer.position() == 0)
return;
Expand All @@ -891,7 +891,7 @@ namespace hazelcast {
}

const std::chrono::steady_clock::time_point ReadHandler::getLastReadTime() const {
return lastReadTime;
return std::chrono::steady_clock::time_point(lastReadTimeDuration);
}

Connection::Connection(const Address &address, spi::ClientContext &clientContext, int connectionId,
Expand All @@ -902,6 +902,7 @@ namespace hazelcast {
boost::asio::ip::tcp::resolver &resolver)
: readHandler(*this, 16 << 10),
startTime(std::chrono::steady_clock::now()),
closedTimeDuration(),
clientContext(clientContext),
invocationService(clientContext.getInvocationService()),
authFuture(authFuture),
Expand Down Expand Up @@ -945,7 +946,7 @@ namespace hazelcast {
return;
}

closedTime.store(std::chrono::steady_clock::now());
closedTimeDuration.store(std::chrono::steady_clock::now().time_since_epoch());

closeCause = cause;
closeReason = reason;
Expand Down Expand Up @@ -1112,7 +1113,7 @@ namespace hazelcast {
os << "null";
}
os << ", lastReadTime=" << util::StringUtil::timeToString(conn.lastReadTime())
<< ", closedTime=" << util::StringUtil::timeToString(conn.closedTime)
<< ", closedTime=" << util::StringUtil::timeToString(std::chrono::steady_clock::time_point(conn.closedTimeDuration))
<< ", connected server version=" << conn.connectedServerVersionString
<< '}';

Expand Down