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

Drop old files left over from svn conversion

Browse Source
This commit is contained in:
Jeremy Bicha
2017-12-18 17:14:01 -05:00
parent 5466264ae4
commit 735886d0d7
7 changed files with 0 additions and 924 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debian/libgtop-2.0-10.install vendored
View File

@@ -1 +0,0 @@
usr/lib/*/*.so.*

78
debian/libgtop-2.0-10.symbols vendored
View File

@@ -1,78 +0,0 @@
libgtop-2.0.so.10 libgtop-2.0-10 #MINVER#
glibtop_call_l@Base 2.22.3
glibtop_close@Base 2.22.3
glibtop_close_r@Base 2.22.3
glibtop_get_cpu@Base 2.22.3
glibtop_get_cpu_l@Base 2.22.3
glibtop_get_fsusage@Base 2.22.3
glibtop_get_fsusage_l@Base 2.22.3
glibtop_get_loadavg@Base 2.22.3
glibtop_get_loadavg_l@Base 2.22.3
glibtop_get_mem@Base 2.22.3
glibtop_get_mem_l@Base 2.22.3
glibtop_get_mountlist@Base 2.22.3
glibtop_get_mountlist_l@Base 2.22.3
glibtop_get_msg_limits@Base 2.22.3
glibtop_get_msg_limits_l@Base 2.22.3
glibtop_get_netlist@Base 2.22.3
glibtop_get_netlist_l@Base 2.22.3
glibtop_get_netload@Base 2.22.3
glibtop_get_netload_l@Base 2.22.3
glibtop_get_parameter_l@Base 2.22.3
glibtop_get_ppp@Base 2.22.3
glibtop_get_ppp_l@Base 2.22.3
glibtop_get_proc_affinity@Base 2.24.0
glibtop_get_proc_affinity_l@Base 2.24.0
glibtop_get_proc_args@Base 2.22.3
glibtop_get_proc_args_l@Base 2.22.3
glibtop_get_proc_argv@Base 2.22.3
glibtop_get_proc_argv_l@Base 2.22.3
glibtop_get_proc_kernel@Base 2.22.3
glibtop_get_proc_kernel_l@Base 2.22.3
glibtop_get_proc_map@Base 2.22.3
glibtop_get_proc_map_l@Base 2.22.3
glibtop_get_proc_mem@Base 2.22.3
glibtop_get_proc_mem_l@Base 2.22.3
glibtop_get_proc_open_files@Base 2.22.3
glibtop_get_proc_open_files_l@Base 2.22.3
glibtop_get_proc_segment@Base 2.22.3
glibtop_get_proc_segment_l@Base 2.22.3
glibtop_get_proc_signal@Base 2.22.3
glibtop_get_proc_signal_l@Base 2.22.3
glibtop_get_proc_state@Base 2.22.3
glibtop_get_proc_state_l@Base 2.22.3
glibtop_get_proc_time@Base 2.22.3
glibtop_get_proc_time_l@Base 2.22.3
glibtop_get_proc_uid@Base 2.22.3
glibtop_get_proc_uid_l@Base 2.22.3
glibtop_get_proc_wd@Base 2.22.3
glibtop_get_proc_wd_l@Base 2.22.3
glibtop_get_proclist@Base 2.22.3
glibtop_get_proclist_l@Base 2.22.3
glibtop_get_sem_limits@Base 2.22.3
glibtop_get_sem_limits_l@Base 2.22.3
glibtop_get_shm_limits@Base 2.22.3
glibtop_get_shm_limits_l@Base 2.22.3
glibtop_get_swap@Base 2.22.3
glibtop_get_swap_l@Base 2.22.3
glibtop_get_sysdeps@Base 2.22.3
glibtop_get_sysdeps_r@Base 2.22.3
glibtop_get_sysinfo@Base 2.22.3
glibtop_get_type@Base 2.32.0
glibtop_get_uptime@Base 2.22.3
glibtop_get_uptime_l@Base 2.22.3
glibtop_global_server@Base 2.22.3
glibtop_init@Base 2.22.3
glibtop_init_r@Base 2.22.3
glibtop_internet_addr@Base 2.22.3
glibtop_make_connection@Base 2.22.3
glibtop_map_entry_get_type@Base 2.32.0
glibtop_mountentry_get_type@Base 2.32.0
glibtop_mountlist_get_type@Base 2.32.0
glibtop_open_files_entry_get_type@Base 2.32.0
glibtop_open_l@Base 2.22.3
glibtop_proc_map_get_type@Base 2.32.0
glibtop_proc_open_files_get_type@Base 2.32.0
glibtop_server_features@Base 2.22.3
glibtop_set_parameter_l@Base 2.22.3
glibtop_sys_siglist@Base 2.22.3

1
debian/libgtop2-7.install vendored
View File

@@ -1 +0,0 @@
usr/lib/*.so.*

71
debian/libgtop2-7.symbols vendored
View File

@@ -1,71 +0,0 @@
libgtop-2.0.so.7 libgtop2-7 #MINVER#
glibtop_call_l@Base 2.22.3
glibtop_close@Base 2.22.3
glibtop_close_r@Base 2.22.3
glibtop_get_cpu@Base 2.22.3
glibtop_get_cpu_l@Base 2.22.3
glibtop_get_fsusage@Base 2.22.3
glibtop_get_fsusage_l@Base 2.22.3
glibtop_get_loadavg@Base 2.22.3
glibtop_get_loadavg_l@Base 2.22.3
glibtop_get_mem@Base 2.22.3
glibtop_get_mem_l@Base 2.22.3
glibtop_get_mountlist@Base 2.22.3
glibtop_get_mountlist_l@Base 2.22.3
glibtop_get_msg_limits@Base 2.22.3
glibtop_get_msg_limits_l@Base 2.22.3
glibtop_get_netlist@Base 2.22.3
glibtop_get_netlist_l@Base 2.22.3
glibtop_get_netload@Base 2.22.3
glibtop_get_netload_l@Base 2.22.3
glibtop_get_parameter_l@Base 2.22.3
glibtop_get_ppp@Base 2.22.3
glibtop_get_ppp_l@Base 2.22.3
glibtop_get_proc_affinity@Base 2.24.0
glibtop_get_proc_affinity_l@Base 2.24.0
glibtop_get_proc_args@Base 2.22.3
glibtop_get_proc_args_l@Base 2.22.3
glibtop_get_proc_argv@Base 2.22.3
glibtop_get_proc_argv_l@Base 2.22.3
glibtop_get_proc_kernel@Base 2.22.3
glibtop_get_proc_kernel_l@Base 2.22.3
glibtop_get_proc_map@Base 2.22.3
glibtop_get_proc_map_l@Base 2.22.3
glibtop_get_proc_mem@Base 2.22.3
glibtop_get_proc_mem_l@Base 2.22.3
glibtop_get_proc_open_files@Base 2.22.3
glibtop_get_proc_open_files_l@Base 2.22.3
glibtop_get_proc_segment@Base 2.22.3
glibtop_get_proc_segment_l@Base 2.22.3
glibtop_get_proc_signal@Base 2.22.3
glibtop_get_proc_signal_l@Base 2.22.3
glibtop_get_proc_state@Base 2.22.3
glibtop_get_proc_state_l@Base 2.22.3
glibtop_get_proc_time@Base 2.22.3
glibtop_get_proc_time_l@Base 2.22.3
glibtop_get_proc_uid@Base 2.22.3
glibtop_get_proc_uid_l@Base 2.22.3
glibtop_get_proc_wd@Base 2.22.3
glibtop_get_proc_wd_l@Base 2.22.3
glibtop_get_proclist@Base 2.22.3
glibtop_get_proclist_l@Base 2.22.3
glibtop_get_sem_limits@Base 2.22.3
glibtop_get_sem_limits_l@Base 2.22.3
glibtop_get_shm_limits@Base 2.22.3
glibtop_get_shm_limits_l@Base 2.22.3
glibtop_get_swap@Base 2.22.3
glibtop_get_swap_l@Base 2.22.3
glibtop_get_sysdeps@Base 2.22.3
glibtop_get_sysdeps_r@Base 2.22.3
glibtop_get_sysinfo@Base 2.22.3
glibtop_get_uptime@Base 2.22.3
glibtop_get_uptime_l@Base 2.22.3
glibtop_global_server@Base 2.22.3
glibtop_init@Base 2.22.3
glibtop_init_r@Base 2.22.3
glibtop_internet_addr@Base 2.22.3
glibtop_make_connection@Base 2.22.3
glibtop_open_l@Base 2.22.3
glibtop_server_features@Base 2.22.3
glibtop_set_parameter_l@Base 2.22.3
glibtop_sys_siglist@Base 2.22.3

22
debian/patches/06_kfreebsd_sys_pipe.patch vendored
View File

@@ -1,22 +0,0 @@
Description: Don't include sys/pipe.h on kFreeBSD
Defining _KERNEL to include sys/pipe.h subsequently breaks sys/conf.h;
since sys/pipe.h is not meant to be used in userland, and libgtop2 builds
anyway on kFreeBSD without it, don't include it.
Author: Steven Chamberlain <steven@pyro.eu.org>
Bug-Debian: http://bugs.debian.org/667984
Index: libgtop2-2.28.4/sysdeps/freebsd/procmap.c
===================================================================
--- libgtop2-2.28.4.orig/sysdeps/freebsd/procmap.c 2012-04-07 22:49:20.000000000 +0100
+++ libgtop2-2.28.4/sysdeps/freebsd/procmap.c 2012-04-07 22:51:00.163079809 +0100
@@ -38,10 +38,7 @@
#include <sys/vnode.h>
#undef _KVM_VNODE
-#define _KERNEL
-#include <sys/pipe.h>
#include <sys/conf.h>
-#undef _KERNEL
#if (__FreeBSD_version >= 800038) || (__FreeBSD_kernel_version >= 800038)
#define _WANT_FILE
#include <sys/file.h>

643
debian/patches/10_kfreebsd.patch vendored
View File

@@ -1,643 +0,0 @@
--- libgtop2-2.14.4.orig/sysdeps/freebsd/procsignal.c
+++ libgtop2-2.14.4/sysdeps/freebsd/procsignal.c
@@ -70,7 +70,7 @@
return;
}
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
#define PROC_SIGLIST ki_siglist
#define PROC_SIGMASK ki_sigmask
@@ -92,7 +92,7 @@
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
buf->signal [0] = pinfo [0].kp_proc.p_sigctx.ps_siglist.__bits[0];
#elif (defined(__NetBSD__) && (NSIG > 32)) || \
- (defined(__FreeBSD__) && (__FreeBSD_version >= 400011))
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__))
buf->signal [0] = pinfo [0].PROC_SIGLIST.__bits[0];
#else
buf->signal [0] = pinfo [0].kp_proc.p_siglist;
@@ -104,7 +104,7 @@
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
buf->blocked [0] = pinfo [0].kp_proc.p_sigctx.ps_sigmask.__bits[0];
#elif (defined(__NetBSD__) && (NSIG > 32)) || \
- (defined(__FreeBSD__) && (__FreeBSD_version >= 400011))
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__))
buf->blocked [0] = pinfo [0].PROC_SIGMASK.__bits[0];
#else
buf->blocked [0] = pinfo [0].kp_proc.p_sigmask;
@@ -116,7 +116,7 @@
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
buf->sigignore [0] = pinfo [0].kp_proc.p_sigctx.ps_sigignore.__bits[0];
#elif (defined(__NetBSD__) && (NSIG > 32)) || \
- (defined(__FreeBSD__) && (__FreeBSD_version >= 400011))
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__))
buf->sigignore [0] = pinfo [0].PROC_SIGIGNORE.__bits[0];
#else
buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore;
@@ -128,7 +128,7 @@
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 105150000)
buf->sigcatch [0] = pinfo [0].kp_proc.p_sigctx.ps_sigcatch.__bits[0];
#elif (defined(__NetBSD__) && (NSIG > 32)) || \
- (defined(__FreeBSD__) && (__FreeBSD_version >= 400011))
+ (defined(__FreeBSD__) && (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__))
buf->sigcatch [0] = pinfo [0].PROC_SIGCATCH.__bits[0];
#else
buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch;
only in patch2:
unchanged:
--- libgtop2-2.14.4.orig/sysdeps/freebsd/mem.c
+++ libgtop2-2.14.4/sysdeps/freebsd/mem.c
@@ -43,7 +43,7 @@
(1L << GLIBTOP_MEM_FREE) +
(1L << GLIBTOP_MEM_SHARED) +
(1L << GLIBTOP_MEM_BUFFER) +
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
(1L << GLIBTOP_MEM_CACHED) +
#endif
(1L << GLIBTOP_MEM_USER) + (1L << GLIBTOP_MEM_LOCKED);
@@ -66,7 +66,7 @@
#else
#if defined(__bsdi__)
{ "_bufcachemem" },
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
{ "_bufspace" },
#else
{ "_bufpages" },
@@ -171,7 +171,7 @@
/* convert memory stats to Kbytes */
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
v_total_count = vmm.v_page_count;
#else
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
@@ -198,7 +198,7 @@
buf->used = (guint64) pagetok (v_used_count) << LOG1024;
buf->free = (guint64) pagetok (v_free_count) << LOG1024;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
buf->cached = (guint64) pagetok (vmm.v_cache_count) << LOG1024;
#endif
@@ -210,7 +210,7 @@
buf->shared = (guint64) pagetok (vmt.t_rmshr) << LOG1024;
-#if __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
buf->buffer = (guint64) bufspace;
#else
buf->buffer = (guint64) pagetok (bufspace) << LOG1024;
only in patch2:
unchanged:
--- libgtop2-2.14.4.orig/sysdeps/freebsd/procstate.c
+++ libgtop2-2.14.4/sysdeps/freebsd/procstate.c
@@ -73,7 +73,7 @@
return;
}
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
#define PROC_COMM ki_comm
#define PROC_SVUID ki_svuid
#define PROC_SVGID ki_svgid
only in patch2:
unchanged:
--- libgtop2-2.14.4.orig/sysdeps/freebsd/fsusage.c
+++ libgtop2-2.14.4/sysdeps/freebsd/fsusage.c
@@ -46,9 +46,9 @@
if (result == -1) {
return;
}
-
+#if !defined(__FreeBSD_kernel__)
buf->read = sfs.f_syncreads + sfs.f_asyncreads;
buf->write = sfs.f_syncwrites + sfs.f_asyncwrites;
-
+#endif
buf->flags |= (1 << GLIBTOP_FSUSAGE_READ) | (1 << GLIBTOP_FSUSAGE_WRITE);
}
only in patch2:
unchanged:
--- libgtop2-2.14.4.orig/sysdeps/freebsd/swap.c
+++ libgtop2-2.14.4/sysdeps/freebsd/swap.c
@@ -33,13 +33,13 @@
(1L << GLIBTOP_SWAP_FREE) + (1L << GLIBTOP_SWAP_PAGEIN) +
(1L << GLIBTOP_SWAP_PAGEOUT);
-#if defined(__FreeBSD__) || defined(__bsdi__)
+#if defined(__FreeBSD__) || defined(__bsdi__) || defined(__FreeBSD_kernel__)
#include <sys/conf.h>
#ifdef __bsdi__
#include <vm/swap_pager.h>
#else
-#if __FreeBSD_version < 400005
+#if (__FreeBSD_version < 400005) && !defined(__FreeBSD_kernel__)
#include <sys/rlist.h>
#endif
#endif
@@ -94,7 +94,7 @@
void
glibtop_init_swap_p (glibtop *server)
{
-#if defined(__FreeBSD__) || defined(__bsdi__)
+#if defined(__FreeBSD__) || defined(__bsdi__) || defined(__FreeBSD_kernel__)
#if __FreeBSD__ < 4 || defined(__bsdi__)
if (kvm_nlist (server->machine.kd, nlst) < 0) {
glibtop_warn_io_r (server, "kvm_nlist (swap)");
@@ -130,9 +130,9 @@
void
glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
{
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-# if __FreeBSD__ < 4
+# if (__FreeBSD__ < 4) && !defined(__FreeBSD_kernel__)
char *header;
int hlen, nswdev, dmmax;
int div, nfree, npfree;
@@ -194,7 +194,7 @@
buf->pagein = 0;
buf->pageout = 0;
} else {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
buf->pagein = vmm.v_swappgsin - swappgsin;
buf->pageout = vmm.v_swappgsout - swappgsout;
#else
@@ -208,7 +208,7 @@
#endif
}
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
swappgsin = vmm.v_swappgsin;
swappgsout = vmm.v_swappgsout;
#else
@@ -221,9 +221,9 @@
#endif
#endif
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-#if __FreeBSD__ < 4
+#if (__FreeBSD__ < 4) && !defined(__FreeBSD_kernel__)
/* Size of largest swap device. */
only in patch2:
unchanged:
--- libgtop2-2.14.4.orig/sysdeps/freebsd/procmap.c
+++ libgtop2-2.14.4/sysdeps/freebsd/procmap.c
@@ -41,18 +41,18 @@
#else
#include <vm/vm_object.h>
#include <vm/vm_map.h>
-#if (__FreeBSD_version >= 400011)
+#if (__FreeBSD_version >= 400011) || defined(__FreeBSD_kernel__)
#include <vm/vm.h>
#else
#include <vm/vm_prot.h>
#endif
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#define _KVM_VNODE
#endif
#include <sys/vnode.h>
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#undef _KVM_VNODE
#endif
#include <sys/mount.h>
@@ -109,9 +109,9 @@
struct vm_object object;
#endif
glibtop_map_entry *maps;
-#if defined __FreeBSD__
+#if (defined __FreeBSD__) || defined(__FreeBSD_kernel__)
struct vnode vnode;
-#if __FreeBSD_version < 500039
+#if (__FreeBSD_version < 500039) && !defined(__FreeBSD_kernel__)
struct inode inode;
#endif
#endif
@@ -137,7 +137,7 @@
/* Now we get the memory maps. */
if (kvm_read (server->machine.kd,
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
(unsigned long) pinfo [0].ki_vmspace,
#else
(unsigned long) pinfo [0].kp_proc.p_vmspace,
@@ -179,8 +179,8 @@
update = 1;
}
-#ifdef __FreeBSD__
-#if __FreeBSD__ >= 4
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if (__FreeBSD__ >= 4) || defined(__FreeBSD_kernel__)
if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP))
continue;
#else
@@ -256,7 +256,7 @@
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
/* If the object is of type vnode, add its size */
if (object.type != OBJT_VNODE)
@@ -270,10 +270,10 @@
&vnode, sizeof (vnode)) != sizeof (vnode))
glibtop_error_io_r (server, "kvm_read (vnode)");
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500039)
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500039)) || defined(__FreeBSD_kernel__)
switch (vnode.v_type) {
case VREG:
-#if __FreeBSD_version < 600006
+#if (__FreeBSD_version < 600006) && !defined(__FreeBSD_kernel__)
maps [i-1].inode = vnode.v_cachedid;
maps [i-1].device = vnode.v_cachedfs;
#endif
only in patch2:
unchanged:
--- libgtop2-2.14.4.orig/sysdeps/freebsd/procmem.c
+++ libgtop2-2.14.4/sysdeps/freebsd/procmem.c
@@ -73,7 +73,7 @@
static const unsigned long _glibtop_sysdeps_proc_mem_share =
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
(1L << GLIBTOP_PROC_MEM_SHARE);
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
(1L << GLIBTOP_PROC_MEM_SHARE);
#else
0;
@@ -126,7 +126,7 @@
#else
struct vm_object object;
#endif
-#if !defined(__FreeBSD__) || (__FreeBSD_version < 500013)
+#if (!defined(__FreeBSD__) || (__FreeBSD_version < 500013)) && !defined(__FreeBSD_kernel__)
struct plimit plimit;
#endif
int count;
@@ -147,7 +147,7 @@
glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
return;
}
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
#define PROC_VMSPACE ki_vmspace
@@ -214,8 +214,8 @@
return;
}
-#ifdef __FreeBSD__
-#if __FreeBSD__ >= 4
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if (__FreeBSD__ >= 4) || defined(__FreeBSD_kernel__)
if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP))
continue;
#else
@@ -282,7 +282,7 @@
#endif /* __NetBSD_Version__ >= 105250000 */
#endif
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
if (object.type != OBJT_VNODE)
continue;
only in patch2:
unchanged:
--- libgtop2-2.14.4.orig/sysdeps/freebsd/prockernel.c
+++ libgtop2-2.14.4/sysdeps/freebsd/prockernel.c
@@ -36,7 +36,7 @@
#include <sys/user.h>
#endif
#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) && \
- !defined(__NetBSD__)
+ !defined(__NetBSD__)
#include <machine/pcb.h>
#endif
@@ -94,7 +94,7 @@
pid_t pid)
{
struct kinfo_proc *pinfo;
-#ifndef __FreeBSD__
+#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
struct user *u_addr = (struct user *)USRSTACK;
struct pstats pstats;
struct pcb pcb;
@@ -119,7 +119,7 @@
if ((pinfo == NULL) || (count != 1))
glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
#define PROC_WCHAN ki_wchan
#define PROC_WMESG ki_wmesg
@@ -147,7 +147,7 @@
}
#endif
-#ifndef __FreeBSD__
+#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
/* Taken from `saveuser ()' in `/usr/src/bin/ps/ps.c'. */
@@ -203,9 +203,9 @@
(unsigned long) &u_addr->u_pcb,
(char *) &pcb, sizeof (pcb)) == sizeof (pcb))
{
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#ifndef __alpha__
-#if (__FreeBSD_version >= 300003)
+#if (__FreeBSD_version >= 300003) || defined(__FreeBSD_kernel__)
buf->kstk_esp = (guint64) pcb.pcb_esp;
buf->kstk_eip = (guint64) pcb.pcb_eip;
#else
only in patch2:
unchanged:
--- libgtop2-2.14.4.orig/sysdeps/freebsd/procuid.c
+++ libgtop2-2.14.4/sysdeps/freebsd/procuid.c
@@ -77,7 +77,7 @@
return;
}
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
#define PROC_RUID ki_ruid
#define PROC_SVUID ki_svuid
@@ -87,12 +87,8 @@
#define PROC_PGID ki_pgid
#define PROC_TPGID ki_tpgid
#define PROC_NICE ki_nice
-#if __FreeBSD_version >= 500013
#define PROC_PRIORITY ki_pri.pri_user
#else
-#define PROC_PRIORITY ki_priority
-#endif
-#else
#define PROC_RUID kp_eproc.e_pcred.p_ruid
#define PROC_SVUID kp_eproc.e_pcred.p_svuid
only in patch2:
unchanged:
--- libgtop2-2.14.4.orig/sysdeps/freebsd/proclist.c
+++ libgtop2-2.14.4/sysdeps/freebsd/proclist.c
@@ -86,7 +86,7 @@
pids = g_realloc (pids, count * sizeof (unsigned));
/* Copy the pids over to this chain */
for (i=j=0; i < count; i++) {
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
#define PROC_STAT ki_stat
#define PROC_RUID ki_ruid
#define PROC_PID ki_pid
only in patch2:
unchanged:
--- libgtop2-2.14.4.orig/sysdeps/freebsd/proctime.c
+++ libgtop2-2.14.4/sysdeps/freebsd/proctime.c
@@ -58,9 +58,8 @@
* system, and interrupt time usage.
*/
-#ifndef __FreeBSD__
+#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__))
-#ifndef __FreeBSD__
static void
calcru(p, up, sp, ip)
struct proc *p;
@@ -109,8 +108,6 @@
ip->tv_usec = it % 1000000;
}
}
-#endif
-
#endif /* !__FreeBSD__ */
/* Provides detailed information about a process. */
@@ -145,7 +142,7 @@
if ((pinfo == NULL) || (count != 1))
glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
buf->rtime = pinfo [0].ki_runtime;
#elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013)
buf->rtime = pinfo [0].kp_proc.p_runtime;
@@ -182,8 +179,8 @@
buf->flags |= _glibtop_sysdeps_proc_time_user;
#else
-#if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
-#if __FreeBSD_version >= 500016
+#if (defined(__FreeBSD__) && (__FreeBSD_version >= 500013)) || defined(__FreeBSD_kernel__)
+#if (__FreeBSD_version >= 500016) || defined(__FreeBSD_kernel__)
if ((pinfo [0].ki_flag & PS_INMEM)) {
#else
if ((pinfo [0].ki_flag & P_INMEM)) {
only in patch2:
unchanged:
--- libgtop2-2.14.4.orig/libgtop-sysdeps.m4
+++ libgtop2-2.14.4/libgtop-sysdeps.m4
@@ -64,7 +64,7 @@
libgtop_have_sysinfo=yes
libgtop_need_server=no
;;
- freebsd*|netbsd*|openbsd*|bsdi*)
+ freebsd*|netbsd*|openbsd*|bsdi*|kfreebsd*)
libgtop_sysdeps_dir=freebsd
libgtop_use_machine_h=yes
libgtop_need_server=yes
@@ -122,7 +122,13 @@
case "$host_os" in
*bsd*)
- AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=)
+ case "$host_os" in
+ *kfreebsd*)
+ AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS="-lkvm -lfreebsd -lbsd", KVM_LIBS=, -lfreebsd -lbsd);;
+ *)
+ AC_CHECK_LIB(kvm, kvm_open, KVM_LIBS=-lkvm, KVM_LIBS=);;
+ esac
+
AC_SUBST(KVM_LIBS)
AC_CHECK_HEADERS(net/if_var.h)
@@ -141,7 +147,7 @@
#include <net/netisr.h>
#include <net/route.h>
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
#include <net/if_sppp.h>
#else
#include <i4b/sppp/if_sppp.h>
@@ -167,7 +173,7 @@
#include <net/netisr.h>
#include <net/route.h>
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
#include <net/if_sppp.h>
#else
#include <i4b/sppp/if_sppp.h>
only in patch2:
unchanged:
--- libgtop2-2.14.4.orig/configure
+++ libgtop2-2.14.4/configure
@@ -21504,7 +21504,7 @@
libgtop_have_sysinfo=yes
libgtop_need_server=no
;;
- freebsd*|netbsd*|openbsd*|bsdi*)
+ freebsd*|netbsd*|openbsd*|bsdi*|kfreebsd*)
libgtop_sysdeps_dir=freebsd
libgtop_use_machine_h=yes
libgtop_need_server=yes
@@ -21563,7 +21563,93 @@
case "$host_os" in
*bsd*)
- { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
+ case "$host_os" in
+ *kfreebsd*)
+ { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
+echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; }
+if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lkvm -lfreebsd -lbsd $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char kvm_open ();
+int
+main ()
+{
+return kvm_open ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_kvm_kvm_open=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_lib_kvm_kvm_open=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_kvm_kvm_open" >&5
+echo "${ECHO_T}$ac_cv_lib_kvm_kvm_open" >&6; }
+if test $ac_cv_lib_kvm_kvm_open = yes; then
+ KVM_LIBS="-lkvm -lfreebsd -lbsd"
+else
+ KVM_LIBS=
+fi
+;;
+ *)
+ { echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6; }
if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21645,6 +21731,8 @@
else
KVM_LIBS=
fi
+;;
+ esac
@@ -21839,7 +21927,7 @@
#include <net/netisr.h>
#include <net/route.h>
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
#include <net/if_sppp.h>
#else
#include <i4b/sppp/if_sppp.h>
@@ -21928,7 +22016,7 @@
#include <net/netisr.h>
#include <net/route.h>
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__FreeBSD_kernel__)
#include <net/if_sppp.h>
#else
#include <i4b/sppp/if_sppp.h>

108
debian/patches/20_glibtop_get_proc_map-stack-overflow.patch vendored
View File

@@ -1,108 +0,0 @@
Index: sysdeps/linux/procmap.c
===================================================================
--- sysdeps/linux/procmap.c (révision 2545)
+++ sysdeps/linux/procmap.c (révision 2546)
@@ -38,7 +38,7 @@
#define SMAPS_FILE "/proc/%u/smaps"
-#define PROC_MAPS_FORMAT "%16llx-%16llx %4c %16llx %02hx:%02hx %llu%*[ ]%[^\n]\n"
+#define PROC_MAPS_FORMAT "%16llx-%16llx %4c %16llx %02hx:%02hx %llu%*[ ]%n"
static const unsigned long _glibtop_sysdeps_proc_map =
@@ -132,6 +132,8 @@
FILE *maps;
const char *filename;
gboolean has_smaps;
+ char *line = NULL;
+ size_t line_size = 0;
glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_MAP, 0);
@@ -152,33 +154,29 @@
while(TRUE)
{
- char line[1024];
-
unsigned long perm = 0;
- int rv;
guint len;
+ int line_end;
unsigned short dev_major, dev_minor;
guint64 start, end, offset, inode;
char flags[4];
- char filename [GLIBTOP_MAP_FILENAME_LEN+1];
+ char *filename;
glibtop_map_entry *entry;
- if (!fgets(line, sizeof line, maps))
+ if (getline(&line, &line_size, maps) == -1)
break;
/* 8 arguments */
- rv = sscanf(line, PROC_MAPS_FORMAT,
- &start, &end, flags, &offset,
- &dev_major, &dev_minor, &inode, filename);
+ if (sscanf(line, PROC_MAPS_FORMAT,
+ &start, &end, flags, &offset,
+ &dev_major, &dev_minor, &inode, &line_end) != 7)
+ break;
- if(rv == EOF || rv < 7)
- break;
+ filename = line + line_end;
+ g_strstrip(filename);
- if(rv == 7) /* no filename */
- filename[0] = '\0';
-
/* Compute access permissions. */
if (flags [0] == 'r')
@@ -217,6 +215,7 @@
}
+ free(line);
fclose (maps);
buf->flags = _glibtop_sysdeps_proc_map;
Index: sysdeps/linux/procopenfiles.c
===================================================================
--- sysdeps/linux/procopenfiles.c (révision 2545)
+++ sysdeps/linux/procopenfiles.c (révision 2546)
@@ -58,7 +58,8 @@
parse_file(const char *filename, LineParser parser, GHashTable *dict)
{
FILE *f;
- char line[1024];
+ char *line = NULL;
+ size_t size = 0;
f = fopen(filename, "r");
@@ -67,15 +68,16 @@
return;
}
+
/* skip the first line */
- if(!fgets(line, sizeof line, f)) goto eof;
+ if (getline(&line, &size, f) == -1)
+ goto eof;
- while(fgets(line, sizeof line, f))
- {
+ while (getline(&line, &size, f) != -1)
parser(dict, line);
- }
eof:
+ free(line);
fclose(f);
}