projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Bad return error code handling
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-app.c
diff --git
a/src/bin/lttng-sessiond/ust-app.c
b/src/bin/lttng-sessiond/ust-app.c
index 96f8eb0b3ead316c0defa96905ff40cfcccb3136..e0562ed4e5448d2e184b288481fad0e80bb77b0b 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.c
+++ b/
src/bin/lttng-sessiond/ust-app.c
@@
-1506,8
+1506,16
@@
void ust_app_unregister(int sock)
/* Assign second node for deletion */
iter.iter.node = <a->pid_n.node;
/* Assign second node for deletion */
iter.iter.node = <a->pid_n.node;
+ /*
+ * Ignore return value since the node might have been removed before by an
+ * add replace during app registration because the PID can be reassigned by
+ * the OS.
+ */
ret = lttng_ht_del(ust_app_ht, &iter);
ret = lttng_ht_del(ust_app_ht, &iter);
- assert(!ret);
+ if (ret) {
+ DBG3("Unregister app by PID %d failed. This can happen on pid reuse",
+ lta->pid);
+ }
/* Free memory */
call_rcu(<a->pid_n.head, delete_ust_app_rcu);
/* Free memory */
call_rcu(<a->pid_n.head, delete_ust_app_rcu);
@@
-2555,7
+2563,8
@@
void ust_app_global_update(struct ltt_ust_session *usess, int sock)
}
ua_sess = create_ust_app_session(usess, app);
}
ua_sess = create_ust_app_session(usess, app);
- if (ua_sess == NULL) {
+ if (ua_sess == NULL || ua_sess == (void *) -1UL) {
+ /* Tracer is gone for this session and has been freed */
goto error;
}
goto error;
}
This page took
0.023839 seconds
and
4
git commands to generate.