X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ust-consumerd%2Fust-consumerd.c;h=ce2ee40a339a96b05e880c7355af1a2e63a2f2f6;hb=fbae86d664c12e450d3cb702b602701d37781b41;hp=fae4efafa87f06e02c80ef09080a0b2e8afabaf0;hpb=d9d1c081341e1bb1ef8e9346d29d36548afb1346;p=ust.git diff --git a/ust-consumerd/ust-consumerd.c b/ust-consumerd/ust-consumerd.c index fae4efa..ce2ee40 100644 --- a/ust-consumerd/ust-consumerd.c +++ b/ust-consumerd/ust-consumerd.c @@ -33,6 +33,7 @@ #include #include "ust/ustconsumer.h" +#include "../libustconsumer/lowlevel.h" #include "usterr.h" char *sock_path=NULL; @@ -144,7 +145,7 @@ int on_read_partial_subbuffer(struct ustconsumer_callbacks *data, struct buffer_ result = patient_write(buf_local->file_fd, buf->mem + subbuf_index * buf->subbuf_size, valid_length); if(result == -1) { ERR("Error writing to buffer file"); - return; + return result; } /* pad with empty bytes */ @@ -154,11 +155,11 @@ int on_read_partial_subbuffer(struct ustconsumer_callbacks *data, struct buffer_ result = patient_write(buf_local->file_fd, tmp, pad_size); if(result == -1) { ERR("Error writing to buffer file"); - return; + return result; } free(tmp); } - + return result; } int on_open_buffer(struct ustconsumer_callbacks *data, struct buffer_info *buf) @@ -234,7 +235,7 @@ int on_close_buffer(struct ustconsumer_callbacks *data, struct buffer_info *buf) int on_put_error(struct ustconsumer_callbacks *data, struct buffer_info *buf) { - unwrite_last_subbuffer(buf); + return unwrite_last_subbuffer(buf); } struct ustconsumer_callbacks *new_callbacks()