Merge pull request #1020 from ludovic-henry/pr7-system-counters
authorLudovic Henry <ludovic.henry@xamarin.com>
Mon, 12 May 2014 21:19:34 +0000 (17:19 -0400)
committerLudovic Henry <ludovic.henry@xamarin.com>
Mon, 12 May 2014 21:19:34 +0000 (17:19 -0400)
[counters] Add system counters

1  2 
mono/utils/mono-counters.c

index 07c71fe60a22c06dfdab5e0830f5489b0ce3f11f,a73b1fb579b541b12b646b5fb77b928d70bfc27e..9d72ba2dcd30e7cc5ed82c5330f7a0be3ce5b336
@@@ -230,42 -143,193 +236,159 @@@ typedef char* (*StrFunc) (void)
  #define ENTRY_FMT "%-36s: "
  static void
  dump_counter (MonoCounter *counter, FILE *outfile) {
 -      int intval;
 -      guint uintval;
 -      gint64 int64val;
 -      guint64 uint64val;
 -      gssize wordval;
 -      double dval;
 -      const char *str;
 +      void *buffer = g_malloc0 (counter->size);
 +      mono_counters_sample (counter, buffer, counter->size);
 +
        switch (counter->type & MONO_COUNTER_TYPE_MASK) {
        case MONO_COUNTER_INT:
 -            if (counter->type & MONO_COUNTER_CALLBACK)
 -                    intval = ((IntFunc)counter->addr) ();
 -            else
 -                    intval = *(int*)counter->addr;
 -            fprintf (outfile, ENTRY_FMT "%d\n", counter->name, intval);
 -            break;
 +              fprintf (outfile, ENTRY_FMT "%d\n", counter->name, *(int*)buffer);
 +              break;
        case MONO_COUNTER_UINT:
 -            if (counter->type & MONO_COUNTER_CALLBACK)
 -                    uintval = ((UIntFunc)counter->addr) ();
 -            else
 -                    uintval = *(guint*)counter->addr;
 -            fprintf (outfile, ENTRY_FMT "%u\n", counter->name, uintval);
 -            break;
 +              fprintf (outfile, ENTRY_FMT "%u\n", counter->name, *(guint*)buffer);
 +              break;
        case MONO_COUNTER_LONG:
 -            if (counter->type & MONO_COUNTER_CALLBACK)
 -                    int64val = ((LongFunc)counter->addr) ();
 -            else
 -                    int64val = *(gint64*)counter->addr;
 -            if (mono_counter_get_unit (counter) == MONO_COUNTER_TIME)
 -                    fprintf (outfile, ENTRY_FMT "%.2f ms\n", counter->name, (double)int64val / 10000.0);
 -            else
 -                    fprintf (outfile, ENTRY_FMT "%lld\n", counter->name, (long long)int64val);
 -            break;
 +              if ((counter->type & MONO_COUNTER_UNIT_MASK) == MONO_COUNTER_TIME)
 +                      fprintf (outfile, ENTRY_FMT "%.2f ms\n", counter->name, (double)(*(gint64*)buffer) / 10000.0);
 +              else
 +                      fprintf (outfile, ENTRY_FMT "%lld\n", counter->name, *(gint64*)buffer);
 +              break;
        case MONO_COUNTER_ULONG:
 -            if (counter->type & MONO_COUNTER_CALLBACK)
 -                    uint64val = ((ULongFunc)counter->addr) ();
 -            else
 -                    uint64val = *(guint64*)counter->addr;
 -            fprintf (outfile, ENTRY_FMT "%llu\n", counter->name, (unsigned long long)uint64val);
 -            break;
 +              fprintf (outfile, ENTRY_FMT "%llu\n", counter->name, *(guint64*)buffer);
 +              break;
        case MONO_COUNTER_WORD:
 -            if (counter->type & MONO_COUNTER_CALLBACK)
 -                    wordval = ((PtrFunc)counter->addr) ();
 -            else
 -                    wordval = *(gssize*)counter->addr;
 -            fprintf (outfile, ENTRY_FMT "%zd\n", counter->name, (gint64)wordval);
 -            break;
 +              fprintf (outfile, ENTRY_FMT "%zd\n", counter->name, *(gssize*)buffer);
 +              break;
        case MONO_COUNTER_DOUBLE:
 -            if (counter->type & MONO_COUNTER_CALLBACK)
 -                    dval = ((DoubleFunc)counter->addr) ();
 -            else
 -                    dval = *(double*)counter->addr;
 -            fprintf (outfile, ENTRY_FMT "%.4f\n", counter->name, dval);
 -            break;
 +              fprintf (outfile, ENTRY_FMT "%.4f\n", counter->name, *(double*)buffer);
 +              break;
        case MONO_COUNTER_STRING:
 -            if (counter->type & MONO_COUNTER_CALLBACK)
 -                    str = ((StrFunc)counter->addr) ();
 -            else
 -                    str = *(char**)counter->addr;
 -            fprintf (outfile, ENTRY_FMT "%s\n", counter->name, str);
 -            break;
 +              fprintf (outfile, ENTRY_FMT "%s\n", counter->name, (counter->size == 0) ? "(null)" : (char*)buffer);
 +              break;
        case MONO_COUNTER_TIME_INTERVAL:
 -              if (counter->type & MONO_COUNTER_CALLBACK)
 -                      int64val = ((LongFunc)counter->addr) ();
 -              else
 -                      int64val = *(gint64*)counter->addr;
 -              fprintf (outfile, ENTRY_FMT "%.2f ms\n", counter->name, (double)int64val / 1000.0);
 +              fprintf (outfile, ENTRY_FMT "%.2f ms\n", counter->name, (double)(*(gint64*)buffer) / 1000.0);
                break;
        }
 +
 +      g_free (buffer);
  }
  
+ static gint64
+ user_time ()
+ {
+       return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_USER_TIME);
+ }
+ static gint64
+ system_time ()
+ {
+       return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_SYSTEM_TIME);
+ }
+ static gint64
+ total_time ()
+ {
+       return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_TOTAL_TIME);
+ }
+ static gint64
+ working_set ()
+ {
+       return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_WORKING_SET);
+ }
+ static gint64
+ private_bytes ()
+ {
+       return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_PRIVATE_BYTES);
+ }
+ static gint64
+ virtual_bytes ()
+ {
+       return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_VIRTUAL_BYTES);
+ }
+ static gint64
+ page_faults ()
+ {
+       return mono_process_get_data (GINT_TO_POINTER (mono_process_current_pid ()), MONO_PROCESS_FAULTS);
+ }
+ static double
+ cpu_load (int kind)
+ {
+ #if defined(TARGET_WIN32)
+ #elif defined(TARGET_MACH)
+       double load [3];
+       if (getloadavg (load, 3) > 0)
+               return load [kind];
+ #else
+       char buffer[512], *b;
+       int len, i;
+       FILE *f = fopen ("/proc/loadavg", "r");
+       if (f) {
+               len = fread (buffer, 1, sizeof (buffer) - 1, f);
+               if (len > 0) {
+                       buffer [len < 511 ? len : 511] = 0;
+                       b = buffer;
+                       for (i = 0; i < 3; i++) {
+                               if (kind == i)
+                                       return strtod (b, NULL);
+                               if (i < 2) {
+                                       b = strchr (b, ' ');
+                                       if (!b)
+                                               return 0;
+                                       b += 1;
+                               }
+                       }
+               }
+               fclose (f);
+       }
+ #endif
+       return 0;
+ }
+ static double
+ cpu_load_1min ()
+ {
+       return cpu_load (0);
+ }
+ static double
+ cpu_load_5min ()
+ {
+       return cpu_load (1);
+ }
+ static double
+ cpu_load_15min ()
+ {
+       return cpu_load (2);
+ }
+ static gboolean system_counters_initialized = FALSE;
+ #define SYSCOUNTER_TIME (MONO_COUNTER_SYSTEM | MONO_COUNTER_LONG | MONO_COUNTER_TIME | MONO_COUNTER_MONOTONIC | MONO_COUNTER_CALLBACK)
+ #define SYSCOUNTER_BYTES (MONO_COUNTER_SYSTEM | MONO_COUNTER_LONG | MONO_COUNTER_BYTES | MONO_COUNTER_VARIABLE | MONO_COUNTER_CALLBACK)
+ #define SYSCOUNTER_COUNT (MONO_COUNTER_SYSTEM | MONO_COUNTER_LONG | MONO_COUNTER_COUNT | MONO_COUNTER_MONOTONIC | MONO_COUNTER_CALLBACK)
+ #define SYSCOUNTER_LOAD (MONO_COUNTER_SYSTEM | MONO_COUNTER_DOUBLE | MONO_COUNTER_PERCENTAGE | MONO_COUNTER_VARIABLE | MONO_COUNTER_CALLBACK)
+ static void
+ initialize_system_counters ()
+ {
+       mono_counters_register ("User Time", SYSCOUNTER_TIME, &user_time);
+       mono_counters_register ("System Time", SYSCOUNTER_TIME, &system_time);
+       mono_counters_register ("Total Time", SYSCOUNTER_TIME, &total_time);
+       mono_counters_register ("Working Set", SYSCOUNTER_BYTES, &working_set);
+       mono_counters_register ("Private Bytes", SYSCOUNTER_BYTES, &private_bytes);
+       mono_counters_register ("Virtual Bytes", SYSCOUNTER_BYTES, &virtual_bytes);
+       mono_counters_register ("Page Faults", SYSCOUNTER_COUNT, &page_faults);
+       mono_counters_register ("CPU Load Average - 1min", SYSCOUNTER_LOAD, &cpu_load_1min);
+       mono_counters_register ("CPU Load Average - 5min", SYSCOUNTER_LOAD, &cpu_load_5min);
+       mono_counters_register ("CPU Load Average - 15min", SYSCOUNTER_LOAD, &cpu_load_15min);
+       system_counters_initialized = TRUE;
+ }
  
  /**
   * mono_counters_foreach: