2010-06-15 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / utils / mono-proclib.c

diff --git a/mono/utils/mono-proclib.c b/mono/utils/mono-proclib.c
index a8897e6180d65320d65808047f9c6e75dbf1f317..a51e75ab552a36fb2414b63ce017ed2679b03e97 100644 (file)
--- a/mono/utils/mono-proclib.c
+++ b/mono/utils/mono-proclib.c
@@ -8,12 +8,13 @@
 #include <unistd.h>
 #endif
 
-#ifdef PLATFORM_WIN32
+#ifdef HOST_WIN32
 #include <windows.h>
 #endif
 
 /* FIXME: bsds untested */
 #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#include <sys/param.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
 #include <sys/proc.h>
@@ -21,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
@@ -41,10 +47,16 @@ gpointer*
 mono_process_list (int *size)
 {
 #if USE_SYSCTL
-       int mib [4];
        int res, i;
+#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 */
        void **buf = NULL;
 
        if (size)
@@ -52,17 +64,33 @@ mono_process_list (int *size)
        if (!processes)
                return NULL;
 
+#ifdef KERN_PROC2
+       mib [0] = CTL_KERN;
+       mib [1] = KERN_PROC2;
+       mib [2] = KERN_PROC_ALL;
+       mib [3] = 0;
+       mib [4] = sizeof(struct kinfo_proc2);
+       mib [5] = 400; /* XXX */
+
+       res = sysctl (mib, 6, processes, &data_len, NULL, 0);
+#else
        mib [0] = CTL_KERN;
        mib [1] = KERN_PROC;
        mib [2] = KERN_PROC_ALL;
        mib [3] = 0;
        
        res = sysctl (mib, 4, processes, &data_len, NULL, 0);
+#endif /* KERN_PROC2 */
+
        if (res < 0) {
                free (processes);
                return NULL;
        }
+#ifdef KERN_PROC2
+       res = data_len/sizeof (struct kinfo_proc2);
+#else
        res = data_len/sizeof (struct kinfo_proc);
+#endif /* KERN_PROC2 */
        buf = g_realloc (buf, res * sizeof (void*));
        for (i = 0; i < res; ++i)
                buf [i] = GINT_TO_POINTER (processes [i].kinfo_pid_member);
@@ -155,14 +183,33 @@ char*
 mono_process_get_name (gpointer pid, char *buf, int len)
 {
 #if USE_SYSCTL
-       int mib [4];
        int res;
-       char *p;
+#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 */
 
        memset (buf, 0, len);
 
+#ifdef KERN_PROC2
+       mib [0] = CTL_KERN;
+       mib [1] = KERN_PROC2;
+       mib [2] = KERN_PROC_PID;
+       mib [3] = GPOINTER_TO_UINT (pid);
+       mib [4] = sizeof(struct kinfo_proc2);
+       mib [5] = 400; /* XXX */
+
+       res = sysctl (mib, 6, &processi, &data_len, NULL, 0);
+
+       if (res < 0 || data_len != sizeof (struct kinfo_proc2)) {
+               return buf;
+       }
+#else
        mib [0] = CTL_KERN;
        mib [1] = KERN_PROC;
        mib [2] = KERN_PROC_PID;
@@ -172,6 +219,7 @@ mono_process_get_name (gpointer pid, char *buf, int len)
        if (res < 0 || data_len != sizeof (struct kinfo_proc)) {
                return buf;
        }
+#endif /* KERN_PROC2 */
        strncpy (buf, processi.kinfo_name_member, len - 1);
        return buf;
 #else
@@ -279,8 +327,8 @@ static gint64
 get_process_stat_time (int pid, int pos, int sum, MonoProcessError *error)
 {
        gint64 val = get_process_stat_item (pid, pos, sum, error);
-       /* return milliseconds */
-       return (val * 1000) / get_user_hz ();
+       /* return 100ns ticks */
+       return (val * 10000000) / get_user_hz ();
 }
 
 static gint64
@@ -316,11 +364,11 @@ mono_process_get_data_with_error (gpointer pid, MonoProcessData data, MonoProces
        case MONO_PROCESS_NUM_THREADS:
                return get_pid_status_item (rpid, "Threads", error);
        case MONO_PROCESS_USER_TIME:
-               return get_process_stat_time (rpid, 12, FALSE, error);
+               return get_process_stat_time (rpid, 10, FALSE, error);
        case MONO_PROCESS_SYSTEM_TIME:
-               return get_process_stat_time (rpid, 13, FALSE, error);
+               return get_process_stat_time (rpid, 11, FALSE, error);
        case MONO_PROCESS_TOTAL_TIME:
-               return get_process_stat_time (rpid, 12, TRUE, error);
+               return get_process_stat_time (rpid, 10, TRUE, error);
        case MONO_PROCESS_WORKING_SET:
                return get_pid_status_item (rpid, "VmRSS", error) * 1024;
        case MONO_PROCESS_WORKING_SET_PEAK:
@@ -382,7 +430,7 @@ mono_cpu_count (void)
                        return count;
        }
 #endif
-#ifdef PLATFORM_WIN32
+#ifdef HOST_WIN32
        {
                SYSTEM_INFO info;
                GetSystemInfo (&info);
@@ -403,7 +451,8 @@ get_cpu_times (int cpu_id, gint64 *user, gint64 *systemt, gint64 *irq, gint64 *s
        FILE *f = fopen ("/proc/stat", "r");
        if (!f)
                return;
-       hz *= mono_cpu_count ();
+       if (cpu_id < 0)
+               hz *= mono_cpu_count ();
        while ((s = fgets (buf, sizeof (buf), f))) {
                char *data = NULL;
                if (cpu_id < 0 && strncmp (s, "cpu", 3) == 0 && g_ascii_isspace (s [3])) {