X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=ustd%2Fustd.c;h=21da4ebb8785d620018b75e5736ee27cc2265e18;hb=02af3e607f471e9fcfe7ea6902cab56efb4c4516;hp=969c192abdb66bea7b9ce93dd48d7a994b5fe70c;hpb=2dae156b134735a52d29f544e4c9e12d03baa283;p=ust.git

diff --git a/ustd/ustd.c b/ustd/ustd.c
index 969c192..21da4eb 100644
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -359,6 +359,24 @@ struct buffer_info *connect_buffer(pid_t pid, const char *bufname)
 	return buf;
 }
 
+int write_current_subbuffer(struct buffer_info *buf)
+{
+	int result;
+
+	void *subbuf_mem = buf->mem + (buf->consumed_old & (buf->n_subbufs * buf->subbuf_size-1));
+
+	size_t cur_sb_size = subbuffer_data_size(subbuf_mem);
+
+	result = patient_write(buf->file_fd, subbuf_mem, cur_sb_size);
+	if(result == -1) {
+		PERROR("write");
+		/* FIXME: maybe drop this trace */
+		return 0;
+	}
+
+	return 0;
+}
+
 int consumer_loop(struct buffer_info *buf)
 {
 	int result;
@@ -382,11 +400,8 @@ int consumer_loop(struct buffer_info *buf)
 		}
 
 		/* write data to file */
-		result = patient_write(buf->file_fd, buf->mem + (buf->consumed_old & (buf->n_subbufs * buf->subbuf_size-1)), buf->subbuf_size);
-		if(result == -1) {
-			PERROR("write");
-			/* FIXME: maybe drop this trace */
-		}
+		write_current_subbuffer(buf);
+		/* FIXME: handle return value? */
 
 		/* put the subbuffer */
 		/* FIXME: we actually should unput the buffer before consuming... */