| 30 |
|
#include <string.h> |
| 31 |
|
#include <time.h> |
| 32 |
|
#include "statgrab.h" |
| 33 |
+ |
#include "vector.h" |
| 34 |
|
|
| 35 |
|
#ifdef SOLARIS |
| 36 |
|
#include <sys/mnttab.h> |
| 76 |
|
"ntfs"} |
| 77 |
|
#endif |
| 78 |
|
|
| 78 |
– |
#define START_VAL 1 |
| 79 |
– |
|
| 79 |
|
char *copy_string(char *orig_ptr, const char *newtext){ |
| 80 |
|
|
| 81 |
|
/* Maybe free if not NULL, and strdup rather than realloc and strcpy? */ |
| 88 |
|
return orig_ptr; |
| 89 |
|
} |
| 90 |
|
|
| 91 |
+ |
static void disk_stat_init(disk_stat_t *d) { |
| 92 |
+ |
d->device_name = NULL; |
| 93 |
+ |
d->fs_type = NULL; |
| 94 |
+ |
d->mnt_point = NULL; |
| 95 |
+ |
} |
| 96 |
|
|
| 97 |
< |
void init_disk_stat(int start, int end, disk_stat_t *disk_stats){ |
| 98 |
< |
|
| 99 |
< |
for(disk_stats+=start; start<=end; start++){ |
| 100 |
< |
disk_stats->device_name=NULL; |
| 97 |
< |
disk_stats->fs_type=NULL; |
| 98 |
< |
disk_stats->mnt_point=NULL; |
| 99 |
< |
|
| 100 |
< |
disk_stats++; |
| 101 |
< |
} |
| 97 |
> |
static void disk_stat_destroy(disk_stat_t *d) { |
| 98 |
> |
free(d->device_name); |
| 99 |
> |
free(d->fs_type); |
| 100 |
> |
free(d->mnt_point); |
| 101 |
|
} |
| 102 |
|
|
| 103 |
|
int is_valid_fs_type(const char *type) { |
| 113 |
|
} |
| 114 |
|
|
| 115 |
|
disk_stat_t *get_disk_stats(int *entries){ |
| 116 |
+ |
VECTOR_DECLARE_STATIC(disk_stats, disk_stat_t, 10, |
| 117 |
+ |
disk_stat_init, disk_stat_destroy); |
| 118 |
|
|
| 118 |
– |
static disk_stat_t *disk_stats; |
| 119 |
– |
static int watermark=-1; |
| 120 |
– |
|
| 119 |
|
int valid_type; |
| 120 |
|
int num_disks=0; |
| 121 |
|
#if defined(LINUX) || defined (SOLARIS) || defined(CYGWIN) |
| 137 |
|
struct statfs *mp; |
| 138 |
|
#endif |
| 139 |
|
|
| 142 |
– |
if(watermark==-1){ |
| 143 |
– |
disk_stats=malloc(START_VAL * sizeof(disk_stat_t)); |
| 144 |
– |
if(disk_stats==NULL){ |
| 145 |
– |
return NULL; |
| 146 |
– |
} |
| 147 |
– |
watermark=START_VAL; |
| 148 |
– |
init_disk_stat(0, watermark-1, disk_stats); |
| 149 |
– |
} |
| 140 |
|
#ifdef ALLBSD |
| 141 |
|
nummnt=getmntinfo(&mp , MNT_LOCAL); |
| 142 |
|
if (nummnt<=0){ |
| 171 |
|
#endif |
| 172 |
|
|
| 173 |
|
if(valid_type){ |
| 174 |
< |
if(num_disks>watermark-1){ |
| 175 |
< |
disk_ptr=disk_stats; |
| 186 |
< |
if((disk_stats=realloc(disk_stats, (watermark*2 * sizeof(disk_stat_t))))==NULL){ |
| 187 |
< |
disk_stats=disk_ptr; |
| 188 |
< |
return NULL; |
| 189 |
< |
} |
| 190 |
< |
|
| 191 |
< |
watermark=watermark*2; |
| 192 |
< |
init_disk_stat(num_disks, watermark-1, disk_stats); |
| 174 |
> |
if (VECTOR_RESIZE(disk_stats, num_disks + 1) < 0) { |
| 175 |
> |
return NULL; |
| 176 |
|
} |
| 194 |
– |
|
| 177 |
|
disk_ptr=disk_stats+num_disks; |
| 178 |
+ |
|
| 179 |
|
#ifdef ALLBSD |
| 180 |
|
if((disk_ptr->device_name=copy_string(disk_ptr->device_name, mp->f_mntfromname))==NULL){ |
| 181 |
|
return NULL; |
| 264 |
|
return disk_stats; |
| 265 |
|
|
| 266 |
|
} |
| 284 |
– |
void diskio_stat_init(int start, int end, diskio_stat_t *diskio_stats){ |
| 267 |
|
|
| 268 |
< |
for(diskio_stats+=start; start<end; start++){ |
| 269 |
< |
diskio_stats->disk_name=NULL; |
| 288 |
< |
|
| 289 |
< |
diskio_stats++; |
| 290 |
< |
} |
| 268 |
> |
static void diskio_stat_init(diskio_stat_t *d) { |
| 269 |
> |
d->disk_name = NULL; |
| 270 |
|
} |
| 271 |
|
|
| 272 |
< |
diskio_stat_t *diskio_stat_malloc(int needed_entries, int *cur_entries, diskio_stat_t *diskio_stats){ |
| 273 |
< |
|
| 295 |
< |
if(diskio_stats==NULL){ |
| 296 |
< |
|
| 297 |
< |
if((diskio_stats=malloc(needed_entries * sizeof(diskio_stat_t)))==NULL){ |
| 298 |
< |
return NULL; |
| 299 |
< |
} |
| 300 |
< |
diskio_stat_init(0, needed_entries, diskio_stats); |
| 301 |
< |
*cur_entries=needed_entries; |
| 302 |
< |
|
| 303 |
< |
return diskio_stats; |
| 304 |
< |
} |
| 305 |
< |
|
| 306 |
< |
|
| 307 |
< |
if(*cur_entries<needed_entries){ |
| 308 |
< |
diskio_stats=realloc(diskio_stats, (sizeof(diskio_stat_t)*needed_entries)); |
| 309 |
< |
if(diskio_stats==NULL){ |
| 310 |
< |
return NULL; |
| 311 |
< |
} |
| 312 |
< |
diskio_stat_init(*cur_entries, needed_entries, diskio_stats); |
| 313 |
< |
*cur_entries=needed_entries; |
| 314 |
< |
} |
| 315 |
< |
|
| 316 |
< |
return diskio_stats; |
| 272 |
> |
static void diskio_stat_destroy(diskio_stat_t *d) { |
| 273 |
> |
free(d->disk_name); |
| 274 |
|
} |
| 275 |
|
|
| 276 |
< |
static diskio_stat_t *diskio_stats=NULL; |
| 277 |
< |
static int num_diskio=0; |
| 276 |
> |
VECTOR_DECLARE_STATIC(diskio_stats, diskio_stat_t, 10, |
| 277 |
> |
diskio_stat_init, diskio_stat_destroy); |
| 278 |
|
|
| 279 |
|
#ifdef LINUX |
| 280 |
|
typedef struct { |
| 284 |
|
#endif |
| 285 |
|
|
| 286 |
|
diskio_stat_t *get_diskio_stats(int *entries){ |
| 287 |
< |
|
| 331 |
< |
static int sizeof_diskio_stats=0; |
| 287 |
> |
int num_diskio; |
| 288 |
|
#ifndef LINUX |
| 289 |
|
diskio_stat_t *diskio_stats_ptr; |
| 290 |
|
#endif |
| 415 |
|
continue; |
| 416 |
|
} |
| 417 |
|
|
| 418 |
< |
diskio_stats = diskio_stat_malloc(num_diskio + 1, |
| 463 |
< |
&sizeof_diskio_stats, |
| 464 |
< |
diskio_stats); |
| 465 |
< |
if (diskio_stats == NULL) { |
| 418 |
> |
if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) { |
| 419 |
|
return NULL; |
| 420 |
|
} |
| 421 |
|
diskio_stats_ptr = diskio_stats + num_diskio; |
| 477 |
|
#else |
| 478 |
|
if((dev_ptr->bytes_read==0) && (dev_ptr->bytes_written==0)) continue; |
| 479 |
|
#endif |
| 480 |
< |
if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){ |
| 480 |
> |
|
| 481 |
> |
if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) { |
| 482 |
|
return NULL; |
| 483 |
|
} |
| 484 |
|
diskio_stats_ptr=diskio_stats+num_diskio; |
| 513 |
|
if((kstat_read(kc, ksp, &kios))==-1){ |
| 514 |
|
} |
| 515 |
|
|
| 516 |
< |
if((diskio_stats=diskio_stat_malloc(num_diskio+1, &sizeof_diskio_stats, diskio_stats))==NULL){ |
| 516 |
> |
if (VECTOR_RESIZE(diskio_stats, num_diskio + 1) < 0) { |
| 517 |
|
kstat_close(kc); |
| 518 |
|
return NULL; |
| 519 |
|
} |
| 574 |
|
wsect = 0; |
| 575 |
|
} |
| 576 |
|
|
| 577 |
< |
diskio_stats = diskio_stat_malloc(n + 1, &sizeof_diskio_stats, |
| 578 |
< |
diskio_stats); |
| 579 |
< |
if (diskio_stats == NULL) goto out; |
| 577 |
> |
if (VECTOR_RESIZE(diskio_stats, n + 1) < 0) { |
| 578 |
> |
goto out; |
| 579 |
> |
} |
| 580 |
|
if (n >= alloc_parts) { |
| 581 |
|
alloc_parts += 16; |
| 582 |
|
parts = realloc(parts, alloc_parts * sizeof *parts); |
| 683 |
|
} |
| 684 |
|
|
| 685 |
|
diskio_stat_t *get_diskio_stats_diff(int *entries){ |
| 686 |
< |
static diskio_stat_t *diff = NULL; |
| 687 |
< |
static int diff_count = 0; |
| 686 |
> |
VECTOR_DECLARE_STATIC(diff, diskio_stat_t, 1, |
| 687 |
> |
diskio_stat_init, diskio_stat_destroy); |
| 688 |
|
diskio_stat_t *src = NULL, *dest; |
| 689 |
< |
int i, j, new_count; |
| 689 |
> |
int i, j, diff_count, new_count; |
| 690 |
|
|
| 691 |
|
if (diskio_stats == NULL) { |
| 692 |
|
/* No previous stats, so we can't calculate a difference. */ |
| 694 |
|
} |
| 695 |
|
|
| 696 |
|
/* Resize the results array to match the previous stats. */ |
| 697 |
< |
diff = diskio_stat_malloc(num_diskio, &diff_count, diff); |
| 698 |
< |
if (diff == NULL) { |
| 697 |
> |
diff_count = VECTOR_SIZE(diskio_stats); |
| 698 |
> |
if (VECTOR_RESIZE(diff, diff_count) < 0) { |
| 699 |
|
return NULL; |
| 700 |
|
} |
| 701 |
|
|
