From e2362a9ed1324c9234d06bced00c2e9a2919fb6f Mon Sep 17 00:00:00 2001 From: Rene Cannao Date: Tue, 9 Jul 2024 15:47:09 +0000 Subject: [PATCH] Removed reference to MHM_PTHREAD_MUTEX --- include/Base_HostGroups_Manager.h | 5 ----- include/MySQL_HostGroups_Manager.h | 5 ----- include/PgSQL_HostGroups_Manager.h | 5 ----- lib/Base_HostGroups_Manager.cpp | 14 -------------- lib/MySQL_HostGroups_Manager.cpp | 14 -------------- lib/PgSQL_HostGroups_Manager.cpp | 14 -------------- 6 files changed, 57 deletions(-) diff --git a/include/Base_HostGroups_Manager.h b/include/Base_HostGroups_Manager.h index 5044cc217..6881a9e66 100644 --- a/include/Base_HostGroups_Manager.h +++ b/include/Base_HostGroups_Manager.h @@ -49,7 +49,6 @@ namespace nlohmann { class json; } #endif // DEBUG #if 0 -#define MHM_PTHREAD_MUTEX // we have 2 versions of the same tables: with (debug) and without (no debug) checks #ifdef DEBUG @@ -643,11 +642,7 @@ class MySQL_HostGroups_Manager { pthread_mutex_t readonly_mutex; std::set read_only_set1; std::set read_only_set2; -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_t lock; -#else - rwlock_t rwlock; -#endif enum HGM_TABLES { MYSQL_SERVERS_V2 = 0, diff --git a/include/MySQL_HostGroups_Manager.h b/include/MySQL_HostGroups_Manager.h index a447bc91a..6c21cb7c7 100644 --- a/include/MySQL_HostGroups_Manager.h +++ b/include/MySQL_HostGroups_Manager.h @@ -35,7 +35,6 @@ namespace nlohmann { class json; } //#define STRESSTEST_POOL #endif // DEBUG -#define MHM_PTHREAD_MUTEX #include "Base_HostGroups_Manager.h" @@ -556,11 +555,7 @@ class MySQL_HostGroups_Manager { pthread_mutex_t readonly_mutex; std::set read_only_set1; std::set read_only_set2; -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_t lock; -#else - rwlock_t rwlock; -#endif enum HGM_TABLES { MYSQL_SERVERS_V2 = 0, diff --git a/include/PgSQL_HostGroups_Manager.h b/include/PgSQL_HostGroups_Manager.h index 2d1dd00f4..a895aadc1 100644 --- a/include/PgSQL_HostGroups_Manager.h +++ b/include/PgSQL_HostGroups_Manager.h @@ -35,7 +35,6 @@ namespace nlohmann { class json; } //#define STRESSTEST_POOL #endif // DEBUG -#define MHM_PTHREAD_MUTEX #include "Base_HostGroups_Manager.h" @@ -461,11 +460,7 @@ class PgSQL_HostGroups_Manager { pthread_mutex_t readonly_mutex; std::set read_only_set1; std::set read_only_set2; -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_t lock; -#else - rwlock_t rwlock; -#endif enum HGM_TABLES { PgSQL_SERVERS_V2 = 0, diff --git a/lib/Base_HostGroups_Manager.cpp b/lib/Base_HostGroups_Manager.cpp index e66635225..a1cdf3c88 100644 --- a/lib/Base_HostGroups_Manager.cpp +++ b/lib/Base_HostGroups_Manager.cpp @@ -662,11 +662,7 @@ MySQL_HostGroups_Manager::MySQL_HostGroups_Manager() { pthread_mutex_init(&Group_Replication_Info_mutex, NULL); pthread_mutex_init(&Galera_Info_mutex, NULL); pthread_mutex_init(&AWS_Aurora_Info_mutex, NULL); -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_init(&lock, NULL); -#else - spinlock_rwlock_init(&rwlock); -#endif admindb=NULL; // initialized only if needed mydb=new SQLite3DB(); #ifdef DEBUG @@ -757,18 +753,12 @@ MySQL_HostGroups_Manager::~MySQL_HostGroups_Manager() { ev_loop_destroy(gtid_ev_loop); if (gtid_ev_timer) free(gtid_ev_timer); -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_destroy(&lock); -#endif } // wrlock() is only required during commit() void MySQL_HostGroups_Manager::wrlock() { -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_lock(&lock); -#else - spin_wrlock(&rwlock); -#endif #ifdef DEBUG is_locked = true; #endif @@ -809,11 +799,7 @@ void MySQL_HostGroups_Manager::wrunlock() { #ifdef DEBUG is_locked = false; #endif -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_unlock(&lock); -#else - spin_wrunlock(&rwlock); -#endif } diff --git a/lib/MySQL_HostGroups_Manager.cpp b/lib/MySQL_HostGroups_Manager.cpp index 268b9bcfc..28d0980c6 100644 --- a/lib/MySQL_HostGroups_Manager.cpp +++ b/lib/MySQL_HostGroups_Manager.cpp @@ -661,11 +661,7 @@ MySQL_HostGroups_Manager::MySQL_HostGroups_Manager() { pthread_mutex_init(&Group_Replication_Info_mutex, NULL); pthread_mutex_init(&Galera_Info_mutex, NULL); pthread_mutex_init(&AWS_Aurora_Info_mutex, NULL); -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_init(&lock, NULL); -#else - spinlock_rwlock_init(&rwlock); -#endif admindb=NULL; // initialized only if needed mydb=new SQLite3DB(); #ifdef DEBUG @@ -756,18 +752,12 @@ MySQL_HostGroups_Manager::~MySQL_HostGroups_Manager() { ev_loop_destroy(gtid_ev_loop); if (gtid_ev_timer) free(gtid_ev_timer); -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_destroy(&lock); -#endif } // wrlock() is only required during commit() void MySQL_HostGroups_Manager::wrlock() { -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_lock(&lock); -#else - spin_wrlock(&rwlock); -#endif #ifdef DEBUG is_locked = true; #endif @@ -808,11 +798,7 @@ void MySQL_HostGroups_Manager::wrunlock() { #ifdef DEBUG is_locked = false; #endif -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_unlock(&lock); -#else - spin_wrunlock(&rwlock); -#endif } diff --git a/lib/PgSQL_HostGroups_Manager.cpp b/lib/PgSQL_HostGroups_Manager.cpp index 8c37ca8c0..304c9cfa9 100644 --- a/lib/PgSQL_HostGroups_Manager.cpp +++ b/lib/PgSQL_HostGroups_Manager.cpp @@ -837,11 +837,7 @@ PgSQL_HostGroups_Manager::PgSQL_HostGroups_Manager() { status.select_for_update_or_equivalent=0; status.auto_increment_delay_multiplex=0; pthread_mutex_init(&readonly_mutex, NULL); -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_init(&lock, NULL); -#else - spinlock_rwlock_init(&rwlock); -#endif admindb=NULL; // initialized only if needed mydb=new SQLite3DB(); #ifdef DEBUG @@ -923,18 +919,12 @@ PgSQL_HostGroups_Manager::~PgSQL_HostGroups_Manager() { ev_loop_destroy(gtid_ev_loop); if (gtid_ev_timer) free(gtid_ev_timer); -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_destroy(&lock); -#endif } // wrlock() is only required during commit() void PgSQL_HostGroups_Manager::wrlock() { -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_lock(&lock); -#else - spin_wrlock(&rwlock); -#endif } void PgSQL_HostGroups_Manager::p_update_pgsql_error_counter(p_pgsql_error_type err_type, unsigned int hid, char* address, uint16_t port, unsigned int code) { @@ -969,11 +959,7 @@ void PgSQL_HostGroups_Manager::p_update_pgsql_error_counter(p_pgsql_error_type e } void PgSQL_HostGroups_Manager::wrunlock() { -#ifdef MHM_PTHREAD_MUTEX pthread_mutex_unlock(&lock); -#else - spin_wrunlock(&rwlock); -#endif }