From e2b606b90c971ccd8b38c1d39cdb6b176e632abc Mon Sep 17 00:00:00 2001 From: Donat Zenichev Date: Tue, 26 May 2026 17:32:13 +0200 Subject: [PATCH] MT#59962 AmSession: session started/stopped renamings - `session_started()` -> `session_started_static()` - `session_stopped()` -> `session_stopped_static()` - `session_stopped_wrapper()` -> `session_stopped()` Change-Id: Ib43a9a03bcc2966877538a045c50391ed0d1ebb6 --- core/AmSession.cpp | 14 +++++++------- core/AmSession.h | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/AmSession.cpp b/core/AmSession.cpp index 3c3efa68..1b7fd1e1 100644 --- a/core/AmSession.cpp +++ b/core/AmSession.cpp @@ -369,7 +369,7 @@ void AmSession::run() { #endif bool AmSession::startup() { - session_started(); + session_started_static(); try { try { @@ -389,7 +389,7 @@ bool AmSession::startup() { onBeforeDestroy(); destroy(); - session_stopped_wrapper(); + session_stopped(); return false; } @@ -512,7 +512,7 @@ void AmSession::finalize() onBeforeDestroy(); destroy(); - session_stopped_wrapper(); + session_stopped(); ILOG_DLG(L_DBG, "session is stopped.\n"); } @@ -582,7 +582,7 @@ static inline void __update_session_count(unsigned int num) { close(fd); } } -void AmSession::session_started() { +void AmSession::session_started_static() { struct timeval now, delta; lock_guard lock(session_num_mut); @@ -602,7 +602,7 @@ void AmSession::session_started() { __update_session_count(session_num); } -void AmSession::session_stopped() { +void AmSession::session_stopped_static() { struct timeval now, delta; lock_guard lock(session_num_mut); @@ -621,9 +621,9 @@ void AmSession::session_stopped() { __update_session_count(session_num); } -void AmSession::session_stopped_wrapper() { +void AmSession::session_stopped() { if (!session_counter) - session_stopped(); + session_stopped_static(); session_counter = true; } diff --git a/core/AmSession.h b/core/AmSession.h index 39745743..2d9a61b4 100644 --- a/core/AmSession.h +++ b/core/AmSession.h @@ -144,10 +144,10 @@ private: // per session flag to prevent double decrement bool session_counter; // per session wrapper to prevent doulbe decrement - void session_stopped_wrapper(); + void session_stopped(); - static void session_started(); - static void session_stopped(); + static void session_started_static(); + static void session_stopped_static(); static unsigned int session_num; static unsigned int max_session_num;