projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix enabled state when listing UST events
[lttng-tools.git]
/
lttng-sessiond
/
ust-app.h
diff --git
a/lttng-sessiond/ust-app.h
b/lttng-sessiond/ust-app.h
index 753639270af84e9f4febdb9471cb6d3a9b38f860..3fa4d423ccbf69c2dabd499f2cb843275074f2c7 100644
(file)
--- a/
lttng-sessiond/ust-app.h
+++ b/
lttng-sessiond/ust-app.h
@@
-24,6
+24,8
@@
#include "trace-ust.h"
#include "trace-ust.h"
+#define UST_APP_EVENT_LIST_SIZE 32
+
/*
* Application registration data structure.
*/
/*
* Application registration data structure.
*/
@@
-54,6
+56,7
@@
struct ust_app_event {
int enabled;
int handle;
struct lttng_ust_object_data *obj;
int enabled;
int handle;
struct lttng_ust_object_data *obj;
+ struct lttng_ust_event attr;
char name[LTTNG_UST_SYM_NAME_LEN];
struct cds_lfht *ctx;
struct cds_lfht_node node;
char name[LTTNG_UST_SYM_NAME_LEN];
struct cds_lfht *ctx;
struct cds_lfht_node node;
@@
-95,18
+98,21
@@
struct ust_app {
struct cds_lfht *sessions;
struct cds_lfht_node node;
struct ust_app_key key;
struct cds_lfht *sessions;
struct cds_lfht_node node;
struct ust_app_key key;
+ int sock_closed;
};
#ifdef HAVE_LIBLTTNG_UST_CTL
int ust_app_register(struct ust_register_msg *msg, int sock);
void ust_app_unregister(int sock);
};
#ifdef HAVE_LIBLTTNG_UST_CTL
int ust_app_register(struct ust_register_msg *msg, int sock);
void ust_app_unregister(int sock);
-int ust_app_add_channel(struct ltt_ust_session *usess,
+int ust_app_add_channel
_all
(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan);
struct ltt_ust_channel *uchan);
-int ust_app_add_event(struct ltt_ust_session *usess,
+int ust_app_add_event
_all
(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
unsigned long ust_app_list_count(void);
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent);
unsigned long ust_app_list_count(void);
-int ust_app_start_trace(struct ltt_ust_session *usess);
+int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app);
+int ust_app_start_trace_all(struct ltt_ust_session *usess);
+int ust_app_list_events(struct lttng_event **events);
void ust_app_global_update(struct ltt_ust_session *usess, int sock);
void ust_app_clean_list(void);
void ust_app_global_update(struct ltt_ust_session *usess, int sock);
void ust_app_clean_list(void);
@@
-117,9
+123,19
@@
struct ust_app *ust_app_find_by_pid(pid_t pid);
#else /* HAVE_LIBLTTNG_UST_CTL */
static inline
#else /* HAVE_LIBLTTNG_UST_CTL */
static inline
-int ust_app_start_trace(struct ltt_ust_session *usess)
+int ust_app_start_trace(struct ltt_ust_session *usess
, struct ust_app *app
)
{
{
- return -ENOSYS;
+ return 0;
+}
+static inline
+int ust_app_start_trace_all(struct ltt_ust_session *usess)
+{
+ return 0;
+}
+static inline
+int ust_app_list_events(struct lttng_event **events)
+{
+ return 0;
}
static inline
int ust_app_register(struct ust_register_msg *msg, int sock)
}
static inline
int ust_app_register(struct ust_register_msg *msg, int sock)
@@
-158,16
+174,16
@@
struct ust_app *ust_app_get_by_pid(pid_t pid)
return NULL;
}
static inline
return NULL;
}
static inline
-int ust_app_add_channel(struct ltt_ust_session *usess,
+int ust_app_add_channel
_all
(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan)
{
return 0;
}
static inline
struct ltt_ust_channel *uchan)
{
return 0;
}
static inline
-int ust_app_add_event(struct ltt_ust_session *usess,
+int ust_app_add_event
_all
(struct ltt_ust_session *usess,
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
{
struct ltt_ust_channel *uchan, struct ltt_ust_event *uevent)
{
- return
-ENOSYS
;
+ return
0
;
}
static inline
struct cds_lfht *ust_app_get_ht(void)
}
static inline
struct cds_lfht *ust_app_get_ht(void)
This page took
0.025791 seconds
and
4
git commands to generate.