| 664 |
|
} |
| 665 |
|
|
| 666 |
|
diskio_stat_t *get_diskio_stats_diff(int *entries){ |
| 667 |
< |
static diskio_stat_t *diskio_stats_diff=NULL; |
| 668 |
< |
static int sizeof_diskio_stats_diff=0; |
| 669 |
< |
diskio_stat_t *diskio_stats_diff_ptr, *diskio_stats_ptr; |
| 670 |
< |
int disks, x, y; |
| 667 |
> |
static diskio_stat_t *diff = NULL; |
| 668 |
> |
static int diff_count = 0; |
| 669 |
> |
diskio_stat_t *src, *dest; |
| 670 |
> |
int i, j, new_count; |
| 671 |
|
|
| 672 |
< |
if(diskio_stats==NULL){ |
| 673 |
< |
diskio_stats_ptr=get_diskio_stats(&disks); |
| 674 |
< |
*entries=disks; |
| 675 |
< |
return diskio_stats_ptr; |
| 672 |
> |
if (diskio_stats == NULL) { |
| 673 |
> |
/* No previous stats, so we can't calculate a difference. */ |
| 674 |
> |
return get_diskio_stats(entries); |
| 675 |
|
} |
| 676 |
|
|
| 677 |
< |
diskio_stats_diff=diskio_stat_malloc(num_diskio, &sizeof_diskio_stats_diff, diskio_stats_diff); |
| 678 |
< |
if(diskio_stats_diff==NULL){ |
| 677 |
> |
/* Resize the results array to match the previous stats. */ |
| 678 |
> |
diff = diskio_stat_malloc(num_diskio, &diff_count, diff); |
| 679 |
> |
if (diff == NULL) { |
| 680 |
|
return NULL; |
| 681 |
|
} |
| 682 |
|
|
| 683 |
< |
diskio_stats_diff_ptr=diskio_stats_diff; |
| 684 |
< |
diskio_stats_ptr=diskio_stats; |
| 683 |
> |
/* Copy the previous stats into the result. */ |
| 684 |
> |
for (i = 0; i < diff_count; i++) { |
| 685 |
> |
src = &diskio_stats[i]; |
| 686 |
> |
dest = &diff[i]; |
| 687 |
|
|
| 688 |
< |
for(disks=0;disks<num_diskio;disks++){ |
| 689 |
< |
if(diskio_stats_diff_ptr->disk_name!=NULL){ |
| 688 |
< |
free(diskio_stats_diff_ptr->disk_name); |
| 688 |
> |
if (dest->disk_name != NULL) { |
| 689 |
> |
free(dest->disk_name); |
| 690 |
|
} |
| 691 |
< |
diskio_stats_diff_ptr->disk_name=strdup(diskio_stats_ptr->disk_name); |
| 692 |
< |
diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes; |
| 693 |
< |
diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes; |
| 694 |
< |
diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime; |
| 694 |
< |
|
| 695 |
< |
diskio_stats_diff_ptr++; |
| 696 |
< |
diskio_stats_ptr++; |
| 691 |
> |
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; |
| 695 |
|
} |
| 696 |
|
|
| 697 |
< |
diskio_stats_ptr=get_diskio_stats(&disks); |
| 698 |
< |
if (diskio_stats_ptr == NULL) { |
| 697 |
> |
/* Get a new set of stats. */ |
| 698 |
> |
if (get_diskio_stats(&new_count) == NULL) { |
| 699 |
|
return NULL; |
| 700 |
|
} |
| 703 |
– |
diskio_stats_diff_ptr=diskio_stats_diff; |
| 701 |
|
|
| 702 |
< |
for(x=0;x<sizeof_diskio_stats_diff;x++){ |
| 702 |
> |
/* For each previous stat... */ |
| 703 |
> |
for (i = 0; i < diff_count; i++) { |
| 704 |
> |
dest = &diff[i]; |
| 705 |
|
|
| 706 |
< |
if((strcmp(diskio_stats_diff_ptr->disk_name, diskio_stats_ptr->disk_name))==0){ |
| 707 |
< |
diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes-diskio_stats_diff_ptr->read_bytes; |
| 708 |
< |
diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes-diskio_stats_diff_ptr->write_bytes; |
| 709 |
< |
diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime-diskio_stats_diff_ptr->systime; |
| 710 |
< |
}else{ |
| 711 |
< |
diskio_stats_ptr=diskio_stats; |
| 712 |
< |
for(y=0;y<disks;y++){ |
| 714 |
< |
if((strcmp(diskio_stats_diff_ptr->disk_name, diskio_stats_ptr->disk_name))==0){ |
| 715 |
< |
diskio_stats_diff_ptr->read_bytes=diskio_stats_ptr->read_bytes-diskio_stats_diff_ptr->read_bytes; |
| 716 |
< |
diskio_stats_diff_ptr->write_bytes=diskio_stats_ptr->write_bytes-diskio_stats_diff_ptr->write_bytes; |
| 717 |
< |
diskio_stats_diff_ptr->systime=diskio_stats_ptr->systime-diskio_stats_diff_ptr->systime; |
| 718 |
< |
|
| 719 |
< |
break; |
| 720 |
< |
} |
| 721 |
< |
|
| 722 |
< |
diskio_stats_ptr++; |
| 706 |
> |
/* ... find the corresponding new stat ... */ |
| 707 |
> |
for (j = 0; j < new_count; j++) { |
| 708 |
> |
/* Try the new stat in the same position first, |
| 709 |
> |
since that's most likely to be it. */ |
| 710 |
> |
src = &diskio_stats[(i + j) % new_count]; |
| 711 |
> |
if (strcmp(src->disk_name, dest->disk_name) == 0) { |
| 712 |
> |
break; |
| 713 |
|
} |
| 714 |
|
} |
| 715 |
+ |
if (j == new_count) { |
| 716 |
+ |
/* No match found. */ |
| 717 |
+ |
continue; |
| 718 |
+ |
} |
| 719 |
|
|
| 720 |
< |
diskio_stats_ptr++; |
| 721 |
< |
diskio_stats_diff_ptr++; |
| 722 |
< |
|
| 720 |
> |
/* ... and subtract the previous stat from it to get the |
| 721 |
> |
difference. */ |
| 722 |
> |
dest->read_bytes = src->read_bytes - dest->read_bytes; |
| 723 |
> |
dest->write_bytes = src->write_bytes - dest->write_bytes; |
| 724 |
> |
dest->systime = src->systime - dest->systime; |
| 725 |
|
} |
| 726 |
< |
|
| 727 |
< |
*entries=sizeof_diskio_stats_diff; |
| 728 |
< |
return diskio_stats_diff; |
| 726 |
> |
|
| 727 |
> |
*entries = diff_count; |
| 728 |
> |
return diff; |
| 729 |
|
} |
| 730 |
+ |
|
