projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Copyright ownership transfer
[lttng-tools.git]
/
src
/
common
/
consumer
/
consumer.h
diff --git
a/src/common/consumer/consumer.h
b/src/common/consumer/consumer.h
index 73189660ce4eb888bf3acc12a0f17ea0c3f9071e..c3e15e3163fb912e6da41ecba92c51434b37b864 100644
(file)
--- a/
src/common/consumer/consumer.h
+++ b/
src/common/consumer/consumer.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2011
Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011
EfficiOS Inc.
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
* Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
* Copyright (C) 2018 Jérémie Galarneau <jeremie.galarneau@efficios.com>
* Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
* Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
* Copyright (C) 2018 Jérémie Galarneau <jeremie.galarneau@efficios.com>
@@
-27,6
+27,7
@@
#include <common/trace-chunk-registry.h>
#include <common/credentials.h>
#include <common/buffer-view.h>
#include <common/trace-chunk-registry.h>
#include <common/credentials.h>
#include <common/buffer-view.h>
+#include <common/dynamic-array.h>
struct lttng_consumer_local_data;
struct lttng_consumer_local_data;
@@
-95,7
+96,7
@@
enum sync_metadata_status {
SYNC_METADATA_STATUS_ERROR,
};
SYNC_METADATA_STATUS_ERROR,
};
-extern struct lttng_consumer_global_data consumer_data;
+extern struct lttng_consumer_global_data
the_
consumer_data;
struct stream_list {
struct cds_list_head head;
struct stream_list {
struct cds_list_head head;
@@
-159,7
+160,7
@@
struct lttng_consumer_channel {
/* For UST */
uid_t ust_app_uid; /* Application UID. */
/* For UST */
uid_t ust_app_uid; /* Application UID. */
- struct
ust
ctl_consumer_channel *uchan;
+ struct
lttng_ust_
ctl_consumer_channel *uchan;
unsigned char uuid[LTTNG_UUID_STR_LEN];
/*
* Temporary stream list used to store the streams once created and waiting
unsigned char uuid[LTTNG_UUID_STR_LEN];
/*
* Temporary stream list used to store the streams once created and waiting
@@
-298,6
+299,12
@@
struct stream_subbuffer {
} info;
};
} info;
};
+enum get_next_subbuffer_status {
+ GET_NEXT_SUBBUFFER_STATUS_OK,
+ GET_NEXT_SUBBUFFER_STATUS_NO_DATA,
+ GET_NEXT_SUBBUFFER_STATUS_ERROR,
+};
+
/*
* Perform any operation required to acknowledge
* the wake-up of a consumer stream (e.g. consume a byte on a wake-up pipe).
/*
* Perform any operation required to acknowledge
* the wake-up of a consumer stream (e.g. consume a byte on a wake-up pipe).
@@
-320,8
+327,8
@@
typedef int (*on_sleep_cb)(struct lttng_consumer_stream *,
*
* Stream and channel locks are acquired during this call.
*/
*
* Stream and channel locks are acquired during this call.
*/
-typedef
int (*get_next_subbuffer_cb)(struct lttng_consumer_stream *,
- struct stream_subbuffer *);
+typedef
enum get_next_subbuffer_status (*get_next_subbuffer_cb)(
+ struct
lttng_consumer_stream *, struct
stream_subbuffer *);
/*
* Populate the stream_subbuffer's info member. The info to populate
/*
* Populate the stream_subbuffer's info member. The info to populate
@@
-389,6
+396,13
@@
typedef void (*lock_cb)(struct lttng_consumer_stream *);
*/
typedef void (*unlock_cb)(struct lttng_consumer_stream *);
*/
typedef void (*unlock_cb)(struct lttng_consumer_stream *);
+/*
+ * Assert that the stream and channel lock and any other stream type specific
+ * lock that need to be acquired during the processing of a read_subbuffer
+ * operation is acquired.
+ */
+typedef void (*assert_locked_cb)(struct lttng_consumer_stream *);
+
/*
* Invoked when a subbuffer's metadata version does not match the last
* known metadata version.
/*
* Invoked when a subbuffer's metadata version does not match the last
* known metadata version.
@@
-539,7
+553,7
@@
struct lttng_consumer_stream {
/* Stream name. Format is: <channel_name>_<cpu_number> */
char name[LTTNG_SYMBOL_NAME_LEN];
/* Internal state of libustctl. */
/* Stream name. Format is: <channel_name>_<cpu_number> */
char name[LTTNG_SYMBOL_NAME_LEN];
/* Internal state of libustctl. */
- struct
ust
ctl_consumer_stream *ustream;
+ struct
lttng_ust_
ctl_consumer_stream *ustream;
struct cds_list_head send_node;
/* On-disk circular buffer */
uint64_t tracefile_size_current;
struct cds_list_head send_node;
/* On-disk circular buffer */
uint64_t tracefile_size_current;
@@
-636,10
+650,11
@@
struct lttng_consumer_stream {
reset_metadata_cb reset_metadata;
consume_subbuffer_cb consume_subbuffer;
put_next_subbuffer_cb put_next_subbuffer;
reset_metadata_cb reset_metadata;
consume_subbuffer_cb consume_subbuffer;
put_next_subbuffer_cb put_next_subbuffer;
-
post_consume_cb post_consume
;
+
struct lttng_dynamic_array post_consume_cbs
;
send_live_beacon_cb send_live_beacon;
on_sleep_cb on_sleep;
unlock_cb unlock;
send_live_beacon_cb send_live_beacon;
on_sleep_cb on_sleep;
unlock_cb unlock;
+ assert_locked_cb assert_locked;
} read_subbuffer_ops;
struct metadata_bucket *metadata_bucket;
};
} read_subbuffer_ops;
struct metadata_bucket *metadata_bucket;
};
@@
-1051,5
+1066,7
@@
enum lttcomm_return_code lttng_consumer_init_command(
int lttng_consumer_clear_channel(struct lttng_consumer_channel *channel);
enum lttcomm_return_code lttng_consumer_open_channel_packets(
struct lttng_consumer_channel *channel);
int lttng_consumer_clear_channel(struct lttng_consumer_channel *channel);
enum lttcomm_return_code lttng_consumer_open_channel_packets(
struct lttng_consumer_channel *channel);
+int consumer_metadata_wakeup_pipe(const struct lttng_consumer_channel *channel);
+void lttng_consumer_sigbus_handle(void *addr);
#endif /* LIB_CONSUMER_H */
#endif /* LIB_CONSUMER_H */
This page took
0.026342 seconds
and
4
git commands to generate.