From 913dca69efe444cc94729b4352fd595d0b6ce9e6 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Sun, 10 Mar 2013 22:56:24 -0700
Subject: [PATCH] Turn down logging for things that can be inferred.

If you see a thread switch for a vblank wait, you know what happened.
---
 Core/CoreTiming.cpp             |  2 +-
 Core/HLE/sceDisplay.cpp         | 15 +++++++--------
 Core/HLE/sceKernelInterrupt.cpp |  4 ++--
 Core/HLE/sceKernelThread.cpp    |  5 +++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Core/CoreTiming.cpp b/Core/CoreTiming.cpp
index 77776468b5..ea33031d7e 100644
--- a/Core/CoreTiming.cpp
+++ b/Core/CoreTiming.cpp
@@ -527,7 +527,7 @@ void Idle(int maxIdle)
 		}
 	}
 
-	DEBUG_LOG(CPU, "Idle for %i cycles! (%f ms)", cyclesDown, cyclesDown / (float)(CPU_HZ * 0.001f));
+	VERBOSE_LOG(CPU, "Idle for %i cycles! (%f ms)", cyclesDown, cyclesDown / (float)(CPU_HZ * 0.001f));
 
 	idledCycles += cyclesDown;
 	currentMIPS->downcount -= cyclesDown;
diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp
index 2eebe46f1a..7b415d1e26 100644
--- a/Core/HLE/sceDisplay.cpp
+++ b/Core/HLE/sceDisplay.cpp
@@ -529,7 +529,7 @@ u32 sceDisplayGetFramebuf(u32 topaddrPtr, u32 linesizePtr, u32 pixelFormatPtr, i
 }
 
 u32 sceDisplayWaitVblankStart() {
-	DEBUG_LOG(HLE,"sceDisplayWaitVblankStart()");
+	VERBOSE_LOG(HLE,"sceDisplayWaitVblankStart()");
 	vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread()));
 	__KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, false, "vblank start waited");
 	return 0;
@@ -537,7 +537,7 @@ u32 sceDisplayWaitVblankStart() {
 
 u32 sceDisplayWaitVblank() {
 	if (!isVblank) {
-		DEBUG_LOG(HLE,"sceDisplayWaitVblank()");
+		VERBOSE_LOG(HLE,"sceDisplayWaitVblank()");
 		vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread()));
 		__KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, false, "vblank waited");
 		return 0;
@@ -549,7 +549,7 @@ u32 sceDisplayWaitVblank() {
 }
 
 u32 sceDisplayWaitVblankStartMulti(int vblanks) {
-	DEBUG_LOG(HLE,"sceDisplayWaitVblankStartMulti()");
+	VERBOSE_LOG(HLE,"sceDisplayWaitVblankStartMulti()");
 	vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread(), vblanks));
 	__KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, false, "vblank start multi waited");
 	return 0;
@@ -557,7 +557,7 @@ u32 sceDisplayWaitVblankStartMulti(int vblanks) {
 
 u32 sceDisplayWaitVblankCB() {
 	if (!isVblank) {
-		DEBUG_LOG(HLE,"sceDisplayWaitVblankCB()");
+		VERBOSE_LOG(HLE,"sceDisplayWaitVblankCB()");
 		vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread()));
 		__KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, true, "vblank waited");
 		return 0;
@@ -569,22 +569,21 @@ u32 sceDisplayWaitVblankCB() {
 }
 
 u32 sceDisplayWaitVblankStartCB() {
-	DEBUG_LOG(HLE,"sceDisplayWaitVblankStartCB()");
+	VERBOSE_LOG(HLE,"sceDisplayWaitVblankStartCB()");
 	vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread()));
 	__KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, true, "vblank start waited");
 	return 0;
 }
 
 u32 sceDisplayWaitVblankStartMultiCB(int vblanks) {
-	DEBUG_LOG(HLE,"sceDisplayWaitVblankStartMultiCB()");
+	VERBOSE_LOG(HLE,"sceDisplayWaitVblankStartMultiCB()");
 	vblankWaitingThreads.push_back(WaitVBlankInfo(__KernelGetCurThread(), vblanks));
 	__KernelWaitCurThread(WAITTYPE_VBLANK, 0, 0, 0, true, "vblank start multi waited");
 	return 0;
 }
 
 u32 sceDisplayGetVcount() {
-	// Too spammy
-	// DEBUG_LOG(HLE,"%i=sceDisplayGetVcount()", vCount);
+	VERBOSE_LOG(HLE,"%i=sceDisplayGetVcount()", vCount);
 
 	hleEatMicro(2);
 	return vCount;
diff --git a/Core/HLE/sceKernelInterrupt.cpp b/Core/HLE/sceKernelInterrupt.cpp
index b0196b75d9..468243ad1d 100644
--- a/Core/HLE/sceKernelInterrupt.cpp
+++ b/Core/HLE/sceKernelInterrupt.cpp
@@ -66,7 +66,7 @@ static bool inInterrupt;
 
 void sceKernelCpuSuspendIntr()
 {
-	//LOG(HLE,"sceKernelCpuSuspendIntr");	// very spammy
+	VERBOSE_LOG(HLE, "sceKernelCpuSuspendIntr");
 	int returnValue;
 	if (__InterruptsEnabled())
 	{
@@ -82,7 +82,7 @@ void sceKernelCpuSuspendIntr()
 
 void sceKernelCpuResumeIntr(u32 enable)
 {
-	//LOG(HLE,"sceKernelCpuResumeIntr(%i)", enable);	// very spammy
+	VERBOSE_LOG(HLE, "sceKernelCpuResumeIntr(%i)", enable);
 	if (enable)
 	{
 		__EnableInterrupts();
diff --git a/Core/HLE/sceKernelThread.cpp b/Core/HLE/sceKernelThread.cpp
index a7286f1058..b92f792eef 100644
--- a/Core/HLE/sceKernelThread.cpp
+++ b/Core/HLE/sceKernelThread.cpp
@@ -1989,11 +1989,12 @@ static void __KernelSleepThread(bool doCallbacks) {
 		return;
 	}
 
-	DEBUG_LOG(HLE,"sceKernelSleepThread() - wakeupCount decremented to %i", thread->nt.wakeupCount);
 	if (thread->nt.wakeupCount > 0) {
 		thread->nt.wakeupCount--;
+		DEBUG_LOG(HLE, "sceKernelSleepThread() - wakeupCount decremented to %i", thread->nt.wakeupCount);
 		RETURN(0);
 	} else {
+		VERBOSE_LOG(HLE, "sceKernelSleepThread()", thread->nt.wakeupCount);
 		RETURN(0);
 		__KernelWaitCurThread(WAITTYPE_SLEEP, 0, 0, 0, doCallbacks, "thread slept");
 	}
@@ -2007,7 +2008,7 @@ void sceKernelSleepThread()
 //the homebrew PollCallbacks
 void sceKernelSleepThreadCB()
 {
-	DEBUG_LOG(HLE, "sceKernelSleepThreadCB()");
+	VERBOSE_LOG(HLE, "sceKernelSleepThreadCB()");
 	__KernelSleepThread(true);
 	__KernelCheckCallbacks();
 }