empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve logging diagnostics.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2020-11-14 09:14:37 +00:00
parent 169188b2b4
commit 4840b7b0ac
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/frontends/common2/timer.cpp
View file

@ -35,14 +35,14 @@ double Timer::getTimeInSeconds() const
std::ostream& operator<<(std::ostream& os, const Timer & timer)
{
const int width = 10;
const double m1 = timer.mySum / timer.myN;
const double m2 = timer.mySum2 / timer.myN;
const double std = std::sqrt(std::max(0.0, m2 - m1 * m1));
const double scale = 1000;
os << std::fixed << std::setprecision(2);
os << "total = " << std::setw(9) << timer.mySum * scale;
os << ", average = " << std::setw(9) << m1 * scale;
os << ", std = " << std::setw(9) << std * scale;
os << ", n = " << std::setw(6) << timer.myN;
os << "total = " << std::setw(width) << timer.mySum * scale;
os << ", average = " << std::setw(width) << m1 * scale;
os << ", std = " << std::setw(width) << std * scale;
os << ", n = " << std::setw(width) << timer.myN;
return os;
}

17
source/frontends/sa2/main.cpp
View file

@ -1,6 +1,7 @@
#include <iostream>
#include <SDL.h>
#include <memory>
#include <iomanip>
#include "linux/interface.h"
#include "linux/windows/misc.h"
@ -123,7 +124,7 @@ namespace
RiffFinishWriteFile();
}
int getFPS()
int getRefreshRate()
{
SDL_DisplayMode current;
@ -233,16 +234,21 @@ void run_sdl(int argc, const char * argv [])
SDL_GetRendererInfo(ren.get(), &info);
std::cerr << "SDL Renderer: " << info.name << std::endl;
std::cerr << "Supported pixel formats:" << std::endl;
for (size_t i = 0; i < info.num_texture_formats; ++i)
{
std::cerr << SDL_GetPixelFormatName(info.texture_formats[i]) << std::endl;
}
std::cerr << std::fixed << std::setprecision(2);
const Uint32 format = SDL_PIXELFORMAT_ARGB8888;
std::cerr << "Selected format: " << SDL_GetPixelFormatName(format) << std::endl;
std::shared_ptr<SDL_Texture> tex(SDL_CreateTexture(ren.get(), format, SDL_TEXTUREACCESS_STATIC, width, height), SDL_DestroyTexture);
const int fps = getRefreshRate();
std::cerr << "Refresh rate: " << fps << "Hz, " << 1000.0 / fps << "ms" << std::endl;
Emulator emulator(win, ren, tex);
Timer global;
@ -327,7 +333,6 @@ void run_sdl(int argc, const char * argv [])
eventTimerTag = "0 .";
updateTextureTimerTag = "0 .";
const int fps = getFPS();
bool quit = false;
const int uCyclesToExecute = int(g_fCurrentCLK6502 / fps);
@ -361,10 +366,10 @@ void run_sdl(int argc, const char * argv [])
std::cerr << "Screen: [" << refreshScreenTimerTag << sep << refreshScreenTimer << std::endl;
std::cerr << "CPU: [" << cpuTimerTag << sep << cpuTimer << std::endl;
const int64_t totalCycles = g_nCumulativeCycles;
const int64_t averageClock = g_nCumulativeCycles / global.getTimeInSeconds();
std::cerr << "Expected clock: " << int64_t(g_fCurrentCLK6502) << std::endl;
std::cerr << "Average clock: " << int64_t(averageClock) << std::endl;
const double timeInSeconds = global.getTimeInSeconds();
const double averageClock = g_nCumulativeCycles / timeInSeconds;
std::cerr << "Expected clock: " << g_fCurrentCLK6502 << "Hz, " << timeInSeconds << " s" << std::endl;
std::cerr << "Average clock: " << averageClock << "Hz, " << g_nCumulativeCycles / g_fCurrentCLK6502 << " s" << std::endl;
SDirectSound::stop();
stopEmulator();