fix uv_cpu_info on solaris

joyent · Dec 15, 2011 · 2702b68 · 2702b68
1 parent b34cfb4
commit 2702b68
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/unix/sunos.c b/src/unix/sunos.c
@@ -352,20 +352,20 @@ uv_err_t uv_cpu_info(uv_cpu_info_t** cpu_infos, int* count) {
       cpu_info->cpu_times.irq = 0;
     } else {
       knp = (kstat_named_t *) kstat_data_lookup(ksp, (char *)"cpu_ticks_user");
-      assert(knp->data_type == KSTAT_DATA_INT32);
-      cpu_info->cpu_times.user = knp->value.i32;
+      assert(knp->data_type == KSTAT_DATA_UINT64);
+      cpu_info->cpu_times.user = knp->value.ui64;
 
       knp = (kstat_named_t *) kstat_data_lookup(ksp, (char *)"cpu_ticks_kernel");
-      assert(knp->data_type == KSTAT_DATA_INT32);
-      cpu_info->cpu_times.sys = knp->value.i32;
+      assert(knp->data_type == KSTAT_DATA_UINT64);
+      cpu_info->cpu_times.sys = knp->value.ui64;
 
       knp = (kstat_named_t *) kstat_data_lookup(ksp, (char *)"cpu_ticks_idle");
-      assert(knp->data_type == KSTAT_DATA_INT32);
-      cpu_info->cpu_times.idle = knp->value.i32;
+      assert(knp->data_type == KSTAT_DATA_UINT64);
+      cpu_info->cpu_times.idle = knp->value.ui64;
 
       knp = (kstat_named_t *) kstat_data_lookup(ksp, (char *)"intr");
-      assert(knp->data_type == KSTAT_DATA_INT32);
-      cpu_info->cpu_times.irq = knp->value.i32;
+      assert(knp->data_type == KSTAT_DATA_UINT64);
+      cpu_info->cpu_times.irq = knp->value.ui64;
       cpu_info->cpu_times.nice = 0;
     }
 

diff --git a/test/test-platform-output.c b/test/test-platform-output.c
@@ -62,6 +62,7 @@ TEST_IMPL(platform_output) {
   uv_free_cpu_info(cpus, count);
 
   err = uv_interface_addresses(&interfaces, &count);
+  ASSERT(UV_OK == err.code);
 
   fprintf(stderr, "uv_interface_addresses:\n");
   for (i = 0; i < count; i++) {