X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=c043353b9e82b078d235aa55a0b90f85d452fb73;hb=dd392e9453fb7aa5f356ed1765db72ef33150461;hp=c6eb71d57807354e729a9f220b02e18d07aaf6ab;hpb=c585b4b94a2f517485cdf1c2f3efe8d26e44b05d;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index c6eb71d57..c043353b9 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -3953,8 +3953,18 @@ int consumer_flush_buffer(struct lttng_consumer_stream *stream, int producer_act
 		} else {
 			ret = kernctl_buffer_flush_empty(stream->wait_fd);
 			if (ret < 0) {
-				ERR("Failed to flush kernel stream");
-				goto end;
+				/*
+				 * Doing a buffer flush which does not take into
+				 * account empty packets. This is not perfect,
+				 * but required as a fall-back when
+				 * "flush_empty" is not implemented by
+				 * lttng-modules.
+				 */
+				ret = kernctl_buffer_flush(stream->wait_fd);
+				if (ret < 0) {
+					ERR("Failed to flush kernel stream");
+					goto end;
+				}
 			}
 		}
 		break;
@@ -4193,7 +4203,7 @@ int consumer_clear_buffer(struct lttng_consumer_stream *stream)
 	case LTTNG_CONSUMER_KERNEL:
 		ret = kernctl_buffer_clear(stream->wait_fd);
 		if (ret < 0) {
-			ERR("Failed to flush kernel stream");
+			ERR("Failed to clear kernel stream (ret = %d)", ret);
 			goto end;
 		}
 		break;