--- projects/libstatgrab/src/libstatgrab/statgrab.h 2003/03/01 15:01:01 1.8 +++ projects/libstatgrab/src/libstatgrab/statgrab.h 2003/10/20 15:25:47 1.14 @@ -1,7 +1,7 @@ /* * i-scream central monitoring system - * http://www.i-scream.org.uk - * Copyright (C) 2000-2002 i-scream + * http://www.i-scream.org + * Copyright (C) 2000-2003 i-scream * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -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,6 +57,9 @@ typedef struct{ #ifdef SOLARIS #define MAX_LOGIN_NAME_SIZE 8 #endif +#if defined(LINUX) || defined(FREEBSD) +#define MAX_LOGIN_NAME_SIZE UT_NAMESIZE +#endif typedef struct{ char *name_list; @@ -113,8 +116,6 @@ typedef struct{ }network_stat_t; typedef struct{ - long long num_pagein; - long long num_pageout; long long pages_pagein; long long pages_pageout; time_t systime; @@ -145,3 +146,5 @@ network_stat_t *get_network_stats_diff(int *entries); page_stat_t *get_page_stats(); page_stat_t *get_page_stats_diff(); + +int statgrab_init(void);