Use BRAVO lock for g_records_rwlock

Author: masaori335

include/records/P_RecCore.h

@@ -26,6 +26,7 @@
 #include "tscore/ink_thread.h"
 #include "tscore/ink_rwlock.h"
 #include "tscore/TextBuffer.h"
+#include "tscpp/util/Bravo.h"
 
 #include "I_RecCore.h"
 #include "P_RecDefs.h"
@@ -39,7 +40,7 @@
 // records, record hash-table, and hash-table rwlock
 extern RecRecord *g_records;
 extern std::unordered_map<std::string, RecRecord *> g_records_ht;
-extern ink_rwlock g_records_rwlock;
+extern ts::bravo::shared_mutex g_records_rwlock;
 extern int g_num_records;
 extern RecModeT g_mode_type;
 

include/tscore/ink_memory.h

@@ -119,7 +119,7 @@ static inline size_t __attribute__((const)) ats_pagesize()
   long ret  = sysconf(_SC_PAGESIZE);
   page_size = (size_t)((ret > -1) ? ret : 8192);
 #elif defined(HAVE_GETPAGESIZE)
-  page_size = (size_t)getpagesize()
+  page_size = (size_t)getpagesize();
 #else
   page_size = (size_t)8192;
 #endif

src/records/P_RecCore.cc

@@ -144,7 +144,7 @@ RecSetRecord(RecT rec_type, const char *name, RecDataT data_type, RecData *data,
   // FIXME: Most of the time we set, we don't actually need to wrlock
   // since we are not modifying the g_records_ht.
   if (lock) {
-    ink_rwlock_wrlock(&g_records_rwlock);
+    g_records_rwlock.lock();
   }
   if (auto it = g_records_ht.find(name); it != g_records_ht.end()) {
     r1 = it->second;
@@ -204,7 +204,7 @@ RecSetRecord(RecT rec_type, const char *name, RecDataT data_type, RecData *data,
 
 Ldone:
   if (lock) {
-    ink_rwlock_unlock(&g_records_rwlock);
+    g_records_rwlock.unlock();
   }
 
   return err;
@@ -284,7 +284,7 @@ RecReadStatsFile()
   ats_scoped_str snap_fpath(RecConfigReadPersistentStatsPath());
 
   // lock our hash table
-  ink_rwlock_wrlock(&g_records_rwlock);
+  std::lock_guard lock(g_records_rwlock);
 
   CheckSnapFileVersion(snap_fpath);
 
@@ -323,7 +323,6 @@ RecReadStatsFile()
     }
   }
 
-  ink_rwlock_unlock(&g_records_rwlock);
   ats_free(m);
 
   return REC_ERR_OKAY;
@@ -393,14 +392,11 @@ RecReadConfigFile()
   RecDebug(DL_Note, "Reading '%s'", g_rec_config_fpath);
 
   // lock our hash table
-  ink_rwlock_wrlock(&g_records_rwlock);
+  std::lock_guard lock(g_records_rwlock);
 
   // Parse the actual file and hash the values.
   RecConfigFileParse(g_rec_config_fpath, RecConsumeConfigEntry);
 
-  // release our hash table
-  ink_rwlock_unlock(&g_records_rwlock);
-
   return REC_ERR_OKAY;
 }
 
@@ -410,12 +406,12 @@ RecReadYamlConfigFile()
   RecDebug(DL_Debug, "Reading '%s'", g_rec_config_fpath);
 
   // lock our hash table
-  ink_rwlock_wrlock(&g_records_rwlock); // review this lock maybe it should be done inside the API
+  // review this lock maybe it should be done inside the API
+  std::lock_guard lock(g_records_rwlock);
 
   // Parse the actual file and hash the values.
   auto ret = RecYAMLConfigFileParse(g_rec_config_fpath, SetRecordFromYAMLNode);
 
-  ink_rwlock_unlock(&g_records_rwlock);
   return ret;
 }
 
@@ -429,7 +425,7 @@ RecExecConfigUpdateCbs(unsigned int update_required_type)
   int i, num_records;
   RecUpdateT update_type = RECU_NULL;
 
-  ink_rwlock_rdlock(&g_records_rwlock);
+  ts::bravo::shared_lock lock(g_records_rwlock);
 
   num_records = g_num_records;
   for (i = 0; i < num_records; i++) {
@@ -463,8 +459,6 @@ RecExecConfigUpdateCbs(unsigned int update_required_type)
     rec_mutex_release(&(r->lock));
   }
 
-  ink_rwlock_unlock(&g_records_rwlock);
-
   return update_type;
 }
 
@@ -540,7 +534,7 @@ RecSetSyncRequired(char *name, bool lock)
   // FIXME: Most of the time we set, we don't actually need to wrlock
   // since we are not modifying the g_records_ht.
   if (lock) {
-    ink_rwlock_wrlock(&g_records_rwlock);
+    g_records_rwlock.lock();
   }
   if (auto it = g_records_ht.find(name); it != g_records_ht.end()) {
     r1 = it->second;
@@ -556,7 +550,7 @@ RecSetSyncRequired(char *name, bool lock)
   }
 
   if (lock) {
-    ink_rwlock_unlock(&g_records_rwlock);
+    g_records_rwlock.unlock();
   }
 
   return err;