citrun

commit ac9d1b2839d250dc9f992fbe7c543f7ea1786e31
parent b85451d89f5d8dc140a503269fb827d5abc9fc8a
Author: Kyle Milz <kyle@0x30.net>
Date:   Sat, 30 Jul 2016 18:11:19 -0600

src: don't re-roll reading code

Diffstat:
M
src/af_unix.cc
 | 
24
++++++++++++------------
M
src/af_unix.h
 | 
21
++-------------------

2 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/src/af_unix.cc b/src/af_unix.cc
@@ -26,19 +26,19 @@
 
 af_unix::af_unix()
 {
-	if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+	if ((m_fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
 		err(1, "socket");
 }
 
 af_unix::~af_unix()
 {
-	close(fd);
+	close(m_fd);
 	if (m_bound)
 		unlink("/tmp/citrun.socket");
 }
 
 af_unix::af_unix(int f) :
-	fd(f)
+	m_fd(f)
 {
 }
 
@@ -47,9 +47,9 @@ af_unix::set_nonblock()
 {
 	int flags;
 
-	if ((flags = fcntl(fd, F_GETFL, 0)) < 0)
+	if ((flags = fcntl(m_fd, F_GETFL, 0)) < 0)
 		err(1, "fcntl(F_GETFL)");
-	if (fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0)
+	if (fcntl(m_fd, F_SETFL, flags | O_NONBLOCK) < 0)
 		err(1, "fcntl(F_SETFL)");
 }
 
@@ -58,9 +58,9 @@ af_unix::set_block()
 {
 	int flags;
 
-	if ((flags = fcntl(fd, F_GETFL, 0)) < 0)
+	if ((flags = fcntl(m_fd, F_GETFL, 0)) < 0)
 		err(1, "fcntl(F_GETFL)");
-	if (fcntl(fd, F_SETFL, flags & ~O_NONBLOCK) < 0)
+	if (fcntl(m_fd, F_SETFL, flags & ~O_NONBLOCK) < 0)
 		err(1, "fcntl(F_SETFL)");
 }
 
@@ -72,13 +72,13 @@ af_unix::set_listen()
 	addr.sun_family = AF_UNIX;
 	std::strcpy(addr.sun_path, "/tmp/citrun.socket");
 
-	if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)))
+	if (bind(m_fd, (struct sockaddr *)&addr, sizeof(addr)))
 		err(1, "bind");
 
 	m_bound = 1;
 
 	// Size 1024 backlog
-	if (listen(fd, 1024))
+	if (listen(m_fd, 1024))
 		err(1, "listen");
 }
 
@@ -90,7 +90,7 @@ af_unix::accept()
 	socklen_t len = sizeof(struct sockaddr_un);
 
 	// Namespace collision
-	new_fd = ::accept(fd, (struct sockaddr *)&addr, &len);
+	new_fd = ::accept(m_fd, (struct sockaddr *)&addr, &len);
 	if (new_fd == -1) {
 		if (errno != EWOULDBLOCK) {
 			perror("accept");
@@ -109,7 +109,7 @@ af_unix::write_all(uint8_t *buf, size_t bytes_total)
 	ssize_t n;
 
 	while (bytes_left > 0) {
-		n = write(fd, buf + bytes_wrote, bytes_left);
+		n = write(m_fd, buf + bytes_wrote, bytes_left);
 
 		if (n < 0)
 			err(1, "write()");
@@ -129,7 +129,7 @@ af_unix::read_all(uint8_t *buf, size_t bytes_total)
 	ssize_t n;
 
 	while (bytes_left > 0) {
-		n = read(fd, buf + bytes_read, bytes_left);
+		n = read(m_fd, buf + bytes_read, bytes_left);
 
 		if (n == 0)
 			errx(1, "read(): read 0 bytes on socket");
diff --git a/src/af_unix.h b/src/af_unix.h
@@ -16,33 +16,16 @@ public:
 	void set_nonblock();
 	af_unix *accept();
 
-	// Makes sure reads don't overflow or underflow types
 	template<typename T>
 	int read_all(T &buf)
 	{
-		int bytes_left = sizeof(T);
-		int bytes_read = 0;
-		ssize_t n;
-
-		while (bytes_left > 0) {
-			n = read(fd, &buf + bytes_read, bytes_left);
-
-			if (n == 0)
-				errx(1, "read(): read 0 bytes on socket");
-			if (n < 0)
-				err(1, "read()");
-
-			bytes_read += n;
-			bytes_left -= n;
-		}
-
-		return bytes_read;
+		return read_all((uint8_t *)&buf, sizeof(T));
 	};
 
 	int read_all(uint8_t *, size_t);
 	int write_all(uint8_t *, size_t);
 private:
-	int fd;
+	int m_fd;
 	int m_bound;
 };