diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2010-04-09 04:19:35 +0400 |
|---|---|---|
| committer | Zoltan Varga <vargaz@gmail.com> | 2010-04-09 04:19:35 +0400 |
| commit | 9c2103dcee403afc9efb0d2ee6e67e4f0525b9e4 (patch) | |
| tree | e250e72954cc3469b25635503a00f7ca9bbd8645 | |
| parent | ac0f4341128c73ea374781e949a3574ad5c00a88 (diff) | |
2010-04-09 Zoltan Varga <vargaz@gmail.com>
* mono-proclib.c: Applied more openbsd changes from Robert Nagy
<robert@openbsd.org>.
svn path=/branches/mono-2-6/mono/; revision=155105
| -rw-r--r-- | mono/utils/ChangeLog | 5 | ||||
| -rw-r--r-- | mono/utils/mono-proclib.c | 15 |
2 files changed, 16 insertions, 4 deletions
diff --git a/mono/utils/ChangeLog b/mono/utils/ChangeLog index 8323bac5406..9fa17e4be21 100644 --- a/mono/utils/ChangeLog +++ b/mono/utils/ChangeLog @@ -1,3 +1,8 @@ +2010-04-09 Zoltan Varga <vargaz@gmail.com> + + * mono-proclib.c: Applied more openbsd changes from Robert Nagy + <robert@openbsd.org>. + 2010-04-08 Gonzalo Paniagua Javier <gonzalo@novell.com> * mono-semaphore.c: set EINTR on windows too. diff --git a/mono/utils/mono-proclib.c b/mono/utils/mono-proclib.c index 3053ca6b178..75043240651 100644 --- a/mono/utils/mono-proclib.c +++ b/mono/utils/mono-proclib.c @@ -22,8 +22,13 @@ #include <sys/user.h> #endif #ifdef HAVE_STRUCT_KINFO_PROC_KP_PROC -#define kinfo_pid_member kp_proc.p_pid -#define kinfo_name_member kp_proc.p_comm +# ifdef KERN_PROC2 +# define kinfo_pid_member p_pid +# define kinfo_name_member p_comm +# else +# define kinfo_pid_member kp_proc.p_pid +# define kinfo_name_member kp_proc.p_comm +# endif #else #define kinfo_pid_member ki_pid #define kinfo_name_member ki_comm @@ -46,11 +51,12 @@ mono_process_list (int *size) #ifdef KERN_PROC2 int mib [6]; size_t data_len = sizeof (struct kinfo_proc2) * 400; + struct kinfo_proc2 *processes = malloc (data_len); #else int mib [4]; size_t data_len = sizeof (struct kinfo_proc) * 400; -#endif /* KERN_PROC2 */ struct kinfo_proc *processes = malloc (data_len); +#endif /* KERN_PROC2 */ void **buf = NULL; if (size) @@ -181,11 +187,12 @@ mono_process_get_name (gpointer pid, char *buf, int len) #ifdef KERN_PROC2 int mib [6]; size_t data_len = sizeof (struct kinfo_proc2); + struct kinfo_proc2 processi; #else int mib [4]; size_t data_len = sizeof (struct kinfo_proc); -#endif /* KERN_PROC2 */ struct kinfo_proc processi; +#endif /* KERN_PROC2 */ memset (buf, 0, len); |