ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #465 from lioncash/logging 

Centralize the logging code into its own folder in Common.
This commit is contained in:
Lioncash 2014-06-25 22:21:49 -04:00
parent d0ad84f69b ca5340ebde
commit a5aac685d6
34 changed files with 92 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/CMakeLists.txt
View File

@ -1,12 +1,10 @@
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
@ -27,7 +25,10 @@ set(SRCS BreakPoints.cpp
x64Analyzer.cpp
x64Emitter.cpp
Crypto/bn.cpp
Crypto/ec.cpp)
Crypto/ec.cpp
Logging/ConsoleListener.cpp
Logging/LogManager.cpp)
if(_M_ARM_32) #ARMv7
set(SRCS ${SRCS}

2
Source/Core/Common/Common.h
View File

@ -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

18
Source/Core/Common/Common.vcxproj
View File

@ -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" />

10
Source/Core/Common/Common.vcxproj.filters
View File

@ -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" />

2
Source/Core/Common/ConsoleListener.cpp → Source/Core/Common/Logging/ConsoleListener.cpp
View File

@ -12,8 +12,8 @@
#include <array>
#endif
#include "Common/ConsoleListener.h"
#include "Common/StringUtil.h"
#include "Common/Logging/ConsoleListener.h"
ConsoleListener::ConsoleListener()
{

2
Source/Core/Common/ConsoleListener.h → Source/Core/Common/Logging/ConsoleListener.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "Common/LogManager.h"
#include "Common/Logging/LogManager.h"
#ifdef _WIN32
#include <windows.h>

0
Source/Core/Common/Log.h → Source/Core/Common/Logging/Log.h
View File

6
Source/Core/Common/LogManager.cpp → Source/Core/Common/Logging/LogManager.cpp
View File

@ -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, ...)

0
Source/Core/Common/LogManager.h → Source/Core/Common/Logging/LogManager.h
View File

2
Source/Core/Common/x64Emitter.cpp
View File

@ -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
{

2
Source/Core/Core/ActionReplay.cpp
View File

@ -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"

2
Source/Core/Core/Core.cpp
View File

@ -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"

2
Source/Core/Core/HW/DSPHLE/DSPHLE.cpp
View File

@ -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"

2
Source/Core/Core/HW/DSPLLE/DSPLLE.cpp
View File

@ -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"

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
View File

@ -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"

2
Source/Core/DiscIO/FileMonitor.cpp
View File

@ -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"

2
Source/Core/DiscIO/NANDContentLoader.cpp
View File

@ -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"

2
Source/Core/DiscIO/WiiWad.cpp
View File

@ -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"

2
Source/Core/DolphinWX/Frame.cpp
View File

@ -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"

2
Source/Core/DolphinWX/FrameAui.cpp
View File

@ -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"

6
Source/Core/DolphinWX/LogConfigWindow.cpp
View File

@ -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"

4
Source/Core/DolphinWX/LogWindow.cpp
View File

@ -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"

2
Source/Core/DolphinWX/LogWindow.h
View File

@ -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;

2
Source/Core/DolphinWX/Main.cpp
View File

@ -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"

2
Source/Core/DolphinWX/MainAndroid.cpp
View File

@ -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"

2
Source/Core/DolphinWX/MainNoGUI.cpp
View File

@ -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"

2
Source/Core/DolphinWX/X11Utils.cpp
View File

@ -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"

2
Source/Core/VideoBackends/D3D/GfxState.cpp
View File

@ -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"

2
Source/Core/VideoBackends/D3D/main.cpp
View File

@ -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"

2
Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
View File

@ -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__)

2
Source/Core/VideoBackends/OGL/main.cpp
View File

@ -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"

2
Source/Core/VideoBackends/Software/SWmain.cpp
View File

@ -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"

3
Source/Core/VideoCommon/AVIDump.cpp
View File

@ -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"

2
Source/Core/VideoCommon/DriverDetails.cpp
View File

@ -4,7 +4,7 @@
#include <map>
#include "Common/LogManager.h"
#include "Common/Logging/LogManager.h"
#include "VideoCommon/DriverDetails.h"
namespace DriverDetails