Skip to content

Commit c7325cd

Browse files
committed
[BugFix]Fix win build error for wrong shutdown usage
1. Use SD_BOTH when _WIN32. 2. delete some useless log.
1 parent 8961fd8 commit c7325cd

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

debug_router/native/core/debug_router_core.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,6 @@ void DebugRouterCore::OnMessage(
503503
}
504504

505505
for (const auto &listener : listeners) {
506-
LOGI("do state_listeners_ onmessage.");
507506
listener->OnMessage(message);
508507
}
509508
}
@@ -737,8 +736,10 @@ std::string DebugRouterCore::GetConnectionStateMsg(ConnectionState state) {
737736
}
738737

739738
void DebugRouterCore::EnableAllSessions() {
739+
if (enable_all_sessions_.exchange(true, std::memory_order_relaxed)) {
740+
return;
741+
}
740742
LOGI("enableAllSessions");
741-
enable_all_sessions_.store(true);
742743
for (size_t i = 0; i < kTransceiverCount; ++i) {
743744
message_transceivers_[i]->StartServer();
744745
}

debug_router/native/socket/socket_server_api.cc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,15 @@ void SocketServer::StartServer() { setEnableServer(true); }
127127

128128
void SocketServer::StopServer() {
129129
setEnableServer(false);
130-
shutdown(socket_fd_, SHUT_RDWR);
130+
// Close socket if it's valid
131+
if (socket_fd_ != kInvalidSocket) {
132+
#ifdef _WIN32
133+
shutdown(socket_fd_, SD_BOTH);
134+
#else
135+
shutdown(socket_fd_, SHUT_RDWR);
136+
#endif
137+
}
138+
131139
Close();
132140
if (usb_client_) {
133141
usb_client_->Stop();

debug_router/native/socket/usb_client.cc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,10 @@ bool UsbClient::ReadAndCheckMessageHeader(char *header) {
103103
*/
104104

105105
bool UsbClient::Read(char *buffer, uint32_t read_size) {
106-
LOGI("To Read:" << read_size);
107106
int64_t start = 0;
108107
while (start < read_size) {
109108
int64_t read_data_len =
110109
recv(socket_guard_.Get(), buffer + start, read_size - start, 0);
111-
LOGI("read_data_len:" << read_data_len);
112110
if (read_data_len <= 0) {
113111
LOGE("Read: read_data_len <= 0 :"
114112
<< "read target count:" << (read_size - start)
@@ -165,7 +163,6 @@ void UsbClient::ReadMessage() {
165163

166164
uint32_t payload_size_int =
167165
util::DecodePayloadSize(payload_size, kPayloadSizeLen);
168-
LOGI("payload_size_int:" << payload_size_int);
169166

170167
if (!util::CheckHeaderFourthByte(header, payload_size_int)) {
171168
LOGE("CheckHeader failed: Drop This Frame!");
@@ -214,8 +211,6 @@ void UsbClient::ReadMessage() {
214211
LOGW("Drop message for inactive session_id: " << session_id);
215212
continue;
216213
}
217-
} else {
218-
LOGI("All sessions are enabled, skipping session check");
219214
}
220215

221216
incoming_message_queue_.put(std::move(payload_str));
@@ -336,8 +331,6 @@ void UsbClient::WriteMessage() {
336331
LOGW("Drop message for inactive session_id: " << session_id);
337332
continue;
338333
}
339-
} else {
340-
LOGI("All sessions are enabled, skipping session check");
341334
}
342335
if (message.length() > 0) {
343336
if (message.find("Page.screencastFrame") != std::string::npos) {

0 commit comments

Comments
 (0)