citrun

commit c15d70662c68b57e6df17671031bf24e288b0add
parent aac303269624f32c100cb6af73c90f553ceb5813
Author: Kyle Milz <kyle@0x30.net>
Date:   Fri,  5 Aug 2016 00:00:58 -0600

Test: keep tightening viewer

Diffstat:
M
Test/Viewer.pm
 | 
22
++++++++++------------

1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/Test/Viewer.pm b/Test/Viewer.pm
@@ -25,24 +25,22 @@ sub new {
 sub accept {
 	my ($self) = @_;
 
-	# Accept a new connection on the listening viewer socket.
-	my $socket = $self->{viewer_socket};
-
-	my $client = $socket->accept();
-	$self->{client_socket} = $client;
+	my $listen_sock = $self->{viewer_socket};
+	my $sock = $listen_sock->accept();
+	$self->{client_socket} = $sock;
 
 	# Protocol defined in lib/runtime.c function send_static().
 	#
-	($self->{maj}, $self->{min}) = read_unpack($client, 2, "C2");
-	($self->{num_tus}, $self->{lines_total}) = read_unpack($client, 8, "L2");
-	@{ $self->{pids} } =	read_unpack($client, 12, "L3");
-	$self->{progname} =	read_string($client);
-	$self->{cwd} =		read_string($client);
+	($self->{maj}, $self->{min}) = read_unpack($sock, 2, "C2");
+	($self->{num_tus}, $self->{lines_total}) = read_unpack($sock, 8, "L2");
+	@{ $self->{pids} } =	read_unpack($sock, 12, "L3");
+	$self->{progname} =	read_string($sock);
+	$self->{cwd} =		read_string($sock);
 
 	my @tus;
 	for (1..$self->{num_tus}) {
-		my $file_name = read_string($client);
-		my ($num_lines, $inst_sites) = read_unpack($client, 8, "L2");
+		my $file_name = read_string($sock);
+		my ($num_lines, $inst_sites) = read_unpack($sock, 8, "L2");
 
 		# Keep this in order so it's easy to fetch dynamic data.
 		push @tus, [ $file_name, $num_lines, $inst_sites ];