Skip to content

fix batch create stream and make SetHostSocket thread safe #2938

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
chenBright merged 1 commit into from
Apr 18, 2025
Merged

fix batch create stream and make SetHostSocket thread safe #2938

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
4 changes: 2 additions & 2 deletions src/brpc/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,12 +1437,12 @@ void Controller::HandleStreamConnection(Socket *host_socket) {
Stream* s = (Stream*)ptrs[0]->conn();
s->SetConnected(_remote_stream_settings);
if (stream_num > 1) {
const auto& extra_stream_ids = _remote_stream_settings->extra_stream_ids();
auto extra_stream_ids = std::move(*_remote_stream_settings->mutable_extra_stream_ids());
_remote_stream_settings->clear_extra_stream_ids();
for (size_t i = 1; i < stream_num; ++i) {
Stream* extra_stream = (Stream *) ptrs[i]->conn();
_remote_stream_settings->set_stream_id(extra_stream_ids[i - 1]);
s->ShareHostSocket(*extra_stream);
s->SetHostSocket(host_socket);
extra_stream->SetConnected(_remote_stream_settings);
}
}
Expand Down
25 changes: 10 additions & 15 deletions src/brpc/stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,17 +640,16 @@ void Stream::SendFeedback() {
}

int Stream::SetHostSocket(Socket *host_socket) {
if (_host_socket != NULL) {
CHECK(false) << "SetHostSocket has already been called";
return -1;
}
SocketUniquePtr ptr;
host_socket->ReAddress(&ptr);
// TODO add *this to host socke
if (ptr->AddStream(id()) != 0) {
return -1;
}
_host_socket = ptr.release();
std::call_once(_set_host_socket_flag, [this, host_socket]() {
SocketUniquePtr ptr;
host_socket->ReAddress(&ptr);
// TODO add *this to host socke
if (ptr->AddStream(id()) != 0) {
CHECK(false) << id() << " fail to add stream to host socket";
return;
}
_host_socket = ptr.release();
});
return 0;
}

Expand Down Expand Up @@ -710,10 +709,6 @@ void Stream::Close(int error_code, const char* reason_fmt, ...) {
return TriggerOnConnectIfNeed();
}

int Stream::ShareHostSocket(Stream& other_stream) {
return other_stream.SetHostSocket(_host_socket);
}

int Stream::SetFailed(StreamId id, int error_code, const char* reason_fmt, ...) {
SocketUniquePtr ptr;
if (Socket::AddressFailedAsWell(id, &ptr) == -1) {
Expand Down
3 changes: 2 additions & 1 deletion src/brpc/stream_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#ifndef BRPC_STREAM_IMPL_H
#define BRPC_STREAM_IMPL_H

#include <mutex>
#include "bthread/bthread.h"
#include "bthread/execution_queue.h"
#include "brpc/socket.h"
Expand Down Expand Up @@ -67,7 +68,6 @@ class BAIDU_CACHELINE_ALIGNMENT Stream : public SocketConnection {
__attribute__ ((__format__ (__printf__, 3, 4)));
void Close(int error_code, const char* reason_fmt, ...)
__attribute__ ((__format__ (__printf__, 3, 4)));
int ShareHostSocket(Stream& other_stream);

private:
friend void StreamWait(StreamId stream_id, const timespec *due_time,
Expand Down Expand Up @@ -134,6 +134,7 @@ friend struct butil::DefaultDeleter<Stream>;
butil::IOBuf *_pending_buf;
int64_t _start_idle_timer_us;
bthread_timer_t _idle_timer;
std::once_flag _set_host_socket_flag;
};

} // namespace brpc
Expand Down
Loading