p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changing from weak_ptr to shared_ptr for storing sessions

This commit is contained in:
bernatx 2022-07-21 23:26:17 +02:00 committed by bernat
parent 55854bfb78
commit 67d7df713e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
LibCarla/source/carla/streaming/detail/Dispatcher.cpp
View File

@ -62,8 +62,8 @@ namespace detail {
log_debug("Calling CloseStream for ", id);
auto search = _stream_map.find(id);
if (search != _stream_map.end()) {
auto stream_state = search->second.lock();
if (stream_state != nullptr) {
auto stream_state = search->second;
if (stream_state) {
log_debug("Disconnecting all sessions (stream ", id, ")");
stream_state->ClearSessions();
}
@ -76,8 +76,8 @@ namespace detail {
std::lock_guard<std::mutex> lock(_mutex);
auto search = _stream_map.find(session->get_stream_id());
if (search != _stream_map.end()) {
auto stream_state = search->second.lock();
if (stream_state != nullptr) {
auto stream_state = search->second;
if (stream_state) {
log_debug("Connecting session (stream ", session->get_stream_id(), ")");
stream_state->ConnectSession(std::move(session));
log_debug("Current streams: ", _stream_map.size());
@ -94,8 +94,8 @@ namespace detail {
log_debug("Calling DeregisterSession for ", session->get_stream_id());
auto search = _stream_map.find(session->get_stream_id());
if (search != _stream_map.end()) {
auto stream_state = search->second.lock();
if (stream_state != nullptr) {
auto stream_state = search->second;
if (stream_state) {
log_debug("Disconnecting session (stream ", session->get_stream_id(), ")");
stream_state->DisconnectSession(session);
log_debug("Current streams: ", _stream_map.size());