diff options
| author | Flavio Cruz <flaviocruz@gmail.com> | 2023-05-16 23:01:01 -0400 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2023-05-17 19:25:02 +0200 |
| commit | 25a3748b9028b5207e419fc49b6178b1b6405fa8 (patch) | |
| tree | 5e0563f9fa8cdaa9b416023fc2ade858c641536b | |
| parent | b16f119edb80e913fdd60fc3bf381afb504509fd (diff) | |
| download | gnumach-25a3748b9028b5207e419fc49b6178b1b6405fa8.tar.gz gnumach-25a3748b9028b5207e419fc49b6178b1b6405fa8.tar.bz2 gnumach-25a3748b9028b5207e419fc49b6178b1b6405fa8.zip | |
Fix task_info for TASK_THREAD_TIMES_INFO.
We are checking for the existence of time_value64_t but we didn't add
that to the task_thread_times_info structure.
Message-Id: <ZGRDbS0XIm1fJwkG@jupiter.tail36e24.ts.net>
| -rw-r--r-- | include/mach/task_info.h | 6 | ||||
| -rw-r--r-- | kern/task.c | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/mach/task_info.h b/include/mach/task_info.h index 2631b04e..0e048c5e 100644 --- a/include/mach/task_info.h +++ b/include/mach/task_info.h @@ -97,10 +97,16 @@ typedef struct task_events_info *task_events_info_t; only accurate if suspended */ struct task_thread_times_info { + /* Deprecated, please use user_time64 */ rpc_time_value_t user_time; /* total user run time for live threads */ + /* Deprecated, please use system_time64 */ rpc_time_value_t system_time; /* total system run time for live threads */ + time_value64_t user_time64; /* total user run time for + live threads */ + time_value64_t system_time64; /* total system run time for + live threads */ }; typedef struct task_thread_times_info task_thread_times_info_data_t; diff --git a/kern/task.c b/kern/task.c index 9492b448..60ab4d73 100644 --- a/kern/task.c +++ b/kern/task.c @@ -887,8 +887,14 @@ kern_return_t task_info( task_unlock(task); TIME_VALUE64_TO_TIME_VALUE(&acc_user_time, ×_info->user_time); TIME_VALUE64_TO_TIME_VALUE(&acc_system_time, ×_info->system_time); + if (*task_info_count >= TASK_THREAD_TIMES_INFO_COUNT) { + /* Copy new time_value64_t fields */ + times_info->user_time64 = acc_user_time; + times_info->system_time64 = acc_system_time; + } - *task_info_count = TASK_THREAD_TIMES_INFO_COUNT; + if (*task_info_count > TASK_THREAD_TIMES_INFO_COUNT) + *task_info_count = TASK_THREAD_TIMES_INFO_COUNT; break; } |