From 8102e13d47a49a56bcfc89687ee9e462a6c254f3 Mon Sep 17 00:00:00 2001 From: Mark Pizzolato Date: Thu, 29 Dec 2016 07:12:12 -0800 Subject: [PATCH] SCP: Add usecs_remaining information to SHOW QUEUE output --- scp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scp.c b/scp.c index 67d92d9b..2fbb5d59 100644 --- a/scp.c +++ b/scp.c @@ -4723,9 +4723,14 @@ else { else fprintf (st, " Unknown"); tim = sim_fmt_secs(((accum + uptr->time) / sim_timer_inst_per_sec ()) + (uptr->usecs_remaining / 1000000.0)); - fprintf (st, " at %d%s%s%s%s\n", accum + uptr->time, - (*tim) ? " (" : "", tim, (*tim) ? ")" : "", - (uptr->flags & UNIT_IDLE) ? " (Idle capable)" : ""); + if (uptr->usecs_remaining) + fprintf (st, " at %d plus %.0f usecs%s%s%s%s\n", accum + uptr->time, uptr->usecs_remaining, + (*tim) ? " (" : "", tim, (*tim) ? " total)" : "", + (uptr->flags & UNIT_IDLE) ? " (Idle capable)" : ""); + else + fprintf (st, " at %d%s%s%s%s\n", accum + uptr->time, + (*tim) ? " (" : "", tim, (*tim) ? ")" : "", + (uptr->flags & UNIT_IDLE) ? " (Idle capable)" : ""); accum = accum + uptr->time; } }