From 6ec8fe6bf3c3f8ae70da7e2baaed52c516ad3577 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Fri, 11 Jan 2013 08:37:54 -0800
Subject: [PATCH] Track summed totals of syscalls.

Just so we can easily see if some func is being called a ton.
---
 Core/HLE/HLE.cpp        | 46 +++++++++++++++++++++++++++++++++--------
 Core/HLE/sceDisplay.cpp |  9 ++++----
 Core/HLE/sceKernel.h    | 10 ++++++++-
 3 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/Core/HLE/HLE.cpp b/Core/HLE/HLE.cpp
index c12e7b1c63..2b9610d9b3 100644
--- a/Core/HLE/HLE.cpp
+++ b/Core/HLE/HLE.cpp
@@ -343,6 +343,42 @@ inline void hleFinishSyscall(int modulenum, int funcnum)
 	hleAfterSyscallReschedReason[0] = 0;
 }
 
+inline void updateSyscallStats(int modulenum, int funcnum, double total)
+{
+	const char *name = moduleDB[modulenum].funcTable[funcnum].name;
+	// Ignore this one, especially for msInSyscalls (although that ignores CoreTiming events.)
+	if (0 == strcmp(name, "_sceKernelIdle"))
+		return;
+
+	if (total > kernelStats.slowestSyscallTime)
+	{
+		kernelStats.slowestSyscallTime = total;
+		kernelStats.slowestSyscallName = name;
+	}
+	kernelStats.msInSyscalls += total;
+
+	KernelStatsSyscall statCall(modulenum, funcnum);
+	auto summedStat = kernelStats.summedMsInSyscalls.find(statCall);
+	if (summedStat == kernelStats.summedMsInSyscalls.end())
+	{
+		kernelStats.summedMsInSyscalls[statCall] = total;
+		if (total > kernelStats.summedSlowestSyscallTime)
+		{
+			kernelStats.summedSlowestSyscallTime = total;
+			kernelStats.summedSlowestSyscallName = name;
+		}
+	}
+	else
+	{
+		double newTotal = kernelStats.summedMsInSyscalls[statCall] += total;
+		if (newTotal > kernelStats.summedSlowestSyscallTime)
+		{
+			kernelStats.summedSlowestSyscallTime = newTotal;
+			kernelStats.summedSlowestSyscallName = name;
+		}
+	}
+}
+
 void CallSyscall(u32 op)
 {
 	time_update();
@@ -369,13 +405,5 @@ void CallSyscall(u32 op)
 		ERROR_LOG(HLE,"Unimplemented HLE function %s", moduleDB[modulenum].funcTable[funcnum].name);
 	}
 	time_update();
-	double total = time_now_d() - start;
-	if (total > kernelStats.slowestSyscallTime) {
-		const char *name = moduleDB[modulenum].funcTable[funcnum].name;
-		if (0 != strcmp(name, "_sceKernelIdle")) {
-			kernelStats.slowestSyscallTime = total;
-			kernelStats.slowestSyscallName = name;
-		}
-	}
-	kernelStats.msInSyscalls += total;
+	updateSyscallStats(modulenum, funcnum, time_now_d() - start);
 }
diff --git a/Core/HLE/sceDisplay.cpp b/Core/HLE/sceDisplay.cpp
index 8b14908cb9..80e77ee3ff 100644
--- a/Core/HLE/sceDisplay.cpp
+++ b/Core/HLE/sceDisplay.cpp
@@ -214,12 +214,11 @@ void hleEnterVblank(u64 userdata, int cyclesLate) {
 			"DL processing time: %0.2f ms\n"
 			"Kernel processing time: %0.2f ms\n"
 			"Slowest syscall: %s : %0.2f ms\n"
-			"Draw calls: %i\n"
-			"Draw flushes: %i\n"
+			"Most active syscall: %s : %0.2f ms\n"
+			"Draw calls: %i, flushes %i\n"
 			"Vertices Transformed: %i\n"
 			"FBOs active: %i\n"
-			"Textures active: %i\n"
-			"Textures decoded: %i\n"
+			"Textures active: %i, decoded: %i\n"
 			"Texture invalidations: %i\n"
 			"Vertex shaders loaded: %i\n"
 			"Fragment shaders loaded: %i\n"
@@ -229,6 +228,8 @@ void hleEnterVblank(u64 userdata, int cyclesLate) {
 			kernelStats.msInSyscalls * 1000.0f,
 			kernelStats.slowestSyscallName ? kernelStats.slowestSyscallName : "(none)",
 			kernelStats.slowestSyscallTime * 1000.0f,
+			kernelStats.summedSlowestSyscallName ? kernelStats.summedSlowestSyscallName : "(none)",
+			kernelStats.summedSlowestSyscallTime * 1000.0f,
 			gpuStats.numDrawCalls,
 			gpuStats.numFlushes,
 			gpuStats.numVertsTransformed,
diff --git a/Core/HLE/sceKernel.h b/Core/HLE/sceKernel.h
index a461c14bbe..09bfade06f 100644
--- a/Core/HLE/sceKernel.h
+++ b/Core/HLE/sceKernel.h
@@ -421,19 +421,27 @@ private:
 
 extern KernelObjectPool kernelObjects;
 
+typedef std::pair<int, int> KernelStatsSyscall;
+
 struct KernelStats {
 	void Reset() {
-		memset(this, 0, sizeof(*this));
+		ResetFrame();
 	}
 	void ResetFrame() {
 		msInSyscalls = 0;
 		slowestSyscallTime = 0;
 		slowestSyscallName = 0;
+		summedMsInSyscalls.clear();
+		summedSlowestSyscallTime = 0;
+		summedSlowestSyscallName = 0;
 	}
 
 	double msInSyscalls;
 	double slowestSyscallTime;
 	const char *slowestSyscallName;
+	std::map<KernelStatsSyscall, double> summedMsInSyscalls;
+	double summedSlowestSyscallTime;
+	const char *summedSlowestSyscallName;
 };
 
 extern KernelStats kernelStats;