projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond: no rotation performed from null chunk to new chunk
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
session.c
diff --git
a/src/bin/lttng-sessiond/session.c
b/src/bin/lttng-sessiond/session.c
index 9072a2ecbead28a7b1c1e990d9d827f009e8af89..ed68d153f20749630012c93a4487f6dad6efec96 100644
(file)
--- a/
src/bin/lttng-sessiond/session.c
+++ b/
src/bin/lttng-sessiond/session.c
@@
-811,7
+811,6
@@
void session_release(struct urcu_ref *ref)
DBG("Destroying session %s (id %" PRIu64 ")", session->name, session->id);
DBG("Destroying session %s (id %" PRIu64 ")", session->name, session->id);
- consumer_output_put(session->consumer);
snapshot_destroy(&session->snapshot);
pthread_mutex_destroy(&session->lock);
snapshot_destroy(&session->snapshot);
pthread_mutex_destroy(&session->lock);
@@
-823,6
+822,7
@@
void session_release(struct urcu_ref *ref)
}
session_notify_destruction(session);
}
session_notify_destruction(session);
+ consumer_output_put(session->consumer);
kernel_free_session(ksess);
session->kernel_session = NULL;
if (usess) {
kernel_free_session(ksess);
session->kernel_session = NULL;
if (usess) {
@@
-962,7
+962,7
@@
end:
* Session list lock must be held by the caller.
*/
enum lttng_error_code session_create(const char *name, uid_t uid, gid_t gid,
* Session list lock must be held by the caller.
*/
enum lttng_error_code session_create(const char *name, uid_t uid, gid_t gid,
-
const char *base_path,
struct ltt_session **out_session)
+ struct ltt_session **out_session)
{
int ret;
enum lttng_error_code ret_code;
{
int ret;
enum lttng_error_code ret_code;
@@
-1086,16
+1086,6
@@
enum lttng_error_code session_create(const char *name, uid_t uid, gid_t gid,
}
}
}
}
- if (base_path) {
- new_session->base_path = strdup(base_path);
- if (!new_session->base_path) {
- ERR("Failed to allocate base path of session \"%s\"",
- name);
- ret_code = LTTNG_ERR_SESSION_FAIL;
- goto error;
- }
- }
-
new_session->uid = uid;
new_session->gid = gid;
new_session->uid = uid;
new_session->gid = gid;
@@
-1163,7
+1153,7
@@
int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid)
*
* Be careful of the result passed to this function. For instance,
* on failure to launch a rotation, a client will expect the rotation
*
* Be careful of the result passed to this function. For instance,
* on failure to launch a rotation, a client will expect the rotation
- * state to be set to "NO_ROTATION". If an error occured while the
+ * state to be set to "NO_ROTATION". If an error occur
r
ed while the
* rotation was "ONGOING", result should be set to "ERROR", which will
* allow a client to report it.
*
* rotation was "ONGOING", result should be set to "ERROR", which will
* allow a client to report it.
*
This page took
0.026648 seconds
and
4
git commands to generate.