summaryrefslogtreecommitdiff
path: root/hurd
diff options
context:
space:
mode:
Diffstat (limited to 'hurd')
-rw-r--r--hurd/hurd_types.h15
-rw-r--r--hurd/msg.defs6
2 files changed, 15 insertions, 6 deletions
diff --git a/hurd/hurd_types.h b/hurd/hurd_types.h
index 6fb4e627..f8258d07 100644
--- a/hurd/hurd_types.h
+++ b/hurd/hurd_types.h
@@ -1,5 +1,5 @@
/* C declarations for Hurd server interfaces
- Copyright (C) 1993,94,95,96,98,99,2001 Free Software Foundation, Inc.
+ Copyright (C) 1993,94,95,96,98,99,2001,02 Free Software Foundation, Inc.
This file is part of the GNU Hurd.
@@ -21,6 +21,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#define _HURD_TYPES_H
#include <mach/std_types.h> /* For mach_port_t et al. */
+#include <mach/message.h> /* For mach_msg_id_t et al. */
#include <sys/types.h> /* For pid_t and uid_t. */
/* A string identifying this release of the GNU Hurd. Our
@@ -244,6 +245,9 @@ enum file_storage_class
#include <mach/task_info.h>
#include <mach/thread_info.h>
+#ifndef THREAD_SCHED_INFO
+#include <mach/policy.h>
+#endif
/* Flags sent in proc_getprocinfo request. */
#define PI_FETCH_TASKINFO 0x00000001
@@ -266,12 +270,19 @@ struct procinfo
int nthreads; /* size of pi_threadinfos */
struct task_basic_info taskinfo;
+#ifdef TASK_SCHED_TIMESHARE_INFO
+ struct policy_timeshare_base timeshare_base_info;
+#endif
struct
{
int died; /* this thread died in the middle of call */
- int rpc_block; /* thred is blocked on this RPC */
+ mach_msg_id_t rpc_block; /* thread is blocked on this RPC */
struct thread_basic_info pis_bi;
+#ifdef THREAD_SCHED_INFO
struct thread_sched_info pis_si;
+#else
+ struct policy_infos pis_pi;
+#endif
} threadinfos[0];
};
typedef int *procinfo_t;
diff --git a/hurd/msg.defs b/hurd/msg.defs
index 32c962af..95802472 100644
--- a/hurd/msg.defs
+++ b/hurd/msg.defs
@@ -1,6 +1,5 @@
/* RPCs which a friendly Hurd process will understand on its message port.
- Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996 Free Software
- Foundation, Inc.
+ Copyright (C) 1991,92,93,94,95,96,2002 Free Software Foundation, Inc.
This file is part of the GNU Hurd.
@@ -191,7 +190,7 @@ routine msg_report_wait (
process: mach_port_t;
thread: thread_t;
out wait_desc: string_t;
- out wait_rpc: int);
+ out wait_rpc: mach_msg_id_t);
/* Given a list of port names in NAMES, return a description of the
corresponding port from libc's point of view, in a '\0'-separated vector.
@@ -201,4 +200,3 @@ routine msg_describe_ports (
refport: mach_port_t;
names: mach_port_name_array_t;
out descriptions: data_t);
-