--- projects/libstatgrab/src/libstatgrab/statgrab.h 2003/02/18 23:12:08 1.2 +++ projects/libstatgrab/src/libstatgrab/statgrab.h 2003/03/03 15:26:23 1.10 @@ -21,13 +21,13 @@ #include typedef struct{ - uint_t user; - uint_t kernel; - uint_t idle; - uint_t iowait; - uint_t swap; - uint_t nice; - uint_t total; + long long user; + long long kernel; + long long idle; + long long iowait; + long long swap; + long long nice; + long long total; time_t systime; }cpu_states_t; @@ -57,11 +57,12 @@ typedef struct{ #ifdef SOLARIS #define MAX_LOGIN_NAME_SIZE 8 #endif +#ifdef LINUX +#define MAX_LOGIN_NAME_SIZE UT_NAMESIZE +#endif -typedef char name[MAX_LOGIN_NAME_SIZE+1]; - typedef struct{ - name *name_list; + char *name_list; int num_entries; }user_stat_t; @@ -93,6 +94,13 @@ typedef struct { }disk_stat_t; typedef struct{ + char *disk_name; + long long read_bytes; + long long write_bytes; + time_t systime; +}diskio_stat_t; + +typedef struct{ int total; int running; int sleeping; @@ -130,9 +138,13 @@ swap_stat_t *get_swap_stats(); general_stat_t *get_general_stats(); disk_stat_t *get_disk_stats(int *entries); +diskio_stat_t *get_diskio_stats(int *entries); +diskio_stat_t *get_diskio_stats_diff(int *entries); process_stat_t *get_process_stats(); network_stat_t *get_network_stats(int *entries); +network_stat_t *get_network_stats_diff(int *entries); page_stat_t *get_page_stats(); +page_stat_t *get_page_stats_diff();