blob: 72a82726e206037f4d7ce4ff28066496b53eb434 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
Upstream status: Taken from upstream.
From 9949068745e2b0ca91e17125d037f332d20a0213 Mon Sep 17 00:00:00 2001
From: Flavio Cruz <flaviocruz@gmail.com>
Date: Tue, 16 May 2023 23:01:01 -0400
Subject: [PATCH] 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>
---
include/mach/task_info.h | 6 ++++++
kern/task.c | 8 +++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/include/mach/task_info.h b/include/mach/task_info.h
index f448ee04..39659ee6 100644
--- a/include/mach/task_info.h
+++ b/include/mach/task_info.h
@@ -89,10 +89,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 65191f5d..81817083 100644
--- a/kern/task.c
+++ b/kern/task.c
@@ -881,8 +881,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;
}
--
2.41.0
|
