citrun

commit d9778150fe21e667449c54a27fab628bd520ed5b
parent 33a898187f0d93d490276f03dc51b02420b9444a
Author: Kyle Milz <kyle@0x30.net>
Date:   Fri, 29 Jul 2016 21:06:56 -0600

src: rename runtime.h to runtime.hh

Diffstat:
M
src/gl_main.cc
 | 
2
+-
M
src/runtime.cc
 | 
2
+-
R
src/runtime.h -> src/runtime.hh
 | 
0

M
src/term_main.cc
 | 
15
+++++++--------

4 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/gl_main.cc b/src/gl_main.cc
@@ -8,7 +8,7 @@
 #include "demo-font.h"
 #include "gl_buffer.h"
 #include "gl_view.h"
-#include "runtime.h"
+#include "runtime.hh"
 
 #if defined(__OpenBSD__)
 #define FONT_PATH "/usr/X11R6/lib/X11/fonts/TTF/DejaVuSansMono.ttf"
diff --git a/src/runtime.cc b/src/runtime.cc
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <fstream>
 
-#include "runtime.h"
+#include "runtime.hh"
 
 RuntimeProcess::RuntimeProcess(af_unix &sock) :
 	m_socket(sock)
diff --git a/src/runtime.h b/src/runtime.hh
diff --git a/src/term_main.cc b/src/term_main.cc
@@ -9,7 +9,7 @@
 #include <time.h>	// clock_gettime, nanosleep
 
 #include "af_unix.h"
-#include "runtime.h"
+#include "runtime.hh"
 
 void
 draw_source(RuntimeProcess &conn)
@@ -87,7 +87,7 @@ draw_source(RuntimeProcess &conn)
 			offset++;
 		else if (ch == 'k' && offset > 0)
 			offset--;
-		else if (ch == 'l' && tu < conn.m_num_tus)
+		else if (ch == 'l' && tu < (conn.m_num_tus - 1))
 			tu++;
 		else if (ch == 'h' && tu > 0)
 			tu--;
@@ -95,9 +95,10 @@ draw_source(RuntimeProcess &conn)
 		move(size_y - 1, 0);
 		clrtoeol();
 
-		printw("%s (%i): [%s] [%i fps] [%ik execs/s] ",
-			conn.m_progname.c_str(), conn.m_num_tus,
-			t.file_name.c_str(), fps, eps / 1000);
+		printw("%s [%s (%i/%i)] [%i fps] [%ik execs/s] [%i us]",
+			conn.m_progname.c_str(), t.file_name.c_str(),
+			tu + 1, conn.m_num_tus, fps, eps / 1000,
+			sleep.tv_sec + sleep.tv_nsec / 1000);
 		for (int i = 1; i <= 5; i++) {
 			attron(COLOR_PAIR(i));
 			printw("<<");
@@ -136,7 +137,7 @@ draw_source(RuntimeProcess &conn)
 
 		struct timespec one = { 1, 0 };
 		struct timespec zero = { 0, 0 };
-		struct timespec shift = { 0, 1000 * 1000 };
+		struct timespec shift = { 0, 100 * 1000 };
 		if (timespeccmp(&floating_avg, &one, <))
 			// We're executing too fast. Increase sleep.
 			timespecadd(&sleep, &shift, &sleep);
@@ -145,8 +146,6 @@ draw_source(RuntimeProcess &conn)
 			// least shift.
 			timespecsub(&sleep, &shift, &sleep);
 
-		eps = sleep.tv_nsec;
-
 		nanosleep(&sleep, NULL);
 	}
 }