Robert,
I tried to reach you using your email but I get tons of errors.
Are you able to build latest Mono on OpenBSD now? Are you going to
maintain it?
Thanks,
pablo
On 08/04/2010 10:42, Robert Nagy wrote:
> Hey
>
> The following diff removes the XXX hacks from the io-layer OpenBSD
> specific code and and support for get_process_name_from_proc() too.
> It also makes mono-proclib to use the correct kinfo struct.
>
> Index: mono/io-layer/processes.c
> ===================================================================
> --- mono/io-layer/processes.c (revision 155030)
> +++ mono/io-layer/processes.c (working copy)
> @@ -1533,7 +1533,7 @@
> name[2] = KERN_PROC_ALL;
> name[3] = 0;
> name[4] = sizeof(struct kinfo_proc2);
> - name[5] = 400; /* XXX */
> + name[5] = 0;
> #else
> struct kinfo_proc *result;
> static const int name[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL, 0 };
> @@ -1543,7 +1543,7 @@
>
> result = NULL;
> done = FALSE;
> -
> +
> do {
> proclength = 0;
> #if defined(__OpenBSD__)
> @@ -1558,7 +1558,11 @@
>
> if (result == NULL)
> return FALSE;
> -
> +
> +#if defined(__OpenBSD__)
> + name[5] = (int)(proclength / sizeof(struct
> kinfo_proc2));
> +#endif
> +
> err = sysctl ((int *) name, size, result, &proclength,
> NULL, 0);
>
> if (err == 0)
> @@ -2224,10 +2228,12 @@
>
> static gchar *get_process_name_from_proc (pid_t pid)
> {
> +#if !defined(__OpenBSD__)
> + FILE *fp;
> gchar *filename = NULL;
> + gchar buf[256];
> +#endif
> gchar *ret = NULL;
> - gchar buf[256];
> - FILE *fp;
>
> #if defined(PLATFORM_SOLARIS)
> filename = g_strdup_printf ("/proc/%d/psinfo", pid);
> @@ -2248,6 +2254,40 @@
> proc_name (pid, buf, sizeof(buf));
> if (strlen (buf) > 0)
> ret = g_strdup (buf);
> +#elif defined(__OpenBSD__)
> + int mib [6];
> + size_t size;
> + struct kinfo_proc2 *pi;
> +
> + mib [0] = CTL_KERN;
> + mib [1] = KERN_PROC2;
> + mib [2] = KERN_PROC_PID;
> + mib [3] = pid;
> + mib [4] = sizeof(struct kinfo_proc2);
> + mib [5] = 0;
> +
> +retry:
> + if (sysctl(mib, 6, NULL, &size, NULL, 0) < 0)
> + return(ret);
> +
> + if ((pi = malloc(size)) == NULL)
> + return(ret);
> +
> + mib[5] = (int)(size / sizeof(struct kinfo_proc2));
> +
> + if ((sysctl (mib, 6, pi, &size, NULL, 0) < 0) ||
> + (size != sizeof (struct kinfo_proc2))) {
> + if (errno == ENOMEM) {
> + free(pi);
> + goto retry;
> + }
> + return(ret);
> + }
> +
> + if (strlen (pi->p_comm) > 0)
> + ret = g_strdup (pi->p_comm);
> +
> + free(pi);
> #else
> memset (buf, '\0', sizeof(buf));
> filename = g_strdup_printf ("/proc/%d/exe", pid);
> Index: mono/utils/mono-proclib.c
> ===================================================================
> --- mono/utils/mono-proclib.c (revision 155030)
> +++ mono/utils/mono-proclib.c (working copy)
> @@ -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 @@
> #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;
> + struct kinfo_proc *processes = malloc (data_len);
> #endif /* KERN_PROC2 */
> - struct kinfo_proc *processes = malloc (data_len);
> void **buf = NULL;
>
> if (size)
> @@ -181,11 +187,12 @@
> #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);
> + struct kinfo_proc processi;
> #endif /* KERN_PROC2 */
> - struct kinfo_proc processi;
>
> memset (buf, 0, len);
>
> _______________________________________________
> Mono-devel-list mailing list
> [email protected]
> http://lists.ximian.com/mailman/listinfo/mono-devel-list
>
_______________________________________________
Mono-devel-list mailing list
[email protected]
http://lists.ximian.com/mailman/listinfo/mono-devel-list
