Chillcraft/libgtop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added version 2.0.8-7 to repository.

Browse Source
This commit is contained in:
Jose Carlos Garcia Sogo
2004-03-27 12:24:05 +00:00
commit ec1f5a9101
25 changed files with 726 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
debian/patches/00list vendored Normal file
View File

@@ -0,0 +1,6 @@
01_kernel26-headers.dpatch
02_fix_link.dpatch
03_mem_values.dpatch
04_mem_values2.dpatch
05_cpu_values.dpatch

40
debian/patches/01_kernel26-headers.dpatch vendored Normal file
View File

@@ -0,0 +1,40 @@
#!/bin/sh -e
## 01_kernel26-headers.dpatch by Sebastien Bacher <seb128@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
case "$1" in
-patch) patch $patch_opts -p1 < $0;;
-unpatch) patch $patch_opts -p1 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad /tmp/libgtop2-2.0.8/sysdeps/linux/ppp.c libgtop2-2.0.8/sysdeps/linux/ppp.c
--- /tmp/libgtop2-2.0.8/sysdeps/linux/ppp.c 2003-10-19 18:55:39.000000000 +0200
+++ libgtop2-2.0.8/sysdeps/linux/ppp.c 2003-12-20 19:54:33.000000000 +0100
@@ -26,7 +26,10 @@
#include <glibtop/xmalloc.h>
#include <glibtop/ppp.h>
-#include <linux/isdn.h>
+/* #include <linux/isdn.h> doesn't work for kernel 2.5+ */
+#include <asm/ioctl.h>
+#define IIOCGETCPS _IO('I',21)
+#define ISDN_MAX_CHANNELS 64
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <fcntl.h>

49
debian/patches/02_fix_link.dpatch vendored Normal file
View File

@@ -0,0 +1,49 @@
#!/bin/sh -e
## 02_fix_link.dpatch by Sebastien Bacher <seb128@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
case "$1" in
-patch) patch $patch_opts -p1 < $0;;
-unpatch) patch $patch_opts -p1 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad /tmp/libgtop2-2.0.8/sysdeps/common/Makefile.in libgtop2-2.0.8/sysdeps/common/Makefile.in
--- /tmp/libgtop2-2.0.8/sysdeps/common/Makefile.in 2003-12-19 17:01:00.000000000 +0100
+++ libgtop2-2.0.8/sysdeps/common/Makefile.in 2003-12-30 22:04:34.000000000 +0100
@@ -160,7 +160,7 @@
$(inodedb_SRCLIST)
-libgtop_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+libgtop_common_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -L`pwd`/../../lib/.libs
libgtop_common_2_0_la_LIBADD = $(LIBGTOP_EXTRA_LIBS)
libgtop_suid_common_2_0_la_SOURCES = xmalloc.c error.c sysdeps_suid.c
diff -urNad /tmp/libgtop2-2.0.8/sysdeps/linux/Makefile.in libgtop2-2.0.8/sysdeps/linux/Makefile.in
--- /tmp/libgtop2-2.0.8/sysdeps/linux/Makefile.in 2003-12-19 17:01:01.000000000 +0100
+++ libgtop2-2.0.8/sysdeps/linux/Makefile.in 2003-12-30 22:04:55.000000000 +0100
@@ -158,7 +158,7 @@
libgtop_sysdeps_2_0_la_LIBADD = @GLIB_LIBS@
-libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO) -L`pwd`/../../lib/.libs
libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h
libgtopincludedir = $(includedir)/libgtop-2.0

38
debian/patches/03_mem_values.dpatch vendored Normal file
View File

@@ -0,0 +1,38 @@
#!/bin/sh -e
## 03_mem_values.dpatch by Sebastien Bacher <seb128@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
if [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
case "$1" in
-patch) patch $patch_opts -p1 < $0;;
-unpatch) patch $patch_opts -p1 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad /tmp/libgtop2-2.0.8/sysdeps/linux/mem.c libgtop2-2.0.8/sysdeps/linux/mem.c
--- /tmp/libgtop2-2.0.8/sysdeps/linux/mem.c 2003-10-20 22:41:06.000000000 +0200
+++ libgtop2-2.0.8/sysdeps/linux/mem.c 2004-01-01 13:30:47.000000000 +0100
@@ -66,8 +66,8 @@
buffer [len] = '\0';
buf->total = get_scaled(buffer, "MemTotal:");
- buf->used = get_scaled(buffer, "Active:");
buf->free = get_scaled(buffer, "MemFree:");
+ buf->used = buf->total - buf->free;
buf->shared = get_scaled(buffer, "Mapped:");
buf->buffer = get_scaled(buffer, "Buffers:");
buf->cached = get_scaled(buffer, "Cached:");

37
debian/patches/04_mem_values2.dpatch vendored Normal file
View File

@@ -0,0 +1,37 @@
#!/bin/sh -e
## 04_mem_values2.dpatch by Sebastien Bacher <seb128@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
if [ $# -lt 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
case "$1" in
-patch) patch $patch_opts -p1 < $0;;
-unpatch) patch $patch_opts -p1 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad /tmp/libgtop2-2.0.8/sysdeps/linux/mem.c libgtop2-2.0.8/sysdeps/linux/mem.c
--- /tmp/libgtop2-2.0.8/sysdeps/linux/mem.c 2004-01-28 01:12:42.000000000 +0100
+++ libgtop2-2.0.8/sysdeps/linux/mem.c 2004-01-28 01:13:14.000000000 +0100
@@ -68,7 +68,7 @@
buf->total = get_scaled(buffer, "MemTotal:");
buf->free = get_scaled(buffer, "MemFree:");
buf->used = buf->total - buf->free;
- buf->shared = get_scaled(buffer, "Mapped:");
+ buf->shared = 0;
buf->buffer = get_scaled(buffer, "Buffers:");
buf->cached = get_scaled(buffer, "Cached:");

52
debian/patches/05_cpu_values.dpatch vendored Normal file
View File

@@ -0,0 +1,52 @@
#!/bin/sh -e
## 05_cpu_values.dpatch by Sebastien Bacher <seb128@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
if [ $# -lt 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
case "$1" in
-patch) patch $patch_opts -p1 < $0;;
-unpatch) patch $patch_opts -p1 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad /tmp/libgtop2-2.0.8/sysdeps/linux/cpu.c libgtop2-2.0.8/sysdeps/linux/cpu.c
--- /tmp/libgtop2-2.0.8/sysdeps/linux/cpu.c 2003-10-19 18:55:39.000000000 +0200
+++ libgtop2-2.0.8/sysdeps/linux/cpu.c 2004-02-13 19:58:42.000000000 +0100
@@ -80,6 +80,11 @@
buf->sys = strtoul (p, &p, 0);
buf->idle = strtoul (p, &p, 0);
+ /* 2.6 kernel */
+ buf->idle += strtoull(p, &p, 0); /* "iowait" */
+ buf->sys += strtoull(p, &p, 0); /* "irq" */
+ buf->sys += strtoull(p, &p, 0); /* "softirq" */
+
total = buf->user;
total += buf->nice;
total += buf->sys;
@@ -99,6 +104,11 @@
buf->xcpu_sys [i] = strtoul (p, &p, 0);
buf->xcpu_idle [i] = strtoul (p, &p, 0);
+ /* 2.6 kernel */
+ buf->xcpu_idle [i] += strtoull(p, &p, 0); /* "iowait" */
+ buf->xcpu_sys [i] += strtoull(p, &p, 0); /* "irq" */
+ buf->xcpu_sys [i] += strtoull(p, &p, 0); /* "softirq" */
+
total = buf->xcpu_user [i];
total += buf->xcpu_nice [i];
total += buf->xcpu_sys [i];