8000 Fix dangling pointer error in cpp worker by mreso · Pull Request #2975 · pytorch/serve · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix dangling pointer error in cpp worker #2975

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 1 commit into from
Feb 28, 2024
Merged

Fix dangling pointer error in cpp worker #2975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 16 additions & 15 deletions cpp/src/backends/process/model_worker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ void SocketServer::Initialize(
if (port_num.empty()) {
TS_LOG(FATAL, "Wrong arguments passed. No socket port given.");
}
port_ = htons(stoi(port_num));
port_ = stoi(port_num);
}
} else {
TS_LOG(FATAL, "Incomplete data provided");
}

TS_LOGF(INFO, "Listening on port: {}", socket_name);
TS_LOGF(INFO, "Listening on {}", socket_name_);
server_socket_ = socket(socket_family, SOCK_STREAM, 0);
if (server_socket_ == -1) {
TS_LOGF(FATAL, "Failed to create socket descriptor. errno: {}", errno);
Expand All @@ -60,24 +60,25 @@ void SocketServer::Run() {
}

sockaddr *srv_sock_address = nullptr, client_sock_address{};
sockaddr_un sock_addr_un{};
sockaddr_in sock_addr_in{};
socklen_t name_len = 0;
if (socket_type_ == "unix") {
TS_LOG(INFO, "Binding to unix socket");
sockaddr_un sock_addr{};
std::memset(&sock_addr, 0, sizeof(sock_addr));
sock_addr.sun_family = AF_UNIX;
std::strncpy(sock_addr.sun_path, socket_name_.c_str(),
sizeof(sock_addr.sun_path));
srv_sock_address = reinterpret_cast<sockaddr*>(&sock_addr);
name_len = SUN_LEN(&sock_addr);
std::memset(&sock_addr_un, 0, sizeof(sock_addr_un));
sock_addr_un.sun_family = AF_UNIX;
std::strncpy(sock_addr_un.sun_path, socket_name_.c_str(),
sizeof(sock_addr_un.sun_path));
srv_sock_address = reinterpret_cast<sockaddr*>(&sock_addr_un);
name_len = SUN_LEN(&sock_addr_un);
} else {
TS_LOG(INFO, "Binding to tcp socket");
sockaddr_in sock_addr{};
std::memset(&sock_addr, 0, sizeof(sock_addr));
sock_addr.sin_family = AF_INET;
sock_addr.sin_port = port_;
sock_addr.sin_addr.s_addr = inet_addr(socket_name_.c_str());
srv_sock_address = reinterpret_cast<sockaddr*>(&sock_addr);
std::memset(&sock_addr_in, 0, sizeof(sock_addr_in));
sock_addr_in.sin_family = AF_INET;
TS_LOGF(INFO, "Listening on port {}", port_);
sock_addr_in.sin_port = htons(port_);
sock_addr_in.sin_addr.s_addr = inet_addr(socket_name_.c_str());
srv_sock_address = reinterpret_cast<sockaddr*>(&sock_addr_in);
name_len = sizeof(*srv_sock_address);
}

Expand Down
2 changes: 1 addition & 1 deletion cpp/src/backends/process/model_worker.hh
View file
Open in desktop
4901
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class SocketServer {
int server_socket_ = -1;
std::string socket_type_;
std::string socket_name_;
ushort port_ = 9000;
int port_ = 9000;
std::shared_ptr<torchserve::Backend> backend_;
};

Expand Down
0