From f8e2af3f59d94bf994bcf1afd63f1bdaf6dc3708 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 18 Nov 2022 13:16:24 +0300
Subject: [PATCH] Rename size() to calc_size() for WaitFree hash tables.

---
 td/telegram/ContactsManager.cpp    | 8 ++++----
 td/telegram/MessagesManager.cpp    | 2 +-
 td/telegram/WebPagesManager.cpp    | 2 +-
 tdutils/td/utils/WaitFreeHashMap.h | 4 ++--
 tdutils/td/utils/WaitFreeHashSet.h | 4 ++--
 tdutils/test/WaitFreeHashMap.cpp   | 2 +-
 tdutils/test/WaitFreeHashSet.cpp   | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 6a5dd0e9a..89993fccc 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -3707,10 +3707,10 @@ void ContactsManager::start_up() {
 void ContactsManager::tear_down() {
   parent_.reset();
 
-  LOG(DEBUG) << "Have " << users_.size() << " users, " << chats_.size() << " basic groups, " << channels_.size()
-             << " supergroups and " << secret_chats_.size() << " secret chats to free";
-  LOG(DEBUG) << "Have " << users_full_.size() << " full users, " << chats_full_.size() << " full basic groups and "
-             << channels_full_.size() << " full supergroups to free";
+  LOG(DEBUG) << "Have " << users_.calc_size() << " users, " << chats_.calc_size() << " basic groups, "
+             << channels_.calc_size() << " supergroups and " << secret_chats_.calc_size() << " secret chats to free";
+  LOG(DEBUG) << "Have " << users_full_.calc_size() << " full users, " << chats_full_.calc_size()
+             << " full basic groups and " << channels_full_.calc_size() << " full supergroups to free";
 }
 
 UserId ContactsManager::load_my_id() {
diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 6c22ee012..42a0425a4 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -13541,7 +13541,7 @@ class MessagesManager::DialogFiltersLogEvent {
 void MessagesManager::tear_down() {
   parent_.reset();
 
-  LOG(DEBUG) << "Have " << dialogs_.size() << " chats with " << added_message_count_ << " messages to free";
+  LOG(DEBUG) << "Have " << dialogs_.calc_size() << " chats with " << added_message_count_ << " messages to free";
 }
 
 void MessagesManager::hangup() {
diff --git a/td/telegram/WebPagesManager.cpp b/td/telegram/WebPagesManager.cpp
index 276abf89a..3b0c1fa19 100644
--- a/td/telegram/WebPagesManager.cpp
+++ b/td/telegram/WebPagesManager.cpp
@@ -414,7 +414,7 @@ WebPagesManager::WebPagesManager(Td *td, ActorShared<> parent) : td_(td), parent
 void WebPagesManager::tear_down() {
   parent_.reset();
 
-  LOG(DEBUG) << "Have " << web_pages_.size() << " web pages to free";
+  LOG(DEBUG) << "Have " << web_pages_.calc_size() << " web pages to free";
 }
 
 WebPagesManager::~WebPagesManager() {
diff --git a/tdutils/td/utils/WaitFreeHashMap.h b/tdutils/td/utils/WaitFreeHashMap.h
index 5392b4493..dc6c5332f 100644
--- a/tdutils/td/utils/WaitFreeHashMap.h
+++ b/tdutils/td/utils/WaitFreeHashMap.h
@@ -161,14 +161,14 @@ class WaitFreeHashMap {
     }
   }
 
-  size_t size() const {
+  size_t calc_size() const {
     if (wait_free_storage_ == nullptr) {
       return default_map_.size();
     }
 
     size_t result = 0;
     for (size_t i = 0; i < MAX_STORAGE_COUNT; i++) {
-      result += wait_free_storage_->maps_[i].size();
+      result += wait_free_storage_->maps_[i].calc_size();
     }
     return result;
   }
diff --git a/tdutils/td/utils/WaitFreeHashSet.h b/tdutils/td/utils/WaitFreeHashSet.h
index b5229004c..54f88e7f7 100644
--- a/tdutils/td/utils/WaitFreeHashSet.h
+++ b/tdutils/td/utils/WaitFreeHashSet.h
@@ -96,14 +96,14 @@ class WaitFreeHashSet {
     }
   }
 
-  size_t size() const {
+  size_t calc_size() const {
     if (wait_free_storage_ == nullptr) {
       return default_set_.size();
     }
 
     size_t result = 0;
     for (size_t i = 0; i < MAX_STORAGE_COUNT; i++) {
-      result += wait_free_storage_->sets_[i].size();
+      result += wait_free_storage_->sets_[i].calc_size();
     }
     return result;
   }
diff --git a/tdutils/test/WaitFreeHashMap.cpp b/tdutils/test/WaitFreeHashMap.cpp
index 83a1345d9..38def7777 100644
--- a/tdutils/test/WaitFreeHashMap.cpp
+++ b/tdutils/test/WaitFreeHashMap.cpp
@@ -26,7 +26,7 @@ TEST(WaitFreeHashMap, stress_test) {
 
   auto check = [&](bool check_size = false) {
     if (check_size) {
-      ASSERT_EQ(reference.size(), map.size());
+      ASSERT_EQ(reference.size(), map.calc_size());
     }
     ASSERT_EQ(reference.empty(), map.empty());
 
diff --git a/tdutils/test/WaitFreeHashSet.cpp b/tdutils/test/WaitFreeHashSet.cpp
index 7190052a7..ec4096c85 100644
--- a/tdutils/test/WaitFreeHashSet.cpp
+++ b/tdutils/test/WaitFreeHashSet.cpp
@@ -26,7 +26,7 @@ TEST(WaitFreeHashSet, stress_test) {
 
   auto check = [&](bool check_size = false) {
     if (check_size) {
-      ASSERT_EQ(reference.size(), set.size());
+      ASSERT_EQ(reference.size(), set.calc_size());
     }
     ASSERT_EQ(reference.empty(), set.empty());