haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce noise of somewhat excessive trace debug. 

Given the surrounding debug we should be able infer the same
state from its absence.

Signed-off-by: Michael Meeks <michael.meeks@collabora.com>
Change-Id: Id20de40f67ed52dc5535585aec9b5888131d6324
pull/8232/head
Michael Meeks 2024-02-06 15:10:48 +00:00 committed by Caolán McNamara
parent d8041e9516
commit 7387d9cc04
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kit/Kit.cpp
View File

@ -843,7 +843,10 @@ public:
#endif
}
LOG_TRC("Purging dead sessions, have " << num_sessions << " active sessions.");
if (deadSessions.size() > 0 )
LOG_TRC("Purging " << deadSessions.size() <<
" dead sessions, with " << num_sessions <<
" active sessions.");
// Don't destroy sessions while holding our lock.
// We may deadlock if a session is waiting on us
@ -962,7 +965,6 @@ public:
void trimIfInactive() override
{
LOG_TRC("Should we trim our caches ?");
// FIXME: multi-document mobile optimization ?
for (const auto& it : _sessions)
{
@ -982,14 +984,13 @@ public:
void trimAfterInactivity()
{
LOG_TRC("Should we trim our caches ?");
if (std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now() -
_lastMemTrimTime) < std::chrono::seconds(30))
{
LOG_TRC("Too soon to trim again");
return;
}
LOG_TRC("Should we trim our caches ?");
double minInactivityMs = std::numeric_limits<double>::max();
for (const auto& it : _sessions)
{

12
net/Socket.cpp
View File

@ -366,10 +366,11 @@ int SocketPoll::poll(int64_t timeoutMaxMicroS)
timeoutMaxMicroS << "us)" << ((rc==0) ? "(timedout)" : ""));
// First process the wakeup pipe (always the last entry).
LOG_TRC('#' << _pollFds[size].fd << ": Handling events of wakeup pipe: 0x" << std::hex
<< _pollFds[size].revents << std::dec);
if (_pollFds[size].revents)
{
LOG_TRC('#' << _pollFds[size].fd << ": Handling events of wakeup pipe: 0x" << std::hex
<< _pollFds[size].revents << std::dec);
// Clear the data.
#if !MOBILEAPP
int dump[32];
@ -403,7 +404,8 @@ int SocketPoll::poll(int64_t timeoutMaxMicroS)
std::swap(_newCallbacks, invoke);
}
LOG_TRC("Invoking " << invoke.size() << " callbacks");
if (invoke.size() > 0)
LOG_TRC("Invoking " << invoke.size() << " callbacks");
for (const auto& callback : invoke)
{
try
@ -693,7 +695,9 @@ void ServerSocket::dumpState(std::ostream& os)
void SocketDisposition::execute()
{
LOG_TRC("Executing SocketDisposition of #" << _socket->getFD() << ": " << name(_disposition));
if (_disposition != Type::CONTINUE)
LOG_TRC("Executing SocketDisposition of #" << _socket->getFD() <<
": " << name(_disposition));
// We should have hard ownership of this socket.
ASSERT_CORRECT_SOCKET_THREAD(_socket);