projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: action executor: ref count imbalance for session object
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
action-executor.cpp
diff --git
a/src/bin/lttng-sessiond/action-executor.cpp
b/src/bin/lttng-sessiond/action-executor.cpp
index cc7834f2745ca6e58d8299dd7c649fe68ecc0aaa..8c2374535195cc0cc59531a4d02133b3930c5e56 100644
(file)
--- a/
src/bin/lttng-sessiond/action-executor.cpp
+++ b/
src/bin/lttng-sessiond/action-executor.cpp
@@
-331,12
+331,12
@@
static int action_executor_start_session_handler(
get_action_name(action),
get_trigger_name(work_item->trigger));
ret = 0;
get_action_name(action),
get_trigger_name(work_item->trigger));
ret = 0;
- goto error_
unlock_list
;
+ goto error_
put_session
;
}
session_lock(session);
if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
}
session_lock(session);
if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
- goto error_
dispose
_session;
+ goto error_
unlock
_session;
}
cmd_ret = (lttng_error_code) cmd_start_trace(session);
}
cmd_ret = (lttng_error_code) cmd_start_trace(session);
@@
-357,8
+357,9
@@
static int action_executor_start_session_handler(
break;
}
break;
}
-error_
dispose
_session:
+error_
unlock
_session:
session_unlock(session);
session_unlock(session);
+error_put_session:
session_put(session);
error_unlock_list:
session_unlock_list();
session_put(session);
error_unlock_list:
session_unlock_list();
@@
-423,12
+424,12
@@
static int action_executor_stop_session_handler(
get_action_name(action),
get_trigger_name(work_item->trigger));
ret = 0;
get_action_name(action),
get_trigger_name(work_item->trigger));
ret = 0;
- goto error_
unlock_list
;
+ goto error_
put_session
;
}
session_lock(session);
if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
}
session_lock(session);
if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
- goto error_
dispose
_session;
+ goto error_
unlock
_session;
}
cmd_ret = (lttng_error_code) cmd_stop_trace(session);
}
cmd_ret = (lttng_error_code) cmd_stop_trace(session);
@@
-449,8
+450,9
@@
static int action_executor_stop_session_handler(
break;
}
break;
}
-error_
dispose
_session:
+error_
unlock
_session:
session_unlock(session);
session_unlock(session);
+error_put_session:
session_put(session);
error_unlock_list:
session_unlock_list();
session_put(session);
error_unlock_list:
session_unlock_list();
@@
-515,12
+517,12
@@
static int action_executor_rotate_session_handler(
get_action_name(action),
get_trigger_name(work_item->trigger));
ret = 0;
get_action_name(action),
get_trigger_name(work_item->trigger));
ret = 0;
- goto error_
unlock_list
;
+ goto error_
put_session
;
}
session_lock(session);
if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
}
session_lock(session);
if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
- goto error_
dispose
_session;
+ goto error_
unlock
_session;
}
cmd_ret = (lttng_error_code) cmd_rotate_session(session, NULL, false,
}
cmd_ret = (lttng_error_code) cmd_rotate_session(session, NULL, false,
@@
-548,8
+550,9
@@
static int action_executor_rotate_session_handler(
break;
}
break;
}
-error_
dispose
_session:
+error_
unlock
_session:
session_unlock(session);
session_unlock(session);
+error_put_session:
session_put(session);
error_unlock_list:
session_unlock_list();
session_put(session);
error_unlock_list:
session_unlock_list();
@@
-629,12
+632,12
@@
static int action_executor_snapshot_session_handler(
get_action_name(action),
get_trigger_name(work_item->trigger));
ret = 0;
get_action_name(action),
get_trigger_name(work_item->trigger));
ret = 0;
- goto error_
unlock_list
;
+ goto error_
put_session
;
}
session_lock(session);
if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
}
session_lock(session);
if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
- goto error_
dispose
_session;
+ goto error_
unlock
_session;
}
cmd_ret = (lttng_error_code) cmd_snapshot_record(session, snapshot_output, 0);
}
cmd_ret = (lttng_error_code) cmd_snapshot_record(session, snapshot_output, 0);
@@
-651,8
+654,9
@@
static int action_executor_snapshot_session_handler(
break;
}
break;
}
-error_
dispose
_session:
+error_
unlock
_session:
session_unlock(session);
session_unlock(session);
+error_put_session:
session_put(session);
error_unlock_list:
session_unlock_list();
session_put(session);
error_unlock_list:
session_unlock_list();
This page took
0.024474 seconds
and
4
git commands to generate.