Skip to content

Commit adaa43d

Browse files
committed
snakecase in gateio
1 parent 482f04b commit adaa43d

File tree

9 files changed

+164
-175
lines changed

9 files changed

+164
-175
lines changed

vpr/src/base/vpr_api.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ RouteStatus vpr_route_flow(const Netlist<>& net_list,
817817
routing_delay_calc = std::make_shared<RoutingDelayCalculator>(atom_ctx.nlist, atom_ctx.lookup, net_delay, is_flat);
818818
timing_info = make_setup_hold_timing_info(routing_delay_calc, router_opts.timing_update_type);
819819
#ifndef NO_SERVER
820-
if (g_vpr_ctx.server().gateIO().isRunning()) {
820+
if (g_vpr_ctx.server().gateIO().is_running()) {
821821
g_vpr_ctx.mutable_server().set_timing_info(timing_info);
822822
g_vpr_ctx.mutable_server().set_routing_delay_calc(routing_delay_calc);
823823
}
@@ -1071,7 +1071,7 @@ void vpr_init_server(const t_vpr_setup& vpr_setup)
10711071
if (vpr_setup.ServerOpts.is_server_mode_enabled) {
10721072
/* Set up a server and its callback to be triggered at 100ms intervals by the timer's timeout event. */
10731073
server::GateIO& gate_io = g_vpr_ctx.mutable_server().mutable_gateIO();
1074-
if (!gate_io.isRunning()) {
1074+
if (!gate_io.is_running()) {
10751075
gate_io.start(vpr_setup.ServerOpts.port_num);
10761076
g_timeout_add(/*interval_ms*/ 100, server::update, &application);
10771077
}

vpr/src/draw/draw.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ static void draw_main_canvas(ezgl::renderer* g) {
254254
draw_placement_macros(g);
255255

256256
#ifndef NO_SERVER
257-
if (g_vpr_ctx.server().gateIO().isRunning()) {
257+
if (g_vpr_ctx.server().gateIO().is_running()) {
258258
const ServerContext& server_ctx = g_vpr_ctx.server(); // shortcut
259259
draw_crit_path_elements(server_ctx.crit_paths(), server_ctx.crit_path_element_indexes(), g);
260260
} else {

vpr/src/server/convertutils.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ std::string getPrettyDurationStrFromMs(int64_t durationMs)
3333
return result;
3434
}
3535

36-
std::string getPrettySizeStrFromBytesNum(int64_t bytesNum)
36+
std::string get_pretty_size_str_from_bytes_num(int64_t bytesNum)
3737
{
3838
std::string result;
3939
if (bytesNum >= 1024*1024*1024) {
@@ -49,7 +49,7 @@ std::string getPrettySizeStrFromBytesNum(int64_t bytesNum)
4949
}
5050

5151

52-
std::string getTruncatedMiddleStr(const std::string& src, std::size_t num) {
52+
std::string get_truncated_middle_str(const std::string& src, std::size_t num) {
5353
std::string result;
5454
static std::size_t minimalStringSizeToTruncate = 20;
5555
if (num < minimalStringSizeToTruncate) {

vpr/src/server/convertutils.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const std::size_t DEFAULT_PRINT_STRING_MAX_NUM = 100;
99

1010
std::optional<int> try_convert_to_int(const std::string&);
1111
std::string getPrettyDurationStrFromMs(int64_t durationMs);
12-
std::string getPrettySizeStrFromBytesNum(int64_t bytesNum);
13-
std::string getTruncatedMiddleStr(const std::string& src, std::size_t num = DEFAULT_PRINT_STRING_MAX_NUM);
12+
std::string get_pretty_size_str_from_bytes_num(int64_t bytesNum);
13+
std::string get_truncated_middle_str(const std::string& src, std::size_t num = DEFAULT_PRINT_STRING_MAX_NUM);
1414

1515
#endif /* CONVERTUTILS_H */

vpr/src/server/gateio.cpp

Lines changed: 112 additions & 122 deletions
Large diffs are not rendered by default.

vpr/src/server/gateio.h

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -61,41 +61,41 @@ class GateIO
6161
class ClientAliveTracker {
6262
public:
6363
ClientAliveTracker(const std::chrono::milliseconds& echoIntervalMs, const std::chrono::milliseconds& clientTimeoutMs)
64-
: m_echoIntervalMs(echoIntervalMs), m_clientTimeoutMs(clientTimeoutMs) {
64+
: m_echo_interval_ms(echoIntervalMs), m_client_timeout_ms(clientTimeoutMs) {
6565
reset();
6666
}
6767
ClientAliveTracker()=default;
6868

69-
void onClientActivity() {
70-
m_lastClientActivityTime = std::chrono::high_resolution_clock::now();
69+
void on_client_activity() {
70+
m_last_client_activity_time = std::chrono::high_resolution_clock::now();
7171
}
7272

73-
void onEchoSent() {
74-
m_lastEchoSentTime = std::chrono::high_resolution_clock::now();
73+
void on_echo_sent() {
74+
m_last_echo_sent_time = std::chrono::high_resolution_clock::now();
7575
}
7676

77-
bool isTimeToSentEcho() const {
78-
return (durationSinceLastClientActivityMs() > m_echoIntervalMs) && (durationSinceLastEchoSentMs() > m_echoIntervalMs);
77+
bool is_time_to_sent_echo() const {
78+
return (duration_since_last_client_activity_ms() > m_echo_interval_ms) && (durationSinceLastEchoSentMs() > m_echo_interval_ms);
7979
}
80-
bool isClientTimeout() const { return durationSinceLastClientActivityMs() > m_clientTimeoutMs; }
80+
bool is_client_timeout() const { return duration_since_last_client_activity_ms() > m_client_timeout_ms; }
8181

8282
void reset() {
83-
onClientActivity();
83+
on_client_activity();
8484
}
8585

8686
private:
87-
std::chrono::high_resolution_clock::time_point m_lastClientActivityTime;
88-
std::chrono::high_resolution_clock::time_point m_lastEchoSentTime;
89-
std::chrono::milliseconds m_echoIntervalMs;
90-
std::chrono::milliseconds m_clientTimeoutMs;
87+
std::chrono::high_resolution_clock::time_point m_last_client_activity_time;
88+
std::chrono::high_resolution_clock::time_point m_last_echo_sent_time;
89+
std::chrono::milliseconds m_echo_interval_ms;
90+
std::chrono::milliseconds m_client_timeout_ms;
9191

92-
std::chrono::milliseconds durationSinceLastClientActivityMs() const {
92+
std::chrono::milliseconds duration_since_last_client_activity_ms() const {
9393
auto now = std::chrono::high_resolution_clock::now();
94-
return std::chrono::duration_cast<std::chrono::milliseconds>(now - m_lastClientActivityTime);
94+
return std::chrono::duration_cast<std::chrono::milliseconds>(now - m_last_client_activity_time);
9595
}
9696
std::chrono::milliseconds durationSinceLastEchoSentMs() const {
9797
auto now = std::chrono::high_resolution_clock::now();
98-
return std::chrono::duration_cast<std::chrono::milliseconds>(now - m_lastEchoSentTime);
98+
return std::chrono::duration_cast<std::chrono::milliseconds>(now - m_last_echo_sent_time);
9999
}
100100
};
101101

@@ -109,34 +109,34 @@ class GateIO
109109
class TLogger {
110110
public:
111111
TLogger() {
112-
m_logLevel = static_cast<int>(LogLevel::Info);
112+
m_log_level = static_cast<int>(LogLevel::Info);
113113
}
114114
~TLogger() {}
115115

116116
template<typename... Args>
117117
void queue(LogLevel logLevel, Args&&... args) {
118-
if (static_cast<int>(logLevel) <= m_logLevel) {
119-
std::unique_lock<std::mutex> lock(m_logStreamMutex);
118+
if (static_cast<int>(logLevel) <= m_log_level) {
119+
std::unique_lock<std::mutex> lock(m_log_stream_mutex);
120120
if (logLevel == LogLevel::Error) {
121-
m_logStream << "ERROR:";
121+
m_log_stream << "ERROR:";
122122
}
123-
((m_logStream << ' ' << std::forward<Args>(args)), ...);
124-
m_logStream << "\n";
123+
((m_log_stream << ' ' << std::forward<Args>(args)), ...);
124+
m_log_stream << "\n";
125125
}
126126
}
127127

128128
void flush() {
129-
std::unique_lock<std::mutex> lock(m_logStreamMutex);
130-
if (!m_logStream.str().empty()) {
131-
VTR_LOG(m_logStream.str().c_str());
132-
m_logStream.str("");
129+
std::unique_lock<std::mutex> lock(m_log_stream_mutex);
130+
if (!m_log_stream.str().empty()) {
131+
VTR_LOG(m_log_stream.str().c_str());
132+
m_log_stream.str("");
133133
}
134134
}
135135

136136
private:
137-
std::stringstream m_logStream;
138-
std::mutex m_logStreamMutex;
139-
std::atomic<int> m_logLevel;
137+
std::stringstream m_log_stream;
138+
std::mutex m_log_stream_mutex;
139+
std::atomic<int> m_log_level;
140140
};
141141

142142
const int LOOP_INTERVAL_MS = 100;
@@ -152,7 +152,7 @@ class GateIO
152152
GateIO& operator=(GateIO&&) = delete;
153153

154154
// Check if the port listening process is currently running
155-
bool isRunning() const { return m_isRunning.load(); }
155+
bool is_running() const { return m_is_running.load(); }
156156

157157
/**
158158
* @brief Transfers ownership of received tasks to the caller.
@@ -205,27 +205,27 @@ class GateIO
205205
void stop();
206206

207207
private:
208-
int m_portNum = -1;
208+
int m_port_num = -1;
209209

210-
std::atomic<bool> m_isRunning; // is true when started
210+
std::atomic<bool> m_is_running; // is true when started
211211

212212
std::thread m_thread; // thread to execute socket IO work
213213

214-
std::mutex m_tasksMutex; // we used single mutex to guard both vectors m_receivedTasks and m_sendTasks
215-
std::vector<TaskPtr> m_receivedTasks; // tasks from client (requests)
216-
std::vector<TaskPtr> m_sendTasks; // tasks to client (responses)
214+
std::mutex m_tasks_mutex; // we used single mutex to guard both vectors m_received_tasks and m_sendTasks
215+
std::vector<TaskPtr> m_received_tasks; // tasks from client (requests)
216+
std::vector<TaskPtr> m_send_tasks; // tasks to client (responses)
217217

218218
TLogger m_logger;
219219

220-
void startListening(); // thread worker function
220+
void start_listening(); // thread worker function
221221

222222
/// helper functions to be executed inside startListening
223-
ActivityStatus checkClientConnection(sockpp::tcp6_acceptor& tcpServer, std::optional<sockpp::tcp6_socket>& clientOpt);
224-
ActivityStatus handleSendingData(sockpp::tcp6_socket& client);
225-
ActivityStatus handleReceivingData(sockpp::tcp6_socket& client, comm::TelegramBuffer& telegramBuff, std::string& receivedMessage);
226-
ActivityStatus handleTelegrams(std::vector<comm::TelegramFramePtr>& telegramFrames, comm::TelegramBuffer& telegramBuff);
227-
ActivityStatus handleClientAliveTracker(sockpp::tcp6_socket& client, std::unique_ptr<ClientAliveTracker>& clientAliveTrackerPtr);
228-
void handleActivityStatus(ActivityStatus status, std::unique_ptr<ClientAliveTracker>& clientAliveTrackerPtr, bool& isCommunicationProblemDetected);
223+
ActivityStatus check_client_connection(sockpp::tcp6_acceptor& tcp_server, std::optional<sockpp::tcp6_socket>& client_opt);
224+
ActivityStatus handle_sending_data(sockpp::tcp6_socket& client);
225+
ActivityStatus handle_receiving_data(sockpp::tcp6_socket& client, comm::TelegramBuffer& telegram_buff, std::string& received_message);
226+
ActivityStatus handle_telegrams(std::vector<comm::TelegramFramePtr>& telegram_frames, comm::TelegramBuffer& telegram_buff);
227+
ActivityStatus handle_client_alive_tracker(sockpp::tcp6_socket& client, std::unique_ptr<ClientAliveTracker>& client_alive_tracker_ptr);
228+
void handle_activity_status(ActivityStatus status, std::unique_ptr<ClientAliveTracker>& client_alive_tracker_ptr, bool& is_communication_problem_detected);
229229
///
230230
};
231231

vpr/src/server/pathhelper.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ static void collect_crit_path_metadata(std::stringstream& ss, const std::vector<
3030
/**
3131
* @brief Helper function to calculate critical path timing report with specified parameters.
3232
*/
33-
CritPathsResult calc_critical_path(const std::string& report_type, int crit_path_num, e_timing_report_detail details_level, bool is_flat_routing)
34-
{
33+
CritPathsResult calc_critical_path(const std::string& report_type, int crit_path_num, e_timing_report_detail details_level, bool is_flat_routing) {
3534
// shortcuts
3635
const std::shared_ptr<SetupHoldTimingInfo>& timing_info = g_vpr_ctx.server().timing_info();
3736
const std::shared_ptr<RoutingDelayCalculator>& routing_delay_calc = g_vpr_ctx.server().routing_delay_calc();

vpr/src/server/serverupdate.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
namespace server {
1010

1111
gboolean update(gpointer data) {
12-
const bool is_running = g_vpr_ctx.server().gateIO().isRunning();
12+
const bool is_running = g_vpr_ctx.server().gateIO().is_running();
1313
if (is_running) {
1414
// shortcuts
1515
ezgl::application* app = static_cast<ezgl::application*>(data);

vpr/src/server/telegramheader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ TelegramHeader::TelegramHeader(const ByteArray& buffer) {
6262
std::string TelegramHeader::info() const {
6363
std::stringstream ss;
6464
ss << "header" << (m_is_valid ? "" : "(INVALID)") << "["
65-
<< "l=" << getPrettySizeStrFromBytesNum(m_body_bytes_num)
65+
<< "l=" << get_pretty_size_str_from_bytes_num(m_body_bytes_num)
6666
<< "/s=" << m_body_check_sum;
6767
if (m_compressor_id) {
6868
ss << "/c=" << m_compressor_id;

0 commit comments

Comments
 (0)