xnu-792.tar.gz

[apple/xnu.git] / osfmk / mach / task_info.h

diff --git a/osfmk/mach/task_info.h b/osfmk/mach/task_info.h
index c4628a1f5f8cfac3a3e833374f5d47fcfb64aa33..05e4db68c3d8ecb5c41d484236b567850c9bc995 100644 (file)
--- a/osfmk/mach/task_info.h
+++ b/osfmk/mach/task_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -58,14 +58,15 @@
  *
  */
 
-#ifndef        TASK_INFO_H_
-#define        TASK_INFO_H_
+#ifndef        _MACH_TASK_INFO_H_
+#define        _MACH_TASK_INFO_H_
 
+#include <mach/message.h>
 #include <mach/machine/vm_types.h>
 #include <mach/time_value.h>
 #include <mach/policy.h>
 
-#include <sys/appleapiopts.h>
+#include <sys/cdefs.h>
 
 /*
  *     Generic information structure to allow for expansion.
@@ -80,12 +81,52 @@ typedef     integer_t       task_info_data_t[TASK_INFO_MAX];
  *     Currently defined information structures.
  */
 
-#define TASK_BASIC_INFO         4       /* basic information */
+#if __DARWIN_ALIGN_POWER
+#pragma options align=power
+#endif
+
+#define TASK_BASIC_INFO_32      4       /* basic information */
+
+struct task_basic_info_32 {
+        integer_t       suspend_count;  /* suspend count for task */
+        natural_t       virtual_size;   /* virtual memory size (bytes) */
+        natural_t       resident_size;  /* resident memory size (bytes) */
+        time_value_t    user_time;      /* total user run time for
+                                           terminated threads */
+        time_value_t    system_time;    /* total system run time for
+                                           terminated threads */
+       policy_t        policy;         /* default policy for new threads */
+};
+typedef struct task_basic_info_32       task_basic_info_32_data_t;
+typedef struct task_basic_info_32       *task_basic_info_32_t;
+#define TASK_BASIC_INFO_32_COUNT   \
+                (sizeof(task_basic_info_32_data_t) / sizeof(natural_t))
+
+
+#define TASK_BASIC_INFO_64      5       /* 64-bit capable basic info */
+
+struct task_basic_info_64 {
+        integer_t       suspend_count;  /* suspend count for task */
+        mach_vm_size_t  virtual_size;   /* virtual memory size (bytes) */
+        mach_vm_size_t  resident_size;  /* resident memory size (bytes) */
+        time_value_t    user_time;      /* total user run time for
+                                           terminated threads */
+        time_value_t    system_time;    /* total system run time for
+                                           terminated threads */
+       policy_t        policy;         /* default policy for new threads */
+};
+typedef struct task_basic_info_64       task_basic_info_64_data_t;
+typedef struct task_basic_info_64       *task_basic_info_64_t;
+#define TASK_BASIC_INFO_64_COUNT   \
+                (sizeof(task_basic_info_64_data_t) / sizeof(natural_t))
+
+
+/* localized structure - cannot be safely passed between tasks of differing sizes */
 
 struct task_basic_info {
         integer_t       suspend_count;  /* suspend count for task */
-        vm_size_t       virtual_size;   /* number of virtual pages */
-        vm_size_t       resident_size;  /* number of resident pages */
+        vm_size_t       virtual_size;   /* virtual memory size (bytes) */
+        vm_size_t       resident_size;  /* resident memory size (bytes) */
         time_value_t    user_time;      /* total user run time for
                                            terminated threads */
         time_value_t    system_time;    /* total system run time for
@@ -97,6 +138,12 @@ typedef struct task_basic_info          task_basic_info_data_t;
 typedef struct task_basic_info          *task_basic_info_t;
 #define TASK_BASIC_INFO_COUNT   \
                 (sizeof(task_basic_info_data_t) / sizeof(natural_t))
+#if !defined(__LP64__)
+#define TASK_BASIC_INFO TASK_BASIC_INFO_32
+#else
+#define TASK_BASIC_INFO TASK_BASIC_INFO_64
+#endif
+
 
 
 #define        TASK_EVENTS_INFO        2       /* various event counts */
@@ -113,8 +160,8 @@ struct task_events_info {
 };
 typedef struct task_events_info                task_events_info_data_t;
 typedef struct task_events_info                *task_events_info_t;
-#define        TASK_EVENTS_INFO_COUNT  \
-               (sizeof(task_events_info_data_t) / sizeof(natural_t))
+#define        TASK_EVENTS_INFO_COUNT          ((mach_msg_type_number_t) \
+               (sizeof(task_events_info_data_t) / sizeof(natural_t)))
 
 #define        TASK_THREAD_TIMES_INFO  3       /* total times for live threads -
                                           only accurate if suspended */
@@ -128,25 +175,44 @@ struct task_thread_times_info {
 
 typedef struct task_thread_times_info  task_thread_times_info_data_t;
 typedef struct task_thread_times_info  *task_thread_times_info_t;
-#define        TASK_THREAD_TIMES_INFO_COUNT    \
-               (sizeof(task_thread_times_info_data_t) / sizeof(natural_t))
-
-#ifdef __APPLE_API_UNSTABLE
+#define        TASK_THREAD_TIMES_INFO_COUNT    ((mach_msg_type_number_t) \
+               (sizeof(task_thread_times_info_data_t) / sizeof(natural_t)))
 
-#define TASK_SCHED_TIMESHARE_INFO      10
-#define TASK_SCHED_RR_INFO             11
-#define TASK_SCHED_FIFO_INFO           12
+#define TASK_ABSOLUTETIME_INFO 1
 
-#define TASK_SCHED_INFO                        14
+struct task_absolutetime_info {
+       uint64_t                total_user;             /* total time */
+       uint64_t                total_system;
+       uint64_t                threads_user;   /* existing threads only */
+       uint64_t                threads_system;
+};
 
-#endif /* __APPLE_API_UNSTABLE */
+typedef struct task_absolutetime_info  task_absolutetime_info_data_t;
+typedef struct task_absolutetime_info  *task_absolutetime_info_t;
+#define TASK_ABSOLUTETIME_INFO_COUNT   ((mach_msg_type_number_t) \
+               (sizeof (task_absolutetime_info_data_t) / sizeof (natural_t)))
 
 #define TASK_SECURITY_TOKEN            13
-#define TASK_SECURITY_TOKEN_COUNT      \
-               (sizeof(security_token_t) / sizeof(natural_t))
+#define TASK_SECURITY_TOKEN_COUNT      ((mach_msg_type_number_t) \
+               (sizeof(security_token_t) / sizeof(natural_t)))
 
 #define TASK_AUDIT_TOKEN               15
 #define TASK_AUDIT_TOKEN_COUNT \
                (sizeof(audit_token_t) / sizeof(natural_t))
 
-#endif /* TASK_INFO_H_ */
+#if __DARWIN_ALIGN_POWER
+#pragma options align=reset
+#endif
+
+
+/*
+ * Obsolete interfaces.
+ */
+
+#define TASK_SCHED_TIMESHARE_INFO      10
+#define TASK_SCHED_RR_INFO             11
+#define TASK_SCHED_FIFO_INFO           12
+
+#define TASK_SCHED_INFO                        14
+
+#endif /* _MACH_TASK_INFO_H_ */