projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: improve error message when UST support is disabled
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-app.h
diff --git
a/src/bin/lttng-sessiond/ust-app.h
b/src/bin/lttng-sessiond/ust-app.h
index 74d4cd6a2619c40d4b9acd52dbcc12049b34f241..fd5e93fe9e4cb80224fd9668eade6cb845fa8d87 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.h
+++ b/
src/bin/lttng-sessiond/ust-app.h
@@
-102,6
+102,7
@@
struct ust_app_ctx {
struct lttng_ust_context ctx;
struct lttng_ust_object_data *obj;
struct lttng_ht_node_ulong node;
struct lttng_ust_context ctx;
struct lttng_ust_object_data *obj;
struct lttng_ht_node_ulong node;
+ struct cds_list_head list;
};
struct ust_app_event {
};
struct ust_app_event {
@@
-141,7
+142,14
@@
struct ust_app_channel {
struct ust_app_stream_list streams;
/* Session pointer that owns this object. */
struct ust_app_session *session;
struct ust_app_stream_list streams;
/* Session pointer that owns this object. */
struct ust_app_session *session;
+ /*
+ * Contexts are kept in a hash table for fast lookup and in an ordered list
+ * so we are able to enable them on the tracer side in the same order the
+ * user added them.
+ */
struct lttng_ht *ctx;
struct lttng_ht *ctx;
+ struct cds_list_head ctx_list;
+
struct lttng_ht *events;
uint64_t tracefile_size;
uint64_t tracefile_count;
struct lttng_ht *events;
uint64_t tracefile_size;
uint64_t tracefile_count;
@@
-175,10
+183,10
@@
struct ust_app_session {
* Tracing session ID. Multiple ust app session can have the same tracing
* session id making this value NOT unique to the object.
*/
* Tracing session ID. Multiple ust app session can have the same tracing
* session id making this value NOT unique to the object.
*/
-
in
t tracing_id;
+
uint64_
t tracing_id;
uint64_t id; /* Unique session identifier */
struct lttng_ht *channels; /* Registered channels */
uint64_t id; /* Unique session identifier */
struct lttng_ht *channels; /* Registered channels */
- struct lttng_ht_node_u
long
node;
+ struct lttng_ht_node_u
64
node;
char path[PATH_MAX];
/* UID/GID of the application owning the session */
uid_t uid;
char path[PATH_MAX];
/* UID/GID of the application owning the session */
uid_t uid;
@@
-309,7
+317,14
@@
ssize_t ust_app_push_metadata(struct ust_registry_session *registry,
struct consumer_socket *socket, int send_zero_data);
void ust_app_destroy(struct ust_app *app);
int ust_app_snapshot_record(struct ltt_ust_session *usess,
struct consumer_socket *socket, int send_zero_data);
void ust_app_destroy(struct ust_app *app);
int ust_app_snapshot_record(struct ltt_ust_session *usess,
- struct snapshot_output *output, int wait);
+ struct snapshot_output *output, int wait, unsigned int nb_streams);
+unsigned int ust_app_get_nb_stream(struct ltt_ust_session *usess);
+
+static inline
+int ust_app_supported(void)
+{
+ return 1;
+}
#else /* HAVE_LIBLTTNG_UST_CTL */
#else /* HAVE_LIBLTTNG_UST_CTL */
@@
-509,7
+524,18
@@
void ust_app_destroy(struct ust_app *app)
}
static inline
int ust_app_snapshot_record(struct ltt_ust_session *usess,
}
static inline
int ust_app_snapshot_record(struct ltt_ust_session *usess,
- struct snapshot_output *output, int wait)
+ struct snapshot_output *output, int wait, unsigned int nb_stream)
+{
+ return 0;
+}
+static inline
+unsigned int ust_app_get_nb_stream(struct ltt_ust_session *usess)
+{
+ return 0;
+}
+
+static inline
+int ust_app_supported(void)
{
return 0;
}
{
return 0;
}
This page took
0.025745 seconds
and
5
git commands to generate.