mirror of https://github.com/PCSX2/pcsx2.git
Merge pull request #239 from xsacha/stats_removal
Remove Stats.{cpp,h}, which was not being used by anything.
This commit is contained in:
commit
adc76243dc
|
@ -151,7 +151,6 @@ set(pcsx2Sources
|
|||
Sio.cpp
|
||||
SourceLog.cpp
|
||||
SPR.cpp
|
||||
Stats.cpp
|
||||
System.cpp
|
||||
Vif0_Dma.cpp
|
||||
Vif1_Dma.cpp
|
||||
|
@ -215,7 +214,6 @@ set(pcsx2Headers
|
|||
Sio.h
|
||||
sio_internal.h
|
||||
SPR.h
|
||||
Stats.h
|
||||
SysForwardDefs.h
|
||||
System.h
|
||||
Vif_Dma.h
|
||||
|
|
|
@ -1,69 +0,0 @@
|
|||
/* PCSX2 - PS2 Emulator for PCs
|
||||
* Copyright (C) 2002-2010 PCSX2 Dev Team
|
||||
*
|
||||
* PCSX2 is free software: you can redistribute it and/or modify it under the terms
|
||||
* of the GNU Lesser General Public License as published by the Free Software Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
* PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with PCSX2.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
#include "PrecompiledHeader.h"
|
||||
|
||||
#include <time.h>
|
||||
|
||||
#include "IopCommon.h"
|
||||
#include "Stats.h"
|
||||
|
||||
void statsOpen() {
|
||||
stats.vsyncCount = 0;
|
||||
stats.vsyncTime = time(NULL);
|
||||
stats.eeCycles = 0;
|
||||
stats.eeSCycle = 0;
|
||||
stats.iopCycles = 0;
|
||||
stats.iopSCycle = 0;
|
||||
}
|
||||
|
||||
void statsClose() {
|
||||
/*
|
||||
time_t t;
|
||||
FILE *f;
|
||||
|
||||
t = time(NULL) - stats.vsyncTime;
|
||||
#ifdef _WIN32
|
||||
f = fopen(LOGS_DIR "\\stats.txt", "w");
|
||||
#else
|
||||
f = fopen(LOGS_DIR "/stats.txt", "w");
|
||||
#endif
|
||||
if (!f) { Console.WriteLn("Can't open stats.txt"); return; }
|
||||
fprintf(f, "-- PCSX2 v%s statics--\n\n", PCSX2_VERSION);
|
||||
fprintf(f, "Ran for %d seconds\n", t);
|
||||
fprintf(f, "Total VSyncs: %d (%s)\n", stats.vsyncCount, Config.PsxType ? "PAL" : "NTSC");
|
||||
fprintf(f, "VSyncs per Seconds: %g\n", (double)stats.vsyncCount / t);
|
||||
fprintf(f, "Total EE Instructions Executed: %lld\n", stats.eeCycles);
|
||||
fprintf(f, "Total IOP Instructions Executed: %lld\n", stats.iopCycles);
|
||||
if (!CHECK_EEREC) fprintf(f, "Interpreter Mode\n");
|
||||
else fprintf(f, "Recompiler Mode: VUrec1 %s, VUrec0 %s\n",
|
||||
CHECK_VU1REC ? "Enabled" : "Disabled", CHECK_VU0REC ? "Enabled" : "Disabled");
|
||||
fclose(f);
|
||||
*/
|
||||
}
|
||||
|
||||
void statsVSync() {
|
||||
//static u64 accum = 0, accumvu1 = 0;
|
||||
//static u32 frame = 0;
|
||||
|
||||
stats.eeCycles+= cpuRegs.cycle - stats.eeSCycle;
|
||||
stats.eeSCycle = cpuRegs.cycle;
|
||||
stats.iopCycles+= psxRegs.cycle - stats.iopSCycle;
|
||||
stats.iopSCycle = psxRegs.cycle;
|
||||
stats.vsyncCount++;
|
||||
stats.vif1count = 0;
|
||||
stats.vu1count = 0;
|
||||
}
|
|
@ -1,41 +0,0 @@
|
|||
/* PCSX2 - PS2 Emulator for PCs
|
||||
* Copyright (C) 2002-2010 PCSX2 Dev Team
|
||||
*
|
||||
* PCSX2 is free software: you can redistribute it and/or modify it under the terms
|
||||
* of the GNU Lesser General Public License as published by the Free Software Found-
|
||||
* ation, either version 3 of the License, or (at your option) any later version.
|
||||
*
|
||||
* PCSX2 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||
* PURPOSE. See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with PCSX2.
|
||||
* If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef __STATS_H__
|
||||
#define __STATS_H__
|
||||
|
||||
#include <time.h>
|
||||
|
||||
struct Stats {
|
||||
time_t vsyncTime;
|
||||
u32 vsyncCount;
|
||||
u32 eeCycles;
|
||||
u32 eeSCycle;
|
||||
u32 iopCycles;
|
||||
u32 iopSCycle;
|
||||
|
||||
u32 ticko;
|
||||
u32 framecount;
|
||||
u32 vu1count;
|
||||
u32 vif1count;
|
||||
};
|
||||
|
||||
Stats stats;
|
||||
|
||||
void statsOpen();
|
||||
void statsClose();
|
||||
void statsVSync();
|
||||
|
||||
#endif /* __STATS_H__ */
|
|
@ -468,7 +468,6 @@
|
|||
<ClCompile Include="..\SamplProf.cpp" />
|
||||
<ClCompile Include="..\..\SaveState.cpp" />
|
||||
<ClCompile Include="..\..\SourceLog.cpp" />
|
||||
<ClCompile Include="..\..\Stats.cpp" />
|
||||
<ClCompile Include="..\..\System\SysCoreThread.cpp" />
|
||||
<ClCompile Include="..\..\System.cpp" />
|
||||
<ClCompile Include="..\..\System\SysThreadBase.cpp" />
|
||||
|
@ -745,7 +744,6 @@
|
|||
<ClInclude Include="..\..\Plugins.h" />
|
||||
<ClInclude Include="..\..\SamplProf.h" />
|
||||
<ClInclude Include="..\..\SaveState.h" />
|
||||
<ClInclude Include="..\..\Stats.h" />
|
||||
<ClInclude Include="..\..\System.h" />
|
||||
<ClInclude Include="..\..\System\SysThreads.h" />
|
||||
<ClInclude Include="..\..\Counters.h" />
|
||||
|
|
|
@ -245,9 +245,6 @@
|
|||
<ClCompile Include="..\..\SourceLog.cpp">
|
||||
<Filter>System</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\Stats.cpp">
|
||||
<Filter>System</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\System\SysCoreThread.cpp">
|
||||
<Filter>System</Filter>
|
||||
</ClCompile>
|
||||
|
@ -906,9 +903,6 @@
|
|||
<ClInclude Include="..\..\SaveState.h">
|
||||
<Filter>System\Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\Stats.h">
|
||||
<Filter>System\Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\System.h">
|
||||
<Filter>System\Include</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
@ -454,7 +454,6 @@
|
|||
<ClCompile Include="..\SamplProf.cpp" />
|
||||
<ClCompile Include="..\..\SaveState.cpp" />
|
||||
<ClCompile Include="..\..\SourceLog.cpp" />
|
||||
<ClCompile Include="..\..\Stats.cpp" />
|
||||
<ClCompile Include="..\..\System\SysCoreThread.cpp" />
|
||||
<ClCompile Include="..\..\System.cpp" />
|
||||
<ClCompile Include="..\..\System\SysThreadBase.cpp" />
|
||||
|
@ -732,7 +731,6 @@
|
|||
<ClInclude Include="..\..\Plugins.h" />
|
||||
<ClInclude Include="..\..\SamplProf.h" />
|
||||
<ClInclude Include="..\..\SaveState.h" />
|
||||
<ClInclude Include="..\..\Stats.h" />
|
||||
<ClInclude Include="..\..\System.h" />
|
||||
<ClInclude Include="..\..\System\SysThreads.h" />
|
||||
<ClInclude Include="..\..\Counters.h" />
|
||||
|
|
|
@ -242,9 +242,6 @@
|
|||
<ClCompile Include="..\..\SourceLog.cpp">
|
||||
<Filter>System</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\Stats.cpp">
|
||||
<Filter>System</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\System\SysCoreThread.cpp">
|
||||
<Filter>System</Filter>
|
||||
</ClCompile>
|
||||
|
@ -903,9 +900,6 @@
|
|||
<ClInclude Include="..\..\SaveState.h">
|
||||
<Filter>System\Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\Stats.h">
|
||||
<Filter>System\Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\System.h">
|
||||
<Filter>System\Include</Filter>
|
||||
</ClInclude>
|
||||
|
|
|
@ -454,7 +454,6 @@
|
|||
<ClCompile Include="..\SamplProf.cpp" />
|
||||
<ClCompile Include="..\..\SaveState.cpp" />
|
||||
<ClCompile Include="..\..\SourceLog.cpp" />
|
||||
<ClCompile Include="..\..\Stats.cpp" />
|
||||
<ClCompile Include="..\..\System\SysCoreThread.cpp" />
|
||||
<ClCompile Include="..\..\System.cpp" />
|
||||
<ClCompile Include="..\..\System\SysThreadBase.cpp" />
|
||||
|
@ -732,7 +731,6 @@
|
|||
<ClInclude Include="..\..\Plugins.h" />
|
||||
<ClInclude Include="..\..\SamplProf.h" />
|
||||
<ClInclude Include="..\..\SaveState.h" />
|
||||
<ClInclude Include="..\..\Stats.h" />
|
||||
<ClInclude Include="..\..\System.h" />
|
||||
<ClInclude Include="..\..\System\SysThreads.h" />
|
||||
<ClInclude Include="..\..\Counters.h" />
|
||||
|
|
|
@ -242,9 +242,6 @@
|
|||
<ClCompile Include="..\..\SourceLog.cpp">
|
||||
<Filter>System</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\Stats.cpp">
|
||||
<Filter>System</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\System\SysCoreThread.cpp">
|
||||
<Filter>System</Filter>
|
||||
</ClCompile>
|
||||
|
@ -903,9 +900,6 @@
|
|||
<ClInclude Include="..\..\SaveState.h">
|
||||
<Filter>System\Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\Stats.h">
|
||||
<Filter>System\Include</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\System.h">
|
||||
<Filter>System\Include</Filter>
|
||||
</ClInclude>
|
||||
|
|
Loading…
Reference in New Issue