projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Major changes of command processing for sessiond
[lttng-tools.git]
/
liblttngctl
/
liblttngctl.c
diff --git
a/liblttngctl/liblttngctl.c
b/liblttngctl/liblttngctl.c
index 3ff1529a1857434202ac7acbd7f1d71fe1a3607b..38be54774049532c8d9cef30a67c244454109b96 100644
(file)
--- a/
liblttngctl/liblttngctl.c
+++ b/
liblttngctl/liblttngctl.c
@@
-35,7
+35,7
@@
static char sessiond_sock_path[PATH_MAX];
/* Communication structure to ltt-sessiond */
static struct lttcomm_session_msg lsm;
/* Communication structure to ltt-sessiond */
static struct lttcomm_session_msg lsm;
-static struct lttcomm_lttng_
header llh
;
+static struct lttcomm_lttng_
msg llm
;
/* Prototypes */
static int check_tracing_group(const char *grp_name);
/* Prototypes */
static int check_tracing_group(const char *grp_name);
@@
-125,18
+125,18
@@
static int ask_sessiond(enum lttcomm_sessiond_command lct, void **buf)
}
/* Get header from data transmission */
}
/* Get header from data transmission */
- ret = recv_data_sessiond(&ll
h, sizeof(llh
));
+ ret = recv_data_sessiond(&ll
m, sizeof(llm
));
if (ret < 0) {
goto end;
}
/* Check error code if OK */
if (ret < 0) {
goto end;
}
/* Check error code if OK */
- if (ll
h
.ret_code != LTTCOMM_OK) {
- ret = -ll
h
.ret_code;
+ if (ll
m
.ret_code != LTTCOMM_OK) {
+ ret = -ll
m
.ret_code;
goto end;
}
goto end;
}
- size = ll
h.payload
_size;
+ size = ll
m.trace_name_offset + llm.data
_size;
if (size == 0) {
goto end;
}
if (size == 0) {
goto end;
}
@@
-250,7
+250,7
@@
int lttng_list_traces(uuid_t *uuid, struct lttng_trace **traces)
{
int ret;
{
int ret;
- uuid_copy(lsm.session_id, *uuid);
+ uuid_copy(lsm.session_
uu
id, *uuid);
ret = ask_sessiond(LTTNG_LIST_TRACES, (void **) traces);
if (ret < 0) {
ret = ask_sessiond(LTTNG_LIST_TRACES, (void **) traces);
if (ret < 0) {
@@
-278,7
+278,7
@@
int lttng_create_session(char *name, uuid_t *session_id)
goto end;
}
goto end;
}
- uuid_copy(*session_id, ll
h.session_
id);
+ uuid_copy(*session_id, ll
m.session_uu
id);
end:
return ret;
end:
return ret;
@@
-293,7
+293,7
@@
int lttng_destroy_session(uuid_t *uuid)
{
int ret;
{
int ret;
- uuid_copy(lsm.session_id, *uuid);
+ uuid_copy(lsm.session_
uu
id, *uuid);
ret = ask_sessiond(LTTNG_DESTROY_SESSION, NULL);
if (ret < 0) {
ret = ask_sessiond(LTTNG_DESTROY_SESSION, NULL);
if (ret < 0) {
@@
-377,7
+377,7
@@
int lttng_disconnect_sessiond(void)
*/
void lttng_set_current_session_uuid(uuid_t *uuid)
{
*/
void lttng_set_current_session_uuid(uuid_t *uuid)
{
- uuid_copy(lsm.session_id, *uuid);
+ uuid_copy(lsm.session_
uu
id, *uuid);
}
/*
}
/*
This page took
0.025297 seconds
and
4
git commands to generate.