database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

Revert "MCOL-5057 Revert "Merge pull request #2326 from drrtuy/MCOL-4912-dev6"" (#2350)

Browse Source 
This reverts commit c6d4c2a102.

Co-authored-by: Roman Nozdrin <rnozdrin@mariadb.com>
This commit is contained in:
Roman Nozdrin
2022-04-27 16:07:58 +02:00
committed by GitHub
parent 826a735f53
commit ff7759f71e
25 changed files with 3498 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tools/clearShm/main.cpp
View File

@@ -60,7 +60,7 @@ void shmDoit(key_t shm_key, const string& label)
bi::offset_t memSize = 0;
memObj.get_size(memSize);
std::lock_guard<std::mutex> lk(coutMutex);
cout << label << ": shm_key: " << shm_key << "; key_name: " << key_name << "; size: " << memSize
cout << label << ": shm|sem_key: " << shm_key << "; key_name: " << key_name << "; size: " << memSize
<< endl;
}
catch (...)
@@ -74,6 +74,11 @@ void shmDoit(key_t shm_key, const string& label)
}
}
void semDoit(key_t sem_key, const string& label)
{
shmDoit(sem_key, label);
}
void shmDoitRange(key_t shm_key, const string& label)
{
if (shm_key == 0)
@@ -87,32 +92,6 @@ void shmDoitRange(key_t shm_key, const string& label)
}
}
void semDoit(key_t sem_key, const string& label)
{
string key_name = ShmKeys::keyToName(sem_key);
if (vFlg)
{
try
{
bi::shared_memory_object memObj(bi::open_only, key_name.c_str(), bi::read_only);
bi::offset_t memSize = 0;
memObj.get_size(memSize);
std::lock_guard<std::mutex> lk(coutMutex);
cout << label << ": sem_key: " << sem_key << "; key_name: " << key_name << "; size: " << memSize
<< endl;
}
catch (...)
{
}
}
if (!nFlg)
{
bi::shared_memory_object::remove(key_name.c_str());
}
}
void usage()
{
cout << "usage: clearShm [-cvnh]" << endl;
@@ -206,6 +185,8 @@ int main(int argc, char** argv)
tg.add_thread(tp);
tp = new boost::thread(ThdFunc(BrmKeys.KEYRANGE_VSS_BASE, "VSS "));
tg.add_thread(tp);
tp = new boost::thread(ThdFunc(BrmKeys.KEYRANGE_EXTENTMAP_INDEX_BASE, "EXTMAP_INDX"));
tg.add_thread(tp);
tg.join_all();
shmDoit(BrmKeys.MST_SYSVKEY, "MST ");
@@ -226,6 +207,7 @@ int main(int argc, char** argv)
semDoit(BrmKeys.KEYRANGE_EMFREELIST_BASE, "EXTMAP_FREE");
semDoit(BrmKeys.KEYRANGE_VBBM_BASE, "VBBM ");
semDoit(BrmKeys.KEYRANGE_VSS_BASE, "VSS ");
semDoit(BrmKeys.KEYRANGE_EXTENTMAP_INDEX_BASE, "EXTMAP_INDX");
semDoit(BrmKeys.MST_SYSVKEY, "MST ");
if (!cFlg)