commit e0436b3e6867b29689ae484af52bab242b5ca8ea
parent 72d5d5178bcfac00747ac547d22d677af3806928
Author: Kyle Milz <kyle@0x30.net>
Date: Fri, 29 Jul 2016 20:16:41 -0600
src: rename runtime_conn
Diffstat:
6 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/src/Jamfile b/src/Jamfile
@@ -9,7 +9,7 @@ InstallShell $(PREFIX)/bin : citrun-wrap ;
#
# utils.a
#
-Library utils : af_unix.cc runtime_conn.cc ;
+Library utils : af_unix.cc runtime.cc ;
#
# citrun-term
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_conn.h"
+#include "runtime.h"
#if defined(__OpenBSD__)
#define FONT_PATH "/usr/X11R6/lib/X11/fonts/TTF/DejaVuSansMono.ttf"
diff --git a/src/runtime.cc b/src/runtime.cc
@@ -0,0 +1,92 @@
+//
+// Copyright (c) 2016 Kyle Milz <kyle@0x30.net>
+//
+// Permission to use, copy, modify, and distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+//
+#include <cassert>
+#include <err.h>
+#include <iostream>
+#include <fstream>
+
+#include "runtime.h"
+
+RuntimeProcess::RuntimeProcess(af_unix &sock) :
+ socket(sock)
+{
+ uint16_t sz;
+ assert(sizeof(pid_t) == 4);
+
+ // Protocol defined in lib/runtime.c send_static().
+ // This is the receive side of things.
+ socket.read_all(m_ver);
+ socket.read_all(num_tus);
+ socket.read_all(lines_total);
+ socket.read_all(process_id);
+ socket.read_all(parent_process_id);
+ socket.read_all(process_group);
+
+ socket.read_all(sz);
+ program_name.resize(sz);
+ socket.read_all((uint8_t *)&program_name[0], sz);
+
+ socket.read_all(sz);
+ m_cwd.resize(sz);
+ socket.read_all((uint8_t *)&m_cwd[0], sz);
+
+ translation_units.resize(num_tus);
+ for (auto &t : translation_units) {
+ socket.read_all(sz);
+ t.file_name.resize(sz);
+ socket.read_all((uint8_t *)&t.file_name[0], sz);
+ socket.read_all(t.num_lines);
+ socket.read_all(t.inst_sites);
+
+ t.execution_counts.resize(t.num_lines, 0);
+ t.source.resize(t.num_lines);
+ read_source(t);
+ }
+}
+
+void
+RuntimeProcess::read_source(struct TranslationUnit &t)
+{
+ std::string line;
+ std::ifstream file_stream(t.file_name);
+
+ if (file_stream.is_open() == 0)
+ errx(1, "ifstream.open()");
+
+ for (auto &l : t.source)
+ std::getline(file_stream, l);
+}
+
+void
+RuntimeProcess::read_executions()
+{
+ for (auto &t : translation_units) {
+ uint8_t flag = 0;
+ socket.read_all(flag);
+
+ if (flag == 0) {
+ std::fill(t.execution_counts.begin(), t.execution_counts.end(), 0);
+ continue;
+ }
+
+ size_t bytes_total = t.num_lines * sizeof(uint32_t);
+ socket.read_all((uint8_t *)&t.execution_counts[0], bytes_total);
+ }
+
+ // Send response back
+ uint8_t msg_type = 1;
+ assert(socket.write_all(&msg_type, 1) == 1);
+}
diff --git a/src/runtime_conn.h b/src/runtime.h
diff --git a/src/runtime_conn.cc b/src/runtime_conn.cc
@@ -1,92 +0,0 @@
-//
-// Copyright (c) 2016 Kyle Milz <kyle@0x30.net>
-//
-// Permission to use, copy, modify, and distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-//
-#include <cassert>
-#include <err.h>
-#include <iostream>
-#include <fstream>
-
-#include "runtime_conn.h"
-
-RuntimeProcess::RuntimeProcess(af_unix &sock) :
- socket(sock)
-{
- uint16_t sz;
- assert(sizeof(pid_t) == 4);
-
- // Protocol defined in lib/runtime.c send_static().
- // This is the receive side of things.
- socket.read_all(m_ver);
- socket.read_all(num_tus);
- socket.read_all(lines_total);
- socket.read_all(process_id);
- socket.read_all(parent_process_id);
- socket.read_all(process_group);
-
- socket.read_all(sz);
- program_name.resize(sz);
- socket.read_all((uint8_t *)&program_name[0], sz);
-
- socket.read_all(sz);
- m_cwd.resize(sz);
- socket.read_all((uint8_t *)&m_cwd[0], sz);
-
- translation_units.resize(num_tus);
- for (auto &t : translation_units) {
- socket.read_all(sz);
- t.file_name.resize(sz);
- socket.read_all((uint8_t *)&t.file_name[0], sz);
- socket.read_all(t.num_lines);
- socket.read_all(t.inst_sites);
-
- t.execution_counts.resize(t.num_lines, 0);
- t.source.resize(t.num_lines);
- read_source(t);
- }
-}
-
-void
-RuntimeProcess::read_source(struct TranslationUnit &t)
-{
- std::string line;
- std::ifstream file_stream(t.file_name);
-
- if (file_stream.is_open() == 0)
- errx(1, "ifstream.open()");
-
- for (auto &l : t.source)
- std::getline(file_stream, l);
-}
-
-void
-RuntimeProcess::read_executions()
-{
- for (auto &t : translation_units) {
- uint8_t flag = 0;
- socket.read_all(flag);
-
- if (flag == 0) {
- std::fill(t.execution_counts.begin(), t.execution_counts.end(), 0);
- continue;
- }
-
- size_t bytes_total = t.num_lines * sizeof(uint32_t);
- socket.read_all((uint8_t *)&t.execution_counts[0], bytes_total);
- }
-
- // Send response back
- uint8_t msg_type = 1;
- assert(socket.write_all(&msg_type, 1) == 1);
-}
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_conn.h"
+#include "runtime.h"
void
draw_source(RuntimeProcess &conn)
