projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add context to both channel and event
[ust.git]
/
libustctl
/
ustctl.c
diff --git
a/libustctl/ustctl.c
b/libustctl/ustctl.c
index 50357645dd18ca0153c3025360a1ad0c2c137e1a..429cc445a0333b046eaad68247f188daacf53e1b 100644
(file)
--- a/
libustctl/ustctl.c
+++ b/
libustctl/ustctl.c
@@
-291,7
+291,7
@@
int ustctl_create_event(int sock, struct lttng_ust_event *ev,
}
int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
}
int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
- struct object_data *
channel
_data,
+ struct object_data *
obj
_data,
struct object_data **_context_data)
{
struct ustcomm_ust_msg lum;
struct object_data **_context_data)
{
struct ustcomm_ust_msg lum;
@@
-304,7
+304,7
@@
int ustctl_add_context(int sock, struct lttng_ust_context *ctx,
return -ENOMEM;
init_object(context_data);
memset(&lum, 0, sizeof(lum));
return -ENOMEM;
init_object(context_data);
memset(&lum, 0, sizeof(lum));
- lum.handle =
channel
_data->handle;
+ lum.handle =
obj
_data->handle;
lum.cmd = LTTNG_UST_CONTEXT;
lum.u.context.ctx = ctx->ctx;
ret = ustcomm_send_app_cmd(sock, &lum, &lur);
lum.cmd = LTTNG_UST_CONTEXT;
lum.u.context.ctx = ctx->ctx;
ret = ustcomm_send_app_cmd(sock, &lum, &lur);
@@
-352,14
+352,20
@@
int ustctl_disable(int sock, struct object_data *object)
return 0;
}
return 0;
}
-int ustctl_start_session(int sock,
struct object_data *object
)
+int ustctl_start_session(int sock,
int handle
)
{
{
- return ustctl_enable(sock, object);
+ struct object_data obj;
+
+ obj.handle = handle;
+ return ustctl_enable(sock, &obj);
}
}
-int ustctl_stop_session(int sock,
struct object_data *object
)
+int ustctl_stop_session(int sock,
int handle
)
{
{
- return ustctl_disable(sock, object);
+ struct object_data obj;
+
+ obj.handle = handle;
+ return ustctl_disable(sock, &obj);
}
}
This page took
0.02496 seconds
and
4
git commands to generate.