projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Memory leak of agent
[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..b7d41f2f406ad948012666e45cde4872e93bc3ee 100644
(file)
--- a/
src/bin/lttng-sessiond/agent.c
+++ b/
src/bin/lttng-sessiond/agent.c
@@
-163,7
+163,7
@@
static void destroy_event_agent_rcu(struct rcu_head *head)
struct agent_event *event =
caa_container_of(node, struct agent_event, node);
struct agent_event *event =
caa_container_of(node, struct agent_event, node);
-
free
(event);
+
agent_destroy_event
(event);
}
/*
}
/*
@@
-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();
}
/*
}
/*
@@
-810,7
+802,7
@@
struct agent *agent_create(enum lttng_domain_type domain)
int ret;
struct agent *agt;
int ret;
struct agent *agt;
- agt = zmalloc(sizeof(
*ag
t));
+ agt = zmalloc(sizeof(
struct agen
t));
if (!agt) {
goto error;
}
if (!agt) {
goto error;
}
@@
-828,33
+820,37
@@
error:
}
/*
}
/*
- * Create a newly allocated agent event data structure.
If name is valid, it's
- *
copied into the created event
.
+ * Create a newly allocated agent event data structure.
+ *
Ownership of filter_expression is taken
.
*
* Return a new object else NULL on error.
*/
struct agent_event *agent_create_event(const char *name,
*
* Return a new object else NULL on error.
*/
struct agent_event *agent_create_event(const char *name,
- struct lttng_filter_bytecode *filter)
+ int loglevel, enum lttng_loglevel_type loglevel_type,
+ struct lttng_filter_bytecode *filter, char *filter_expression)
{
{
- struct agent_event *event;
+ struct agent_event *event
= NULL
;
DBG3("Agent create new event with name %s", name);
DBG3("Agent create new event with name %s", name);
- event = zmalloc(sizeof(*event));
- if (!event) {
+ if (!name) {
+ ERR("Failed to create agent event; no name provided.");
goto error;
}
goto error;
}
- if (name) {
- strncpy(event->name, name, sizeof(event->name));
- event->name[sizeof(event->name) - 1] = '\0';
- lttng_ht_node_init_str(&event->node, event->name);
+ event = zmalloc(sizeof(*event));
+ if (!event) {
+ goto error;
}
}
- if (filter) {
-
event->filter = filter
;
- }
+ strncpy(event->name, name, sizeof(event->name));
+
event->name[sizeof(event->name) - 1] = '\0'
;
+ lttng_ht_node_init_str(&event->node, event->name);
+ event->loglevel = loglevel;
+ event->loglevel_type = loglevel_type;
+ event->filter = filter;
+ event->filter_expression = filter_expression;
error:
return event;
}
error:
return event;
}
@@
-869,10
+865,7
@@
void agent_add_event(struct agent_event *event, struct agent *agt)
assert(agt->events);
DBG3("Agent adding event %s", event->name);
assert(agt->events);
DBG3("Agent adding event %s", event->name);
-
- rcu_read_lock();
add_unique_agent_event(agt->events, event);
add_unique_agent_event(agt->events, event);
- rcu_read_unlock();
agt->being_used = 1;
}
agt->being_used = 1;
}
@@
-961,12
+954,13
@@
void agent_destroy_event(struct agent_event *event)
assert(event);
free(event->filter);
assert(event);
free(event->filter);
+ free(event->filter_expression);
+ free(event->exclusion);
free(event);
}
/*
free(event);
}
/*
- * Destroy an agent completely. Note that the given pointer is NOT freed
- * thus a reference to static or stack data can be passed to this function.
+ * Destroy an agent completely.
*/
void agent_destroy(struct agent *agt)
{
*/
void agent_destroy(struct agent *agt)
{
@@
-977,14
+971,6
@@
void agent_destroy(struct agent *agt)
DBG3("Agent destroy");
DBG3("Agent destroy");
- /*
- * Just ignore if no events hash table exists. This is possible if for
- * instance an agent object was allocated but not initialized.
- */
- if (!agt->events) {
- return;
- }
-
rcu_read_lock();
cds_lfht_for_each_entry(agt->events->ht, &iter.iter, node, node) {
int ret;
rcu_read_lock();
cds_lfht_for_each_entry(agt->events->ht, &iter.iter, node, node) {
int ret;
@@
-1005,6
+991,7
@@
void agent_destroy(struct agent *agt)
rcu_read_unlock();
ht_cleanup_push(agt->events);
rcu_read_unlock();
ht_cleanup_push(agt->events);
+ free(agt);
}
/*
}
/*
This page took
0.027105 seconds
and
4
git commands to generate.