X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=common.cc;h=26f6d5d8cd42bdd28484c231a995b5fbe84c633b;hb=2d0d4ac38e05905a6633b3f2d5112ccadd45c27f;hp=c190ed37487e44ff37d9145017dad1bd654085d0;hpb=222118f318e4788839083a6d99aa7309246243e7;p=model-checker.git

diff --git a/common.cc b/common.cc
index c190ed3..26f6d5d 100644
--- a/common.cc
+++ b/common.cc
@@ -14,15 +14,15 @@
 
 #define MAX_TRACE_LEN 100
 
-/** @brief Model-checker output stream; default to stdout until redirected */
-FILE *model_out = stdout;
+/** @brief Model-checker output file descriptor; default to stdout until redirected */
+int model_out = STDOUT_FILENO;
 
 #define CONFIG_STACKTRACE
 /** Print a backtrace of the current program state. */
 void print_trace(void)
 {
 #ifdef CONFIG_STACKTRACE
-	print_stacktrace(stdout);
+	print_stacktrace(model_out);
 #else
 	void *array[MAX_TRACE_LEN];
 	char **strings;
@@ -40,14 +40,9 @@ void print_trace(void)
 #endif /* CONFIG_STACKTRACE */
 }
 
-void model_print_summary(void)
-{
-	model->print_summary();
-}
-
 void assert_hook(void)
 {
-	model_print("Add breakpoint to line %u in file %s.\n",__LINE__,__FILE__);
+	model_print("Add breakpoint to line %u in file %s.\n", __LINE__, __FILE__);
 }
 
 void model_assert(bool expr, const char *file, int line)
@@ -69,7 +64,7 @@ static int fd_user_out; /**< @brief File descriptor from which to read user prog
  *
  * Redirects user program's stdout to a pipe so that we can dump it
  * selectively, when displaying bugs, etc.
- * Also connects a special file 'model_out' directly to stdout, for printing
+ * Also connects a file descriptor 'model_out' directly to stdout, for printing
  * data when needed.
  *
  * The model-checker can selectively choose to print/hide the user program
@@ -86,11 +81,12 @@ static int fd_user_out; /**< @brief File descriptor from which to read user prog
  */
 void redirect_output()
 {
-	int fd;
-
 	/* Save stdout for later use */
-	fd = dup(fileno(stdout));
-	model_out = fdopen(fd, "w");
+	model_out = dup(STDOUT_FILENO);
+	if (model_out < 0) {
+		perror("dup");
+		exit(EXIT_FAILURE);
+	}
 
 	/* Redirect program output to a pipe */
 	int pipefd[2];
@@ -98,11 +94,17 @@ void redirect_output()
 		perror("pipe");
 		exit(EXIT_FAILURE);
 	}
-	fd = dup2(pipefd[1], fileno(stdout)); // STDOUT_FILENO
+	if (dup2(pipefd[1], STDOUT_FILENO) < 0) {
+		perror("dup2");
+		exit(EXIT_FAILURE);
+	}
 	close(pipefd[1]);
 
 	/* Save the "read" side of the pipe for use later */
-	fcntl(pipefd[0], F_SETFL, O_NONBLOCK);
+	if (fcntl(pipefd[0], F_SETFL, O_NONBLOCK) < 0) {
+		perror("fcntl");
+		exit(EXIT_FAILURE);
+	}
 	fd_user_out = pipefd[0];
 }
 
@@ -145,24 +147,27 @@ void print_program_output()
 {
 	char buf[200];
 
+	model_print("---- BEGIN PROGRAM OUTPUT ----\n");
+
 	/* Gather all program output */
 	fflush(stdout);
 
 	/* Read program output pipe and write to (real) stdout */
-	int ret;
+	ssize_t ret;
 	while (1) {
 		ret = read_to_buf(fd_user_out, buf, sizeof(buf));
 		if (!ret)
 			break;
 		while (ret > 0) {
-			int res = fwrite(buf, 1, ret, model_out);
+			ssize_t res = write(model_out, buf, ret);
 			if (res < 0) {
-				errno = ferror(model_out);
-				perror("fwrite");
+				perror("write");
 				exit(EXIT_FAILURE);
 			}
 			ret -= res;
 		}
 	}
+
+	model_print("---- END PROGRAM OUTPUT   ----\n");
 }
 #endif /* ! CONFIG_DEBUG */