/*
- * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
/*
* These are for the eproc structure defined below.
*/
+#include <sys/cdefs.h>
+
#include <sys/appleapiopts.h>
#ifndef KERNEL
#include <sys/time.h>
#include <sys/ucred.h>
+#else
+#include <libkern/sysctl.h>
#endif
-
-#include <sys/vm.h>
#include <sys/proc.h>
+#include <sys/vm.h>
+
+#ifdef BSD_KERNEL_PRIVATE
#include <sys/linker_set.h>
+#endif
/*
* Definitions for sysctl call. The sysctl call uses a hierarchical name
#define CTLFLAG_NOLOCK 0x20000000 /* XXX Don't Lock */
#define CTLFLAG_ANYBODY 0x10000000 /* All users can set this var */
#define CTLFLAG_SECURE 0x08000000 /* Permit set only if securelevel<=0 */
+#define CTLFLAG_MASKED 0x04000000 /* deprecated variable, do not display */
+#define CTLFLAG_NOAUTO 0x02000000 /* do not auto-register */
+#define CTLFLAG_KERN 0x01000000 /* valid inside the kernel */
/*
* USE THIS instead of a hardwired number from the categories below
#define OID_AUTO (-1)
#ifdef KERNEL
-#ifdef __APPLE_API_UNSTABLE
#define SYSCTL_HANDLER_ARGS (struct sysctl_oid *oidp, void *arg1, int arg2, \
struct sysctl_req *req)
*/
struct sysctl_req {
struct proc *p;
- int lock;
- void *oldptr;
+ int lock;
+ user_addr_t oldptr;
size_t oldlen;
size_t oldidx;
- int (*oldfunc)(struct sysctl_req *, const void *, size_t);
- void *newptr;
+ int (*oldfunc)(struct sysctl_req *, const void *, size_t);
+ user_addr_t newptr;
size_t newlen;
size_t newidx;
- int (*newfunc)(struct sysctl_req *, void *, size_t);
+ int (*newfunc)(struct sysctl_req *, void *, size_t);
};
SLIST_HEAD(sysctl_oid_list, sysctl_oid);
#define SYSCTL_IN(r, p, l) (r->newfunc)(r, p, l)
#define SYSCTL_OUT(r, p, l) (r->oldfunc)(r, p, l)
+__BEGIN_DECLS
+
int sysctl_handle_int SYSCTL_HANDLER_ARGS;
int sysctl_handle_long SYSCTL_HANDLER_ARGS;
-int sysctl_handle_intptr SYSCTL_HANDLER_ARGS;
+int sysctl_handle_quad SYSCTL_HANDLER_ARGS;
+int sysctl_handle_int2quad SYSCTL_HANDLER_ARGS;
+/*int sysctl_handle_intptr SYSCTL_HANDLER_ARGS; XXX not implemented */
int sysctl_handle_string SYSCTL_HANDLER_ARGS;
int sysctl_handle_opaque SYSCTL_HANDLER_ARGS;
void sysctl_register_oid(struct sysctl_oid *oidp);
void sysctl_unregister_oid(struct sysctl_oid *oidp);
+__END_DECLS
+
/* Declare an oid to allow child oids to be added to it. */
#define SYSCTL_DECL(name) \
extern struct sysctl_oid_list sysctl_##name##_children
SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \
ptr, val, sysctl_handle_int, "I", descr)
+/* Oid for an unsigned int. If ptr is NULL, val is returned. */
+#define SYSCTL_UINT(parent, nbr, name, access, ptr, val, descr) \
+ SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \
+ ptr, val, sysctl_handle_int, "IU", descr)
+
/* Oid for a long. The pointer must be non NULL. */
#define SYSCTL_LONG(parent, nbr, name, access, ptr, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \
ptr, 0, sysctl_handle_long, "L", descr)
+/* Oid for a quad. The pointer must be non NULL. */
+#define SYSCTL_QUAD(parent, nbr, name, access, ptr, descr) \
+ SYSCTL_OID(parent, nbr, name, CTLTYPE_QUAD|access, \
+ ptr, 0, sysctl_handle_quad, "Q", descr)
+
+/* Oid for a int returned as quad. The pointer must be non NULL. */
+#define SYSCTL_INT2QUAD(parent, nbr, name, access, ptr, descr) \
+ SYSCTL_OID(parent, nbr, name, CTLTYPE_QUAD|access, \
+ ptr, 0, sysctl_handle_int2quad, "Q", descr)
+
/* Oid for an opaque object. Specified by a pointer and a length. */
#define SYSCTL_OPAQUE(parent, nbr, name, access, ptr, len, fmt, descr) \
SYSCTL_OID(parent, nbr, name, CTLTYPE_OPAQUE|access, \
#define SYSCTL_PROC(parent, nbr, name, access, ptr, arg, handler, fmt, descr) \
SYSCTL_OID(parent, nbr, name, access, \
ptr, arg, handler, fmt, descr)
-#endif /* __APPLE_API_UNSTABLE */
+
+
+extern struct sysctl_oid_list sysctl__children;
+SYSCTL_DECL(_kern);
+SYSCTL_DECL(_sysctl);
+SYSCTL_DECL(_vm);
+SYSCTL_DECL(_vfs);
+SYSCTL_DECL(_net);
+SYSCTL_DECL(_debug);
+SYSCTL_DECL(_hw);
+SYSCTL_DECL(_machdep);
+SYSCTL_DECL(_user);
+
#endif /* KERNEL */
+#ifdef XNU_KERNEL_PRIVATE
+#define SYSCTL_DEF_ENABLED
+#else
+#ifndef KERNEL
+#define SYSCTL_DEF_ENABLED
+#endif
+#endif
+
+#ifdef SYSCTL_DEF_ENABLED
/*
* Top-level identifiers
*/
#define KERN_NISDOMAINNAME 22 /* string: YP domain name */
#define KERN_DOMAINNAME KERN_NISDOMAINNAME
#define KERN_MAXPARTITIONS 23 /* int: number of partitions/disk */
-#define KERN_KDEBUG 24 /* int: kernel trace points */
+#define KERN_KDEBUG 24 /* int: kernel trace points */
#define KERN_UPDATEINTERVAL 25 /* int: update process sleep time */
#define KERN_OSRELDATE 26 /* int: OS release date */
#define KERN_NTP_PLL 27 /* node: NTP PLL control */
#define KERN_DUMPDEV 31 /* dev_t: device to dump on */
#define KERN_IPC 32 /* node: anything related to IPC */
#define KERN_DUMMY 33 /* unused */
-#define KERN_PS_STRINGS 34 /* int: address of PS_STRINGS */
-#define KERN_USRSTACK 35 /* int: address of USRSTACK */
-#define KERN_LOGSIGEXIT 36 /* int: do we log sigexit procs? */
+#define KERN_PS_STRINGS 34 /* int: address of PS_STRINGS */
+#define KERN_USRSTACK32 35 /* int: address of USRSTACK */
+#define KERN_LOGSIGEXIT 36 /* int: do we log sigexit procs? */
#define KERN_SYMFILE 37 /* string: kernel symbol filename */
#define KERN_PROCARGS 38
#define KERN_PCSAMPLES 39 /* node: pc sampling */
#define KERN_NETBOOT 40 /* int: are we netbooted? 1=yes,0=no */
#define KERN_PANICINFO 41 /* node: panic UI information */
-#define KERN_SYSV 42 /* node: panic UI information */
-#define KERN_MAXID 43 /* number of valid kern ids */
-
+#define KERN_SYSV 42 /* node: System V IPC information */
+#define KERN_AFFINITY 43 /* xxx */
+#define KERN_CLASSIC 44 /* xxx */
+#define KERN_CLASSICHANDLER 45 /* xxx */
+#define KERN_AIOMAX 46 /* int: max aio requests */
+#define KERN_AIOPROCMAX 47 /* int: max aio requests per process */
+#define KERN_AIOTHREADS 48 /* int: max aio worker threads */
+#ifdef __APPLE_API_UNSTABLE
+#define KERN_PROCARGS2 49
+#endif /* __APPLE_API_UNSTABLE */
+#define KERN_COREFILE 50 /* string: corefile format string */
+#define KERN_COREDUMP 51 /* int: whether to coredump at all */
+#define KERN_SUGID_COREDUMP 52 /* int: whether to dump SUGID cores */
+#define KERN_PROCDELAYTERM 53 /* int: set/reset current proc for delayed termination during shutdown */
+#define KERN_SHREG_PRIVATIZABLE 54 /* int: can shared regions be privatized ? */
+#define KERN_PROC_LOW_PRI_IO 55 /* int: set/reset current proc for low priority I/O */
+#define KERN_LOW_PRI_WINDOW 56 /* int: set/reset throttle window - milliseconds */
+#define KERN_LOW_PRI_DELAY 57 /* int: set/reset throttle delay - milliseconds */
+#define KERN_POSIX 58 /* node: posix tunables */
+#define KERN_USRSTACK64 59 /* LP64 user stack query */
+#define KERN_MAXID 60 /* number of valid kern ids */
+
+#if defined(__LP64__)
+#define KERN_USRSTACK KERN_USRSTACK64
+#else
+#define KERN_USRSTACK KERN_USRSTACK32
+#endif
/* KERN_KDEBUG types */
#define KERN_KDEFLAGS 1
#define KERN_KDSETREG 8
#define KERN_KDGETREG 9
#define KERN_KDREADTR 10
-#define KERN_KDPIDTR 11
+#define KERN_KDPIDTR 11
#define KERN_KDTHRMAP 12
/* Don't use 13 as it is overloaded with KERN_VNODE */
#define KERN_KDPIDEX 14
/* KERN_PANICINFO types */
#define KERN_PANICINFO_MAXSIZE 1 /* quad: panic UI image size limit */
-#define KERN_PANICINFO_IMAGE16 2 /* string: path to the panic UI (16 bit) */
-#define KERN_PANICINFO_IMAGE32 3 /* string: path to the panic UI (32 bit) */
+#define KERN_PANICINFO_IMAGE 2 /* panic UI in 8-bit kraw format */
/*
* KERN_SYSV identifiers
#define KSYSV_SHMMNI 3 /* int: max number of shared memory identifiers */
#define KSYSV_SHMSEG 4 /* int: max shared memory segments per process */
#define KSYSV_SHMALL 5 /* int: max amount of shared memory (pages) */
+#define KSYSV_SEMMNI 6 /* int: max num of semaphore identifiers */
+#define KSYSV_SEMMNS 7 /* int: max num of semaphores in system */
+#define KSYSV_SEMMNU 8 /* int: max num of undo structures in system */
+#define KSYSV_SEMMSL 9 /* int: max num of semaphores per id */
+#define KSYSV_SEMUNE 10 /* int: max num of undo entries per process */
#define CTL_KERN_NAMES { \
{ "dumpdev", CTLTYPE_STRUCT }, /* we lie; don't print as int */ \
{ "ipc", CTLTYPE_NODE }, \
{ "dummy", CTLTYPE_INT }, \
- { "ps_strings", CTLTYPE_INT }, \
+ { "dummy", CTLTYPE_INT }, \
{ "usrstack", CTLTYPE_INT }, \
{ "logsigexit", CTLTYPE_INT }, \
{ "symfile",CTLTYPE_STRING },\
{ "pcsamples",CTLTYPE_STRUCT },\
{ "netboot", CTLTYPE_INT }, \
{ "panicinfo", CTLTYPE_NODE }, \
- { "sysv", CTLTYPE_NODE } \
+ { "sysv", CTLTYPE_NODE }, \
+ { "dummy", CTLTYPE_INT }, \
+ { "dummy", CTLTYPE_INT }, \
+ { "dummy", CTLTYPE_INT }, \
+ { "aiomax", CTLTYPE_INT }, \
+ { "aioprocmax", CTLTYPE_INT }, \
+ { "aiothreads", CTLTYPE_INT }, \
+ { "procargs2",CTLTYPE_STRUCT }, \
+ { "corefile",CTLTYPE_STRING }, \
+ { "coredump", CTLTYPE_INT }, \
+ { "sugid_coredump", CTLTYPE_INT }, \
+ { "delayterm", CTLTYPE_INT }, \
+ { "shreg_private", CTLTYPE_INT }, \
+ { "proc_low_pri_io", CTLTYPE_INT }, \
+ { "low_pri_window", CTLTYPE_INT }, \
+ { "low_pri_delay", CTLTYPE_INT }, \
+ { "posix", CTLTYPE_NODE } \
}
/*
* KERN_PROC subtype ops return arrays of augmented proc structures:
*/
#ifdef __APPLE_API_UNSTABLE
+
+struct _pcred {
+ char pc_lock[72]; /* opaque content */
+ struct ucred *pc_ucred; /* Current credentials. */
+ uid_t p_ruid; /* Real user id. */
+ uid_t p_svuid; /* Saved effective user id. */
+ gid_t p_rgid; /* Real group id. */
+ gid_t p_svgid; /* Saved effective group id. */
+ int p_refcnt; /* Number of references. */
+};
+
+struct _ucred {
+ int32_t cr_ref; /* reference count */
+ uid_t cr_uid; /* effective user id */
+ short cr_ngroups; /* number of groups */
+ gid_t cr_groups[NGROUPS]; /* groups */
+};
+
struct kinfo_proc {
struct extern_proc kp_proc; /* proc structure */
struct eproc {
struct proc *e_paddr; /* address of proc */
struct session *e_sess; /* session pointer */
- struct pcred e_pcred; /* process credentials */
- struct ucred e_ucred; /* current credentials */
+ struct _pcred e_pcred; /* process credentials */
+ struct _ucred e_ucred; /* current credentials */
struct vmspace e_vm; /* address space */
pid_t e_ppid; /* parent process id */
pid_t e_pgid; /* process group id */
short e_xrssize; /* text rss */
short e_xccount; /* text references */
short e_xswrss;
- long e_flag;
+ int32_t e_flag;
#define EPROC_CTTY 0x01 /* controlling tty vnode active */
#define EPROC_SLEADER 0x02 /* session leader */
#define COMAPT_MAXLOGNAME 12
char e_login[COMAPT_MAXLOGNAME]; /* short setlogin() name */
- long e_spare[4];
+ int32_t e_spare[4];
} kp_eproc;
};
+
+#ifdef BSD_KERNEL_PRIVATE
+#include <sys/proc_internal.h>
+
+// LP64todo - should this move?
+
+/* LP64 version of _pcred. all pointers
+ * grow when we're dealing with a 64-bit process.
+ * WARNING - keep in sync with _pcred
+ */
+
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=natural
+#endif
+
+struct user_pcred {
+ char pc_lock[72]; /* opaque content */
+ user_addr_t pc_ucred; /* Current credentials. */
+ uid_t p_ruid; /* Real user id. */
+ uid_t p_svuid; /* Saved effective user id. */
+ gid_t p_rgid; /* Real group id. */
+ gid_t p_svgid; /* Saved effective group id. */
+ int p_refcnt; /* Number of references. */
+};
+
+/* LP64 version of kinfo_proc. all pointers
+ * grow when we're dealing with a 64-bit process.
+ * WARNING - keep in sync with kinfo_proc
+ */
+struct user_kinfo_proc {
+ struct user_extern_proc kp_proc; /* proc structure */
+ struct user_eproc {
+ user_addr_t e_paddr; /* address of proc */
+ user_addr_t e_sess; /* session pointer */
+ struct user_pcred e_pcred; /* process credentials */
+ struct _ucred e_ucred; /* current credentials */
+ struct user_vmspace e_vm; /* address space */
+ pid_t e_ppid; /* parent process id */
+ pid_t e_pgid; /* process group id */
+ short e_jobc; /* job control counter */
+ dev_t e_tdev; /* controlling tty dev */
+ pid_t e_tpgid; /* tty process group id */
+ user_addr_t e_tsess; /* tty session pointer */
+ char e_wmesg[WMESGLEN+1]; /* wchan message */
+ segsz_t e_xsize; /* text size */
+ short e_xrssize; /* text rss */
+ short e_xccount; /* text references */
+ short e_xswrss;
+ int32_t e_flag;
+ char e_login[COMAPT_MAXLOGNAME]; /* short setlogin() name */
+ int32_t e_spare[4];
+ } kp_eproc;
+};
+
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=reset
+#endif
+
+#endif /* BSD_KERNEL_PRIVATE */
+
#endif /* __APPLE_API_UNSTABLE */
/*
*/
#define VM_METER 1 /* struct vmmeter */
#define VM_LOADAVG 2 /* struct loadavg */
-#define VM_MAXID 3 /* number of valid vm ids */
+/*
+ * Note: "3" was skipped sometime ago and should probably remain unused
+ * to avoid any new entry from being accepted by older kernels...
+ */
#define VM_MACHFACTOR 4 /* struct loadavg with mach factor*/
+#define VM_SWAPUSAGE 5 /* total swap usage */
+#define VM_MAXID 6 /* number of valid vm ids */
#define CTL_VM_NAMES { \
{ 0, 0 }, \
{ "vmmeter", CTLTYPE_STRUCT }, \
- { "loadavg", CTLTYPE_STRUCT } \
+ { "loadavg", CTLTYPE_STRUCT }, \
+ { 0, 0 }, /* placeholder for "3" (see comment above) */ \
+ { "machfactor", CTLTYPE_STRUCT }, \
+ { "swapusage", CTLTYPE_STRUCT } \
}
+struct xsw_usage {
+ u_int64_t xsu_total;
+ u_int64_t xsu_avail;
+ u_int64_t xsu_used;
+ u_int32_t xsu_pagesize;
+ boolean_t xsu_encrypted;
+};
+
+#ifdef __APPLE_API_PRIVATE
+/* Load average structure. Use of fixpt_t assume <sys/types.h> in scope. */
+/* XXX perhaps we should protect fixpt_t, and define it here (or discard it) */
+struct loadavg {
+ fixpt_t ldavg[3];
+ long fscale;
+};
+extern struct loadavg averunnable;
+#define LSCALE 1000 /* scaling for "fixed point" arithmetic */
+
+// LP64todo - should this move?
+#ifdef BSD_KERNEL_PRIVATE
+
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=natural
+#endif
+struct user_loadavg {
+ fixpt_t ldavg[3];
+ user_long_t fscale;
+};
+
+#if __DARWIN_ALIGN_NATURAL
+#pragma options align=reset
+#endif
+
+#endif /* BSD_KERNEL_PRIVATE */
+#endif /* __APPLE_API_PRIVATE */
+
+
/*
* CTL_HW identifiers
*/
#define HW_L3SETTINGS 21 /* int: L3 Cache Settings */
#define HW_L3CACHESIZE 22 /* int: L3 Cache Size in Bytes */
#define HW_TB_FREQ 23 /* int: Bus Frequency */
-#define HW_MAXID 24 /* number of valid hw ids */
+#define HW_MEMSIZE 24 /* uint64_t: physical ram size */
+#define HW_AVAILCPU 25 /* int: number of available CPUs */
+#define HW_MAXID 26 /* number of valid hw ids */
#define CTL_HW_NAMES { \
{ 0, 0 }, \
{ "l2cachesize", CTLTYPE_INT }, \
{ "l3settings", CTLTYPE_INT }, \
{ "l3cachesize", CTLTYPE_INT }, \
- { "tbfrequency", CTLTYPE_INT } \
+ { "tbfrequency", CTLTYPE_INT }, \
+ { "memsize", CTLTYPE_QUAD }, \
+ { "availcpu", CTLTYPE_INT } \
}
+/*
+ * These are the support HW selectors for sysctlbyname. Parameters that are byte counts or frequencies are 64 bit numbers.
+ * All other parameters are 32 bit numbers.
+ *
+ * hw.memsize - The number of bytes of physical memory in the system.
+ *
+ * hw.ncpu - The maximum number of processors that could be available this boot.
+ * Use this value for sizing of static per processor arrays; i.e. processor load statistics.
+ *
+ * hw.activecpu - The number of processors currently available for executing threads.
+ * Use this number to determine the number threads to create in SMP aware applications.
+ * This number can change when power management modes are changed.
+ *
+ * hw.physicalcpu - The number of physical processors available in the current power management mode.
+ * hw.physicalcpu_max - The maximum number of physical processors that could be available this boot
+ *
+ * hw.logicalcpu - The number of logical processors available in the current power management mode.
+ * hw.logicalcpu_max - The maximum number of logical processors that could be available this boot
+ *
+ * hw.tbfrequency - This gives the time base frequency used by the OS and is the basis of all timing services.
+ * In general is is better to use mach's or higher level timing services, but this value
+ * is needed to convert the PPC Time Base registers to real time.
+ *
+ * hw.cpufrequency - These values provide the current, min and max cpu frequency. The min and max are for
+ * hw.cpufrequency_max - all power management modes. The current frequency is the max frequency in the current mode.
+ * hw.cpufrequency_min - All frequencies are in Hz.
+ *
+ * hw.busfrequency - These values provide the current, min and max bus frequency. The min and max are for
+ * hw.busfrequency_max - all power management modes. The current frequency is the max frequency in the current mode.
+ * hw.busfrequency_min - All frequencies are in Hz.
+ *
+ * hw.cputype - These values provide the mach-o cpu type and subtype. A complete list is in <mach/machine.h>
+ * hw.cpusubtype - These values should be used to determine what processor family the running cpu is from so that
+ * the best binary can be chosen, or the best dynamic code generated. They should not be used
+ * to determine if a given processor feature is available.
+ * hw.cputhreadtype - This value will be present if the processor supports threads. Like hw.cpusubtype this selector
+ * should not be used to infer features, and only used to name the processors thread architecture.
+ * The values are defined in <mach/machine.h>
+ *
+ * hw.byteorder - Gives the byte order of the processor. 4321 for big endian, 1234 for little.
+ *
+ * hw.pagesize - Gives the size in bytes of the pages used by the processor and VM system.
+ *
+ * hw.cachelinesize - Gives the size in bytes of the processor's cache lines.
+ * This value should be use to control the strides of loops that use cache control instructions
+ * like dcbz, dcbt or dcbst.
+ *
+ * hw.l1dcachesize - These values provide the size in bytes of the L1, L2 and L3 caches. If a cache is not present
+ * hw.l1icachesize - then the selector will return and error.
+ * hw.l2cachesize -
+ * hw.l3cachesize -
+ *
+ *
+ * These are the selectors for optional processor features. Selectors that return errors are not support on the system.
+ * Supported features will return 1 if they are recommended or 0 if they are supported but are not expected to help performance.
+ * Future versions of these selectors may return larger values as necessary so it is best to test for non zero.
+ *
+ * hw.optional.floatingpoint - Floating Point Instructions
+ * hw.optional.altivec - AltiVec Instructions
+ * hw.optional.graphicsops - Graphics Operations
+ * hw.optional.64bitops - 64-bit Instructions
+ * hw.optional.fsqrt - HW Floating Point Square Root Instruction
+ * hw.optional.stfiwx - Store Floating Point as Integer Word Indexed Instructions
+ * hw.optional.dcba - Data Cache Block Allocate Instruction
+ * hw.optional.datastreams - Data Streams Instructions
+ * hw.optional.dcbtstreams - Data Cache Block Touch Steams Instruction Form
+ *
+ */
+
+
/*
* CTL_USER definitions
*/
#define CTL_DEBUG_MAXID 20
#ifdef KERNEL
-#ifdef __APPLE_API_UNSTABLE
-
-extern struct sysctl_oid_list sysctl__children;
-SYSCTL_DECL(_kern);
-SYSCTL_DECL(_sysctl);
-SYSCTL_DECL(_vm);
-SYSCTL_DECL(_vfs);
-SYSCTL_DECL(_net);
-SYSCTL_DECL(_debug);
-SYSCTL_DECL(_hw);
-SYSCTL_DECL(_machdep);
-SYSCTL_DECL(_user);
-
-
#ifdef DEBUG
/*
* CTL_DEBUG variables.
extern struct ctldebug debug15, debug16, debug17, debug18, debug19;
#endif /* DEBUG */
+#ifdef BSD_KERNEL_PRIVATE
extern char machine[];
extern char osrelease[];
extern char ostype[];
void sysctl_register_set(struct linker_set *lsp);
void sysctl_unregister_set(struct linker_set *lsp);
+void sysctl_mib_init(void);
int kernel_sysctl(struct proc *p, int *name, u_int namelen, void *old,
- size_t *oldlenp, void *new, size_t newlen,
- size_t *retval);
-int userland_sysctl(struct proc *p, int *name, u_int namelen, void *old,
- size_t *oldlenp, int inkernel, void *new, size_t newlen,
+ size_t *oldlenp, void *newp, size_t newlen);
+int userland_sysctl(struct proc *p, int *name, u_int namelen, user_addr_t old,
+ size_t *oldlenp, int inkernel, user_addr_t newp, size_t newlen,
size_t *retval);
+
/*
* Internal sysctl function calling convention:
*
* the name.
*/
typedef int (sysctlfn)
- __P((int *, u_int, void *, size_t *, void *, size_t, struct proc *));
-
-int sysctl_int __P((void *, size_t *, void *, size_t, int *));
-int sysctl_rdint __P((void *, size_t *, void *, int));
-int sysctl_quad __P((void *, size_t *, void *, size_t, quad_t *));
-int sysctl_rdquad __P((void *, size_t *, void *, quad_t));
-int sysctl_string __P((void *, size_t *, void *, size_t, char *, int));
-int sysctl_rdstring __P((void *, size_t *, void *, char *));
-int sysctl_rdstruct __P((void *, size_t *, void *, void *, int));
-void fill_eproc __P((struct proc *, struct eproc *));
-
-#endif /* __APPLE_API_UNSTABLE */
+ (int *, u_int, user_addr_t, size_t *, user_addr_t, size_t, struct proc *);
+
+int sysctl_int(user_addr_t, size_t *, user_addr_t, size_t, int *);
+int sysctl_rdint(user_addr_t, size_t *, user_addr_t, int);
+int sysctl_quad(user_addr_t, size_t *, user_addr_t, size_t, quad_t *);
+int sysctl_rdquad(void *, size_t *, void *, quad_t);
+int sysctl_string(user_addr_t, size_t *, user_addr_t, size_t, char *, int);
+int sysctl_trstring(user_addr_t, size_t *, user_addr_t, size_t, char *, int);
+int sysctl_rdstring(user_addr_t, size_t *, user_addr_t, char *);
+int sysctl_rdstruct(user_addr_t, size_t *, user_addr_t, void *, int);
+
+#endif /* BSD_KERNEL_PRIVATE */
#else /* !KERNEL */
-#include <sys/cdefs.h>
__BEGIN_DECLS
-int sysctl __P((int *, u_int, void *, size_t *, void *, size_t));
-int sysctlbyname __P((const char *, void *, size_t *, void *, size_t));
+int sysctl(int *, u_int, void *, size_t *, void *, size_t);
+int sysctlbyname(const char *, void *, size_t *, void *, size_t);
+int sysctlnametomib(const char *, int *, size_t *);
__END_DECLS
+
#endif /* KERNEL */
+
+
+#endif /* SYSCTL_DEF_ENABLED */
+
+
#endif /* !_SYS_SYSCTL_H_ */
projects / apple / xnu.git / blobdiff