diff -crN ./libgtop/ChangeLog /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/ChangeLog *** ./libgtop/ChangeLog Tue Sep 9 01:57:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/ChangeLog Thu Oct 16 13:28:06 2003 *************** *** 1,3 **** --- 1,4 ---- + 2003-09-08 Kevin Vandersloot * configure.in: release 2.0.5 diff -crN ./libgtop/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/configure.in *** ./libgtop/configure.in Tue Sep 9 01:57:43 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/configure.in Tue Jan 27 15:27:33 2004 *************** *** 397,402 **** --- 397,406 ---- LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS" + if test "x$LIBGTOP_EXTRA_LIBS_PC" = "x" ; then + LIBGTOP_EXTRA_LIBS_PC=LIBGTOP_EXTRA_LIBS + fi + LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0" LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0" *************** *** 430,435 **** --- 434,440 ---- AC_SUBST(INCLUDES) AC_SUBST(LIBGTOP_EXTRA_LIBS) + AC_SUBST(LIBGTOP_EXTRA_LIBS_PC) AC_SUBST(GLIB_LIBS) AC_SUBST(LIBGTOP_LIBS) AC_SUBST(LIBGTOP_INCS) diff -crN ./libgtop/examples/second.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/examples/second.c *** ./libgtop/examples/second.c Mon Jan 13 03:33:03 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/examples/second.c Mon Feb 24 15:45:08 2003 *************** *** 1,4 **** ! /* $Id: second.c,v 1.20.4.3.2.2 2002/12/27 11:15:04 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: second.c,v 1.1.3.3 2003/02/24 14:45:06 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/examples/smp.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/examples/smp.c *** ./libgtop/examples/smp.c Mon Jan 13 03:33:03 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/examples/smp.c Mon Feb 24 15:46:27 2003 *************** *** 1,4 **** ! /* $Id: smp.c,v 1.3.2.1.2.2 2002/12/27 11:15:04 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: smp.c,v 1.1.3.3 2003/02/24 14:46:25 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/libgtop-2.0.pc.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/libgtop-2.0.pc.in *** ./libgtop/libgtop-2.0.pc.in Sun Aug 24 19:57:13 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/libgtop-2.0.pc.in Mon Jan 26 14:54:50 2004 *************** *** 7,13 **** Description: Portable System Access Library Requires: glib-2.0 Version: @VERSION@ ! Libs: -L${libdir} @LIBGTOP_LIBS@ @LIBGTOP_EXTRA_LIBS@ Cflags: -I${includedir}/libgtop-2.0 --- 7,13 ---- Description: Portable System Access Library Requires: glib-2.0 Version: @VERSION@ ! Libs: -L${libdir} @LIBGTOP_LIBS@ @LIBGTOP_EXTRA_LIBS_PC@ Cflags: -I${includedir}/libgtop-2.0 diff -crN ./libgtop/libgtop-sysdeps.m4 /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/libgtop-sysdeps.m4 *** ./libgtop/libgtop-sysdeps.m4 Mon Jan 13 03:33:00 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/libgtop-sysdeps.m4 Mon Feb 24 15:58:55 2003 *************** *** 138,144 **** libgtop_use_machine_h=yes libgtop_need_server=yes libgtop_have_sysinfo=yes ! libgtop_postinstall='chgrp system $(bindir)/libgtop_server && chmod g+s $(bindir)/libgtop_server2' ;; *) if test x$hacker_mode = xyes ; then --- 138,144 ---- libgtop_use_machine_h=yes libgtop_need_server=yes libgtop_have_sysinfo=yes ! libgtop_postinstall='chgrp system $(bindir)/libgtop_server2 && chmod g+s $(bindir)/libgtop_server2' ;; *) if test x$hacker_mode = xyes ; then diff -crN ./libgtop/src/daemon/server.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/src/daemon/server.c *** ./libgtop/src/daemon/server.c Mon Jan 13 03:33:13 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/src/daemon/server.c Wed Apr 9 10:14:23 2003 *************** *** 1,5 **** - /* $Id: server.c,v 1.11.2.1.2.1 2002/12/27 11:15:07 hadess Exp $ */ - /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,3 ---- diff -crN ./libgtop/sysdeps/aix/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/Makefile.am *** ./libgtop/sysdeps/aix/Makefile.am Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/Makefile.am Mon Dec 30 17:14:35 2002 *************** *** 4,19 **** lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la ! libgtop_sysdeps_2_0_la_SOURCES = siglist.c nosuid.c libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) ! libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ ! uptime.c loadavg.c shm_limits.c msg_limits.c \ ! sem_limits.c proclist.c procstate.c procuid.c \ ! proctime.c procmem.c procsignal.c prockernel.c \ ! procsegment.c procargs.c procmap.c netload.c \ ! ppp.c utils.c utils.h sysinfo.c libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) libgtop_sysdeps_suid_2_0_la_LIBADD = $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la $(GLIB_LIBS) --- 4,21 ---- lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la ! libgtop_sysdeps_2_0_la_SOURCES = siglist.c nosuid.c mem.c swap.c uptime.c \ ! procargs.c prockernel.c proclist.c procmap.c \ ! procmem.c procsegment.c procsignal.c \ ! proctime.c procuid.c procmem.c utils.c \ ! procstate.c sysinfo.c ! libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) ! libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c loadavg.c \ ! msg_limits.c shm_limits.c sem_limits.c \ ! netload.c ppp.c utils.c libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO) libgtop_sysdeps_suid_2_0_la_LIBADD = $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la $(GLIB_LIBS) diff -crN ./libgtop/sysdeps/aix/close.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/close.c *** ./libgtop/sysdeps/aix/close.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/close.c Tue Sep 24 15:27:36 2002 *************** *** 1,4 **** ! /* $Id: close.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: close.c,v 1.1.2.2 2002/09/24 14:24:09 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/sysdeps/aix/cpu.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/cpu.c *** ./libgtop/sysdeps/aix/cpu.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/cpu.c Mon Dec 30 17:07:31 2002 *************** *** 1,4 **** ! /* $Id: cpu.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: cpu.c,v 1.1.2.9 2002/12/30 16:07:26 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 52,57 **** --- 52,64 ---- server->ncpu = 0; /* means single-processor, see glibtop.h */ } + result = _glibtop_get_kmem_offset(server, "sysinfo"); + if (result == -1) + { + return; + } + server->machine.sysinfo_offset = result; + result = _glibtop_get_kmem_offset(server, "cpuinfo"); if (result == -1) { *************** *** 73,83 **** --- 80,106 ---- { int result; int cpu; + struct sysinfo sysinfo; glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_CPU), 0); memset (buf, 0, sizeof (glibtop_cpu)); + result = _glibtop_get_kmem_info(server, server->machine.sysinfo_offset, + &sysinfo, sizeof(struct sysinfo)); + if (result <= 0) + { + glibtop_error_io_r (server, "Cannot read sysinfo"); + return; + } + + buf->idle = sysinfo.cpu[CPU_IDLE]; + buf->user = sysinfo.cpu[CPU_USER]; + buf->sys = sysinfo.cpu[CPU_KERNEL]; + buf->nice = sysinfo.cpu[CPU_WAIT]; + + buf->total = buf->idle + buf->user + buf->sys + buf->nice ; + result = _glibtop_get_kmem_info(server, server->machine.cpuinfo_offset, server->machine.cpuinfo, _system_configuration.ncpus *************** *** 89,125 **** return; } ! buf->idle = 0; ! buf->user = 0; ! buf->sys = 0; ! buf->nice = 0; ! for (cpu = 0; cpu < _system_configuration.ncpus; cpu++) ! { ! if (cpu < GLIBTOP_NCPU) ! { ! buf->xcpu_idle[cpu] = ! server->machine.cpuinfo[cpu].cpu[CPU_IDLE]; ! buf->xcpu_user[cpu] = ! server->machine.cpuinfo[cpu].cpu[CPU_USER]; ! buf->xcpu_sys[cpu] = ! server->machine.cpuinfo[cpu].cpu[CPU_KERNEL]; ! buf->xcpu_nice[cpu] = ! server->machine.cpuinfo[cpu].cpu[CPU_WAIT]; ! ! buf->xcpu_total[cpu] = buf->xcpu_idle[cpu] + ! buf->xcpu_user[cpu] + ! buf->xcpu_sys[cpu] + ! buf->xcpu_nice[cpu]; ! } ! ! buf->idle += server->machine.cpuinfo[cpu].cpu[CPU_IDLE]; ! buf->user += server->machine.cpuinfo[cpu].cpu[CPU_USER]; ! buf->sys += server->machine.cpuinfo[cpu].cpu[CPU_KERNEL]; ! buf->nice += server->machine.cpuinfo[cpu].cpu[CPU_WAIT]; ! ! buf->total = buf->idle + buf->user + buf->sys + buf->nice ; } ! buf->frequency = sysconf(_SC_CLK_TCK); buf->flags = _glibtop_sysdeps_cpu; } --- 112,134 ---- return; } ! for (cpu = 0; cpu < MIN(GLIBTOP_NCPU, _system_configuration.ncpus); cpu++) ! { ! buf->xcpu_idle[cpu] = ! server->machine.cpuinfo[cpu].cpu[CPU_IDLE]; ! buf->xcpu_user[cpu] = ! server->machine.cpuinfo[cpu].cpu[CPU_USER]; ! buf->xcpu_sys[cpu] = ! server->machine.cpuinfo[cpu].cpu[CPU_KERNEL]; ! buf->xcpu_nice[cpu] = ! server->machine.cpuinfo[cpu].cpu[CPU_WAIT]; ! ! buf->xcpu_total[cpu] = buf->xcpu_idle[cpu] + ! buf->xcpu_user[cpu] + ! buf->xcpu_sys[cpu] + ! buf->xcpu_nice[cpu]; } ! buf->frequency = sysconf(_SC_CLK_TCK); buf->flags = _glibtop_sysdeps_cpu; } diff -crN ./libgtop/sysdeps/aix/glibtop_machine.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/glibtop_machine.h *** ./libgtop/sysdeps/aix/glibtop_machine.h Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/glibtop_machine.h Mon Dec 30 17:09:01 2002 *************** *** 1,4 **** ! /* $Id: glibtop_machine.h,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: glibtop_machine.h,v 1.1.2.10 2002/12/30 16:08:56 vivierl Exp $ */ /* This file is part of LibGTop 1.0. *************** *** 38,43 **** --- 38,44 ---- int kmem_fd; off_t cpuinfo_offset; + off_t sysinfo_offset; off_t ifnet_offset; off_t loadavg_offset; off_t shminfo_offset; diff -crN ./libgtop/sysdeps/aix/glibtop_server.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/glibtop_server.h *** ./libgtop/sysdeps/aix/glibtop_server.h Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/glibtop_server.h Mon Dec 30 17:13:05 2002 *************** *** 1,4 **** ! /* $Id: glibtop_server.h,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: glibtop_server.h,v 1.1.2.8 2002/12/30 16:13:00 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 29,35 **** #define GLIBTOP_SUID_CPU (1 << GLIBTOP_SYSDEPS_CPU) #define GLIBTOP_SUID_MEM 0 #define GLIBTOP_SUID_SWAP 0 ! #define GLIBTOP_SUID_UPTIME (1 << GLIBTOP_SYSDEPS_UPTIME) #define GLIBTOP_SUID_LOADAVG (1 << GLIBTOP_SYSDEPS_LOADAVG) #define GLIBTOP_SUID_SHM_LIMITS (1 << GLIBTOP_SYSDEPS_SHM_LIMITS) #define GLIBTOP_SUID_MSG_LIMITS (1 << GLIBTOP_SYSDEPS_MSG_LIMITS) --- 29,35 ---- #define GLIBTOP_SUID_CPU (1 << GLIBTOP_SYSDEPS_CPU) #define GLIBTOP_SUID_MEM 0 #define GLIBTOP_SUID_SWAP 0 ! #define GLIBTOP_SUID_UPTIME 0 #define GLIBTOP_SUID_LOADAVG (1 << GLIBTOP_SYSDEPS_LOADAVG) #define GLIBTOP_SUID_SHM_LIMITS (1 << GLIBTOP_SYSDEPS_SHM_LIMITS) #define GLIBTOP_SUID_MSG_LIMITS (1 << GLIBTOP_SYSDEPS_MSG_LIMITS) diff -crN ./libgtop/sysdeps/aix/glibtop_suid.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/glibtop_suid.h *** ./libgtop/sysdeps/aix/glibtop_suid.h Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/glibtop_suid.h Tue Oct 15 12:50:09 2002 *************** *** 1,4 **** ! /* $Id: glibtop_suid.h,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: glibtop_suid.h,v 1.1.2.4 2002/10/15 11:50:04 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/sysdeps/aix/loadavg.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/loadavg.c *** ./libgtop/sysdeps/aix/loadavg.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/loadavg.c Tue Oct 15 12:48:53 2002 *************** *** 1,4 **** ! /* $Id: loadavg.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: loadavg.c,v 1.1.2.5 2002/10/15 11:48:48 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/sysdeps/aix/mem.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/mem.c *** ./libgtop/sysdeps/aix/mem.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/mem.c Mon Dec 30 17:04:55 2002 *************** *** 1,4 **** ! /* $Id: mem.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: mem.c,v 1.1.2.7 2002/12/30 16:04:52 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 49,54 **** --- 49,56 ---- int pagesize; int result; + glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_MEM), 0); + memset (buf, 0, sizeof (glibtop_mem)); pagesize = sysconf(_SC_PAGESIZE); diff -crN ./libgtop/sysdeps/aix/msg_limits.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/msg_limits.c *** ./libgtop/sysdeps/aix/msg_limits.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/msg_limits.c Tue Oct 15 12:47:58 2002 *************** *** 1,4 **** ! /* $Id: msg_limits.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: msg_limits.c,v 1.1.2.3 2002/10/15 11:47:54 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/sysdeps/aix/netload.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/netload.c *** ./libgtop/sysdeps/aix/netload.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/netload.c Mon Dec 30 17:03:21 2002 *************** *** 1,4 **** ! /* $Id: netload.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: netload.c,v 1.1.2.4 2002/12/30 16:03:17 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 119,124 **** --- 119,126 ---- long mask; char name[16]; + glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0); + memset (buf, 0, sizeof (glibtop_netload)); for ( offset = server->machine.ifnet_offset; diff -crN ./libgtop/sysdeps/aix/nosuid.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/nosuid.c *** ./libgtop/sysdeps/aix/nosuid.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/nosuid.c Wed Oct 16 10:25:41 2002 *************** *** 1,4 **** ! /* $Id: nosuid.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: nosuid.c,v 1.1.2.3 2002/10/16 09:25:36 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/sysdeps/aix/open.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/open.c *** ./libgtop/sysdeps/aix/open.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/open.c Wed Oct 9 13:00:53 2002 *************** *** 1,4 **** ! /* $Id: open.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: open.c,v 1.1.2.4 2002/10/09 12:00:49 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/sysdeps/aix/ppp.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/ppp.c *** ./libgtop/sysdeps/aix/ppp.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/ppp.c Tue Sep 24 15:28:07 2002 *************** *** 1,4 **** ! /* $Id: ppp.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: ppp.c,v 1.1.2.2 2002/09/24 14:25:11 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/sysdeps/aix/procargs.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procargs.c *** ./libgtop/sysdeps/aix/procargs.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procargs.c Mon Dec 30 16:58:50 2002 *************** *** 1,4 **** ! /* $Id: procargs.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: procargs.c,v 1.1.2.5 2002/12/30 15:58:45 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 63,68 **** --- 63,70 ---- int result; int len; + glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_ARGS), 0); + memset (buf, 0, sizeof (glibtop_proc_args)); pinfo = _glibtop_get_procinfo(server, pid); diff -crN ./libgtop/sysdeps/aix/prockernel.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/prockernel.c *** ./libgtop/sysdeps/aix/prockernel.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/prockernel.c Mon Dec 30 16:56:42 2002 *************** *** 1,4 **** ! /* $Id: prockernel.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: prockernel.c,v 1.1.2.4 2002/12/30 15:56:38 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 57,62 **** --- 57,64 ---- tid_t thid; int result; + glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_KERNEL), 0); + memset (buf, 0, sizeof (glibtop_proc_kernel)); pinfo = _glibtop_get_procinfo(server, pid); diff -crN ./libgtop/sysdeps/aix/proclist.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/proclist.c *** ./libgtop/sysdeps/aix/proclist.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/proclist.c Mon Dec 30 16:55:22 2002 *************** *** 1,4 **** ! /* $Id: proclist.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: proclist.c,v 1.1.2.7 2002/12/30 15:55:18 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 60,65 **** --- 60,67 ---- pid_t current; int result; + glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROCLIST), 0); + memset (buf, 0, sizeof (glibtop_proclist)); for( count = total = 0, current = 0 diff -crN ./libgtop/sysdeps/aix/procmap.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procmap.c *** ./libgtop/sysdeps/aix/procmap.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procmap.c Mon Dec 30 16:54:03 2002 *************** *** 1,4 **** ! /* $Id: procmap.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: procmap.c,v 1.1.2.4 2002/12/30 15:53:58 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 42,48 **** glibtop_map_entry * glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid) { ! glibtop_init_p (&server, GLIBTOP_SYSDEPS_PROC_MAP, 0); memset (buf, 0, sizeof (glibtop_proc_map)); --- 42,48 ---- glibtop_map_entry * glibtop_get_proc_map_s (glibtop *server, glibtop_proc_map *buf, pid_t pid) { ! glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_MAP), 0); memset (buf, 0, sizeof (glibtop_proc_map)); diff -crN ./libgtop/sysdeps/aix/procmem.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procmem.c *** ./libgtop/sysdeps/aix/procmem.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procmem.c Mon Dec 30 16:52:16 2002 *************** *** 1,4 **** ! /* $Id: procmem.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: procmem.c,v 1.1.2.6 2002/12/30 15:52:11 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 53,58 **** --- 53,60 ---- struct procsinfo *pinfo; int pagesize; + glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_MEM), 0); + memset (buf, 0, sizeof (glibtop_proc_mem)); pinfo = _glibtop_get_procinfo(server, pid); diff -crN ./libgtop/sysdeps/aix/procsegment.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procsegment.c *** ./libgtop/sysdeps/aix/procsegment.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procsegment.c Mon Dec 30 16:37:08 2002 *************** *** 1,4 **** ! /* $Id: procsegment.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: procsegment.c,v 1.1.2.4 2002/12/30 15:37:04 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 53,58 **** --- 53,60 ---- struct procsinfo *pinfo; int pagesize; + glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_SEGMENT), 0); + memset (buf, 0, sizeof (glibtop_proc_segment)); pinfo = _glibtop_get_procinfo(server, pid); diff -crN ./libgtop/sysdeps/aix/procsignal.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procsignal.c *** ./libgtop/sysdeps/aix/procsignal.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procsignal.c Mon Dec 30 16:35:00 2002 *************** *** 1,4 **** ! /* $Id: procsignal.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C)) +998-99 Martin Baulig This file is part of LibGTop) +.0. --- 1,4 ---- ! /* $Id: procsignal.c,v 1.1.2.5 2002/12/30 15:34:56 vivierl Exp $ */ /* Copyright (C)) +998-99 Martin Baulig This file is part of LibGTop) +.0. *************** *** 54,59 **** --- 54,61 ---- int i; long bit; + glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_SIGNAL), 0); + memset (buf, 0, sizeof (glibtop_proc_signal)); pinfo = _glibtop_get_procinfo(server, pid); diff -crN ./libgtop/sysdeps/aix/procstate.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procstate.c *** ./libgtop/sysdeps/aix/procstate.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procstate.c Mon Dec 30 16:33:52 2002 *************** *** 1,4 **** ! /* $Id: procstate.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: procstate.c,v 1.1.2.8 2002/12/30 15:33:48 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 53,58 **** --- 53,60 ---- tid_t thid; int result; + glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_STATE), 0); + memset (buf, 0, sizeof (glibtop_proc_state)); pinfo = _glibtop_get_procinfo(server, pid); diff -crN ./libgtop/sysdeps/aix/proctime.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/proctime.c *** ./libgtop/sysdeps/aix/proctime.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/proctime.c Mon Dec 30 16:32:08 2002 *************** *** 1,4 **** ! /* $Id: proctime.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: proctime.c,v 1.1.2.5 2002/12/30 15:32:03 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 51,56 **** --- 51,58 ---- { struct procsinfo *pinfo; + glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_TIME), 0); + memset (buf, 0, sizeof (glibtop_proc_time)); pinfo = _glibtop_get_procinfo(server, pid); diff -crN ./libgtop/sysdeps/aix/procuid.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procuid.c *** ./libgtop/sysdeps/aix/procuid.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/procuid.c Mon Dec 30 16:30:15 2002 *************** *** 1,4 **** ! /* $Id: procuid.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: procuid.c,v 1.1.2.6 2002/12/30 15:30:11 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 59,64 **** --- 59,66 ---- tid_t thid; int result; + glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_PROC_UID), 0); + memset (buf, 0, sizeof (glibtop_proc_uid)); pinfo = _glibtop_get_procinfo(server, pid); diff -crN ./libgtop/sysdeps/aix/sem_limits.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/sem_limits.c *** ./libgtop/sysdeps/aix/sem_limits.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/sem_limits.c Tue Oct 15 12:44:00 2002 *************** *** 1,4 **** ! /* $Id: sem_limits.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: sem_limits.c,v 1.1.2.3 2002/10/15 11:43:55 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/sysdeps/aix/shm_limits.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/shm_limits.c *** ./libgtop/sysdeps/aix/shm_limits.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/shm_limits.c Tue Oct 15 12:42:58 2002 *************** *** 1,4 **** ! /* $Id: shm_limits.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: shm_limits.c,v 1.1.2.4 2002/10/15 11:42:53 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/sysdeps/aix/siglist.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/siglist.c *** ./libgtop/sysdeps/aix/siglist.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/siglist.c Mon Sep 30 13:25:29 2002 *************** *** 1,4 **** ! /* $Id: siglist.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: siglist.c,v 1.1.2.3 2002/09/30 12:25:24 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/sysdeps/aix/swap.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/swap.c *** ./libgtop/sysdeps/aix/swap.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/swap.c Mon Dec 30 16:25:58 2002 *************** *** 1,4 **** ! /* $Id: swap.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: swap.c,v 1.1.2.6 2002/12/30 15:25:54 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 57,62 **** --- 57,64 ---- int comment = 0; int pos = 0; + glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_SWAP), 0); + memset (buf, 0, sizeof (glibtop_swap)); pagesize = sysconf(_SC_PAGESIZE); diff -crN ./libgtop/sysdeps/aix/sysinfo.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/sysinfo.c *** ./libgtop/sysdeps/aix/sysinfo.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/sysinfo.c Mon Dec 30 11:56:27 2002 *************** *** 1,4 **** ! /* $Id: sysinfo.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: sysinfo.c,v 1.1.2.3 2002/12/30 10:56:18 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 31,40 **** static glibtop_sysinfo sysinfo; ! static void add_info(glibtop_entry* entry, char* label, char* value) { ! g_ptr_array_add(entry->labels, g_strdup(label)); ! g_hash_table_insert(entry->values, label, g_strdup(value)); } static void init_sysinfo(void) --- 31,46 ---- static glibtop_sysinfo sysinfo; ! static void add_info(glibtop_entry* entry, char* label, char* attribute) { ! char* key; ! char* value; ! ! key = g_strdup(label); ! value = g_strdup(attribute); ! ! g_ptr_array_add(entry->labels, key); ! g_hash_table_insert(entry->values, key, value); } static void init_sysinfo(void) *************** *** 60,81 **** case POWER_RS: add_info( &sysinfo.cpuinfo[cpu] , "architecture" ! , "Power Classic architecture"); break; case POWER_PC: add_info( &sysinfo.cpuinfo[cpu] , "architecture" ! , "Power PC architecture"); break; case IA64: add_info( &sysinfo.cpuinfo[cpu] , "architecture" ! , "Intel IA64 architecture"); break; default: add_info( &sysinfo.cpuinfo[cpu] , "architecture" ! , "Unknown architecture"); break; } --- 66,87 ---- case POWER_RS: add_info( &sysinfo.cpuinfo[cpu] , "architecture" ! , "Power Classic"); break; case POWER_PC: add_info( &sysinfo.cpuinfo[cpu] , "architecture" ! , "Power PC"); break; case IA64: add_info( &sysinfo.cpuinfo[cpu] , "architecture" ! , "Intel IA64"); break; default: add_info( &sysinfo.cpuinfo[cpu] , "architecture" ! , "Unknown"); break; } *************** *** 161,167 **** sprintf(buf,"%d", _system_configuration.width); add_info( &sysinfo.cpuinfo[cpu], "width", buf); ! if (_system_configuration.cache_attrib & (1 << 31)) { /* L1 cache is present */ --- 167,173 ---- sprintf(buf,"%d", _system_configuration.width); add_info( &sysinfo.cpuinfo[cpu], "width", buf); ! if (_system_configuration.cache_attrib & 1 ) { /* L1 cache is present */ diff -crN ./libgtop/sysdeps/aix/uptime.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/uptime.c *** ./libgtop/sysdeps/aix/uptime.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/uptime.c Mon Dec 30 16:22:48 2002 *************** *** 1,4 **** ! /* $Id: uptime.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: uptime.c,v 1.1.2.4 2002/12/30 15:22:43 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. *************** *** 21,26 **** --- 21,28 ---- Boston, MA 02111-1307, USA. */ + #include + #include #include #include *************** *** 30,73 **** #include static const unsigned long _glibtop_sysdeps_uptime = ! (1L << GLIBTOP_UPTIME_UPTIME) + (1L << GLIBTOP_UPTIME_IDLETIME); ! ! static const unsigned long _required_cpu_flags = ! (1L << GLIBTOP_CPU_TOTAL) + (1L << GLIBTOP_CPU_IDLE) + ! (1L << GLIBTOP_CPU_FREQUENCY); /* Init function. */ void ! glibtop_init_uptime_p (glibtop *server) { server->sysdeps.uptime = _glibtop_sysdeps_uptime; } ! /* Provides uptime and idle time. */ void ! glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf) { ! glibtop_cpu cpu; ! glibtop_init_p (server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0); memset (buf, 0, sizeof (glibtop_uptime)); ! /* We simply calculate it from the CPU usage. */ ! ! glibtop_get_cpu_p (server, &cpu); ! ! /* Make sure all required fields are present. */ ! ! if ((cpu.flags & _required_cpu_flags) != _required_cpu_flags) ! return; ! ! /* Calculate values. */ ! ! buf->uptime = (double) cpu.total / (double) cpu.frequency; ! buf->idletime = (double) cpu.idle / (double) cpu.frequency; buf->flags = _glibtop_sysdeps_uptime; } --- 32,61 ---- #include static const unsigned long _glibtop_sysdeps_uptime = ! (1L << GLIBTOP_UPTIME_UPTIME); /* Init function. */ void ! glibtop_init_uptime_s (glibtop *server) { server->sysdeps.uptime = _glibtop_sysdeps_uptime; } ! /* Provides uptime */ void ! glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf) { ! time_t uptime; ! struct tms tbuf; ! glibtop_init_s (&server, (1L << GLIBTOP_SYSDEPS_UPTIME), 0); memset (buf, 0, sizeof (glibtop_uptime)); ! buf->uptime = (double)times(&tbuf) / (double)sysconf(_SC_CLK_TCK); ! buf->idletime = 0; buf->flags = _glibtop_sysdeps_uptime; } diff -crN ./libgtop/sysdeps/aix/utils.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/utils.c *** ./libgtop/sysdeps/aix/utils.c Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/utils.c Fri Dec 27 11:26:22 2002 *************** *** 1,4 **** ! /* $Id: utils.c,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: utils.c,v 1.1.2.4 2002/12/27 10:26:18 vivierl Exp $ */ /* Copyright (C) 1998-99 Martin Baulig This file is part of LibGTop 1.0. diff -crN ./libgtop/sysdeps/aix/utils.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/utils.h *** ./libgtop/sysdeps/aix/utils.h Mon Dec 30 17:15:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./libgtop/sysdeps/aix/utils.h Fri Dec 27 11:27:09 2002 *************** *** 1,4 **** ! /* $Id: utils.h,v 1.1.2.1 2002/12/30 16:15:12 hadess Exp $ */ /* This file is part of LibGTop 1.0. --- 1,4 ---- ! /* $Id: utils.h,v 1.1.2.4 2002/12/27 10:27:05 vivierl Exp $ */ /* This file is part of LibGTop 1.0.