diff options
| author | jperkin <jperkin@pkgsrc.org> | 2013-02-26 15:54:16 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2013-02-26 15:54:16 +0000 |
| commit | bbe80994dd89c242a0ba7b2d7dcdf18fa7020da8 (patch) | |
| tree | 9edcedd0981373ac58d8f2d31b6cc5c2b2c77af1 /sysutils/libgtop/patches | |
| parent | baaa5cc712ea0580558ad977b5ae5c2e0cdb3f5d (diff) | |
| download | pkgsrc-bbe80994dd89c242a0ba7b2d7dcdf18fa7020da8.tar.gz | |
Implement stubs for missing functions on Solaris. This at least gets us a
working package - help fleshing them out with actual data is appreciated.
Diffstat (limited to 'sysutils/libgtop/patches')
| -rw-r--r-- | sysutils/libgtop/patches/patch-sysdeps_solaris_glibtop__server.h | 15 | ||||
| -rw-r--r-- | sysutils/libgtop/patches/patch-sysdeps_solaris_procopenfiles.c | 65 |
2 files changed, 80 insertions, 0 deletions
diff --git a/sysutils/libgtop/patches/patch-sysdeps_solaris_glibtop__server.h b/sysutils/libgtop/patches/patch-sysdeps_solaris_glibtop__server.h new file mode 100644 index 00000000000..110eeb2f2c7 --- /dev/null +++ b/sysutils/libgtop/patches/patch-sysdeps_solaris_glibtop__server.h @@ -0,0 +1,15 @@ +$NetBSD: patch-sysdeps_solaris_glibtop__server.h,v 1.1 2013/02/26 15:54:16 jperkin Exp $ + +Add missing defines. + +--- sysdeps/solaris/glibtop_server.h.orig 2011-06-01 15:40:47.000000000 +0000 ++++ sysdeps/solaris/glibtop_server.h +@@ -45,6 +45,8 @@ G_BEGIN_DECLS + #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 --git a/sysutils/libgtop/patches/patch-sysdeps_solaris_procopenfiles.c b/sysutils/libgtop/patches/patch-sysdeps_solaris_procopenfiles.c new file mode 100644 index 00000000000..b9d085db0ab --- /dev/null +++ b/sysutils/libgtop/patches/patch-sysdeps_solaris_procopenfiles.c @@ -0,0 +1,65 @@ +$NetBSD: patch-sysdeps_solaris_procopenfiles.c,v 1.1 2013/02/26 15:54:16 jperkin Exp $ + +Implement stub functions for Solaris to at least get the package to +build. Help filling them out with actual data would be very welcome. + +--- sysdeps/solaris/procopenfiles.c.orig 2011-06-01 15:40:47.000000000 +0000 ++++ sysdeps/solaris/procopenfiles.c +@@ -22,7 +22,10 @@ + #include <config.h> + #include <glibtop.h> + #include <glibtop/error.h> ++#include <glibtop/procaffinity.h> + #include <glibtop/procopenfiles.h> ++#include <glibtop/procwd.h> ++#include <glibtop/sysinfo.h> + #include <sys/types.h> + #include <fcntl.h> + #include <sys/stat.h> +@@ -126,3 +129,46 @@ glibtop_get_proc_open_files_s (glibtop * + + return (glibtop_open_files_entry*)g_array_free(entries, FALSE); + } ++ ++/* ++ * Stub functions, currently unimplemented on Solaris ++ */ ++void ++_glibtop_init_proc_wd_s (glibtop *server) ++{ ++ server->sysdeps.proc_wd = ++ (1 << GLIBTOP_PROC_WD_EXE) | ++ (1 << GLIBTOP_PROC_WD_ROOT) | ++ (1 << GLIBTOP_PROC_WD_NUMBER); ++} ++char ** ++glibtop_get_proc_wd_s (glibtop *server, glibtop_proc_wd *buf, pid_t pid) ++{ ++ memset (buf, 0, sizeof (glibtop_proc_wd)); ++ return NULL; ++} ++ ++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 (glibtop_proc_affinity)); ++ return NULL; ++} ++ ++static glibtop_sysinfo sysinfo = { .flags = 0 }; ++ ++const glibtop_sysinfo * ++glibtop_get_sysinfo_s (glibtop *server) ++{ ++ server->sysdeps.flags = ++ (1L << GLIBTOP_SYSINFO_CPUINFO); ++ glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0); ++ return NULL; ++} |