e16
/
e16-epplets
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wed Nov 17 14:18:42 PST 1999 

(KainX)

Cleanups to the libgtop stuff.  Someone (Mark) please tell me if this doesn't
work on Solaris....


SVN revision: 1322
This commit is contained in:
Michael Jennings 1999-11-17 20:55:49 +00:00
parent 3798c6a812
commit 00c98e327a
8 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -593,3 +593,10 @@ Tue Nov 16 17:10:44 EST 1999
Added a textbox cursor.
-------------------------------------------------------------------------------
Wed Nov 17 14:18:42 PST 1999
(KainX)
Cleanups to the libgtop stuff. Someone (Mark) please tell me if this doesn't
work on Solaris....

3
acconfig.h
View File

@ -277,6 +277,9 @@
#undef EROOT
#undef EBIN
/* Do we need libgtop? */
#undef HAVE_LIBGTOP
/* Leave that blank line there!! Autoheader needs it.
If you're adding to this file, keep in mind:

17
configure.in
View File

@ -162,7 +162,14 @@ if test "$IMLIB_CONFIG" = "no"; then
fi
AC_CHECK_PROG(LIBGTOP_CONFIG, libgtop-config, libgtop-config, no)
AC_MSG_CHECKING(for Linux)
if test "`uname -s`" != "Linux"; then
AC_MSG_RESULT(no)
AC_CHECK_PROG(LIBGTOP_CONFIG, libgtop-config, libgtop-config, no)
else
AC_MSG_RESULT(yes)
LIBGTOP_CONFIG=no
fi
if test "$LIBGTOP_CONFIG" != "no"; then
@ -171,7 +178,8 @@ if test "$LIBGTOP_CONFIG" != "no"; then
. $LIBGTOP_CONF_SH
AC_MSG_CHECKING(libgtop-config for the value of CFLAGS)
CFLAGS="$CFLAGS $LIBGTOP_INCS -DHAVE_LIBGTOP"
CFLAGS="$CFLAGS $LIBGTOP_INCS"
AC_DEFINE(HAVE_LIBGTOP)
AC_MSG_RESULT($CFLAGS)
AC_MSG_CHECKING(libgtop-config for the value of LIBS)
@ -183,11 +191,13 @@ if test "$LIBGTOP_CONFIG" != "no"; then
AC_MSG_CHECKING(the sanity of new compile/link flags)
AC_TRY_LINK(, , echo "yes", echo "no" ; LIBGTOP_CONFIG="no" ;
AC_WARN(Compile/link failed. Reverting to manual method.)
AC_WARN(Compile/link failed.)
)
LIBS="$SAVE_LIBS"
fi
else
GTLIBS=""
fi
# Build test programs?
@ -257,6 +267,7 @@ AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(LIBS)
AC_SUBST(GTLIBS)
AC_SUBST(THREADLIBS)
AC_SUBST(TEST_PROGS)

6
epplets/E-Cpu.c
View File

@ -6,7 +6,7 @@
#include <errno.h>
#include <epplet.h>
#ifdef HAVE_GLIBTOP
#ifdef HAVE_LIBGTOP
#include <glibtop.h>
#include <glibtop/cpu.h>
#include "proc.h"
@ -200,7 +200,7 @@ draw_flame(void)
static void
cb_timer(void *data)
{
#ifdef HAVE_GLIBTOP
#ifdef HAVE_LIBGTOP
glibtop_cpu cpu;
double val, val2;
@ -317,7 +317,7 @@ cb_out(void *data, Window w)
static int
count_cpus(void)
{
#ifdef HAVE_GLIBTOP
#ifdef HAVE_LIBGTOP
int i,c = 0;
int bits;
glibtop_cpu cpu;

6
epplets/E-Load.c
View File

@ -1,6 +1,6 @@
#include "epplet.h"
#ifdef HAVE_GLIBTOP
#ifdef HAVE_LIBGTOP
#include <glibtop.h>
#include <glibtop/loadavg.h>
#include <glibtop/cpu.h>
@ -19,7 +19,7 @@ int count_cpus(void);
static void
cb_timer(void *data)
{
#ifdef HAVE_GLIBTOP
#ifdef HAVE_LIBGTOP
/* libgtop only handles total load, not per-CPU load */
@ -88,7 +88,7 @@ cb_close(void *data)
int
count_cpus(void)
{
#ifdef HAVE_GLIBTOP
#ifdef HAVE_LIBGTOP
int i,c = 0;
int bits;
glibtop_cpu cpu;

6
epplets/E-MemWatch.c
View File

@ -6,7 +6,7 @@
#include <errno.h>
#include "epplet.h"
#ifdef HAVE_GLIBTOP
#ifdef HAVE_LIBGTOP
#include <glibtop.h>
#include <glibtop/mem.h>
#include <glibtop/swap.h>
@ -35,7 +35,7 @@ timer_cb(void *data) {
char buff[1024];
unsigned long total, used, buffers, cached;
#ifdef HAVE_GLIBTOP
#ifdef HAVE_LIBGTOP
int check=0;
glibtop_mem mem;
glibtop_swap swap;
@ -73,7 +73,7 @@ timer_cb(void *data) {
}
Epplet_change_label(mem_label, buff);
#ifdef HAVE_GLIBTOP
#ifdef HAVE_LIBGTOP
glibtop_get_swap (&swap);
check=0;

4
epplets/E-Sys.c
View File

@ -6,7 +6,7 @@
#include <errno.h>
#include "epplet.h"
#ifdef HAVE_GLIBTOP
#ifdef HAVE_LIBGTOP
#include <glibtop.h>
#include <glibtop/uptime.h>
#include "proc.h"
@ -35,7 +35,7 @@ timer_cb(void *data) {
unsigned long days, hours, mins, secs;
double total_secs, delay;
#ifdef HAVE_GLIBTOP
#ifdef HAVE_LIBGTOP
glibtop_uptime uptime;

8
epplets/Makefile.am
View File

@ -37,7 +37,7 @@ E_SD_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir) -lesd
E_Load_epplet_SOURCES = E-Load.c
E_Load_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_Load_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Load_epplet_LDFLAGS = $(GTLIBS) -rpath $(libdir):$(pkglibdir)
E_Clock_epplet_SOURCES = E-Clock.c
E_Clock_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
@ -61,7 +61,7 @@ E_NetFlame_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Cpu_epplet_SOURCES = E-Cpu.c
E_Cpu_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_Cpu_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Cpu_epplet_LDFLAGS = $(GTLIBS) -rpath $(libdir):$(pkglibdir)
E_Power_epplet_SOURCES = E-Power.c
E_Power_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
@ -81,7 +81,7 @@ E_Biff_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_MemWatch_epplet_SOURCES = E-MemWatch.c
E_MemWatch_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_MemWatch_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_MemWatch_epplet_LDFLAGS = $(GTLIBS) -rpath $(libdir):$(pkglibdir)
E_Disk_epplet_SOURCES = E-Disk.c
E_Disk_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
@ -89,7 +89,7 @@ E_Disk_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Sys_epplet_SOURCES = E-Sys.c
E_Sys_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la
E_Sys_epplet_LDFLAGS = -rpath $(libdir):$(pkglibdir)
E_Sys_epplet_LDFLAGS = $(GTLIBS) -rpath $(libdir):$(pkglibdir)
E_Slides_epplet_SOURCES = E-Slides.c
E_Slides_epplet_DEPENDENCIES = $(top_srcdir)/api/libepplet.la