Skip to content

Commit 55f888d

Browse files
committed
* remove debug messages that I added
for CI debug like it's 1995
1 parent 662ed87 commit 55f888d

File tree

2 files changed

+0
-41
lines changed

2 files changed

+0
-41
lines changed

src/client.hpp

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ namespace netlib {
2424
FD_ZERO(&fdset);
2525
FD_SET(sock, &fdset);
2626
timeval tv{.tv_sec = static_cast<int32_t>(timeout.count() / 1000), .tv_usec=static_cast<int32_t>((timeout.count() % 1000) * 1000)};
27-
std::cout << "tv.tv_sec = " << tv.tv_sec << ", usec=" << tv.tv_usec << std::endl;
2827
fd_set* fdset_ptr_read = ((op_class == OperationClass::read) || (op_class == OperationClass::both)) ? &fdset : nullptr;
2928
fd_set* fdset_ptr_write = ((op_class == OperationClass::write) || (op_class == OperationClass::both)) ? &fdset : nullptr;
3029
std::chrono::time_point<std::chrono::steady_clock> start = std::chrono::steady_clock::now();
@@ -34,28 +33,11 @@ namespace netlib {
3433
if (select_res == 1)
3534
{
3635
return {{}, ms_taken};
37-
38-
39-
40-
41-
// int32_t so_error = 0;
42-
// socklen_t len = sizeof(so_error);
43-
// getsockopt(sock, SOL_SOCKET, SO_ERROR, &so_error, &len);
44-
// if (so_error == 0) {
45-
// //success
46-
// std::cout << "client select no error" << std::endl;
47-
// return {{}, ms_taken};
48-
// }
49-
// std::error_condition error_condition = static_cast<std::errc>(so_error);
50-
// std::cout << "client select ret error" << error_condition.message() << std::endl;
51-
// return {static_cast<std::errc>(so_error), ms_taken};
5236
} else if (select_res == 0) {
5337
//timeout
54-
std::cout << "select ret 0 timeout" << std::endl;
5538
return {std::errc::timed_out, ms_taken};
5639
} else {
5740
//error
58-
std::cout << "select ret -1" << socket_get_last_error().message() << std::endl;
5941
return {socket_get_last_error(), ms_taken};
6042
}
6143
}
@@ -145,7 +127,6 @@ namespace netlib {
145127
}
146128
inline std::pair<std::size_t, std::error_condition> send(const std::vector<uint8_t> &data, std::optional<std::chrono::milliseconds> timeout) {
147129

148-
std::cout << "client send: " << data.size() << std::endl;
149130
if (!is_connected()) {
150131
return {0, std::errc::not_connected};
151132
}
@@ -180,29 +161,22 @@ namespace netlib {
180161
}
181162

182163
if (timeout.has_value() && timeout->count() < 0) {
183-
std::cout << "client recv timeout returned" << std::endl;
184164
return {{}, std::errc::timed_out};
185165
}
186166

187167
auto wait_res = wait_for_operation(_socket.value().get_raw().value(), OperationClass::read, timeout.value());
188168
if (wait_res.first) {
189-
std::cout << "client recv select timeout returned" << std::endl;
190169
return {{}, wait_res.first};
191170
}
192171

193-
std::cout << "client recv after wait" << std::endl;
194-
195172
std::vector<uint8_t> data(byte_count, 0);
196173
ssize_t recv_res = ::recv(_socket.value().get_raw().value(), reinterpret_cast<char*>(data.data()), byte_count, 0);
197174
if (recv_res > 0) {
198-
std::cout << "client recv " << recv_res << std::endl;
199175
data.resize(recv_res);
200176
return {data, {}};
201177
} else if (recv_res == 0){
202-
std::cout << "client recv 0" << std::endl;
203178
return {{}, std::errc::connection_aborted};
204179
}
205-
std::cout << "client recv error: " << recv_res << " : " << socket_get_last_error().message() << std::endl;
206180
return {{}, socket_get_last_error()};
207181
}
208182

@@ -217,7 +191,6 @@ namespace netlib {
217191
freeaddrinfo(_endpoint_addr);
218192
}
219193

220-
std::cout << "client disconnected" << std::endl;
221194
return {};
222195
}
223196
inline bool is_connected() {

src/server.hpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ namespace netlib {
116116
//nothing interesting happened before timeout
117117
} else {
118118
//error was returned
119-
std::cerr << "server select error: " << socket_get_last_error().message() << std::endl;
120119
}
121120
}
122121
}
@@ -138,7 +137,6 @@ namespace netlib {
138137
greeting.answer.size(),
139138
0);
140139
if ((static_cast<std::size_t>(send_result) != greeting.answer.size()) && (_cb_on_error)) {
141-
std::cout << "server error accept" << std::endl;
142140
_cb_on_error(new_endpoint, socket_get_last_error());
143141
}
144142
}
@@ -147,13 +145,11 @@ namespace netlib {
147145
_cb_on_error(new_endpoint, std::errc::connection_aborted);
148146
}
149147
remove_client(new_endpoint);
150-
std::cout << "server kicked client accept" << std::endl;
151148
continue;
152149
}
153150
}
154151
if (new_endpoint.socket.is_valid()) {
155152
std::lock_guard<std::mutex> lock(_mutex);
156-
std::cout << "server added new client, id " << status << std::endl;
157153
_clients.push_back(new_endpoint);
158154
_busy_map[status] = false;
159155
}
@@ -172,9 +168,7 @@ namespace netlib {
172168
total_buffer.insert(total_buffer.end(), buffer.begin(),
173169
buffer.begin() + recv_res);
174170
} else if (recv_res == 0) {
175-
std::cout << "server recv_res == 0" << std::endl;
176171
remove_client(endpoint);
177-
std::cout << "server kicked client recv 0" << std::endl;
178172
return std::errc::connection_aborted;
179173
} else if (recv_res < 0) {
180174
// error
@@ -195,14 +189,11 @@ namespace netlib {
195189
}
196190
if (response.terminate) {
197191
remove_client(endpoint);
198-
std::cout << "server kicked client because wanted"
199-
<< std::endl;
200192
return std::errc::connection_aborted;
201193
}
202194
}
203195
return {};
204196
} else {
205-
std::cout << "server recv_res == -1" << std::endl;
206197
return recv_error;
207198
}
208199
}
@@ -212,15 +203,11 @@ namespace netlib {
212203
bool remove_client(client_endpoint& ce) {
213204
//the remove_if-> erase idiom is perhaps my most hated part about std containers
214205
std::lock_guard<std::mutex> lock(_mutex);
215-
std::size_t client_count = _clients.size();
216206
_busy_map.erase(ce.socket.get_raw().value());
217-
std::cout << "remove_client, client count at start " << _clients.size() << std::endl;
218207
std::erase_if(_clients, [&](const client_endpoint& single_endpoint){
219208
return (ce.socket.get_raw().value() == single_endpoint.socket.get_raw().value());
220209
});
221-
std::cout << "removed client, id " << ce.socket.get_raw().value() << std::endl;
222210
ce.socket.close();
223-
assert((client_count - _clients.size()) == 1);
224211
return true;
225212
}
226213

@@ -297,7 +284,6 @@ namespace netlib {
297284
_listener_sock->close();
298285
_listener_sock.reset();
299286
}
300-
std::cout << "server stopped" << std::endl;
301287
}
302288

303289
inline std::size_t get_client_count() {

0 commit comments

Comments
 (0)