diff options
| author | Bill Pijewski <wdp@joyent.com> | 2011-06-20 17:50:25 -0700 |
|---|---|---|
| committer | Bill Pijewski <wdp@joyent.com> | 2011-06-20 17:51:35 -0700 |
| commit | 189f13542c3afadf757cf8ebbaef04fb0cdbf454 (patch) | |
| tree | ee6ca957efb30a2b810bee1a8e6821f099814d39 /usr/src | |
| parent | a6719b526c4a518d825f9e4bc0506e37bee09605 (diff) | |
| download | illumos-joyent-189f13542c3afadf757cf8ebbaef04fb0cdbf454.tar.gz | |
OS-446 want zonename field in zone_vfs/zone_zfs kstats
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/os/zone.c | 10 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/zone.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/usr/src/uts/common/os/zone.c b/usr/src/uts/common/os/zone.c index 870d276e69..2ad2d3c3a9 100644 --- a/usr/src/uts/common/os/zone.c +++ b/usr/src/uts/common/os/zone.c @@ -1961,9 +1961,13 @@ zone_vfs_kstat_create(zone_t *zone) kstat_zone_add(ksp, GLOBAL_ZONEID); zvp = ksp->ks_data = kmem_zalloc(sizeof (zone_vfs_kstat_t), KM_SLEEP); + ksp->ks_data_size += strlen(zone->zone_name) + 1; ksp->ks_lock = &zone->zone_vfs_lock; zone->zone_vfs_stats = zvp; + /* The kstat "name" field is not large enough for a full zonename */ + kstat_named_init(&zvp->zv_zonename, "zonename", KSTAT_DATA_STRING); + kstat_named_setstr(&zvp->zv_zonename, zone->zone_name); kstat_named_init(&zvp->zv_nread, "nread", KSTAT_DATA_UINT64); kstat_named_init(&zvp->zv_reads, "reads", KSTAT_DATA_UINT64); kstat_named_init(&zvp->zv_rtime, "rtime", KSTAT_DATA_UINT64); @@ -2033,9 +2037,13 @@ zone_zfs_kstat_create(zone_t *zone) kstat_zone_add(ksp, GLOBAL_ZONEID); zzp = ksp->ks_data = kmem_zalloc(sizeof (zone_zfs_kstat_t), KM_SLEEP); + ksp->ks_data_size += strlen(zone->zone_name) + 1; ksp->ks_lock = &zone->zone_zfs_lock; zone->zone_zfs_stats = zzp; + /* The kstat "name" field is not large enough for a full zonename */ + kstat_named_init(&zzp->zz_zonename, "zonename", KSTAT_DATA_STRING); + kstat_named_setstr(&zzp->zz_zonename, zone->zone_name); kstat_named_init(&zzp->zz_nread, "nread", KSTAT_DATA_UINT64); kstat_named_init(&zzp->zz_reads, "reads", KSTAT_DATA_UINT64); kstat_named_init(&zzp->zz_rtime, "rtime", KSTAT_DATA_UINT64); @@ -3491,7 +3499,7 @@ zone_loadavg_update() /* Now calculate the 1min, 5min, 15 min load avg. */ hr_avg = 0; for (i = 0; i < S_LOADAVG_SZ; i++) - hr_avg += lavg->lg_loads[i]; + hr_avg += lavg->lg_loads[i]; hr_avg = hr_avg / S_LOADAVG_SZ; nrun = hr_avg / (NANOSEC / LGRP_LOADAVG_IN_THREAD_MAX); diff --git a/usr/src/uts/common/sys/zone.h b/usr/src/uts/common/sys/zone.h index 1de1385132..32c80691df 100644 --- a/usr/src/uts/common/sys/zone.h +++ b/usr/src/uts/common/sys/zone.h @@ -390,6 +390,7 @@ typedef struct { } sys_zio_cntr_t; typedef struct { + kstat_named_t zv_zonename; kstat_named_t zv_nread; kstat_named_t zv_reads; kstat_named_t zv_rtime; @@ -406,6 +407,7 @@ typedef struct { } zone_vfs_kstat_t; typedef struct { + kstat_named_t zz_zonename; kstat_named_t zz_nread; kstat_named_t zz_reads; kstat_named_t zz_rtime; |