piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed crash on linux, added DISCIO logging type, some extra logging messages and some logging cleanup

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2533 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2009-03-03 00:21:08 +00:00
parent 9ef42aefac
commit e9430a0252
4 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/Src/FileUtil.cpp
View File

@ -174,6 +174,11 @@ bool CreateFullPath(const char *fullPath)
int panicCounter = 100;
INFO_LOG(COMMON, "CreateFullPath: path %s\n", fullPath);
if (File::Exists(fullPath)) {
INFO_LOG(COMMON, "CreateFullPath: path exists %s\n", fullPath);
return true;
}
const char *position = fullPath;
while (true) {
// Find next sub path, support both \ and / directory separators
@ -329,6 +334,7 @@ u64 GetSize(const char *filename)
// on windows it's actually _stat64 defined in commonFuncs
struct stat64 buf;
if (stat64(filename, &buf) == 0) {
DEBUG_LOG(COMMON, "GetSize: %s: %d", filename, buf.st_size);
return buf.st_size;
}

45
Source/Core/Common/Src/Log.h
View File

@ -29,6 +29,7 @@ enum LOG_TYPE {
COMMANDPROCESSOR,
COMMON,
CONSOLE,
DISCIO,
DSPHLE,
DSPINTERFACE,
DVDINTERFACE,
@ -60,10 +61,10 @@ enum LOG_TYPE {
};
enum LOG_LEVELS {
LERROR, // Bad errors - that still don't deserve a PanicAlert.
LWARNING, // Something is suspicious.
LINFO, // General information.
LDEBUG, // Strictly for detailed debugging - might make things slow.
LERROR = 0, // Bad errors - that still don't deserve a PanicAlert.
LWARNING, // Something is suspicious.
LINFO, // General information.
LDEBUG, // Strictly for detailed debugging - might make things slow.
};
} // namespace
@ -71,44 +72,22 @@ enum LOG_LEVELS {
/*
FIXME:
- How can generic_log support log levels in compile time?
Maybe it should call ERROR/.. according to level instead of the other way around.
- Check if we can make the win32 and gcc togther (get rid of those ##)
- Debug_run() - run only in debug time
- Compile the log functions according to LOGLEVEL
*/
#ifdef LOGGING
#define LOGLEVEL 4
#define LOGLEVEL 5
extern void __Log(int logNumber, const char* text, ...);
//extern void __Logv(int log, int v, const char *format, ...);
#ifdef _WIN32
/* #define LOG(t, ...) __Log(LogTypes::t, __VA_ARGS__); */
/* #define LOGV(t, v, ...) __Log(LogTypes::t + (v)*100, __VA_ARGS__); */
/* #define LOGP(t, ...) __Log(t, __VA_ARGS__); */
/* #define LOGVP(t, v, ...) __Log(t + (v)*100, __VA_ARGS__); */
// Let the compiler optimize this out
//#define GENERIC_LOG(t,v, ...) {if (v <= LOGLEVEL) __Log(t + (v)*100, __VA_ARGS__);}
#define GENERIC_LOG(t,v, ...) {__Log(t + (v)*100, __VA_ARGS__);}
#define ERROR_LOG(t,...) {GENERIC_LOG(LogTypes::t, LogTypes::LERROR, __VA_ARGS__)}
#define WARN_LOG(t,...) {GENERIC_LOG(LogTypes::t, LogTypes::LINFO, __VA_ARGS__)}
#define INFO_LOG(t,...) {GENERIC_LOG(LogTypes::t, LogTypes::LWARNING, __VA_ARGS__)}
#define DEBUG_LOG(t,...) {GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, __VA_ARGS__)}
#else
//#define LOG(t, ...) __Log(LogTypes::t, ##__VA_ARGS__);
//#define LOGV(t,v, ...) __Log(LogTypes::t + (v)*100, ##__VA_ARGS__);
//#define LOGP(t, ...) __Log(t, ##__VA_ARGS__);
//#define LOGVP(t,v, ...) __Log(t + (v)*100, ##__VA_ARGS__);
#define GENERIC_LOG(t,v, ...) {__Log(t + (v)*100, ##__VA_ARGS__);}
#define ERROR_LOG(t,...) {GENERIC_LOG(LogTypes::t, LogTypes::LERROR, ##__VA_ARGS__)}
#define WARN_LOG(t,...) {GENERIC_LOG(LogTypes::t, LogTypes::LINFO, ##__VA_ARGS__)}
#define INFO_LOG(t,...) {GENERIC_LOG(LogTypes::t, LogTypes::LWARNING, ##__VA_ARGS__)}
#define DEBUG_LOG(t,...) {GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, ##__VA_ARGS__)}
#endif // WIN32
#define _dbg_assert_(_t_, _a_) \
if (!(_a_)) {\
@ -124,11 +103,7 @@ extern void __Log(int logNumber, const char* text, ...);
#define _dbg_update_() Host_UpdateLogDisplay();
#else // no logging
//#define LOG(_t_, ...)
//#define LOGV(_t_, _v_, ...)
//#define LOGP(_t_, ...)
//#define LOGVP(_t_, _v_, ...)
#define LOGLEVEL 1
#define _dbg_clear_()
#define _dbg_update_() ;