folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

SCP: Display most recent instruction execution rate in SHOW QUEUE output

Browse source
This commit is contained in:
Mark Pizzolato 2017-01-05 06:24:25 -08:00
parent 6e31112469
commit e450edd6ce
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scp.c
View file

@ -4702,13 +4702,13 @@ int32 accum;
if (cptr && (*cptr != 0)) if (cptr && (*cptr != 0))
return SCPE_2MARG; return SCPE_2MARG;
if (sim_clock_queue == QUEUE_LIST_END) if (sim_clock_queue == QUEUE_LIST_END)
fprintf (st, "%s event queue empty, time = %.0f, executing %.0f instructios/sec\n", fprintf (st, "%s event queue empty, time = %.0f, executing %s instructios/sec\n",
sim_name, sim_time, sim_timer_inst_per_sec ()); sim_name, sim_time, sim_fmt_numeric (sim_timer_inst_per_sec ()));
else { else {
const char *tim; const char *tim;
fprintf (st, "%s event queue status, time = %.0f, executing %.0f instructions/sec\n", fprintf (st, "%s event queue status, time = %.0f, executing %s instructions/sec\n",
sim_name, sim_time, sim_timer_inst_per_sec ()); sim_name, sim_time, sim_fmt_numeric (sim_timer_inst_per_sec ()));
accum = 0; accum = 0;
for (uptr = sim_clock_queue; uptr != QUEUE_LIST_END; uptr = uptr->next) { for (uptr = sim_clock_queue; uptr != QUEUE_LIST_END; uptr = uptr->next) {
if (uptr == &sim_step_unit) if (uptr == &sim_step_unit)

4
sim_timer.c
View file

@ -1064,7 +1064,7 @@ int tmr, clocks;
struct timespec now; struct timespec now;
time_t time_t_now; time_t time_t_now;
int32 calb_tmr = (sim_calb_tmr == -1) ? sim_calb_tmr_last : sim_calb_tmr; int32 calb_tmr = (sim_calb_tmr == -1) ? sim_calb_tmr_last : sim_calb_tmr;
double inst_per_sec = (sim_calb_tmr == -1) ? sim_inst_per_sec_last : sim_timer_inst_per_sec (); double inst_per_sec = sim_timer_inst_per_sec ();
fprintf (st, "Minimum Host Sleep Time: %d ms (%dHz)\n", sim_os_sleep_min_ms, sim_os_tick_hz); fprintf (st, "Minimum Host Sleep Time: %d ms (%dHz)\n", sim_os_sleep_min_ms, sim_os_tick_hz);
if (sim_os_sleep_min_ms != sim_os_sleep_inc_ms) if (sim_os_sleep_min_ms != sim_os_sleep_inc_ms)
@ -2270,7 +2270,7 @@ return SCPE_OK;
double sim_timer_inst_per_sec (void) double sim_timer_inst_per_sec (void)
{ {
double inst_per_sec = SIM_INITIAL_IPS; double inst_per_sec = sim_inst_per_sec_last;
if (sim_calb_tmr == -1) if (sim_calb_tmr == -1)
return inst_per_sec; return inst_per_sec;