projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: add extern "C" to two header files
[lttng-ust.git]
/
include
/
lttng
/
ust-ctl.h
diff --git
a/include/lttng/ust-ctl.h
b/include/lttng/ust-ctl.h
index ed944e97b0a872b657ad8ec1045c6b5c912271db..360bb09ab5d02dac0901963a11f208c1db4200df 100644
(file)
--- a/
include/lttng/ust-ctl.h
+++ b/
include/lttng/ust-ctl.h
@@
-16,6
+16,11
@@
#include <lttng/ust-abi.h>
#include <lttng/ust-utils.h>
#include <lttng/ust-abi.h>
#include <lttng/ust-utils.h>
+#include <lttng/ust-sigbus.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
#ifndef LTTNG_UST_UUID_LEN
#define LTTNG_UST_UUID_LEN 16
#ifndef LTTNG_UST_UUID_LEN
#define LTTNG_UST_UUID_LEN 16
@@
-24,7
+29,7
@@
/* Default unix socket path */
#define LTTNG_UST_SOCK_FILENAME \
"lttng-ust-sock-" \
/* Default unix socket path */
#define LTTNG_UST_SOCK_FILENAME \
"lttng-ust-sock-" \
- lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+ lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION
_OLDEST_COMPATIBLE
)
/*
* Shared memory files path are automatically related to shm root, e.g.
/*
* Shared memory files path are automatically related to shm root, e.g.
@@
-32,7
+37,7
@@
*/
#define LTTNG_UST_WAIT_FILENAME \
"lttng-ust-wait-" \
*/
#define LTTNG_UST_WAIT_FILENAME \
"lttng-ust-wait-" \
- lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+ lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION
_OLDEST_COMPATIBLE
)
struct lttng_ust_ctl_consumer_channel_attr {
enum lttng_ust_abi_chan_type type;
struct lttng_ust_ctl_consumer_channel_attr {
enum lttng_ust_abi_chan_type type;
@@
-251,9
+256,9
@@
int lttng_ust_ctl_get_subbuf(struct lttng_ust_ctl_consumer_stream *stream,
unsigned long *pos);
int lttng_ust_ctl_put_subbuf(struct lttng_ust_ctl_consumer_stream *stream);
unsigned long *pos);
int lttng_ust_ctl_put_subbuf(struct lttng_ust_ctl_consumer_stream *stream);
-
void
lttng_ust_ctl_flush_buffer(struct lttng_ust_ctl_consumer_stream *stream,
+
int
lttng_ust_ctl_flush_buffer(struct lttng_ust_ctl_consumer_stream *stream,
int producer_active);
int producer_active);
-
void
lttng_ust_ctl_clear_buffer(struct lttng_ust_ctl_consumer_stream *stream);
+
int
lttng_ust_ctl_clear_buffer(struct lttng_ust_ctl_consumer_stream *stream);
/* index */
/* index */
@@
-653,4
+658,10
@@
int lttng_ust_ctl_counter_aggregate(struct lttng_ust_ctl_daemon_counter *counter
int lttng_ust_ctl_counter_clear(struct lttng_ust_ctl_daemon_counter *counter,
const size_t *dimension_indexes);
int lttng_ust_ctl_counter_clear(struct lttng_ust_ctl_daemon_counter *counter,
const size_t *dimension_indexes);
+void lttng_ust_ctl_sigbus_handle(void *addr);
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* _LTTNG_UST_CTL_H */
#endif /* _LTTNG_UST_CTL_H */
This page took
0.024049 seconds
and
4
git commands to generate.