projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't save log level in session configuration when unneeded
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
agent.c
diff --git
a/src/bin/lttng-sessiond/agent.c
b/src/bin/lttng-sessiond/agent.c
index 92307f85fa88431fee805c0a0fee0a72f1817e2e..ca2d4c872931632f4e5d46cb9c6b17b6b3d0d8ed 100644
(file)
--- a/
src/bin/lttng-sessiond/agent.c
+++ b/
src/bin/lttng-sessiond/agent.c
@@
-303,9
+303,7
@@
static ssize_t list_events(struct agent_app *app, struct lttng_event **events)
data_size = be32toh(reply_hdr.data_size) + sizeof(*reply);
break;
default:
data_size = be32toh(reply_hdr.data_size) + sizeof(*reply);
break;
default:
- ERR("Agent returned an unknown code: %" PRIu32,
- be32toh(reply_hdr.ret_code));
- ret = LTTNG_ERR_FATAL;
+ ret = LTTNG_ERR_UNK;
goto error;
}
goto error;
}
@@
-402,9
+400,7
@@
static int enable_event(struct agent_app *app, struct agent_event *event)
ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
goto error;
default:
ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
goto error;
default:
- ERR("Agent returned an unknown code: %" PRIu32,
- be32toh(reply.ret_code));
- ret = LTTNG_ERR_FATAL;
+ ret = LTTNG_ERR_UNK;
goto error;
}
goto error;
}
@@
-426,6
+422,7
@@
static int disable_event(struct agent_app *app, struct agent_event *event)
{
int ret;
uint64_t data_size;
{
int ret;
uint64_t data_size;
+ uint32_t reply_ret_code;
struct lttcomm_agent_disable msg;
struct lttcomm_agent_generic_reply reply;
struct lttcomm_agent_disable msg;
struct lttcomm_agent_generic_reply reply;
@@
-455,16
+452,16
@@
static int disable_event(struct agent_app *app, struct agent_event *event)
goto error_io;
}
goto error_io;
}
- switch (be32toh(reply.ret_code)) {
+ reply_ret_code = be32toh(reply.ret_code);
+ log_reply_code(reply_ret_code);
+ switch (reply_ret_code) {
case AGENT_RET_CODE_SUCCESS:
break;
case AGENT_RET_CODE_UNKNOWN_NAME:
ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
goto error;
default:
case AGENT_RET_CODE_SUCCESS:
break;
case AGENT_RET_CODE_UNKNOWN_NAME:
ret = LTTNG_ERR_UST_EVENT_NOT_FOUND;
goto error;
default:
- ERR("Agent returned an unknown code: %" PRIu32,
- be32toh(reply.ret_code));
- ret = LTTNG_ERR_FATAL;
+ ret = LTTNG_ERR_UNK;
goto error;
}
goto error;
}
@@
-719,10
+716,7
@@
void agent_add_app(struct agent_app *app)
assert(app);
DBG3("Agent adding app sock: %d and pid: %d to ht", app->sock->fd, app->pid);
assert(app);
DBG3("Agent adding app sock: %d and pid: %d to ht", app->sock->fd, app->pid);
-
- rcu_read_lock();
lttng_ht_add_unique_ulong(agent_apps_ht_by_sock, &app->node);
lttng_ht_add_unique_ulong(agent_apps_ht_by_sock, &app->node);
- rcu_read_unlock();
}
/*
}
/*
@@
-795,9
+789,7
@@
void agent_add(struct agent *agt, struct lttng_ht *ht)
DBG3("Agent adding from domain %d", agt->domain);
DBG3("Agent adding from domain %d", agt->domain);
- rcu_read_lock();
lttng_ht_add_unique_u64(ht, &agt->node);
lttng_ht_add_unique_u64(ht, &agt->node);
- rcu_read_unlock();
}
/*
}
/*
@@
-961,6
+953,7
@@
void agent_destroy_event(struct agent_event *event)
assert(event);
free(event->filter);
assert(event);
free(event->filter);
+ free(event->filter_expression);
free(event);
}
free(event);
}
This page took
0.025487 seconds
and
4
git commands to generate.