7e93937adf
debian/patches/03_kfreebsd_installdirs.patch, debian/patches/04_kfreebsd_version_check.patch, debian/patches/05_kfreebsd_8.0.patch: - Add headers.
179 lines
6.5 KiB
Diff
179 lines
6.5 KiB
Diff
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=602662
|
|
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=557446
|
|
Author: Samuel Thibault <sthibault@debian.org>
|
|
|
|
Fix the stub backend to build again, making libgtop build on the Hurd.
|
|
|
|
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/Makefile.am libgtop2-2.28.0/sysdeps/stub/Makefile.am
|
|
--- libgtop2-2.28.0.sav/sysdeps/stub/Makefile.am 2009-04-18 23:29:49.000000000 +0000
|
|
+++ libgtop2-2.28.0/sysdeps/stub/Makefile.am 2009-11-22 01:07:39.000000000 +0000
|
|
@@ -8,7 +8,8 @@
|
|
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 netlist.c procopenfiles.c
|
|
+ ppp.c netlist.c procopenfiles.c procwd.c \
|
|
+ procaffinity.c sysinfo.c
|
|
|
|
libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
|
|
|
|
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/glibtop_server.h libgtop2-2.28.0/sysdeps/stub/glibtop_server.h
|
|
--- libgtop2-2.28.0.sav/sysdeps/stub/glibtop_server.h 2009-04-18 23:29:49.000000000 +0000
|
|
+++ libgtop2-2.28.0/sysdeps/stub/glibtop_server.h 2009-11-22 01:02:16.000000000 +0000
|
|
@@ -45,6 +45,8 @@
|
|
#define GLIBTOP_SUID_NETLOAD 0
|
|
#define GLIBTOP_SUID_NETLIST 0
|
|
#define GLIBTOP_SUID_PPP 0
|
|
+#define GLIBTOP_SUID_PROC_WD 0
|
|
+#define GLIBTOP_SUID_PROC_AFFINITY 0
|
|
|
|
G_END_DECLS
|
|
|
|
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/procaffinity.c libgtop2-2.28.0/sysdeps/stub/procaffinity.c
|
|
--- libgtop2-2.28.0.sav/sysdeps/stub/procaffinity.c 1970-01-01 00:00:00.000000000 +0000
|
|
+++ libgtop2-2.28.0/sysdeps/stub/procaffinity.c 2009-11-22 01:06:58.000000000 +0000
|
|
@@ -0,0 +1,44 @@
|
|
+/*
|
|
+
|
|
+ This file is part of LibGTop 2.
|
|
+
|
|
+ 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 <config.h>
|
|
+#include <glibtop/procaffinity.h>
|
|
+#include <glibtop/error.h>
|
|
+
|
|
+#include <sys/param.h>
|
|
+
|
|
+void
|
|
+_glibtop_init_proc_affinity_s(glibtop *server)
|
|
+{
|
|
+ server->sysdeps.proc_affinity =
|
|
+ (1 << GLIBTOP_PROC_AFFINITY_NUMBER) |
|
|
+ (1 << GLIBTOP_PROC_AFFINITY_ALL);
|
|
+
|
|
+}
|
|
+
|
|
+
|
|
+guint16 *
|
|
+glibtop_get_proc_affinity_s(glibtop *server, glibtop_proc_affinity *buf, pid_t pid)
|
|
+{
|
|
+ memset(buf, 0, sizeof *buf);
|
|
+
|
|
+ return NULL;
|
|
+}
|
|
+
|
|
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/proclist.c libgtop2-2.28.0/sysdeps/stub/proclist.c
|
|
--- libgtop2-2.28.0.sav/sysdeps/stub/proclist.c 2009-04-18 23:29:49.000000000 +0000
|
|
+++ libgtop2-2.28.0/sysdeps/stub/proclist.c 2009-11-22 01:30:53.000000000 +0000
|
|
@@ -42,7 +42,7 @@
|
|
* On success, it returnes a pointer to a list of buf->number elements
|
|
* each buf->size big. The total size is stored in buf->total. */
|
|
|
|
-unsigned *
|
|
+pid_t *
|
|
glibtop_get_proclist_s (glibtop *server, glibtop_proclist *buf,
|
|
gint64 which, gint64 arg)
|
|
{
|
|
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/procwd.c libgtop2-2.28.0/sysdeps/stub/procwd.c
|
|
--- libgtop2-2.28.0.sav/sysdeps/stub/procwd.c 1970-01-01 00:00:00.000000000 +0000
|
|
+++ libgtop2-2.28.0/sysdeps/stub/procwd.c 2009-11-22 01:46:06.000000000 +0000
|
|
@@ -0,0 +1,48 @@
|
|
+/*
|
|
+ This file is part of LibGTop 2.0.
|
|
+
|
|
+ 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 <config.h>
|
|
+#include <glibtop/procwd.h>
|
|
+#include <glibtop/error.h>
|
|
+
|
|
+#include <unistd.h>
|
|
+#include <dirent.h>
|
|
+#include <sys/types.h>
|
|
+
|
|
+static const unsigned long _glibtop_sysdeps_proc_wd = 0;
|
|
+
|
|
+/* Init function. */
|
|
+
|
|
+void
|
|
+_glibtop_init_proc_wd_s (glibtop *server)
|
|
+{
|
|
+ server->sysdeps.proc_wd = _glibtop_sysdeps_proc_wd;
|
|
+}
|
|
+
|
|
+/* Provides detailed information about a process. */
|
|
+
|
|
+char **
|
|
+glibtop_get_proc_wd_s (glibtop *server, glibtop_proc_wd *buf,
|
|
+ pid_t pid)
|
|
+{
|
|
+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_WD, 0);
|
|
+
|
|
+ memset (buf, 0, sizeof (glibtop_proc_wd));
|
|
+ return NULL;
|
|
+}
|
|
diff -urN --exclude='*.o' --exclude='*.lo' --exclude='*.in' libgtop2-2.28.0.sav/sysdeps/stub/sysinfo.c libgtop2-2.28.0/sysdeps/stub/sysinfo.c
|
|
--- libgtop2-2.28.0.sav/sysdeps/stub/sysinfo.c 1970-01-01 00:00:00.000000000 +0000
|
|
+++ libgtop2-2.28.0/sysdeps/stub/sysinfo.c 2009-11-22 02:08:44.000000000 +0000
|
|
@@ -0,0 +1,31 @@
|
|
+/*
|
|
+ This file is part of LibGTop 2.0.
|
|
+
|
|
+ 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 <config.h>
|
|
+#include <glibtop/cpu.h>
|
|
+#include <glibtop/sysinfo.h>
|
|
+
|
|
+static glibtop_sysinfo sysinfo = { };
|
|
+const glibtop_sysinfo *
|
|
+glibtop_get_sysinfo_s (glibtop *server)
|
|
+{
|
|
+ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
|
|
+
|
|
+ return &sysinfo;
|
|
+}
|