From c504e94e40873973a3780c2502c19beda9bdb0c2 Mon Sep 17 00:00:00 2001 From: bernatx Date: Thu, 21 Jul 2022 13:44:54 +0200 Subject: [PATCH] Changing log_info to log_debug --- .../carla/streaming/detail/Dispatcher.cpp | 32 +++++++++---------- .../carla/streaming/detail/MultiStreamState.h | 8 ++--- .../source/carla/streaming/low_level/Server.h | 2 +- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/LibCarla/source/carla/streaming/detail/Dispatcher.cpp b/LibCarla/source/carla/streaming/detail/Dispatcher.cpp index a524ad97d..baa180334 100644 --- a/LibCarla/source/carla/streaming/detail/Dispatcher.cpp +++ b/LibCarla/source/carla/streaming/detail/Dispatcher.cpp @@ -37,7 +37,7 @@ namespace detail { carla::streaming::Stream Dispatcher::MakeStream() { std::lock_guard lock(_mutex); ++_cached_token._token.stream_id; // id zero only happens in overflow. - log_info("New stream:", _cached_token._token.stream_id); + log_debug("New stream:", _cached_token._token.stream_id); std::shared_ptr ptr; auto search = _stream_map.find(_cached_token.get_stream_id()); if (search == _stream_map.end()) { @@ -47,11 +47,11 @@ namespace detail { if (!result.second) { throw_exception(std::runtime_error("failed to create stream!")); } - log_info("Stream created"); + log_debug("Stream created"); return carla::streaming::Stream(ptr); } else { // reusing existing stream - log_info("Stream reused"); + log_debug("Stream reused"); ptr = search->second; return carla::streaming::Stream(ptr); } @@ -59,12 +59,12 @@ namespace detail { void Dispatcher::CloseStream(carla::streaming::detail::stream_id_type id) { std::lock_guard lock(_mutex); - log_info("Calling CloseStream for ", id); + 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) { - log_info("Disconnecting all sessions (stream ", id, ")"); + log_debug("Disconnecting all sessions (stream ", id, ")"); stream_state->ClearSessions(); } _stream_map.erase(search); @@ -78,9 +78,9 @@ namespace detail { if (search != _stream_map.end()) { auto stream_state = search->second.lock(); if (stream_state != nullptr) { - log_info("Connecting session (stream ", session->get_stream_id(), ")"); + log_debug("Connecting session (stream ", session->get_stream_id(), ")"); stream_state->ConnectSession(std::move(session)); - log_info("Current streams: ", _stream_map.size()); + log_debug("Current streams: ", _stream_map.size()); return true; } } @@ -91,37 +91,37 @@ namespace detail { void Dispatcher::DeregisterSession(std::shared_ptr session) { DEBUG_ASSERT(session != nullptr); std::lock_guard lock(_mutex); - log_info("Calling DeregisterSession for ", session->get_stream_id()); + 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) { - log_info("Disconnecting session (stream ", session->get_stream_id(), ")"); + log_debug("Disconnecting session (stream ", session->get_stream_id(), ")"); stream_state->DisconnectSession(session); - log_info("Current streams: ", _stream_map.size()); + log_debug("Current streams: ", _stream_map.size()); } } } token_type Dispatcher::GetToken(stream_id_type sensor_id) { std::lock_guard lock(_mutex); - log_info("Searching sensor id: ", sensor_id); + log_debug("Searching sensor id: ", sensor_id); auto search = _stream_map.find(sensor_id); if (search != _stream_map.end()) { - log_info("Found sensor id: ", sensor_id); + log_debug("Found sensor id: ", sensor_id); auto stream_state = search->second; - log_info("Getting token from stream ", sensor_id, " on port ", stream_state->token().get_port()); + log_debug("Getting token from stream ", sensor_id, " on port ", stream_state->token().get_port()); return stream_state->token(); } else { - log_info("Not Found sensor id, creating sensor stream: ", sensor_id); + log_debug("Not Found sensor id, creating sensor stream: ", sensor_id); token_type temp_token(_cached_token); temp_token.set_stream_id(sensor_id); auto ptr = std::make_shared(temp_token); auto result = _stream_map.emplace(std::make_pair(temp_token.get_stream_id(), ptr)); if (!result.second) { - log_info("Failed to create multistream for stream ", sensor_id, " on port ", temp_token.get_port()); + log_debug("Failed to create multistream for stream ", sensor_id, " on port ", temp_token.get_port()); } - log_info("Created token from stream ", sensor_id, " on port ", temp_token.get_port()); + log_debug("Created token from stream ", sensor_id, " on port ", temp_token.get_port()); return temp_token; } return token_type(); diff --git a/LibCarla/source/carla/streaming/detail/MultiStreamState.h b/LibCarla/source/carla/streaming/detail/MultiStreamState.h index 532a753a6..f53532bf8 100644 --- a/LibCarla/source/carla/streaming/detail/MultiStreamState.h +++ b/LibCarla/source/carla/streaming/detail/MultiStreamState.h @@ -39,8 +39,7 @@ namespace detail { if (session != nullptr) { auto message = Session::MakeMessage(std::move(buffers)...); session->Write(std::move(message)); - // log_info("sensor ", session->get_stream_id()," data sent ", message->size(), " by"); - log_info("sensor ", session->get_stream_id()," data sent"); + log_debug("sensor ", session->get_stream_id()," data sent"); // Return here, _session is only valid if we have a // single session. return; @@ -53,8 +52,7 @@ namespace detail { for (auto &s : _sessions) { if (s != nullptr) { s->Write(message); - // log_info("sensor ", s->get_stream_id()," data sent ", message->size(), " by"); - log_info("sensor ", s->get_stream_id()," data sent "); + log_debug("sensor ", s->get_stream_id()," data sent "); } } } @@ -80,7 +78,7 @@ namespace detail { void DisconnectSession(std::shared_ptr session) final { DEBUG_ASSERT(session != nullptr); std::lock_guard lock(_mutex); - log_info("Calling DisconnectSession for ", session->get_stream_id()); + log_debug("Calling DisconnectSession for ", session->get_stream_id()); if (_sessions.size() == 0) return; if (_sessions.size() == 1) { DEBUG_ASSERT(session == _session.load()); diff --git a/LibCarla/source/carla/streaming/low_level/Server.h b/LibCarla/source/carla/streaming/low_level/Server.h index ef9e11110..3f704ff19 100644 --- a/LibCarla/source/carla/streaming/low_level/Server.h +++ b/LibCarla/source/carla/streaming/low_level/Server.h @@ -86,7 +86,7 @@ namespace low_level { } }; auto on_session_closed = [this](auto session) { - log_info("on_session_closed called"); + log_debug("on_session_closed called"); _dispatcher.DeregisterSession(session); }; _server.Listen(on_session_opened, on_session_closed);