libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-02-25 11:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Profiler fix for Android, count events

Browse Source
This commit is contained in:
Henrik Rydgard 2015-05-15 18:14:28 +02:00
parent b9089e5051
commit 05d48b053e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app-android.cpp
View File

@ -20,6 +20,7 @@
#include "base/timeutil.h"
#include "file/zip_read.h"
#include "input/input_state.h"
#include "profiler/profiler.h"
#include "audio/mixer.h"
#include "math/math_util.h"
#include "net/resolve.h"
@ -193,6 +194,7 @@ extern "C" void Java_com_henrikrydgard_libnative_NativeApp_init
jniEnvUI = env;
ILOG("NativeApp.init() -- begin");
PROFILE_INIT();
memset(&input_state, 0, sizeof(input_state));
renderer_inited = false;

10
profiler/profiler.cpp
View File

@ -28,6 +28,7 @@ struct CategoryFrame {
memset(time_taken, 0, sizeof(time_taken));
}
float time_taken[MAX_CATEGORIES];
int count[MAX_CATEGORIES];
};
struct Profiler {
@ -76,10 +77,15 @@ int internal_profiler_enter(const char *category_name) {
}
void internal_profiler_leave(int category) {
if (category < 0)
if (category == -1 || !history) {
return;
}
if (category < 0 || category >= MAX_CATEGORIES) {
ELOG("Bad category index %d", category);
}
double diff = real_time_now() - profiler.eventStart[category];
history[profiler.historyPos].time_taken[category] += (float)diff;
history[profiler.historyPos].count[category]++;
profiler.eventStart[category] = 0.0;
}
@ -108,7 +114,7 @@ int Profiler_GetNumCategories() {
void Profiler_GetHistory(int category, float *data, int count) {
for (int i = 0; i < HISTORY_SIZE; i++) {
int x = i - count + profiler.historyPos;
int x = i - count + profiler.historyPos + 1;
if (x < 0)
x += HISTORY_SIZE;
if (x >= HISTORY_SIZE)