From 567fe019ac21ee78a07beae1a387ab5688e7f97b Mon Sep 17 00:00:00 2001 From: isanae <14251494+isanae@users.noreply.github.com> Date: Fri, 14 Feb 2020 01:53:59 -0500 Subject: removed some unnecessary counters delete old structure in thread --- src/shared/directoryentry.cpp | 48 ------------------------------------------- 1 file changed, 48 deletions(-) (limited to 'src/shared/directoryentry.cpp') diff --git a/src/shared/directoryentry.cpp b/src/shared/directoryentry.cpp index 4e64d1c1..c5702026 100644 --- a/src/shared/directoryentry.cpp +++ b/src/shared/directoryentry.cpp @@ -40,13 +40,6 @@ namespace MOShared using namespace MOBase; static const int MAXPATH_UNICODE = 32767; - -static std::atomic FileEntryCount(0); -static std::atomic FilesOriginCount(0); -static std::atomic FileRegisterCount(0); -static std::atomic DirectoryEntryCount(0); -static std::atomic OriginConnectionCount(0); - template std::chrono::nanoseconds elapsed(F&& f) { @@ -56,13 +49,6 @@ std::chrono::nanoseconds elapsed(F&& f) return (end - start); } -void logcounts(std::string w) -{ - log::debug( - "{}: FileEntry={} FilesOrigin={} FileRegister={} DirectoryEntry={} OriginConnection={}", - w, FileEntryCount, FilesOriginCount, FileRegisterCount, DirectoryEntryCount, OriginConnectionCount); -} - static std::wstring tail(const std::wstring &source, const size_t count) { @@ -203,12 +189,6 @@ public: OriginConnection() : m_NextID(0) { - ++OriginConnectionCount; - } - - ~OriginConnection() - { - --OriginConnectionCount; } std::pair getOrCreate( @@ -350,7 +330,6 @@ FileEntry::FileEntry() : m_FileSize(NoFileSize), m_CompressedFileSize(NoFileSize), m_LastAccessed(time(nullptr)) { - ++FileEntryCount; } FileEntry::FileEntry(Index index, std::wstring name, DirectoryEntry *parent) : @@ -358,16 +337,6 @@ FileEntry::FileEntry(Index index, std::wstring name, DirectoryEntry *parent) : m_FileSize(NoFileSize), m_CompressedFileSize(NoFileSize), m_LastAccessed(time(nullptr)) { - ++FileEntryCount; -} - -FileEntry::~FileEntry() -{ - while (!m_Alternatives.empty()) { - m_Alternatives.pop_back(); - } - - --FileEntryCount; } void FileEntry::addOrigin( @@ -606,7 +575,6 @@ bool FileEntry::recurseParents(std::wstring &path, const DirectoryEntry *parent) FilesOrigin::FilesOrigin() : m_ID(0), m_Disabled(false), m_Name(), m_Path(), m_Priority(0) { - ++FilesOriginCount; } FilesOrigin::FilesOrigin(const FilesOrigin &reference) @@ -618,7 +586,6 @@ FilesOrigin::FilesOrigin(const FilesOrigin &reference) , m_FileRegister(reference.m_FileRegister) , m_OriginConnection(reference.m_OriginConnection) { - ++FilesOriginCount; } FilesOrigin::FilesOrigin( @@ -629,12 +596,6 @@ FilesOrigin::FilesOrigin( m_Priority(priority), m_FileRegister(fileRegister), m_OriginConnection(originConnection) { - ++FilesOriginCount; -} - -FilesOrigin::~FilesOrigin() -{ - --FilesOriginCount; } void FilesOrigin::setPriority(int priority) @@ -733,12 +694,6 @@ bool FilesOrigin::containsArchive(std::wstring archiveName) FileRegister::FileRegister(boost::shared_ptr originConnection) : m_OriginConnection(originConnection) { - ++FileRegisterCount; -} - -FileRegister::~FileRegister() -{ - --FileRegisterCount; } bool FileRegister::indexValid(FileEntry::Index index) const @@ -907,7 +862,6 @@ DirectoryEntry::DirectoryEntry( m_OriginConnection(new OriginConnection), m_Name(std::move(name)), m_Parent(parent), m_Populated(false), m_TopLevel(true) { - ++DirectoryEntryCount; m_FileRegister.reset(new FileRegister(m_OriginConnection)); m_Origins.insert(originID); } @@ -919,13 +873,11 @@ DirectoryEntry::DirectoryEntry( m_FileRegister(fileRegister), m_OriginConnection(originConnection), m_Name(std::move(name)), m_Parent(parent), m_Populated(false), m_TopLevel(false) { - ++DirectoryEntryCount; m_Origins.insert(originID); } DirectoryEntry::~DirectoryEntry() { - --DirectoryEntryCount; clear(); } -- cgit v1.3.1