citrun

commit 8922ca69f9ee3e3362751b676c21b37991788d8f
parent 2c228c3f38dacffad87611c70e7abac43df0a085
Author: Kyle Milz <kyle@0x30.net>
Date:   Mon,  8 Aug 2016 20:33:23 -0600

src: use compiler file name downstream

Diffstat:
M
src/gl_main.cc
 | 
2
+-
M
src/runtime.cc
 | 
5
+++--
M
src/runtime.hh
 | 
3
++-
M
src/term_main.cc
 | 
4
++--

4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/gl_main.cc b/src/gl_main.cc
@@ -213,7 +213,7 @@ window::next_frame(View *vu)
 		cur_pos.x = 0;
 		glyphy_point_t tmp;
 		for (auto &t : conn->m_tus) {
-			demo_buffer_add_text(buffer, t.file_name.c_str(), font, 1);
+			demo_buffer_add_text(buffer, t.comp_file_path.c_str(), font, 1);
 		}
 	}
 
diff --git a/src/runtime.cc b/src/runtime.cc
@@ -41,7 +41,8 @@ RuntimeProcess::RuntimeProcess(af_unix &sock) :
 
 	m_tus.resize(m_num_tus);
 	for (auto &t : m_tus) {
-		m_socket.read_string(t.file_name);
+		m_socket.read_string(t.comp_file_path);
+		m_socket.read_string(t.abs_file_path);
 		m_socket.read_all(t.num_lines);
 
 		t.exec_diffs.resize(t.num_lines, 0);
@@ -54,7 +55,7 @@ void
 RuntimeProcess::read_source(struct TranslationUnit &t)
 {
 	std::string line;
-	std::ifstream file_stream(t.file_name);
+	std::ifstream file_stream(t.abs_file_path);
 
 	if (file_stream.is_open() == 0)
 		errx(1, "ifstream.open()");
diff --git a/src/runtime.hh b/src/runtime.hh
@@ -6,7 +6,8 @@
 #include "af_unix.h"
 
 struct TranslationUnit {
-	std::string	file_name;
+	std::string	comp_file_path;
+	std::string	abs_file_path;
 	uint32_t	num_lines;
 	uint8_t		has_execs;
 	std::vector<uint32_t> exec_diffs;
diff --git a/src/term_main.cc b/src/term_main.cc
@@ -114,7 +114,7 @@ CursesViewer::draw()
 	int upper_bound = m_size_y - 2 + m_offset;
 
 	for (int i = m_offset; i < upper_bound && i < m_cur_tu.num_lines; i++) {
-		uint32_t e = m_cur_tu.exec_diffs[i + 1];
+		uint32_t e = m_cur_tu.exec_diffs[i];
 		std::string l = m_cur_tu.source[i];
 
 		m_total_executions += e;
@@ -152,7 +152,7 @@ CursesViewer::print_statusbar()
 
 	printw("%s [%s (%i/%i)] [%i fps] [%ik execs/s (%i)] [%i us]",
 		m_progname.c_str(),
-		m_cur_tu.file_name.c_str(),
+		m_cur_tu.comp_file_path.c_str(),
 		m_tu + 1, m_num_tus,
 		m_fps,
 		m_eps / 1000, m_tus_with_execs,