diff --git a/ChangeLog b/ChangeLog index 4b883397..acbfb34d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-04-21 Martin Baulig + + * configure.in: Removed all sysdeps checks. + + * lib/sysdeps-init*.c: Removed. + + * lib/inodedb.c: Moved here from sysdeps/common/inodedb.c. + + * glibtop-config.h: Removed. + 2001-04-20 Martin Baulig Moved all sysdeps code to the new libgtop-backends module. diff --git a/Makefile.am b/Makefile.am index 93bbd833..d0145839 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in. -SUBDIRS = po intl misc include lib src doc dtd scripts +SUBDIRS = po intl misc include lib sysdeps src doc dtd scripts include_HEADERS = glibtop.h configincludedir = $(pkglibdir)/include diff --git a/acconfig.h b/acconfig.h index 1196dc40..b2ce4095 100644 --- a/acconfig.h +++ b/acconfig.h @@ -1,23 +1,5 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - -/* Define if gethostname () must be declared. */ -#undef NEED_DECLARATION_GETHOSTNAME - -/* Define if setreuid () must be declared. */ -#undef NEED_DECLARATION_SETREUID - -/* Define if setregid () must be declared. */ -#undef NEED_DECLARATION_SETREGID - -/* Define if getpagesize () must be declared. */ -#undef NEED_DECLARATION_GETPAGESIZE - -/* Define if program_invocation_name must be declared. */ -#undef NEED_DECLARATION_PROGRAM_INVOCATION_NAME - -@TOP@ - #undef ENABLE_NLS #undef HAVE_CATGETS #undef HAVE_GETTEXT @@ -31,8 +13,6 @@ #undef HAVE_LIBINTL_H #undef HAVE_GTK_SIGNAL_HANDLER_PENDING -/* Do not remove this comments and the empty lines; they are needed */ -#undef HAVE_PROGRAM_INVOCATION_SHORT_NAME /* Define if you have the Andrew File System. */ #undef AFS @@ -112,43 +92,19 @@ SunOS 4.1.1 seems not to be affected.] */ #undef STATFS_TRUNCATES_BLOCK_COUNTS - -/* to fix a bug in autoheader on DEC OSF1. */ -#undef HAVE_PROGRAM_INVOCATION_NAME - #undef HAVE_SOCKETS #undef HAVE_SOCKADDR_SUN_LEN -#undef HAVE_LIBJPEG -#undef HAVE_LIBGIF -#undef HAVE_LIBTIFF -#undef HAVE_LIBZ -#undef HAVE_LIBPNG -#undef HAVE_GMP2_INCLUDE_DIR - #undef ssize_t #undef u_int64_t #undef int64_t #undef u_int8_t #undef int8_t -#undef HAVE_GLIBTOP_MACHINE_H - -#undef GLIBTOP_NAMES -#undef GLIBTOP_EXAMPLES #undef GLIBTOP_INODEDB -#undef NEED_LIBGTOP - -#undef HAVE_LINUX_SYSCTL -#undef HAVE_LIBGTOP_SMP - #undef HAVE_XAUTH -/* Define if your have the I4B package. */ -#undef HAVE_I4B -#undef HAVE_I4B_ACCT - /* Define to enable debugging. */ #undef LIBGTOP_ENABLE_DEBUG #undef LIBGTOP_FATAL_WARNINGS @@ -156,36 +112,3 @@ /* Define to use glib's malloc. */ #undef LIBGTOP_USE_GLIB_MALLOC -/* Same as LINUX_VERSION_CODE either from or from - * the running kernel (if we don't have configured kernel sources). - */ -#undef GLIBTOP_LINUX_VERSION_CODE - -/* Solaris release code (eg. 251 for Solaris 2.5.1). */ -#undef GLIBTOP_SOLARIS_RELEASE - -/* Define if you want to use LibGTop without GNOME. */ -#undef WITHOUT_GNOME - -/* Define if you have the header file */ -#undef HAVE_PROCFS_H - -/* Define if you have the header file */ -#undef HAVE_SYS_PROCFS_H - -/* Define if you have the libxml library */ -#undef HAVE_LIBXML - -/* Modem lockfile for PPP support. This is a printf-like format string - * which takes the interface number as argument - * (default '/var/lock/LCK..ttyS%u'). */ -#undef LIBGTOP_MODEM_LOCKFILE - -/* Define to enable dynamic linking of the backends. */ -#undef LIBGTOP_USE_GMODULE - -/* Define if we need the LibGTop server. */ -#undef LIBGTOP_NEED_SERVER - -/* Define if we have a non-suid backend library. */ -#undef LIBGTOP_HAVE_SYSDEPS diff --git a/acinclude.m4 b/acinclude.m4 index 2b6106b3..7c11a785 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,526 +1,4 @@ dnl -dnl LIBGTOP_CHECK_TYPE -dnl -dnl Improved version of AC_CHECK_TYPE which takes into account -dnl that we need to #include some other header files on some -dnl systems to get some types. - -dnl AC_LIBGTOP_CHECK_TYPE(TYPE, DEFAULT) -AC_DEFUN(AC_LIBGTOP_CHECK_TYPE, -[AC_REQUIRE([AC_HEADER_STDC])dnl -AC_MSG_CHECKING(for $1) -AC_CACHE_VAL(ac_cv_type_$1, -[AC_EGREP_CPP(dnl -changequote(<<,>>)dnl -<<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl -changequote([,]), [#include -#if STDC_HEADERS -#include -#include -#endif - -/* For Tru64 */ -#ifdef HAVE_SYS_BITYPES_H -#include -#endif -], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl -AC_MSG_RESULT($ac_cv_type_$1) -if test $ac_cv_type_$1 = no; then - AC_DEFINE($1, $2) -fi -]) - -dnl This is used internally for . - -AC_DEFUN([GNOME_LIBGTOP_TYPES_PRIVATE], -[ - AC_CHECK_HEADERS(sys/bitypes.h) - AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int) - AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int) - AC_LIBGTOP_CHECK_TYPE(u_int8_t, unsigned char) - AC_LIBGTOP_CHECK_TYPE(int8_t, signed char) -]) - -dnl This file is intended for use both internally in libgtop and in every program -dnl that wants to use it. -dnl -dnl It defines the following variables: -dnl -dnl * 'libgtop_sysdeps_dir' - sysdeps dir for libgtop. -dnl * 'libgtop_sysdeps_name' - name of the sysdeps dir. -dnl * 'libgtop_use_machine_h' - some of system dependend parts of libgtop provide -dnl their own header file. In this case we need to -dnl define 'HAVE_GLIBTOP_MACHINE_H'. -dnl * 'libgtop_need_server' - is the server really needed? Defines 'NEED_LIBGTOP' -dnl if true; defines conditional 'NEED_LIBGTOP'. - -AC_DEFUN([LIBGTOP_HACKER_TESTS],[ - AC_REQUIRE([AC_CANONICAL_HOST]) - - case "$host_os" in - linux*) - AC_ARG_WITH(linux-sysctl, - [ --with-linux-sysctl Use the sysctl () interface from Martin Baulig],[ - linux_sysctl="$withval"],[linux_sysctl=auto]) - if test $linux_sysctl = yes ; then - AC_CHECK_HEADER(linux/libgtop.h, linux_sysctl=yes, linux_sysctl=no) - elif test $linux_sysctl = auto ; then - AC_MSG_CHECKING(for LibGTop sysctl support in Linux Kernel) - AC_TRY_RUN([ -#include -#include - -#include -#include -#include - -#define SIZE(x) sizeof(x)/sizeof(x[0]) - -int name[2] = { CTL_LIBGTOP, LIBGTOP_VERSION }; - -int -main (void) -{ - unsigned version; - size_t size = sizeof (version); - - if (sysctl (name, SIZE (name), &version, &size, NULL, 0)) - exit (1); - else if (version < 1) - exit (2); - else - exit (0); -} -], linux_sysctl=yes, linux_sysctl=no, linux_sysctl=no) - AC_MSG_RESULT($linux_sysctl) - fi - if test $linux_sysctl = yes ; then - AC_DEFINE(HAVE_LINUX_SYSCTL) - fi - AM_CONDITIONAL(LINUX_SYSCTL, test $linux_sysctl = yes) - ;; - esac -]) - -AC_DEFUN([LIBGTOP_CHECK_SYSDEPS_DIR],[ - AC_MSG_CHECKING(for libgtop sysdeps directory) - - case "$host_os" in - linux*) - libgtop_sysdeps_dir=linux - libgtop_use_machine_h=no - libgtop_have_sysinfo=no - libgtop_need_server=no - libgtop_have_sysdeps=yes - libgtop_dynlink_ok=yes - ;; - freebsd*|netbsd*|openbsd*) - libgtop_sysdeps_dir=freebsd - libgtop_use_machine_h=yes - libgtop_need_server=yes - libgtop_have_sysdeps=no - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server' - libgtop_dynlink_ok=yes - ;; - bsdi*) - libgtop_sysdeps_dir=freebsd - libgtop_use_machine_h=yes - libgtop_need_server=yes - libgtop_have_sysdeps=no - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server' - libgtop_dynlink_ok=yes - ;; - solaris*) - libgtop_sysdeps_dir=solaris - libgtop_use_machine_h=yes - libgtop_need_server=yes - libgtop_have_sysdeps=yes - libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server' - libgtop_dynlink_ok=no - ;; - osf*) - libgtop_sysdeps_dir=osf1 - libgtop_use_machine_h=yes - libgtop_need_server=yes - libgtop_have_sysdeps=yes - libgtop_dynlink_ok=yes - ;; - *) - if test x$hacker_mode = xyes ; then - case "$host_os" in - sunos4*) - #Please note that this port is obsolete and not working at - #all. It is only useful for people who want to fix it ... :-) - libgtop_sysdeps_dir=sun4 - libgtop_use_machine_h=yes - libgtop_need_server=yes - libgtop_have_sysdeps=no - libgtop_dynlink_ok=no - ;; - *) - libgtop_sysdeps_dir=stub - libgtop_use_machine_h=no - libgtop_need_server=no - libgtop_have_sysdeps=yes - libgtop_dynlink_ok=yes - ;; - esac - else - libgtop_sysdeps_dir=stub - libgtop_use_machine_h=no - libgtop_need_server=no - libgtop_have_sysdeps=yes - libgtop_dynlink_ok=yes - fi - ;; - esac - - test -z "$libgtop_postinstall" && libgtop_postinstall=: - - AC_MSG_RESULT($libgtop_sysdeps_dir) -]) - -AC_DEFUN([GNOME_LIBGTOP_DYNLINK],[ - AC_MSG_CHECKING(whether to build gmodulized LibGTop) - - AC_ARG_ENABLE(modules, - [ --disable-modules Disables dynamic module loading],[ - if test x$withval = xyes; then - with_modules=yes - else - with_modules=no - fi - ],[with_modules=auto]) - - dynworks=false - deps= - if test x$with_modules = xno; then - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(yes) - fi - - AC_MSG_CHECKING(whether dynamic modules work) - if test x$with_modules = xauto; then - oLIBS="$LIBS" - oCFLAGS="$CFLAGS" - LIBS="`glib-config --libs gmodule`" - CFLAGS="`glib-config --cflags gmodule`" - AC_TRY_RUN([ - #include - #include - main () - { - if (g_module_supported ()) - exit (0); - else - exit (1); - } - ], dynworks=true, dynworks=false, dynworks=true) - LIBS="$oLIBS" - CFLAGS="$oCFLAGS" - - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then - libgtop_libtool_config="${CONFIG_SHELL-/bin/sh} libtool --config" - libgtop_deplibs_check=`$libgtop_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''\"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` - if test "x$libgtop_deplibs_check" = "xnone" || \ - test "x$libgtop_deplibs_check" = "xunknown" || \ - test "x$libgtop_deplibs_check" = "x"; then - dynworks=false - fi - fi - elif test x$with_modules = xyes; then - dynworks=true - else - dynworks=false - fi - - if $dynworks; then - AC_DEFINE(LIBGTOP_USE_GMODULE) - GMODULE_LIBS="`glib-config --libs gmodule`" - GMODULE_FLAGS="`glib-config --cflags gmodule`" - AC_SUBST(GMODULE_LIBS) - AC_SUBST(GMODULE_FLAGS) - libgtop_use_gmodule=yes - libgtop_dynamic_ldflags='-export-dynamic -module' - else - libgtop_use_gmodule=no - libgtop_dynamic_ldflags= - fi - - AC_MSG_RESULT($libgtop_use_gmodule) - - AC_SUBST(libgtop_dynamic_ldflags) -]) - -AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[ - AC_REQUIRE([AC_CANONICAL_HOST]) - - AC_SUBST(libgtop_sysdeps_dir) - AC_SUBST(libgtop_sysdeps_name) - AC_SUBST(libgtop_use_machine_h) - AC_SUBST(libgtop_need_server) - AC_SUBST(libgtop_have_sysdeps) - - AC_ARG_ENABLE(hacker-mode, - [ --enable-hacker-mode Enable building of unstable sysdeps], - [hacker_mode="$enableval"], [hacker_mode=no]) - - AM_CONDITIONAL(HACKER_MODE, test x"$hacker_mode" = xyes) - - if test x$hacker_mode = xyes ; then - LIBGTOP_HACKER_TESTS - AC_ARG_WITH(sysdeps-dir, - [ --with-sysdeps-dir Manually override sysdeps directory],[override_sysdeps_dir="$withval"],[override_sysdeps_dir=no]) - else - override_sysdeps_dir=no - fi - - AC_ARG_WITH(libgtop-smp, - [ --with-libgtop-smp Enable SMP support (default-auto)],[ - libgtop_smp="$withval"],[libgtop_smp=auto]) - - if test $libgtop_smp = auto ; then - AC_MSG_CHECKING(whether to enable SMP support) - case "$host_os" in - linux*) - libgtop_smp=yes - ;; - *) - libgtop_smp=no - ;; - esac - AC_MSG_RESULT($libgtop_smp) - fi - - if test $libgtop_smp = yes ; then - AC_DEFINE(HAVE_LIBGTOP_SMP) - fi - - AM_CONDITIONAL(LIBGTOP_SMP, test $libgtop_smp = yes) - - if test x$override_sysdeps_dir = xno ; then - LIBGTOP_CHECK_SYSDEPS_DIR - else - case $override_sysdeps_dir in - stub) - libgtop_sysdeps_dir=stub - libgtop_use_machine_h=no - libgtop_have_sysinfo=no - libgtop_need_server=no - libgtop_have_sysdeps=yes - libgtop_dynlink_ok=yes - ;; - stub_suid) - libgtop_sysdeps_dir=stub_suid - libgtop_use_machine_h=yes - libgtop_have_sysinfo=no - libgtop_need_server=yes - libgtop_have_sysdeps=no - libgtop_dynlink_ok=yes - ;; - linux|kernel) - libgtop_sysdeps_dir=linux - libgtop_use_machine_h=no - libgtop_have_sysinfo=no - libgtop_need_server=no - libgtop_have_sysdeps=yes - libgtop_dynlink_ok=yes - ;; - bsd) - libgtop_sysdeps_dir=freebsd - libgtop_use_machine_h=yes - libgtop_need_server=yes - libgtop_have_sysdeps=no - libgtop_postinstall='chgrp kmem $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server' - libgtop_dynlink_ok=yes - ;; - solaris) - libgtop_sysdeps_dir=solaris - libgtop_use_machine_h=yes - libgtop_need_server=yes - libgtop_have_sysdeps=yes - libgtop_postinstall='chgrp sys $(bindir)/libgtop_server && chmod 2755 $(bindir)/libgtop_server' - libgtop_dynlink_ok=no - ;; - osf) - libgtop_sysdeps_dir=osf1 - libgtop_use_machine_h=yes - libgtop_need_server=yes - libgtop_have_sysdeps=yes - libgtop_dynlink_ok=yes - ;; - *) - AC_MSG_ERROR(Invalid value for --with-sysdeps-dir) - ;; - esac - fi - - AC_MSG_CHECKING(for libgtop sysdeps name) - libgtop_sysdeps_name=`echo $libgtop_sysdeps_dir | sed -e 's/_/-/g'` - AC_MSG_RESULT($libgtop_sysdeps_name) - - AC_MSG_CHECKING(whether to use dynamic linking in LibGtop) - AC_MSG_RESULT($libgtop_dynlink_ok) - - AC_SUBST(libgtop_sysdeps_dir) - AC_SUBST(libgtop_postinstall) - AC_SUBST(libgtop_have_sysinfo) - - case "$host_os" in - *bsd*) - AC_CHECK_HEADERS(net/if_var.h osreldate.h) - AC_MSG_CHECKING([for I4B]) - AC_TRY_COMPILE([ -#include -#include - -#include -#include - -#ifdef HAVE_NET_IF_VAR_H -#include -#endif - -#include -#include - -#if defined(__FreeBSD__) || defined(__NetBSD__) -#include -#else -#include -#endif -],[ - size_t size = sizeof (struct sppp); -], have_i4b=yes, have_i4b=no) - AC_MSG_RESULT($have_i4b) - if test x$have_i4b = xyes; then - AC_DEFINE(HAVE_I4B) - AC_MSG_CHECKING([for I4B accounting]) - AC_TRY_COMPILE([ -#include -#include - -#include -#include - -#ifdef HAVE_NET_IF_VAR_H -#include -#endif - -#include -#include - -#if defined(__FreeBSD__) || defined(__NetBSD__) -#include -#else -#include -#endif - -#include -],[ - size_t size = sizeof (struct i4bisppp_softc); -], have_i4b_acct=yes, have_i4b_acct=no) - AC_MSG_RESULT($have_i4b_acct) - if test x$have_i4b_acct = xyes ; then - AC_DEFINE(HAVE_I4B_ACCT) - else - AC_WARN([ -*** I4B accounting disabled - you won't get any PPP statistics. -*** Read "misc/i4b_acct.txt" in the LibGTop source directory -*** to see how to enable it.]) - fi - fi - ;; - linux*) - os_major_version=`uname -r | sed 's/-pre[[0-9]]*//' | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - os_minor_version=`uname -r | sed 's/-pre[[0-9]]*//' | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - os_micro_version=`uname -r | sed 's/-pre[[0-9]]*//' | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - os_version_expr="$os_major_version 65536 * $os_minor_version 256 * + $os_micro_version + p q" - - AC_CHECK_HEADERS(linux/version.h, have_linux_version_h=yes, - have_linux_version_h=no) - - if test x$have_linux_version_h = xyes ; then - version_code=`cat /usr/include/linux/version.h | \ - grep \#define | grep LINUX_VERSION_CODE` - os_version_code=`echo $version_code | \ - sed 's/^.*LINUX_VERSION_CODE[[ \t]]*\([[0-9]]*\).*$/\1/'` - else - os_version_code=`echo "$os_version_expr" | dc` - fi - - AC_MSG_CHECKING(for Linux kernel version code) - AC_DEFINE_UNQUOTED(GLIBTOP_LINUX_VERSION_CODE, $os_version_code) - AC_MSG_RESULT($os_version_code) - ;; - solaris*) - os_major_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\1/'` - os_minor_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\2/'` - os_micro_version=`uname -r | sed 's/\([[0-9]]*\).\([[0-9]]\)\.*\([[0-9]]*\)/\3/'` - test -z "$os_micro_version" && os_micro_version=0 - os_version_expr="$os_major_version 100 * $os_minor_version 10 * + $os_micro_version + p q" - os_version_code=`echo "$os_version_expr" | dc` - - AC_MSG_CHECKING(for Solaris release code) - AC_DEFINE_UNQUOTED(GLIBTOP_SOLARIS_RELEASE, $os_version_code) - AC_MSG_RESULT($os_version_code) - ;; - esac - - AC_MSG_CHECKING(for Modem lockfile) - AC_ARG_WITH(modem-lockfile, - [ --with-modem-lockfile Modem lockfile for PPP support],[libgtop_modem_lockfile="$withval"], - [if test -f /dev/modem ; then - libgtop_modem_lockfile='/var/lock/LCK..modem' - else - libgtop_modem_lockfile='/var/lock/LCK..ttyS%u' - fi]) - AC_MSG_RESULT($libgtop_modem_lockfile) - AC_DEFINE_UNQUOTED(LIBGTOP_MODEM_LOCKFILE, "$libgtop_modem_lockfile") - - AC_MSG_CHECKING(for machine.h in libgtop sysdeps dir) - AC_MSG_RESULT($libgtop_use_machine_h) - - AC_MSG_CHECKING(whether we need libgtop) - AC_MSG_RESULT($libgtop_need_server) - - if test x$libgtop_need_server = xyes ; then - AC_DEFINE(NEED_LIBGTOP) - fi - - if test x$libgtop_use_machine_h = xyes ; then - AC_DEFINE(HAVE_GLIBTOP_MACHINE_H) - fi - - if test x$libgtop_dynlink_ok = xyes ; then - GNOME_LIBGTOP_DYNLINK - else - libgtop_use_gmodule=no - fi - - AC_SUBST(libgtop_use_gmodule) - - if test x$libgtop_have_sysdeps = xyes ; then - AC_DEFINE(LIBGTOP_HAVE_SYSDEPS) - fi - - if test x$libgtop_need_server = xyes ; then - AC_DEFINE(LIBGTOP_NEED_SERVER) - fi - - AM_CONDITIONAL(NEED_LIBGTOP, test x$libgtop_need_server = xyes) - AM_CONDITIONAL(HAVE_SYSDEPS, test x$libgtop_have_sysdeps = xyes) - AM_CONDITIONAL(LIBGTOP_USE_GMODULE, test x$libgtop_use_gmodule = xyes) -]) -dnl dnl GNOME_FILEUTILS_CHECKS dnl dnl checks that are needed for the diskusage applet. diff --git a/configure.in b/configure.in index 68edb970..08fad734 100644 --- a/configure.in +++ b/configure.in @@ -30,7 +30,6 @@ AC_SUBST(LIBGTOP_MINOR_VERSION) AC_SUBST(LIBGTOP_MICRO_VERSION) AC_SUBST(LIBGTOP_INTERFACE_AGE) AC_SUBST(LIBGTOP_BINARY_AGE) -AC_SUBST(LIBGTOP_SERVER_VERSION) AC_SUBST(LIBGTOP_VERSION) AC_SUBST(LIBGTOP_VERSION_CODE) AC_SUBST(LIBGTOP_VERSION_SUFFIX) @@ -98,25 +97,7 @@ AC_SUBST(GNOMESUPPORT_LIBS) AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes) -GNOME_LIBGTOP_SYSDEPS -GNOME_LIBGTOP_TYPES_PRIVATE - -sysdeps_dir="$libgtop_sysdeps_dir" -sysdeps_name="$libgtop_sysdeps_name" -AC_SUBST(sysdeps_dir) -AC_SUBST(sysdeps_name) - -AC_MSG_CHECKING(for sysdeps_init_file) -if test x$linux_sysctl = xyes ; then - sysdeps_init_file='sysdeps-init-kernel.c' -else - sysdeps_init_file='sysdeps-init-'"$libgtop_sysdeps_name"'.c' -fi -AC_SUBST(sysdeps_init_file) -AC_MSG_RESULT($sysdeps_init_file) - GNOME_PKGCONFIG_CHECK_MODULES(XML, libxml-2.0:2.2.8) -AC_DEFINE(HAVE_LIBXML) AC_SUBST(XML_CFLAGS) AC_SUBST(XML_LIBS) @@ -135,18 +116,13 @@ if test x$build_inodedb = xyes ; then AC_DEFINE(GLIBTOP_INODEDB) fi -AC_DEFINE(GLIBTOP_NAMES) - AM_CONDITIONAL(ENABLE_STATIC, test x$enable_static = xyes) AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes) AM_PROG_LIBTOOL -if test x$libgtop_use_gmodule = xyes ; then - GNOME_PKGCONFIG_CHECK_MODULES(GLIB, glib-2.0:1.3.1 gmodule-2.0:1.3.1 gobject-2.0:1.3.1) -else - GNOME_PKGCONFIG_CHECK_MODULES(GLIB, glib-2.0:1.3.1 gobject-2.0:1.3.1) -fi +dnl Check for glib +GNOME_PKGCONFIG_CHECK_MODULES(GLIB, glib-2.0:1.3.1 gmodule-2.0:1.3.1 gobject-2.0:1.3.1) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) @@ -161,54 +137,6 @@ AC_HEADER_TIME AC_STRUCT_TM AC_TYPE_UID_T -dnl For SunOS -AC_CHECK_TYPE(ssize_t, int) -AC_CHECK_HEADERS(memory.h) -AC_CHECK_HEADERS(string.h strings.h, break) -AC_REPLACE_FUNCS(strerror) - -dnl dlopen() and dlsym() -DL_LIB= -AC_CHECK_FUNCS(dlopen,,[ - AC_CHECK_LIB(dl, dlopen, DL_LIB="-ldl", [ - AC_CHECK_LIB(dld, shl_load, DL_LIB="-ldld", [ - AC_CHECK_FUNCS(dlopen, DL_LIB="", DL_LIB="") - ]) - ]) -]) -oLIBS="$LIBS" -LIBS="$LIBS $DL_LIB" -AC_CHECK_FUNCS(dlerror,,) -LIBS="$oLIBS" -AC_SUBST(DL_LIB) - -dnl Solaris -AC_CHECK_LIB(kstat, kstat_open) -AC_CHECK_FUNCS(getloadavg swapctl) -AC_CHECK_HEADERS(procfs.h sys/procfs.h, break) - -dnl Some versions of Solaris require -lelf for -lkvm -AC_CHECK_LIB(kvm, kvm_open,[ - LIBS="-lkvm $LIBS" -],[AC_MSG_CHECKING(for kvm_open in -lkvm with -lelf) - AC_CACHE_VAL(ac_cv_lib_kvm_with_elf, - [ac_save_LIBS="$LIBS" - LIBS="-lkvm -lelf $LIBS" - AC_TRY_LINK([char kvm_open();], [kvm_open()], - ac_cv_lib_kvm_with_elf=yes, ac_cv_lib_kvm_with_elf=no) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib_kvm_with_elf" = "yes"; then - AC_MSG_RESULT(yes) - LIBS="-lkvm -lelf $LIBS" - else - AC_MSG_RESULT(no) - fi -]) - -dnl For DEC OSF1 -AC_CHECK_LIB(mach, vm_statistics) - dnl Check for Internet sockets. AC_CHECK_FUNC(socket, [AC_CHECK_HEADER(netinet/in.h, @@ -237,21 +165,6 @@ AM_GNOME2_GETTEXT AC_PATH_XTRA -dnl For Solaris -dnl Please don't move this before AC_PATH_XTRA -AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) -AC_CHECK_FUNC(connect,,[AC_CHECK_LIB(socket,connect)]) -AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)]) - -dnl The construct foo=`echo $w1 $w2 $w3` fails on some systems if $w1 = -e or -n -dnl So we use the following instead. -dnl XE_SPACE(var, words) -define([XE_SPACE],[ -T="" -for W in $2; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done -$1="$T" -])dnl - dnl For diskusage stuff GNOME_FILEUTILS_CHECKS @@ -280,40 +193,15 @@ dnl These definitions are expanded in make. LIBGTOP_LIBS='-L$(libdir)' LIBGTOP_INCS='-I$(includedir) -I$(pkglibdir)/include' -if test x$libgtop_use_machine_h = xyes ; then - LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H" -fi - if test x$build_inodedb = xyes ; then LIBGTOP_INCS="$LIBGTOP_INCS -DGLIBTOP_INODEDB" fi -if test x$libgtop_smp = xyes ; then - LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SMP" -fi - -if test x$libgtop_have_sysinfo = xyes ; then - LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO" -fi - LIBGTOP_INCS="$LIBGTOP_INCS $GNOMESUPPORT_CFLAGS $GLIB_CFLAGS $XML_CFLAGS" -LIBGTOP_BINDIR='$(bindir)' -LIBGTOP_SERVER='$(bindir)/libgtop_server' - LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS $XML_LIBS" -if test x$libgtop_use_gmodule != xyes ; then - LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop -lgtop_backend_common -lgtop_common" - if test x$libgtop_have_sysdeps = xyes ; then - LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_backend_sysdeps -lgtop_sysdeps" - fi - if test x$libgtop_need_server = xyes ; then - LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_backend_server" - fi -else - LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_common -lgtop" -fi +LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop_common -lgtop" LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names" @@ -328,7 +216,7 @@ AC_SUBST(machine_incs) LIBGTOP_BACKEND_DIR="\$(datadir)/libgtop/backends" -INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -Werror -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include -I\$(top_builddir)/include -I\$(top_srcdir)/intl $GNOMESUPPORT_CFLAGS $GLIB_CFLAGS $XML_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\" -DLIBGTOP_BACKEND_DIR=\"'"$LIBGTOP_BACKEND_DIR"'\"' +INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -Werror -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include -I\$(top_builddir)/include -I\$(top_srcdir)/intl $GNOMESUPPORT_CFLAGS $GLIB_CFLAGS $XML_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_BACKEND_DIR=\"'"$LIBGTOP_BACKEND_DIR"'\"' AC_SUBST(INCLUDES) @@ -339,177 +227,9 @@ AC_SUBST(LIBGTOP_LIBS) AC_SUBST(LIBGTOP_INCS) AC_SUBST(LIBGTOP_NAMES_LIBS) AC_SUBST(LIBGTOP_NAMES_INCS) -AC_SUBST(LIBGTOP_BINDIR) -AC_SUBST(LIBGTOP_SERVER) - -if test x$libgtop_need_server = xyes ; then - sysdeps_suid_lib="\$(top_builddir)/sysdeps/\$(sysdeps_dir)/libgtop_sysdeps_suid.la" - server_programs='libgtop_server' -else - sysdeps_suid_lib= - server_programs= -fi -AC_SUBST(sysdeps_suid_lib) -AC_SUBST(server_programs) - - -dnl The following one is copied from glib/configure.in - -AC_OUTPUT_COMMANDS([ - -## Generate `glibconfig.h' in two cases -## 1. `config.status' is run either explicitly, or via configure. -## Esp. not when it is run in `Makefile' to generate makefiles and -## config.h -## 2. CONFIG_OTHER is set explicitly -## -## Case 1 is difficult. We know that `automake' sets one of -## CONFIG_FILES or CONFIG_HEADERS to empty. This heuristic works -## only when AM_CONFIG_HEADER is set, however. - -if test -n "${CONFIG_FILES}" && test -n "${CONFIG_HEADERS}"; then - # Both CONFIG_FILES and CONFIG_HEADERS are non-empty ==> Case 1 - CONFIG_OTHER=${CONFIG_OTHER:-glibtop-config.h} -fi -case "$CONFIG_OTHER" in -*glibtop-config.h*) - echo creating glibtop-config.h - outfile=glibtop-config.h-tmp - cat > $outfile <<\_______EOF -/* glibtop-config.h - * - * This is a generated file. Please modify `configure.in' - */ - -#ifndef GLIBTOP_CONFIG_H -#define GLIBTOP_CONFIG_H - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ -_______EOF - - did_typedefs=no - - if test x$glibtop_uint64_t != xyes ; then - did_typedefs=yes - cat >> $outfile <<\_______EOF - -#ifndef u_int64_t -typedef unsigned long long int u_int64_t; -#endif -_______EOF - fi - - if test x$glibtop_int64_t != xyes ; then - did_typedefs=yes - cat >> $outfile <<\_______EOF - -#ifndef int64_t -typedef signed long long int int64_t; -#endif -_______EOF - fi - - if test x$glibtop_uint8_t != xyes ; then - did_typedefs=yes - cat >> $outfile <<\_______EOF - -#ifndef u_int8_t -typedef unsigned char u_int8_t; -#endif -_______EOF - fi - - if test x$glibtop_int8_t != xyes ; then - did_typedefs=yes - cat >> $outfile <<\_______EOF - -#ifndef int8_t -typedef signed char int8_t; -#endif -_______EOF - fi - - if test x$did_typedefs = xyes ; then - cat >>$outfile <<_______EOF - -/* - * NOTE: If your application checks for "u_int64_t" or "int64_t" in its own - * config.h, you must not include it after any of the LibGTop headers. - */ -_______EOF - fi - - cat >>$outfile <<_______EOF - -/* Define if we need the LibGTop server. */ -_______EOF - - if test x$glibtop_need_libgtop = xyes ; then - echo '#define NEED_LIBGTOP 1' >> $outfile - else - echo '#undef NEED_LIBGTOP' >> $outfile - fi - - cat >>$outfile <<_______EOF - -/* Define if LibGTop has support for multiple processors. */ -_______EOF - - if test x$glibtop_have_smp = xyes ; then - echo '#define HAVE_LIBGTOP_SMP 1' >> $outfile - else - echo '#undef HAVE_LIBGTOP_SMP' >> $outfile - fi - - cat >>$outfile <<_______EOF - -/* LibGTop major, minor and micro version. */ -#define LIBGTOP_MAJOR_VERSION $libgtop_major_version -#define LIBGTOP_MINOR_VERSION $libgtop_minor_version -#define LIBGTOP_MICRO_VERSION $libgtop_micro_version - -/* LibGTop version and numerical version code ("1.234.567" -> 1234567). */ -#define LIBGTOP_VERSION "$libgtop_version" -#define LIBGTOP_VERSION_CODE $libgtop_version_code - -/* LibGTop server version, increased each time the protocol changes. */ -#define LIBGTOP_SERVER_VERSION $libgtop_server_version - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* GLIBCONFIG_H */ -_______EOF - - if cmp -s $outfile glibtop-config.h; then - echo glibtop-config.h is unchanged - rm -f $outfile - else - mv $outfile glibtop-config.h - fi ;; -esac -],[ -glibtop_uint64_t=$ac_cv_type_u_int64_t -glibtop_int64_t=$ac_cv_type_int64_t -glibtop_uint8_t=$ac_cv_type_u_int8_t -glibtop_int8_t=$ac_cv_type_int8_t -libgtop_major_version=$LIBGTOP_MAJOR_VERSION -libgtop_minor_version=$LIBGTOP_MINOR_VERSION -libgtop_micro_version=$LIBGTOP_MICRO_VERSION -libgtop_version_code=$LIBGTOP_VERSION_CODE -libgtop_server_version=$LIBGTOP_SERVER_VERSION -libgtop_version=$LIBGTOP_VERSION -glibtop_need_libgtop=$libgtop_need_server -glibtop_have_smp=$libgtop_smp -]) - AC_OUTPUT([ Makefile -libgtop.spec po/Makefile.in intl/Makefile misc/Makefile @@ -518,13 +238,6 @@ include/glibtop/Makefile sysdeps/Makefile sysdeps/common/Makefile sysdeps/names/Makefile -sysdeps/stub/Makefile -sysdeps/stub_suid/Makefile -sysdeps/osf1/Makefile -sysdeps/linux/Makefile -sysdeps/kernel/Makefile -sysdeps/freebsd/Makefile -sysdeps/solaris/Makefile src/Makefile src/inodedb/Makefile scripts/Makefile diff --git a/lib/Makefile.am b/lib/Makefile.am index 149d2d64..f26ba719 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,14 @@ LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ -INCLUDES = @INCLUDES@ +if INODEDB +inodedb_SRCLIST = inodedb.c +inodedb_DEFS = -DSYSTEM_INODEDB=\"$(prefix)/var/libgtop/inodedb.db\" +else +inodedb_SRCLIST = +inodedb_DEFS = +endif + +INCLUDES = @INCLUDES@ $(inodedb_DEFS) noinst_PROGRAMS = test-backends @@ -12,7 +20,7 @@ libgtop_la_SOURCES = errors.c glibtop-backend-info.c \ glibtop-client.c glibtop-server.c \ glibtop-backend.c glibtop-client-private.h \ glibtop-server-private.h xmalloc.c error.c \ - $(BUILT_SOURCES) + $(inodedb_SRCLIST) $(BUILT_SOURCES) libgtop_server_la_SOURCES = error.c xmalloc.c @@ -28,7 +36,7 @@ glibtopdir = $(includedir)/glibtop glibtop_HEADERS = structures.h -BUILT_SOURCES = lib.c structures.h sysdeps-init.c +BUILT_SOURCES = lib.c structures.h lib.c: lib.pl $(top_builddir)/config.h $(top_srcdir)/features.def $(top_srcdir)/scripts/c_types.pl $(PERL) -I $(top_srcdir)/scripts $(srcdir)/lib.pl < $(top_srcdir)/features.def > lib-t @@ -41,17 +49,7 @@ structures.h: structures.pl $(top_builddir)/config.h \ structures.h > tmp-s mv tmp-s structures.h -sysdeps-init.c: - rm -f sysdeps-init.c - cp $(srcdir)/@sysdeps_init_file@ sysdeps-init.c - CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = lib.pl structures.pl \ - sysdeps-init-freebsd.c \ - sysdeps-init-kernel.c \ - sysdeps-init-linux.c \ - sysdeps-init-solaris.c \ - sysdeps-init-stub-suid.c \ - sysdeps-init-stub.c +EXTRA_DIST = lib.pl structures.pl diff --git a/lib/close.c b/lib/close.c index 53996d85..b6f84cde 100644 --- a/lib/close.c +++ b/lib/close.c @@ -46,12 +46,10 @@ close_backend (gpointer value, gpointer user_data) /* Note that two or more servers may open the same backend. */ backend->_priv_module->refcount--; -#if LIBGTOP_USE_GMODULE if (!backend->_priv_module->refcount) { g_module_close (backend->_priv_module->module); g_free (backend->_priv_module); } -#endif /* LIBGTOP_USE_GMODULE */ g_free (backend); } diff --git a/lib/glibtop-server-private.h b/lib/glibtop-server-private.h index 403844ee..d76bd473 100644 --- a/lib/glibtop-server-private.h +++ b/lib/glibtop-server-private.h @@ -26,19 +26,12 @@ #ifndef __GLIBTOP_SERVER_PRIVATE_H__ #define __GLIBTOP_SERVER_PRIVATE_H__ -#ifdef HAVE_GLIBTOP_MACHINE_H -#include -#endif - #include typedef struct _glibtop_server_private glibtop_server_private; struct _glibtop_server_private { -#ifdef HAVE_GLIBTOP_MACHINE_H - glibtop_machine machine; /* Machine dependent data */ -#endif GSList *backend_list; }; diff --git a/lib/sysdeps-init-freebsd.c b/lib/sysdeps-init-freebsd.c deleted file mode 100644 index 633493ec..00000000 --- a/lib/sysdeps-init-freebsd.c +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - -/* $Id$ */ - -/* Copyright (C) 1998-99 Martin Baulig - This file is part of LibGTop 1.0. - - Contributed by Martin Baulig , April 1998. - - LibGTop is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - LibGTop is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with LibGTop; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -#include -#include -#include - -#include - -const glibtop_signame glibtop_sys_siglist [] = -{ { 1, "SIGHUP", N_("Hangup (POSIX)") }, - { 2, "SIGINT", N_("Interrupt (ANSI)") }, - { 3, "SIGQUIT", N_("Quit (POSIX)") }, - { 4, "SIGILL", N_("Illegal instruction (ANSI)") }, - { 5, "SIGTRAP", N_("Trace trap (POSIX)") }, - { 6, "SIGABRT", N_("Abort (ANSI)") }, - { 7, "SIGEMT", N_("EMT instruction") }, - { 8, "SIGFPE", N_("Floating-point exception (ANSI)") }, - { 9, "SIGKILL", N_("Kill, unblockable (POSIX)") }, - { 10, "SIGBUS", N_("BUS error (4.2 BSD)") }, - { 11, "SIGSEGV", N_("Segmentation violation (ANSI)") }, - { 12, "SIGSYS", N_("Bad argument to system call") }, - { 13, "SIGPIPE", N_("Broken pipe (POSIX)") }, - { 14, "SIGALRM", N_("Alarm clock (POSIX)") }, - { 15, "SIGTERM", N_("Termination (ANSI)") }, - { 16, "SIGURG", N_("Urgent condition on socket (4.2 BSD)") }, - { 17, "SIGSTOP", N_("Stop, unblockable (POSIX)") }, - { 18, "SIGTSTP", N_("Keyboard stop (POSIX)") }, - { 19, "SIGCONT", N_("Continue (POSIX)") }, - { 20, "SIGCHLD", N_("Child status has changed (POSIX)") }, - { 21, "SIGTTIN", N_("Background read from tty (POSIX)") }, - { 22, "SIGTTOU", N_("Background write to tty (POSIX)") }, - { 23, "SIGIO", N_("I/O now possible (4.2 BSD)") }, - { 24, "SIGXCPU", N_("CPU limit exceeded (4.2 BSD)") }, - { 25, "SIGXFSZ", N_("File size limit exceeded (4.2 BSD)") }, - { 26, "SIGVTALRM", N_("Virtual alarm clock (4.2 BSD)") }, - { 27, "SIGPROF", N_("Profiling alarm clock (4.2 BSD)") }, - { 28, "SIGWINCH", N_("Window size change (4.3 BSD, Sun)") }, - { 29, "SIGINFO", N_("Information request") }, - { 30, "SIGUSR1", N_("User-defined signal 1 (POSIX)") }, - { 31, "SIGUSR2", N_("User-defined signal 2 (POSIX)") }, - { 0, NULL, NULL }, -}; - -void -_glibtop_open_sysdeps (glibtop_client *client, const char *program_name, - const u_int64_t features, const char **backend_args, - GError **opt_error) -{ - glibtop_client_open_backend (client, "glibtop-backend-common", - features, backend_args); - glibtop_client_open_backend (client, "glibtop-backend-server", - features, backend_args); -} diff --git a/lib/sysdeps-init-kernel.c b/lib/sysdeps-init-kernel.c deleted file mode 100644 index 42eee110..00000000 --- a/lib/sysdeps-init-kernel.c +++ /dev/null @@ -1,78 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - -/* $Id$ */ - -/* Copyright (C) 1998-99 Martin Baulig - This file is part of LibGTop 1.0. - - Contributed by Martin Baulig , April 1998. - - LibGTop is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - LibGTop is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with LibGTop; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -#include -#include -#include - -#include - -const glibtop_signame glibtop_sys_siglist [] = -{ { 1, "SIGHUP", NULL }, /* Hangup (POSIX). */ - { 2, "SIGINT", NULL }, /* Interrupt (ANSI). */ - { 3, "SIGQUIT", NULL }, /* Quit (POSIX). */ - { 4, "SIGILL", NULL }, /* Illegal instruction (ANSI). */ - { 5, "SIGTRAP", NULL }, /* Trace trap (POSIX). */ - { 6, "SIGABRT", NULL }, /* Abort (ANSI). */ - { 7, "SIGBUS", NULL }, /* BUS error (4.2 BSD). */ - { 8, "SIGFPE", NULL }, /* Floating-point exception (ANSI). */ - { 9, "SIGKILL", NULL }, /* Kill, unblockable (POSIX). */ - { 10, "SIGUSR1", NULL }, /* User-defined signal 1 (POSIX). */ - { 11, "SIGSEGV", NULL }, /* Segmentation violation (ANSI). */ - { 12, "SIGUSR2", NULL }, /* User-defined signal 2 (POSIX). */ - { 13, "SIGPIPE", NULL }, /* Broken pipe (POSIX). */ - { 14, "SIGALRM", NULL }, /* Alarm clock (POSIX). */ - { 15, "SIGTERM", NULL }, /* Termination (ANSI). */ - { 16, "SIGSTKFLT", NULL }, /* ??? */ - { 17, "SIGCHLD", NULL }, /* Child status has changed (POSIX). */ - { 18, "SIGCONT", NULL }, /* Continue (POSIX). */ - { 19, "SIGSTOP", NULL }, /* Stop, unblockable (POSIX). */ - { 20, "SIGTSTP", NULL }, /* Keyboard stop (POSIX). */ - { 21, "SIGTTIN", NULL }, /* Background read from tty (POSIX). */ - { 22, "SIGTTOU", NULL }, /* Background write to tty (POSIX). */ - { 23, "SIGURG", NULL }, /* Urgent condition on socket (4.2 BSD). */ - { 24, "SIGXCPU", NULL }, /* CPU limit exceeded (4.2 BSD). */ - { 25, "SIGXFSZ", NULL }, /* File size limit exceeded (4.2 BSD). */ - { 26, "SIGVTALRM", NULL }, /* Virtual alarm clock (4.2 BSD). */ - { 27, "SIGPROF", NULL }, /* Profiling alarm clock (4.2 BSD). */ - { 28, "SIGWINCH", NULL }, /* Window size change (4.3 BSD, Sun). */ - { 29, "SIGIO", NULL }, /* I/O now possible (4.2 BSD). */ - { 30, "SIGPWR", NULL }, /* Power failure restart (System V). */ - { 31, "SIGUNUSED", NULL }, - { 0, NULL, NULL }, -}; - -void -_glibtop_open_sysdeps (glibtop_client *client, const char *program_name, - const u_int64_t features, const char **backend_args, - GError **opt_error) -{ - glibtop_client_open_backend (client, "glibtop-backend-kernel", - features, backend_args); - glibtop_client_open_backend (client, "glibtop-backend-common", - features, backend_args); - glibtop_client_open_backend (client, "glibtop-backend-sysdeps", - features, backend_args); -} diff --git a/lib/sysdeps-init-linux.c b/lib/sysdeps-init-linux.c deleted file mode 100644 index 098092b1..00000000 --- a/lib/sysdeps-init-linux.c +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - -/* $Id$ */ - -/* Copyright (C) 1998-99 Martin Baulig - This file is part of LibGTop 1.0. - - Contributed by Martin Baulig , April 1998. - - LibGTop is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - LibGTop is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with LibGTop; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -#include -#include -#include - -#include - -const glibtop_signame glibtop_sys_siglist [] = -{ { 1, "SIGHUP", N_("Hangup (POSIX)") }, - { 2, "SIGINT", N_("Interrupt (ANSI)") }, - { 3, "SIGQUIT", N_("Quit (POSIX)") }, - { 4, "SIGILL", N_("Illegal instruction (ANSI)") }, - { 5, "SIGTRAP", N_("Trace trap (POSIX)") }, - { 6, "SIGABRT", N_("Abort (ANSI)") }, - { 7, "SIGBUS", N_("BUS error (4.2 BSD)") }, - { 8, "SIGFPE", N_("Floating-point exception (ANSI)") }, - { 9, "SIGKILL", N_("Kill, unblockable (POSIX)") }, - { 10, "SIGUSR1", N_("User-defined signal 1 (POSIX)") }, - { 11, "SIGSEGV", N_("Segmentation violation (ANSI)") }, - { 12, "SIGUSR2", N_("User-defined signal 2 (POSIX)") }, - { 13, "SIGPIPE", N_("Broken pipe (POSIX)") }, - { 14, "SIGALRM", N_("Alarm clock (POSIX)") }, - { 15, "SIGTERM", N_("Termination (ANSI)") }, - { 16, "SIGSTKFLT", NULL }, - { 17, "SIGCHLD", N_("Child status has changed (POSIX)") }, - { 18, "SIGCONT", N_("Continue (POSIX)") }, - { 19, "SIGSTOP", N_("Stop, unblockable (POSIX)") }, - { 20, "SIGTSTP", N_("Keyboard stop (POSIX)") }, - { 21, "SIGTTIN", N_("Background read from tty (POSIX)") }, - { 22, "SIGTTOU", N_("Background write to tty (POSIX)") }, - { 23, "SIGURG", N_("Urgent condition on socket (4.2 BSD)") }, - { 24, "SIGXCPU", N_("CPU limit exceeded (4.2 BSD)") }, - { 25, "SIGXFSZ", N_("File size limit exceeded (4.2 BSD)") }, - { 26, "SIGVTALRM", N_("Virtual alarm clock (4.2 BSD)") }, - { 27, "SIGPROF", N_("Profiling alarm clock (4.2 BSD)") }, - { 28, "SIGWINCH", N_("Window size change (4.3 BSD, Sun)") }, - { 29, "SIGIO", N_("I/O now possible (4.2 BSD)") }, - { 30, "SIGPWR", N_("Power failure restart (System V)") }, - { 31, "SIGUNUSED", NULL }, - { 0, NULL, NULL }, -}; - -void -_glibtop_open_sysdeps (glibtop_client *client, const char *program_name, - const u_int64_t features, const char **backend_args, - GError **opt_error) -{ - glibtop_client_open_backend (client, "glibtop-backend-common", - features, backend_args); - glibtop_client_open_backend (client, "glibtop-backend-sysdeps", - features, backend_args); -} diff --git a/lib/sysdeps-init-osf1.c b/lib/sysdeps-init-osf1.c deleted file mode 100644 index 9ea0fd7c..00000000 --- a/lib/sysdeps-init-osf1.c +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - -/* $Id$ */ - -/* Copyright (C) 1998-99 Martin Baulig - This file is part of LibGTop 1.0. - - Contributed by Martin Baulig , April 1998. - - LibGTop is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - LibGTop is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with LibGTop; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -#include -#include -#include - -#include - -const glibtop_signame glibtop_sys_siglist [] = -{ { 0, NULL, NULL } }; - -void -_glibtop_open_sysdeps (glibtop_client *client, const char *program_name, - const u_int64_t features, const char **backend_args, - GError **opt_error) -{ - glibtop_client_open_backend (client, "glibtop-backend-common", - features, backend_args); - glibtop_client_open_backend (client, "glibtop-backend-sysdeps", - features, backend_args); - glibtop_client_open_backend (client, "glibtop-backend-server", - features, backend_args); -} diff --git a/lib/sysdeps-init-solaris.c b/lib/sysdeps-init-solaris.c deleted file mode 100644 index 9ea0fd7c..00000000 --- a/lib/sysdeps-init-solaris.c +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - -/* $Id$ */ - -/* Copyright (C) 1998-99 Martin Baulig - This file is part of LibGTop 1.0. - - Contributed by Martin Baulig , April 1998. - - LibGTop is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - LibGTop is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with LibGTop; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -#include -#include -#include - -#include - -const glibtop_signame glibtop_sys_siglist [] = -{ { 0, NULL, NULL } }; - -void -_glibtop_open_sysdeps (glibtop_client *client, const char *program_name, - const u_int64_t features, const char **backend_args, - GError **opt_error) -{ - glibtop_client_open_backend (client, "glibtop-backend-common", - features, backend_args); - glibtop_client_open_backend (client, "glibtop-backend-sysdeps", - features, backend_args); - glibtop_client_open_backend (client, "glibtop-backend-server", - features, backend_args); -} diff --git a/lib/sysdeps-init-stub-suid.c b/lib/sysdeps-init-stub-suid.c deleted file mode 100644 index dc294d12..00000000 --- a/lib/sysdeps-init-stub-suid.c +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - -/* $Id$ */ - -/* Copyright (C) 1998-99 Martin Baulig - This file is part of LibGTop 1.0. - - Contributed by Martin Baulig , April 1998. - - LibGTop is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - LibGTop is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with LibGTop; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -#include -#include -#include - -#include - -const glibtop_signame glibtop_sys_siglist [] = -{ { 0, NULL, NULL } }; - -void -_glibtop_open_sysdeps (glibtop_client *client, const char *program_name, - const u_int64_t features, const char **backend_args, - GError **opt_error) -{ - glibtop_client_open_backend (client, "glibtop-backend-common", - features, backend_args); - glibtop_client_open_backend (client, "glibtop-backend-server", - features, backend_args); -} diff --git a/lib/sysdeps-init-stub.c b/lib/sysdeps-init-stub.c deleted file mode 100644 index dad20445..00000000 --- a/lib/sysdeps-init-stub.c +++ /dev/null @@ -1,44 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ - -/* $Id$ */ - -/* Copyright (C) 1998-99 Martin Baulig - This file is part of LibGTop 1.0. - - Contributed by Martin Baulig , April 1998. - - LibGTop is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, - or (at your option) any later version. - - LibGTop is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with LibGTop; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. -*/ - -#include -#include -#include - -#include - -const glibtop_signame glibtop_sys_siglist [] = -{ { 0, NULL, NULL } }; - -void -_glibtop_open_sysdeps (glibtop_client *client, const char *program_name, - const u_int64_t features, const char **backend_args, - GError **opt_error) -{ - glibtop_client_open_backend (client, "glibtop-backend-common", - features, backend_args); - glibtop_client_open_backend (client, "glibtop-backend-sysdeps", - features, backend_args); -}