thread_group_cputimer() is a complete misnomer. The function does two things: - For arming process wide timers it makes sure that the atomic time storage is up to date. If no cpu timer is armed yet, then the atomic time storage is not updated by the scheduler for performance reasons. In that case a full summing up of all threads needs to be done and the update needs to be enabled. - Samples the current time into the caller supplied storage. Rename it to thread_group_start_cputime(), make it static and fixup the callsite.
Unified · Split
| @@ -61,7 +61,6 @@ extern void cputime_adjust(struct task_cputime *curr, struct prev_cputime *prev, · 60 unmodified lines | ||
| 61 | 61 | * Thread group CPU time accounting. |
| 62 | 62 | */ |
| 63 | 63 | void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times); |
| 64 | −void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times); | |
| 65 | 64 | void thread_group_sample_cputime(struct task_struct *tsk, struct task_cputime *times); |
| 66 | 65 | |
| 67 | 66 | /* |
| @@ -253,7 +253,20 @@ void thread_group_sample_cputime(struct task_struct *tsk, · 252 unmodified lines | ||
| 253 | 253 | sample_cputime_atomic(times, &cputimer->cputime_atomic); |
| 254 | 254 | } |
| 255 | 255 | |
| 256 | −void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times) | |
| 256 | +/** | |
| 257 | + * thread_group_start_cputime - Start cputime and return a sample | |
| 258 | + * @tsk: Task for which cputime needs to be started | |
| 259 | + * @iimes: Storage for time samples | |
| 260 | + * | |
| 261 | + * The thread group cputime accouting is avoided when there are no posix | |
| 262 | + * CPU timers armed. Before starting a timer it's required to check whether | |
| 263 | + * the time accounting is active. If not, a full update of the atomic | |
| 264 | + * accounting store needs to be done and the accounting enabled. | |
| 265 | + * | |
| 266 | + * Updates @times with an uptodate sample of the thread group cputimes. | |
| 267 | + */ | |
| 268 | +static void | |
| 269 | +thread_group_start_cputime(struct task_struct *tsk, struct task_cputime *times) | |
| 257 | 270 | { |
| 258 | 271 | struct thread_group_cputimer *cputimer = &tsk->signal->cputimer; |
| 259 | 272 | struct task_cputime sum; |
| @@ -536,7 +549,7 @@ static int cpu_timer_sample_group(const clockid_t which_clock, · 276 unmodified lines | ||
| 536 | 549 | { |
| 537 | 550 | struct task_cputime cputime; |
| 538 | 551 | |
| 539 | − thread_group_cputimer(p, &cputime); | |
| 552 | + thread_group_start_cputime(p, &cputime); | |
| 540 | 553 | switch (CPUCLOCK_WHICH(which_clock)) { |
| 541 | 554 | default: |
| 542 | 555 | return -EINVAL; |