G_BEGIN_DECLS

-void glibtop_error_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;

-void glibtop_warn_vr (glibtop *server, const char *format, va_list args) G_GNUC_INTERNAL;

-void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL G_GNUC_NORETURN;

-void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args) G_GNUC_INTERNAL;

-

-void glibtop_error_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;

-void glibtop_warn_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);

-void glibtop_error_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;

-void glibtop_warn_io_r (glibtop *server, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);

-

-void glibtop_error (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;

-void glibtop_warn (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);

-void glibtop_error_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;

-void glibtop_warn_io (const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(1, 2);

+G_GNUC_INTERNAL void glibtop_error_vr (glibtop *server, const char *format, va_list args)  G_GNUC_NORETURN;

+G_GNUC_INTERNAL void glibtop_warn_vr (glibtop *server, const char *format, va_list args) ;

+G_GNUC_INTERNAL void glibtop_error_io_vr (glibtop *server, const char *format, int, va_list args)  G_GNUC_NORETURN;

+G_GNUC_INTERNAL void glibtop_warn_io_vr (glibtop *server, const char *format, int, va_list args) ;

+

+G_GNUC_INTERNAL void glibtop_error_r (glibtop *server, const char *format, ...)  G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;

+G_GNUC_INTERNAL void glibtop_warn_r (glibtop *server, const char *format, ...)  G_GNUC_PRINTF(2, 3);

+G_GNUC_INTERNAL void glibtop_error_io_r (glibtop *server, const char *format, ...)  G_GNUC_PRINTF(2, 3) G_GNUC_NORETURN;

+G_GNUC_INTERNAL void glibtop_warn_io_r (glibtop *server, const char *format, ...)  G_GNUC_PRINTF(2, 3);

+

+G_GNUC_INTERNAL void glibtop_error (const char *format, ...)  G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;

+G_GNUC_INTERNAL void glibtop_warn (const char *format, ...)  G_GNUC_PRINTF(1, 2);

+G_GNUC_INTERNAL void glibtop_error_io (const char *format, ...)  G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN;

+G_GNUC_INTERNAL void glibtop_warn_io (const char *format, ...)  G_GNUC_PRINTF(1, 2);

 G_END_DECLS

 	 *                   fields if their values are corrent ! */

 	int uid;		/* UID of process */

 	int gid;		/* GID of process */

-    int ruid;

-    int rgid;

-    int has_cpu;

-    int processor;

-    int last_processor;

+        gint32  nice;           /*zhua: used to store nice */

+        guint64 start_time;     /* start time of process -- */

+        guint64 vsize;          /* number of pages of virtual memory ... */

+        guint64 resident;       /* number of resident set */

+        guint   load;           /* cpu load for process */

+        gint32  ppid;           /* pid of parent process */

+

 };

 void glibtop_get_proc_state(glibtop_proc_state *buf, pid_t pid);

 #define MSG_BUFSZ		sizeof (struct _glibtop_ipc_message)

 #define MSG_MSGSZ		(MSG_BUFSZ - sizeof (long))

-void handle_parent_connection (int s) G_GNUC_INTERNAL;

-void handle_slave_connection (int input, int output) G_GNUC_INTERNAL;

-void handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,

-			   const void *parameter) G_GNUC_INTERNAL ;

-

-void do_output (int s, glibtop_response *resp, off_t offset,

-		size_t data_size, const void *data) G_GNUC_INTERNAL;

-int do_read (int s, void *ptr, size_t total_size) G_GNUC_INTERNAL;

+G_GNUC_INTERNAL void handle_parent_connection (int s) ;

+G_GNUC_INTERNAL void handle_slave_connection (int input, int output) ;

+G_GNUC_INTERNAL void handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,

+

+G_GNUC_INTERNAL void do_output (int s, glibtop_response *resp, off_t offset,

+		size_t data_size, const void *data) ;

+G_GNUC_INTERNAL int do_read (int s, void *ptr, size_t total_size) ;

-void syslog_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);

-void syslog_io_message (int priority, const char *format, ...) G_GNUC_INTERNAL G_GNUC_PRINTF(2, 3);

+G_GNUC_INTERNAL void syslog_message (int priority, const char *format, ...)  G_GNUC_PRINTF(2, 3);

+G_GNUC_INTERNAL void syslog_io_message (int priority, const char *format, ...)  G_GNUC_PRINTF(2, 3);

 #define _glibtop_get_fsusage_read_write(S, B, P) \

 	_glibtop_freebsd_get_fsusage_read_write(S, B, P)

+#elif (defined(sun) || defined(__sun))

+G_GNUC_INTERNAL void

+_glibtop_sun_get_fsusage_read_write(glibtop *server,

+					glibtop_fsusage *buf,

+					const char *path);

+

+#define _glibtop_get_fsusage_read_write(S, B, P) \

+	_glibtop_sun_get_fsusage_read_write(S, B, P)

 #else /* default fallback */

 #warning glibtop_get_fsusage .read .write are not implemented.

 	for (cur = &entries[0]; cur != NULL; cur = next) {

+                /*zhua: delete these 2 type of fs: objfs,ctfs */

+                if (!strcmp(cur->me_type, "objfs") || !strcmp(cur->me_type,"ctfs")){

+                /* free current mount_entry and move to the next */

+                        next = cur->me_next;

+                        g_free(cur->me_devname);

+                        g_free(cur->me_mountdir);

+                        g_free(cur->me_type);

+                        g_free(cur);

+                        continue;

+                }

 		if(all_fs || !ignore_mount_entry(cur)) {

 			/* add a new glibtop_mountentry */

 			glibtop_mountentry e;

@@ -8,7 +8,7 @@ libgtop_sysdeps_2_0_la_SOURCES	= open.c 

 				  proclist.c procstate.c procuid.c \

 				  proctime.c procmem.c procsignal.c \

 				  prockernel.c procsegment.c procargs.c \

-				  procopenfiles.c \

 				  procmap.c netload.c ppp.c procdata.c netlist.c

 libgtop_sysdeps_2_0_la_LDFLAGS	= $(LT_VERSION_INFO)

 static const unsigned long _glibtop_sysdeps_cpu_all =

 (1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_USER) +

 (1L << GLIBTOP_CPU_SYS) + (1L << GLIBTOP_CPU_IDLE) +

 (1L << GLIBTOP_XCPU_TOTAL) + (1L << GLIBTOP_XCPU_USER) +

 (1L << GLIBTOP_XCPU_SYS) + (1L << GLIBTOP_XCPU_IDLE) +

@@ -0,0 +1,99 @@

+#include <config.h>

+#include <glibtop.h>

+#include <glibtop/error.h>

+#include <glibtop/fsusage.h>

+#include <glibtop/union.h>

+

+#include "glibtop_private.h"

+

+#include <glib.h>

+

+#include <unistd.h>

+#include <kstat.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <sys/statvfs.h>

+

+#include <stdio.h>

+#include <string.h>

+#include <stdlib.h>

+

+G_GNUC_INTERNAL void 

+_glibtop_sun_get_fsusage_read_write(glibtop *server,

+				      glibtop_fsusage *buf,

+				      const char *path)

+{

+        struct statvfs64       statvfsbuf;

+        char            ksname[KSTAT_STRLEN + 1];

+    	kstat_ctl_t * const kctl = server->machine.kc;

+	kstat_t		*ksp;

+     	kstat_io_t     	kio;

+	kstat_named_t   *kread, *kwrite;

+	int i;

+	

+        /*

+         *  get a kstat handle and update the user's kstat chain

+         */

+        if( kctl == NULL ){ 

+                glibtop_warn_io_r (server, "kstat_open ()");

+                return;

+        }

+	

+        /* make sure we have current data */  

+	while( kstat_chain_update( kctl ) != 0 )

+                ;

+		

+         for (ksp = kctl->kc_chain, i =0; ksp != NULL; ksp = ksp->ks_next, i++) {  

+		if (ksp->ks_type == KSTAT_TYPE_IO && strcmp(ksp->ks_class,"disk") == 0) { 

+              		kstat_read(kctl, ksp, &kio);  

+               		buf->read +=  kio.nread;       

+			buf->write +=  kio.nwritten;

+		}  

+	}

+#if 0

+	/* these codes keep here, because they are a good way to get the 

+	   fsusage information, but at the moment, the interfaces used 

+	   are not public or stable. so let's use them when public...

+	  */

+        /*

+         *  get a kstat handle and update the user's kstat chain

+         */

+        if( kctl == NULL ){

+                glibtop_warn_io_r (server, "kstat_open ()");

+                return;

+        }

+	   

+	while( kstat_chain_update( kctl ) != 0 )

+                ;

+

+	if (statvfs64(path, &statvfsbuf) != 0) {

+                glibtop_warn_io_r (server, "kstat_open ()");

+		return;

+	}        

+	snprintf(ksname, KSTAT_STRLEN, "%s%lx", VOPSTATS_STR,

+                        	statvfsbuf.f_fsid);

+

+       	/*

+         *  traverse the kstat chain

+         *  to find the appropriate statistics

+         */

+        if( (ksp = kstat_lookup( kctl,

+                       "unix", 0, ksname )) == NULL ) {

+               	return;

+        }

+        if( kstat_read( kctl, ksp, NULL ) == -1 ) {

+               	return;

+        }

+

+	kread = (kstat_named_t *)kstat_data_lookup(ksp,"read_bytes");

+        if( kread != NULL ) {

+               	buf->read = kread->value.ull;

+        }

+

+        kwrite = (kstat_named_t *)kstat_data_lookup(ksp,"write_bytes");

+        if( kwrite != NULL ) {

+               	buf->write = kwrite->value.ull;

+        }

+#endif

+        buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);

+}

     int pagesize;		/* in bits to shift, ie. 2^pagesize gives Kb */

     int ticks;			/* clock ticks, as returned by sysconf() */

     unsigned long long boot;	/* boot time, although it's ui32 in kstat */

-    void *libproc;		/* libproc handle */

-#if GLIBTOP_SOLARIS_RELEASE >= 50600

-    void (*objname)(void *, uintptr_t, const char *, size_t);

-    struct ps_prochandle *(*pgrab)(pid_t, int, int *);

-    void (*pfree)(void *);

-#else

     void *filler[3];

-#endif

 };

 G_END_DECLS