52 lines
1.3 KiB
Diff
52 lines
1.3 KiB
Diff
From 83a2af722ce2c2b38f3d6d9f4114015521449a2a Mon Sep 17 00:00:00 2001
|
|
From: "Dmitry V. Levin" <ldv@strace.io>
|
|
Date: Sat, 25 Nov 2023 08:00:00 +0000
|
|
Subject: [PATCH] Factor out droptcb_verbose() from detach()
|
|
|
|
* src/strace.c (droptcb_verbose): New function.
|
|
(detach): Use it instead of droptcb.
|
|
|
|
Reference: https://github.com/strace/strace/commit/83a2af722ce2c2b38f3d6d9f4114015521449a2a
|
|
Conflict: NA
|
|
---
|
|
src/strace.c | 16 +++++++++++-----
|
|
1 file changed, 11 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/src/strace.c b/src/strace.c
|
|
index 28f5b4368..351842792 100644
|
|
--- a/src/strace.c
|
|
+++ b/src/strace.c
|
|
@@ -1148,6 +1148,16 @@ droptcb(struct tcb *tcp)
|
|
memset(tcp, 0, sizeof(*tcp));
|
|
}
|
|
|
|
+static void
|
|
+droptcb_verbose(struct tcb *tcp)
|
|
+{
|
|
+ if (!is_number_in_set(QUIET_ATTACH, quiet_set)
|
|
+ && (tcp->flags & TCB_ATTACHED))
|
|
+ error_msg("Process %u detached", tcp->pid);
|
|
+
|
|
+ droptcb(tcp);
|
|
+}
|
|
+
|
|
/* Detach traced process.
|
|
* Never call DETACH twice on the same process as both unattached and
|
|
* attached-unstopped processes give the same ESRCH. For unattached process we
|
|
@@ -1302,11 +1312,7 @@ detach(struct tcb *tcp)
|
|
}
|
|
|
|
drop:
|
|
- if (!is_number_in_set(QUIET_ATTACH, quiet_set)
|
|
- && (tcp->flags & TCB_ATTACHED))
|
|
- error_msg("Process %u detached", tcp->pid);
|
|
-
|
|
- droptcb(tcp);
|
|
+ droptcb_verbose(tcp);
|
|
}
|
|
|
|
static void
|
|
--
|
|
2.33.0
|
|
|