Merge branch 'master' of git://sources.redhat.com/git/systemtap

2 files changed, 25 insertions, 10 deletions

diff --git a/runtime/staprun/relay.c b/runtime/staprun/relay.c
index 694cb27e..b9796241 100644
--- a/runtime/staprun/relay.c
+++ b/runtime/staprun/relay.c
@@ -185,7 +185,7 @@ static void *reader_thread(void *data)
 			dbug(3, "cpu=%d poll=%d errno=%d\n", cpu, rc, errno);
                         if (errno != EINTR) {
 				_perr("poll error");
-				return(NULL);
+				goto error_out;
                         }
                 }
 		while ((rc = read(relay_fd[cpu], buf, sizeof(buf))) > 0) {
@@ -198,17 +198,24 @@ static void *reader_thread(void *data)
 					remove_file = 1;
 				if (open_outfile(fnum, cpu, remove_file) < 0) {
 					perr("Couldn't open file for cpu %d, exiting.", cpu);
-					return(NULL);
+					goto error_out;
 				}
 				wsize = rc;
 			}
 			if (write(out_fd[cpu], buf, rc) != rc) {
-				perr("Couldn't write to output %d for cpu %d, exiting.", out_fd[cpu], cpu);
-				return(NULL);
+				if (errno != EPIPE)
+					perr("Couldn't write to output %d for cpu %d, exiting.", out_fd[cpu], cpu);
+				goto error_out;
 			}
 		}
         } while (!stop_threads);
-	dbug(3, "exiting thread %d\n", cpu);
+	dbug(3, "exiting thread for cpu %d\n", cpu);
+	return(NULL);
+
+error_out:
+	/* Signal the main thread that we need to quit */
+	kill(getpid(), SIGTERM);
+	dbug(2, "exiting thread for cpu %d after error\n", cpu);
 	return(NULL);
 }
 
diff --git a/runtime/staprun/relay_old.c b/runtime/staprun/relay_old.c
index 469a5831..33d2daf3 100644
--- a/runtime/staprun/relay_old.c
+++ b/runtime/staprun/relay_old.c
@@ -239,14 +239,15 @@ static int process_subbufs(struct _stp_buf_info *info,
 				scb->rmfile = 1;
 			if (open_oldoutfile(scb->fnum, cpu, scb->rmfile) < 0) {
 				perr("Couldn't open file for cpu %d, exiting.", cpu);
-				exit(1);
+				return -1;
 			}
 			scb->wsize = len;
 		}
 		if (len) {
 			if (fwrite_unlocked (subbuf_ptr, len, 1, percpu_tmpfile[cpu]) != 1) {
-				_perr("Couldn't write to output file for cpu %d, exiting:", cpu);
-				exit(1);
+				if (errno != EPIPE)
+					_perr("Couldn't write to output file for cpu %d, exiting:", cpu);
+				return -1;
 			}
 		}
 		subbufs_consumed++;
@@ -281,14 +282,17 @@ static void *reader_thread(void *data)
 		if (rc < 0) {
 			if (errno != EINTR) {
 				_perr("poll error");
-				exit(1);
+				break;
 			}
 			err("WARNING: poll warning: %s\n", strerror(errno));
 			rc = 0;
 		}
 
 		rc = read(proc_fd[cpu], &status[cpu].info, sizeof(struct _stp_buf_info));
-		subbufs_consumed = process_subbufs(&status[cpu].info, &scb);
+		rc = process_subbufs(&status[cpu].info, &scb);
+		if (rc < 0)
+			break;
+		subbufs_consumed = rc;
 		if (subbufs_consumed) {
 			if (subbufs_consumed > status[cpu].max_backlog)
 				status[cpu].max_backlog = subbufs_consumed;
@@ -301,6 +305,10 @@ static void *reader_thread(void *data)
 		if (status[cpu].info.flushing)
 			pthread_exit(NULL);
 	} while (1);
+
+	/* Signal the main thread that we need to quit */
+	kill(getpid(), SIGTERM);
+	pthread_exit(NULL);
 }
 
 /**