From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 10 Apr 2013 02:17:54 +0000 (-0400)
Subject: Fix: ABI breakage between 2.1 and 2.2-rc1
X-Git-Tag: v2.2.0-rc2~13
X-Git-Url: http://git.liburcu.org/?p=lttng-ust.git;a=commitdiff_plain;h=9e917229ef5d0b6103a9c6cb2e33bf9c5638bfe9

Fix: ABI breakage between 2.1 and 2.2-rc1

Removal of 2 callbacks was causing ABI breakage. This has been caught
in 2.2-rc1.

This was causing the application to segfault when tracing is active.

Fixes #486

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index 4cc507a0..749478a6 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -395,6 +395,8 @@ struct lttng_channel_ops {
 			unsigned char *uuid,
 			uint32_t chan_id);
 	void (*channel_destroy)(struct lttng_channel *chan);
+	void *_deprecated1;
+	void *_deprecated2;
 	int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
 			     uint32_t event_id);
 	void (*event_commit)(struct lttng_ust_lib_ring_buffer_ctx *ctx);