From: jp_ikaheimonen@mentor.com (JP Ikaheimonen)
Subject: [lttng-dev] [PATCH lttng-ust 6/7] Add handler for LTTNG_UST_EXCLUSION in UST ABI
Date: Thu, 7 Nov 2013 12:22:34 +0200 [thread overview]
Message-ID: <1383819755-6891-7-git-send-email-jp_ikaheimonen@mentor.com> (raw)
In-Reply-To: <1383819755-6891-1-git-send-email-jp_ikaheimonen@mentor.com>
Add message handler for the LTTNG_UST_EXCLUSION command in
UST ABI. Copy the exclusion data into a lttng_ust_excluder_node
structure and pass it to the enabler command handler.
Signed-off-by: JP Ikaheimonen <jp_ikaheimonen at mentor.com>
---
liblttng-ust/lttng-ust-comm.c | 62 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index bf2750c..597712b 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -488,6 +488,68 @@ int handle_message(struct sock_info *sock_info,
}
break;
}
+ case LTTNG_UST_EXCLUSION:
+ {
+ /* Receive exclusion names */
+ struct lttng_ust_excluder_node *node;
+ unsigned int count;
+
+ count = lum->u.exclusion.count;
+ if (count == 0) {
+ /* There are no names to read */
+ ret = 0;
+ goto error;
+ }
+ node = zmalloc(sizeof(*node) +
+ count * LTTNG_UST_SYM_NAME_LEN);
+ if (!node) {
+ ret = -ENOMEM;
+ goto error;
+ }
+ node->excluder.count = count;
+ len = ustcomm_recv_unix_sock(sock, node->excluder.names,
+ count * LTTNG_UST_SYM_NAME_LEN);
+ switch (len) {
+ case 0: /* orderly shutdown */
+ ret = 0;
+ free(node);
+ goto error;
+ default:
+ if (len == count * LTTNG_UST_SYM_NAME_LEN) {
+ DBG("Exclusion data received");
+ break;
+ } else if (len < 0) {
+ DBG("Receive failed from lttng-sessiond with errno %d", (int) -len);
+ if (len == -ECONNRESET) {
+ ERR("%s remote end closed connection", sock_info->name);
+ ret = len;
+ free(node);
+ goto error;
+ }
+ ret = len;
+ free(node);
+ goto end;
+ } else {
+ DBG("Incorrect exclusion data message size: %zd", len);
+ ret = -EINVAL;
+ free(node);
+ goto end;
+ }
+ }
+ if (ops->cmd) {
+ ret = ops->cmd(lum->handle, lum->cmd,
+ (unsigned long) node,
+ &args, sock_info);
+ if (ret) {
+ free(node);
+ }
+ /* Don't free exclusion data if everything went fine. */
+ } else {
+ ret = -ENOSYS;
+ free(node);
+ }
+ break;
+ }
case LTTNG_UST_CHANNEL:
{
void *chan_data;
--
1.8.1.2
next prev parent reply other threads:[~2013-11-07 10:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-07 10:22 [lttng-dev] [PATCH lttng-ust 0/7] UST Event exclusions JP Ikaheimonen
2013-11-07 10:22 ` [lttng-dev] [PATCH lttng-ust 1/7] Define a new command LTTNG_UST_EXCLUSION JP Ikaheimonen
2013-11-07 10:22 ` [lttng-dev] [PATCH lttng-ust 2/7] Define exclusion structure for UST ABI JP Ikaheimonen
2013-11-07 10:22 ` [lttng-dev] [PATCH lttng-ust 3/7] Send exclusion data through ustcomm JP Ikaheimonen
2013-11-07 10:22 ` [lttng-dev] [PATCH lttng-ust 4/7] Add excluders to enabler structure JP Ikaheimonen
2013-11-07 10:22 ` [lttng-dev] [PATCH lttng-ust 5/7] Store exclusions to enablers JP Ikaheimonen
2013-11-07 10:22 ` JP Ikaheimonen [this message]
2013-11-07 10:22 ` [lttng-dev] [PATCH lttng-ust 7/7] Add a check against excluders JP Ikaheimonen
2013-11-13 14:05 ` Mathieu Desnoyers
2013-11-13 20:25 ` Mathieu Desnoyers
2013-11-14 7:26 ` Ikaheimonen, JP
2013-11-14 14:25 ` Mathieu Desnoyers
2013-11-14 14:26 ` Ikaheimonen, JP
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383819755-6891-7-git-send-email-jp_ikaheimonen@mentor.com \
--to=jp_ikaheimonen@mentor.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox