bughz/sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use KSTAT_NAMED_STR_PTR if available

Browse Source
This commit is contained in:
Doug MacEachern 2006-10-10 01:00:22 +00:00
parent 65a63c4650
commit 10e8d8804f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/os/solaris/solaris_sigar.c
View File

@ -246,6 +246,11 @@ int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap)
return SIGAR_OK; return SIGAR_OK;
} }
#ifndef KSTAT_NAMED_STR_PTR
/* same offset as KSTAT_NAMED_STR_PTR(brand) */
#define KSTAT_NAMED_STR_PTR(n) (char *)((n)->value.i32)
#endif
static int get_chip_brand(sigar_t *sigar, int processor, static int get_chip_brand(sigar_t *sigar, int processor,
sigar_cpu_info_t *info) sigar_cpu_info_t *info)
{ {
@ -261,8 +266,8 @@ static int get_chip_brand(sigar_t *sigar, int processor,
(kstat_read(sigar->kc, ksp, NULL) != -1) && (kstat_read(sigar->kc, ksp, NULL) != -1) &&
(brand = (kstat_named_t *)kstat_data_lookup(ksp, "brand"))) (brand = (kstat_named_t *)kstat_data_lookup(ksp, "brand")))
{ {
/* same offset as KSTAT_NAMED_STR_PTR(brand) */ char *name = KSTAT_NAMED_STR_PTR(brand);
char *name = (char *)brand->value.i32;
char *vendor = "Sun"; char *vendor = "Sun";
char *vendors[] = { char *vendors[] = {
"Intel", "AMD", NULL "Intel", "AMD", NULL