diff options
author | Oleg Nesterov <oleg@redhat.com> | 2011-06-23 13:06:50 -0400 |
---|---|---|
committer | Oleg Nesterov <oleg@redhat.com> | 2011-06-27 14:30:08 -0400 |
commit | 45cdf5cc0703c537194588c63d53bad1f2539d36 (patch) | |
tree | 579573d2cbe054d767a9f6b575b88836586fb7ce /include/linux/tracehook.h | |
parent | 53c8f9f199b239668e6b1a907735ee323a0d1ccd (diff) |
kill tracehook_notify_death()
Kill tracehook_notify_death(), reimplement the logic in its caller,
exit_notify().
Also, change the exec_id's check to use thread_group_leader() instead
of task_detached(), this is more clear. This logic only applies to
the exiting leader, a sub-thread must never change its exit_signal.
Note: when the traced group leader exits the exit_signal-or-SIGCHLD
logic looks really strange:
- we notify the tracer even if !thread_group_empty() but
do_wait(WEXITED) can't work until all threads exit
- if the tracer is real_parent, it is not clear why can't
we use ->exit_signal event if !thread_group_empty()
-v2: do not try to fix the 2nd oddity to avoid the subtle behavior
change mixed with reorganization, suggested by Tejun.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Reviewed-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/tracehook.h')
-rw-r--r-- | include/linux/tracehook.h | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h index 7a1bd12aeffa..a71a2927a6a0 100644 --- a/include/linux/tracehook.h +++ b/include/linux/tracehook.h | |||
@@ -152,40 +152,6 @@ static inline void tracehook_signal_handler(int sig, siginfo_t *info, | |||
152 | ptrace_notify(SIGTRAP); | 152 | ptrace_notify(SIGTRAP); |
153 | } | 153 | } |
154 | 154 | ||
155 | #define DEATH_REAP -1 | ||
156 | #define DEATH_DELAYED_GROUP_LEADER -2 | ||
157 | |||
158 | /** | ||
159 | * tracehook_notify_death - task is dead, ready to notify parent | ||
160 | * @task: @current task now exiting | ||
161 | * @death_cookie: value to pass to tracehook_report_death() | ||
162 | * @group_dead: nonzero if this was the last thread in the group to die | ||
163 | * | ||
164 | * A return value >= 0 means call do_notify_parent() with that signal | ||
165 | * number. Negative return value can be %DEATH_REAP to self-reap right | ||
166 | * now, or %DEATH_DELAYED_GROUP_LEADER to a zombie without notifying our | ||
167 | * parent. Note that a return value of 0 means a do_notify_parent() call | ||
168 | * that sends no signal, but still wakes up a parent blocked in wait*(). | ||
169 | * | ||
170 | * Called with write_lock_irq(&tasklist_lock) held. | ||
171 | */ | ||
172 | static inline int tracehook_notify_death(struct task_struct *task, | ||
173 | void **death_cookie, int group_dead) | ||
174 | { | ||
175 | if (task_detached(task)) | ||
176 | return task->ptrace ? SIGCHLD : DEATH_REAP; | ||
177 | |||
178 | /* | ||
179 | * If something other than our normal parent is ptracing us, then | ||
180 | * send it a SIGCHLD instead of honoring exit_signal. exit_signal | ||
181 | * only has special meaning to our real parent. | ||
182 | */ | ||
183 | if (thread_group_empty(task) && !ptrace_reparented(task)) | ||
184 | return task->exit_signal; | ||
185 | |||
186 | return task->ptrace ? SIGCHLD : DEATH_DELAYED_GROUP_LEADER; | ||
187 | } | ||
188 | |||
189 | #ifdef TIF_NOTIFY_RESUME | 155 | #ifdef TIF_NOTIFY_RESUME |
190 | /** | 156 | /** |
191 | * set_notify_resume - cause tracehook_notify_resume() to be called | 157 | * set_notify_resume - cause tracehook_notify_resume() to be called |