From 6978e2b841fdb37402a256ab638ff48e925fb3d5 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Wed, 22 Dec 2021 09:09:16 +0100 Subject: [PATCH] Removed unused file logging If necessary, it should be implemented later by directly modifying base/logging.hpp Signed-off-by: Alexander Borsuk --- .../com/mapswithme/maps/LocationHelper.cpp | 2 - .../jni/com/mapswithme/maps/MapFragment.cpp | 1 - iphone/Maps/main.mm | 5 -- platform/CMakeLists.txt | 2 - platform/file_logging.cpp | 72 ------------------- platform/file_logging.hpp | 28 -------- .../platform.xcodeproj/project.pbxproj | 8 --- 7 files changed, 118 deletions(-) delete mode 100644 platform/file_logging.cpp delete mode 100644 platform/file_logging.hpp diff --git a/android/jni/com/mapswithme/maps/LocationHelper.cpp b/android/jni/com/mapswithme/maps/LocationHelper.cpp index 4951743e95..d7a759d230 100644 --- a/android/jni/com/mapswithme/maps/LocationHelper.cpp +++ b/android/jni/com/mapswithme/maps/LocationHelper.cpp @@ -1,6 +1,5 @@ #include "Framework.hpp" #include "map/gps_tracker.hpp" -#include "platform/file_logging.hpp" extern "C" { @@ -37,7 +36,6 @@ extern "C" if (speed > 0.0) info.m_speedMpS = speed; - LOG_MEMORY_INFO(); if (g_framework) g_framework->OnLocationUpdated(info); GpsTracker::Instance().OnLocationUpdated(info); diff --git a/android/jni/com/mapswithme/maps/MapFragment.cpp b/android/jni/com/mapswithme/maps/MapFragment.cpp index 1013e832b9..990dc325a3 100644 --- a/android/jni/com/mapswithme/maps/MapFragment.cpp +++ b/android/jni/com/mapswithme/maps/MapFragment.cpp @@ -8,7 +8,6 @@ #include "base/logging.hpp" -#include "platform/file_logging.hpp" #include "platform/settings.hpp" namespace diff --git a/iphone/Maps/main.mm b/iphone/Maps/main.mm index 45a8a7b13a..b23b68bb8f 100644 --- a/iphone/Maps/main.mm +++ b/iphone/Maps/main.mm @@ -1,15 +1,10 @@ #import "MapsAppDelegate.h" -#include "platform/file_logging.hpp" #include "platform/platform.hpp" #include "platform/settings.hpp" - int main(int argc, char * argv[]) { -#ifdef MWM_LOG_TO_FILE - base::SetLogMessageFn(LogMessageFile); -#endif auto & p = GetPlatform(); LOG(LINFO, ("Organic Maps started, detected CPU cores:", p.CpuCores())); diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt index e0379c3f7e..4f94a6cf50 100644 --- a/platform/CMakeLists.txt +++ b/platform/CMakeLists.txt @@ -14,8 +14,6 @@ set(SRC downloader_defines.hpp downloader_utils.cpp downloader_utils.hpp - file_logging.cpp - file_logging.hpp get_text_by_id.cpp get_text_by_id.hpp gui_thread.hpp diff --git a/platform/file_logging.cpp b/platform/file_logging.cpp deleted file mode 100644 index e7a0131613..0000000000 --- a/platform/file_logging.cpp +++ /dev/null @@ -1,72 +0,0 @@ -#include "platform/file_logging.hpp" - -#include "platform/platform.hpp" - -#include "coding/file_writer.hpp" - -#include -#include -#include - -using namespace std; - -namespace -{ - tm * GetLocalTime() - { - time_t rawTime; - time(&rawTime); - tm * localTime = localtime(&rawTime); - assert(localTime); - return localTime; - } -} - -void LogMessageFile(base::LogLevel level, base::SrcPoint const & srcPoint, string const & msg) -{ - static mutex mtx; - static unique_ptr file; - - string recordType; - switch (level) - { - case LINFO: recordType.assign("INFO "); break; - case LDEBUG: recordType.assign("DEBUG "); break; - case LWARNING: recordType.assign("WARN "); break; - case LERROR: recordType.assign("ERROR "); break; - case LCRITICAL: recordType.assign("FATAL "); break; - case NUM_LOG_LEVELS: CHECK(false, ()); break; - } - - lock_guard lock(mtx); - - if (file == nullptr) - { - if (GetPlatform().WritableDir().empty()) - return; - tm * curTimeTM = GetLocalTime(); - stringstream fileName; - fileName << "logging_" << curTimeTM->tm_year + 1900 << "_" << curTimeTM->tm_mon + 1 << "_" << curTimeTM->tm_mday << "_" - << curTimeTM->tm_hour << "_" << curTimeTM->tm_min << "_" << curTimeTM->tm_sec << ".log"; - file.reset(new FileWriter(GetPlatform().WritablePathForFile(fileName.str()))); - } - - string srcString = recordType + DebugPrint(srcPoint) + " " + msg + "\n"; - - file->Write(srcString.c_str(), srcString.size()); - file->Flush(); -} - -void LogMemoryInfo() -{ - static unsigned long counter = 0; - const unsigned short writeLogEveryNthCall = 3; - if (counter++ % writeLogEveryNthCall == 0) - { - tm * curTimeTM = GetLocalTime(); - stringstream timeDate; - timeDate << " " << curTimeTM->tm_year + 1900 << "." << curTimeTM->tm_mon + 1 << "." << curTimeTM->tm_mday << " " - << curTimeTM->tm_hour << ":" << curTimeTM->tm_min << ":" << curTimeTM->tm_sec << " "; - LOG(LINFO, (timeDate.str(), GetPlatform().GetMemoryInfo())); - } -} diff --git a/platform/file_logging.hpp b/platform/file_logging.hpp deleted file mode 100644 index d508d0de6a..0000000000 --- a/platform/file_logging.hpp +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "base/logging.hpp" - -#include - -// @todo this functionality is not located in logging.hpp since file_logging uses FileWriter which depends on coding lib. -// At the same time loging is located in base and I do not want base depens on several more libs. -// Probably it's a good idea to move all logging functionality (logging, file_logging, mem_logging and so on) -// to a special subsystem which depends on base and coding. - -// If you uncomment the line bellow the application log will be written to a file. -// You'll find a log file (logging_