Merge pull request #465 from lioncash/logging

Centralize the logging code into its own folder in Common.
2014-06-25 22:21:49 -04:00 · 2014-06-25 22:21:49 -04:00 · a5aac685d6
parent d0ad84f69b ca5340ebde
commit a5aac685d6
34 changed files with 92 additions and 90 deletions
--- a/Source/Core/Common/CMakeLists.txt
+++ b/Source/Core/Common/CMakeLists.txt
@ -1,50 +1,51 @@
-set(SRCS	BreakPoints.cpp
-			CDUtils.cpp
-			ColorUtil.cpp
-			ConsoleListener.cpp
-			FileSearch.cpp
-			FileUtil.cpp
-			Hash.cpp
-			IniFile.cpp
-			LogManager.cpp
-			MathUtil.cpp
-			MemArena.cpp
-			MemoryUtil.cpp
-			Misc.cpp
-			MsgHandler.cpp
-			NandPaths.cpp
-			Network.cpp
-			PcapFile.cpp
-			SettingsHandler.cpp
-			SDCardUtil.cpp
-			StringUtil.cpp
-			SymbolDB.cpp
-			SysConf.cpp
-			Thread.cpp
-			Timer.cpp
-			Version.cpp
-			x64ABI.cpp
-			x64Analyzer.cpp
-			x64Emitter.cpp
-			Crypto/bn.cpp
-			Crypto/ec.cpp)
+set(SRCS BreakPoints.cpp
+         CDUtils.cpp
+         ColorUtil.cpp
+         FileSearch.cpp
+         FileUtil.cpp
+         Hash.cpp
+         IniFile.cpp
+         MathUtil.cpp
+         MemArena.cpp
+         MemoryUtil.cpp
+         Misc.cpp
+         MsgHandler.cpp
+         NandPaths.cpp
+         Network.cpp
+         PcapFile.cpp
+         SettingsHandler.cpp
+         SDCardUtil.cpp
+         StringUtil.cpp
+         SymbolDB.cpp
+         SysConf.cpp
+         Thread.cpp
+         Timer.cpp
+         Version.cpp
+         x64ABI.cpp
+         x64Analyzer.cpp
+         x64Emitter.cpp
+         Crypto/bn.cpp
+         Crypto/ec.cpp
+         Logging/ConsoleListener.cpp
+         Logging/LogManager.cpp)
+

 if(_M_ARM_32) #ARMv7
-	set(SRCS ${SRCS}
-	         ArmCPUDetect.cpp
-	         ArmEmitter.cpp
-	         GenericFPURoundMode.cpp)
+    set(SRCS ${SRCS}
+         ArmCPUDetect.cpp
+         ArmEmitter.cpp
+         GenericFPURoundMode.cpp)
 elseif(_M_X86) #X86
-	set(SRCS ${SRCS}
-		   x64CPUDetect.cpp
-		   x64FPURoundMode.cpp)
+    set(SRCS ${SRCS}
+         x64CPUDetect.cpp
+         x64FPURoundMode.cpp)
 else() #Generic
-	set(SRCS ${SRCS}
-	         GenericFPURoundMode.cpp
-	         x64CPUDetect.cpp)
+    set(SRCS ${SRCS}
+         GenericFPURoundMode.cpp
+         x64CPUDetect.cpp)
 endif()
 if(WIN32)
-	set(SRCS ${SRCS} ExtendedTrace.cpp)
+    set(SRCS ${SRCS} ExtendedTrace.cpp)
 endif(WIN32)

 enable_precompiled_headers(stdafx.h stdafx.cpp SRCS)
--- a/Source/Core/Common/Common.h
+++ b/Source/Core/Common/Common.h
@ -168,5 +168,5 @@ enum EMUSTATE_CHANGE

 #include "Common/CommonTypes.h" // IWYU pragma: export
 #include "Common/CommonFuncs.h" // IWYU pragma: export // NOLINT
-#include "Common/Log.h" // IWYU pragma: export
 #include "Common/MsgHandler.h" // IWYU pragma: export
+#include "Common/Logging/Log.h" // IWYU pragma: export
--- a/Source/Core/Common/Common.vcxproj
+++ b/Source/Core/Common/Common.vcxproj
@ -48,10 +48,7 @@
    <ClInclude Include="CommonFuncs.h" />
    <ClInclude Include="CommonPaths.h" />
    <ClInclude Include="CommonTypes.h" />
-    <ClInclude Include="ConsoleListener.h" />
    <ClInclude Include="CPUDetect.h" />
-    <ClInclude Include="Crypto\bn.h" />
-    <ClInclude Include="Crypto\ec.h" />
    <ClInclude Include="DebugInterface.h" />
    <ClInclude Include="ExtendedTrace.h" />
    <ClInclude Include="FifoQueue.h" />
@ -62,8 +59,6 @@
    <ClInclude Include="Hash.h" />
    <ClInclude Include="IniFile.h" />
    <ClInclude Include="LinearDiskCache.h" />
-    <ClInclude Include="Log.h" />
-    <ClInclude Include="LogManager.h" />
    <ClInclude Include="MathUtil.h" />
    <ClInclude Include="MemArena.h" />
    <ClInclude Include="MemoryUtil.h" />
@ -86,20 +81,21 @@
    <ClInclude Include="x64ABI.h" />
    <ClInclude Include="x64Analyzer.h" />
    <ClInclude Include="x64Emitter.h" />
+    <ClInclude Include="Crypto\bn.h" />
+    <ClInclude Include="Crypto\ec.h" />
+    <ClInclude Include="Logging\ConsoleListener.h" />
+    <ClInclude Include="Logging\Log.h" />
+    <ClInclude Include="Logging\LogManager.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="BreakPoints.cpp" />
    <ClCompile Include="CDUtils.cpp" />
    <ClCompile Include="ColorUtil.cpp" />
-    <ClCompile Include="ConsoleListener.cpp" />
-    <ClCompile Include="Crypto\bn.cpp" />
-    <ClCompile Include="Crypto\ec.cpp" />
    <ClCompile Include="ExtendedTrace.cpp" />
    <ClCompile Include="FileSearch.cpp" />
    <ClCompile Include="FileUtil.cpp" />
    <ClCompile Include="Hash.cpp" />
    <ClCompile Include="IniFile.cpp" />
-    <ClCompile Include="LogManager.cpp" />
    <ClCompile Include="MathUtil.cpp" />
    <ClCompile Include="MemArena.cpp" />
    <ClCompile Include="MemoryUtil.cpp" />
@ -125,6 +121,10 @@
    <ClCompile Include="x64Emitter.cpp" />
    <ClCompile Include="x64FPURoundMode.cpp" />
    <ClCompile Include="XSaveWorkaround.cpp" />
+    <ClCompile Include="Crypto\bn.cpp" />
+    <ClCompile Include="Crypto\ec.cpp" />
+    <ClCompile Include="Logging\ConsoleListener.cpp" />
+    <ClCompile Include="Logging\LogManager.cpp" />
  </ItemGroup>
  <ItemGroup>
    <Text Include="CMakeLists.txt" />
@ -140,4 +140,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>
--- a/Source/Core/Common/Common.vcxproj.filters
+++ b/Source/Core/Common/Common.vcxproj.filters
@ -54,13 +54,13 @@
    <ClInclude Include="x64ABI.h" />
    <ClInclude Include="x64Analyzer.h" />
    <ClInclude Include="x64Emitter.h" />
-    <ClInclude Include="ConsoleListener.h">
+    <ClInclude Include="Logging\ConsoleListener.h">
      <Filter>Logging</Filter>
    </ClInclude>
-    <ClInclude Include="Log.h">
+    <ClInclude Include="Logging\Log.h">
      <Filter>Logging</Filter>
    </ClInclude>
-    <ClInclude Include="LogManager.h">
+    <ClInclude Include="Logging\LogManager.h">
      <Filter>Logging</Filter>
    </ClInclude>
    <ClInclude Include="stdafx.h" />
@ -107,10 +107,10 @@
    <ClCompile Include="Crypto\ec.cpp">
      <Filter>Crypto</Filter>
    </ClCompile>
-    <ClCompile Include="ConsoleListener.cpp">
+    <ClCompile Include="Logging\ConsoleListener.cpp">
      <Filter>Logging</Filter>
    </ClCompile>
-    <ClCompile Include="LogManager.cpp">
+    <ClCompile Include="Logging\LogManager.cpp">
      <Filter>Logging</Filter>
    </ClCompile>
    <ClCompile Include="stdafx.cpp" />
--- a/Source/Core/Common/Logging/ConsoleListener.cpp
+++ b/Source/Core/Common/Logging/ConsoleListener.cpp
@ -12,8 +12,8 @@
 #include <array>
 #endif

-#include "Common/ConsoleListener.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/ConsoleListener.h"

 ConsoleListener::ConsoleListener()
 {
--- a/Source/Core/Common/Logging/ConsoleListener.h
+++ b/Source/Core/Common/Logging/ConsoleListener.h
@ -4,7 +4,7 @@

 #pragma once

-#include "Common/LogManager.h"
+#include "Common/Logging/LogManager.h"

 #ifdef _WIN32
 #include <windows.h>
--- a/Source/Core/Common/Logging/Log.h
+++ b/Source/Core/Common/Logging/Log.h
--- a/Source/Core/Common/Logging/LogManager.cpp
+++ b/Source/Core/Common/Logging/LogManager.cpp
@ -12,12 +12,12 @@
 #ifdef ANDROID
 #include "Core/Host.h"
 #endif
-#include "Common/ConsoleListener.h"
 #include "Common/FileUtil.h"
-#include "Common/Log.h"
-#include "Common/LogManager.h"
 #include "Common/StringUtil.h"
 #include "Common/Timer.h"
+#include "Common/Logging/ConsoleListener.h"
+#include "Common/Logging/Log.h"
+#include "Common/Logging/LogManager.h"

 void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
 		const char *file, int line, const char* fmt, ...)
--- a/Source/Core/Common/Logging/LogManager.h
+++ b/Source/Core/Common/Logging/LogManager.h
--- a/Source/Core/Common/x64Emitter.cpp
+++ b/Source/Core/Common/x64Emitter.cpp
@ -6,8 +6,8 @@

 #include "Common/Common.h"
 #include "Common/CPUDetect.h"
-#include "Common/Log.h"
 #include "Common/x64Emitter.h"
+#include "Common/Logging/Log.h"

 namespace Gen
 {
--- a/Source/Core/Core/ActionReplay.cpp
+++ b/Source/Core/Core/ActionReplay.cpp
@ -23,8 +23,8 @@
 #include <vector>

 #include "Common/Common.h"
-#include "Common/LogManager.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/LogManager.h"

 #include "Core/ActionReplay.h"
 #include "Core/ARDecrypt.h"
--- a/Source/Core/Core/Core.cpp
+++ b/Source/Core/Core/Core.cpp
@ -14,12 +14,12 @@
 #include "Common/Common.h"
 #include "Common/CommonPaths.h"
 #include "Common/CPUDetect.h"
-#include "Common/LogManager.h"
 #include "Common/MathUtil.h"
 #include "Common/MemoryUtil.h"
 #include "Common/StringUtil.h"
 #include "Common/Thread.h"
 #include "Common/Timer.h"
+#include "Common/Logging/LogManager.h"

 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
--- a/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp
+++ b/Source/Core/Core/HW/DSPHLE/DSPHLE.cpp
@ -6,8 +6,8 @@

 #include "Common/ChunkFile.h"
 #include "Common/IniFile.h"
-#include "Common/LogManager.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/LogManager.h"

 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
--- a/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
+++ b/Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
@ -9,9 +9,9 @@
 #include "Common/CPUDetect.h"
 #include "Common/Event.h"
 #include "Common/IniFile.h"
-#include "Common/LogManager.h"
 #include "Common/StdMutex.h"
 #include "Common/StdThread.h"
+#include "Common/Logging/LogManager.h"

 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
--- a/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
+++ b/Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
@ -5,7 +5,7 @@
 #include <cinttypes>

 #include "Common/Common.h"
-#include "Common/LogManager.h"
+#include "Common/Logging/LogManager.h"

 #include "Core/Core.h"
 #include "Core/VolumeHandler.h"
--- a/Source/Core/DiscIO/FileMonitor.cpp
+++ b/Source/Core/DiscIO/FileMonitor.cpp
@ -10,8 +10,8 @@
 #include <vector>

 #include "Common/Common.h"
-#include "Common/LogManager.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/LogManager.h"

 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
--- a/Source/Core/DiscIO/NANDContentLoader.cpp
+++ b/Source/Core/DiscIO/NANDContentLoader.cpp
@ -14,10 +14,10 @@

 #include "Common/Common.h"
 #include "Common/FileUtil.h"
-#include "Common/Log.h"
 #include "Common/MathUtil.h"
 #include "Common/NandPaths.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"

 #include "DiscIO/NANDContentLoader.h"
 #include "DiscIO/Volume.h"
--- a/Source/Core/DiscIO/WiiWad.cpp
+++ b/Source/Core/DiscIO/WiiWad.cpp
@ -8,8 +8,8 @@

 #include "Common/Common.h"
 #include "Common/FileUtil.h"
-#include "Common/Log.h"
 #include "Common/MathUtil.h"
+#include "Common/Logging/Log.h"
 #include "DiscIO/Blob.h"
 #include "DiscIO/WiiWad.h"

--- a/Source/Core/DolphinWX/Frame.cpp
+++ b/Source/Core/DolphinWX/Frame.cpp
@ -44,9 +44,9 @@
 #include <wx/aui/framemanager.h>

 #include "Common/Common.h"
-#include "Common/ConsoleListener.h"
 #include "Common/FileUtil.h"
 #include "Common/Thread.h"
+#include "Common/Logging/ConsoleListener.h"

 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
--- a/Source/Core/DolphinWX/FrameAui.cpp
+++ b/Source/Core/DolphinWX/FrameAui.cpp
@ -31,10 +31,10 @@
 #include <wx/aui/framemanager.h>

 #include "Common/Common.h"
-#include "Common/ConsoleListener.h"
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/ConsoleListener.h"
 #include "Core/ConfigManager.h"
 #include "DolphinWX/Frame.h"
 #include "DolphinWX/Globals.h"
--- a/Source/Core/DolphinWX/LogConfigWindow.cpp
+++ b/Source/Core/DolphinWX/LogConfigWindow.cpp
@ -18,11 +18,11 @@
 #include <wx/validate.h>
 #include <wx/windowid.h>

-#include "Common/ConsoleListener.h"
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
-#include "Common/Log.h"
-#include "Common/LogManager.h"
+#include "Common/Logging/ConsoleListener.h"
+#include "Common/Logging/Log.h"
+#include "Common/Logging/LogManager.h"
 #include "DolphinWX/LogConfigWindow.h"
 #include "DolphinWX/LogWindow.h"
 #include "DolphinWX/WxUtils.h"
--- a/Source/Core/DolphinWX/LogWindow.cpp
+++ b/Source/Core/DolphinWX/LogWindow.cpp
@ -29,10 +29,10 @@
 #include <wx/aui/framemanager.h>

 #include "Common/Common.h"
-#include "Common/ConsoleListener.h"
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
-#include "Common/LogManager.h"
+#include "Common/Logging/ConsoleListener.h"
+#include "Common/Logging/LogManager.h"
 #include "DolphinWX/Frame.h"
 #include "DolphinWX/LogWindow.h"
 #include "DolphinWX/WxUtils.h"
--- a/Source/Core/DolphinWX/LogWindow.h
+++ b/Source/Core/DolphinWX/LogWindow.h
@ -18,7 +18,7 @@
 #include <wx/windowid.h>

 #include "Common/Common.h"
-#include "Common/LogManager.h"
+#include "Common/Logging/LogManager.h"

 class CFrame;
 class wxBoxSizer;
--- a/Source/Core/DolphinWX/Main.cpp
+++ b/Source/Core/DolphinWX/Main.cpp
@ -33,8 +33,8 @@
 #include "Common/CPUDetect.h"
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
-#include "Common/LogManager.h"
 #include "Common/Thread.h"
+#include "Common/Logging/LogManager.h"

 #include "Core/ConfigManager.h"
 #include "Core/CoreParameter.h"
--- a/Source/Core/DolphinWX/MainAndroid.cpp
+++ b/Source/Core/DolphinWX/MainAndroid.cpp
@ -29,7 +29,7 @@
 #include "Common/CPUDetect.h"
 #include "Common/Event.h"
 #include "Common/FileUtil.h"
-#include "Common/LogManager.h"
+#include "Common/Logging/LogManager.h"
 #include "Core/BootManager.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
--- a/Source/Core/DolphinWX/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/MainNoGUI.cpp
@ -11,7 +11,7 @@

 #include "Common/Common.h"
 #include "Common/Event.h"
-#include "Common/LogManager.h"
+#include "Common/Logging/LogManager.h"

 #include "Core/BootManager.h"
 #include "Core/ConfigManager.h"
--- a/Source/Core/DolphinWX/X11Utils.cpp
+++ b/Source/Core/DolphinWX/X11Utils.cpp
@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <sys/wait.h>

-#include "Common/Log.h"
+#include "Common/Logging/Log.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/CoreParameter.h"
--- a/Source/Core/VideoBackends/D3D/GfxState.cpp
+++ b/Source/Core/VideoBackends/D3D/GfxState.cpp
@ -2,7 +2,7 @@
 // Licensed under GPLv2
 // Refer to the license.txt file included.

-#include "Common/Log.h"
+#include "Common/Logging/Log.h"

 #include "VideoBackends/D3D/D3DBase.h"
 #include "VideoBackends/D3D/GfxState.h"
--- a/Source/Core/VideoBackends/D3D/main.cpp
+++ b/Source/Core/VideoBackends/D3D/main.cpp
@ -7,8 +7,8 @@

 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
-#include "Common/LogManager.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/LogManager.h"

 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
--- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
@ -5,7 +5,7 @@
 #include <sstream>
 #include <unordered_map>

-#include "Common/Log.h"
+#include "Common/Logging/Log.h"
 #include "VideoBackends/OGL/GLExtensions/GLExtensions.h"

 #if defined(__linux__) || defined(__APPLE__)
--- a/Source/Core/VideoBackends/OGL/main.cpp
+++ b/Source/Core/VideoBackends/OGL/main.cpp
@ -41,8 +41,8 @@ Make AA apply instantly during gameplay if possible

 #include "Common/Atomic.h"
 #include "Common/CommonPaths.h"
-#include "Common/LogManager.h"
 #include "Common/Thread.h"
+#include "Common/Logging/LogManager.h"

 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@ -7,8 +7,8 @@
 #include "Common/Atomic.h"
 #include "Common/Common.h"
 #include "Common/FileUtil.h"
-#include "Common/LogManager.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/LogManager.h"

 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
--- a/Source/Core/VideoCommon/AVIDump.cpp
+++ b/Source/Core/VideoCommon/AVIDump.cpp
@ -10,8 +10,9 @@

 #include "Common/CommonPaths.h"
 #include "Common/FileUtil.h"
-#include "Common/Log.h"
 #include "Common/StringUtil.h"
+#include "Common/Logging/Log.h"
+
 #include "Core/HW/VideoInterface.h" //for TargetRefreshRate
 #include "VideoCommon/AVIDump.h"
 #include "VideoCommon/VideoConfig.h"
--- a/Source/Core/VideoCommon/DriverDetails.cpp
+++ b/Source/Core/VideoCommon/DriverDetails.cpp
@ -4,7 +4,7 @@

 #include <map>

-#include "Common/LogManager.h"
+#include "Common/Logging/LogManager.h"
 #include "VideoCommon/DriverDetails.h"

 namespace DriverDetails