projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename shm_handle to lttng_ust_shm_handle
[lttng-ust.git]
/
libust
/
lttng-ust-abi.c
diff --git
a/libust/lttng-ust-abi.c
b/libust/lttng-ust-abi.c
index 1d32e777be7c62126f44c7281c0d4539c5835660..c9623713dcd211a9ec6dfef5073e8d46b2acccb9 100644
(file)
--- a/
libust/lttng-ust-abi.c
+++ b/
libust/lttng-ust-abi.c
@@
-632,6
+632,8
@@
long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg)
return ltt_channel_enable(channel);
case LTTNG_UST_DISABLE:
return ltt_channel_disable(channel);
return ltt_channel_enable(channel);
case LTTNG_UST_DISABLE:
return ltt_channel_disable(channel);
+ case LTTNG_UST_FLUSH_BUFFER:
+ return channel->ops->flush_buffer(channel->chan, channel->handle);
default:
return -EINVAL;
}
default:
return -EINVAL;
}
@@
-653,6
+655,8
@@
long lttng_channel_cmd(int objd, unsigned int cmd, unsigned long arg)
static
long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg)
{
static
long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg)
{
+ struct ltt_channel *channel = objd_private(objd);
+
switch (cmd) {
case LTTNG_UST_STREAM:
{
switch (cmd) {
case LTTNG_UST_STREAM:
{
@@
-662,6
+666,8
@@
long lttng_metadata_cmd(int objd, unsigned int cmd, unsigned long arg)
/* stream used as output */
return lttng_abi_open_stream(objd, stream);
}
/* stream used as output */
return lttng_abi_open_stream(objd, stream);
}
+ case LTTNG_UST_FLUSH_BUFFER:
+ return channel->ops->flush_buffer(channel->chan, channel->handle);
default:
return -EINVAL;
}
default:
return -EINVAL;
}
@@
-727,13
+733,10
@@
static const struct objd_ops lttng_metadata_ops = {
*
* This object descriptor implements lttng commands:
* (None for now. Access is done directly though shm.)
*
* This object descriptor implements lttng commands:
* (None for now. Access is done directly though shm.)
- * TODO: Add buffer flush.
*/
static
long lttng_rb_cmd(int objd, unsigned int cmd, unsigned long arg)
{
*/
static
long lttng_rb_cmd(int objd, unsigned int cmd, unsigned long arg)
{
- //struct stream_priv_data *priv = objd_private(objd);
-
switch (cmd) {
default:
return -EINVAL;
switch (cmd) {
default:
return -EINVAL;
This page took
0.023483 seconds
and
4
git commands to generate.