31 |
|
#include <time.h> |
32 |
|
#include "statgrab.h" |
33 |
|
#include "vector.h" |
34 |
+ |
#include "tools.h" |
35 |
|
|
36 |
|
#ifdef SOLARIS |
37 |
|
#include <sys/mnttab.h> |
43 |
|
#if defined(LINUX) || defined(CYGWIN) |
44 |
|
#include <mntent.h> |
45 |
|
#include <sys/vfs.h> |
45 |
– |
#include "tools.h" |
46 |
|
#endif |
47 |
|
|
48 |
|
#ifdef LINUX |
380 |
|
} |
381 |
|
|
382 |
|
for (i = 0; i < num_disks; i++) { |
383 |
+ |
const char *name; |
384 |
|
u_int64_t rbytes, wbytes; |
385 |
|
|
386 |
|
#ifdef NETBSD |
407 |
|
|
408 |
|
diskio_stats_ptr->read_bytes = rbytes; |
409 |
|
diskio_stats_ptr->write_bytes = wbytes; |
409 |
– |
if (diskio_stats_ptr->disk_name != NULL) { |
410 |
– |
free(diskio_stats_ptr->disk_name); |
411 |
– |
} |
410 |
|
#ifdef NETBSD |
411 |
< |
diskio_stats_ptr->disk_name = strdup(stats[i].dk_name); |
411 |
> |
name = stats[i].dk_name; |
412 |
|
#else |
413 |
< |
diskio_stats_ptr->disk_name = strdup(dk_name[i]); |
413 |
> |
name = dk_name[i]; |
414 |
|
#endif |
415 |
+ |
if (update_string(&diskio_stats_ptr->disk_name, name) == NULL) { |
416 |
+ |
return NULL; |
417 |
+ |
} |
418 |
|
diskio_stats_ptr->systime = time(NULL); |
419 |
|
|
420 |
|
num_diskio++; |
476 |
|
diskio_stats_ptr->write_bytes=dev_ptr->bytes_written; |
477 |
|
#endif |
478 |
|
if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name); |
479 |
< |
asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number); |
479 |
> |
if (asprintf((&diskio_stats_ptr->disk_name), "%s%d", dev_ptr->device_name, dev_ptr->unit_number) == -1) { |
480 |
> |
return NULL; |
481 |
> |
} |
482 |
|
diskio_stats_ptr->systime=time(NULL); |
483 |
|
|
484 |
|
num_diskio++; |
507 |
|
diskio_stats_ptr=diskio_stats+num_diskio; |
508 |
|
|
509 |
|
diskio_stats_ptr->read_bytes=kios.nread; |
507 |
– |
|
510 |
|
diskio_stats_ptr->write_bytes=kios.nwritten; |
511 |
< |
|
512 |
< |
if(diskio_stats_ptr->disk_name!=NULL) free(diskio_stats_ptr->disk_name); |
513 |
< |
|
514 |
< |
diskio_stats_ptr->disk_name=strdup((char *) get_svr_from_bsd(ksp->ks_name)); |
511 |
> |
if (update_string(&diskio_stats_ptr->disk_name, |
512 |
> |
get_svr_from_bsd(ksp->ks_name)) == NULL) { |
513 |
> |
return NULL; |
514 |
> |
} |
515 |
|
diskio_stats_ptr->systime=time(NULL); |
516 |
+ |
|
517 |
|
num_diskio++; |
518 |
|
} |
519 |
|
} |
568 |
|
goto out; |
569 |
|
} |
570 |
|
|
571 |
< |
if (diskio_stats[n].disk_name != NULL) |
572 |
< |
free(diskio_stats[n].disk_name); |
573 |
< |
diskio_stats[n].disk_name = strdup(name); |
571 |
> |
if (update_string(&diskio_stats[n].disk_name, name) == NULL) { |
572 |
> |
goto out; |
573 |
> |
} |
574 |
|
diskio_stats[n].read_bytes = rsect * 512; |
575 |
|
diskio_stats[n].write_bytes = wsect * 512; |
576 |
|
diskio_stats[n].systime = now; |
686 |
|
src = &diskio_stats[i]; |
687 |
|
dest = &diff[i]; |
688 |
|
|
689 |
< |
if (dest->disk_name != NULL) { |
690 |
< |
free(dest->disk_name); |
689 |
> |
if (update_string(&dest->disk_name, src->disk_name) == NULL) { |
690 |
> |
return NULL; |
691 |
|
} |
689 |
– |
dest->disk_name = strdup(src->disk_name); |
692 |
|
dest->read_bytes = src->read_bytes; |
693 |
|
dest->write_bytes = src->write_bytes; |
694 |
|
dest->systime = src->systime; |