summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>2010-06-16 15:06:27 -0500
committerBenoƮt Dejean <benoit@placenet.org>2010-11-28 15:46:33 +0100
commit3cc7b3aecba95741e01327f071c90b1763c97af2 (patch)
tree74e76c84220edf0c303b505e91555405149d5840
parentf7e1ab5a0e43fe2b34e5ace00e22cfa4167ac195 (diff)
downloadlibgtop-3cc7b3aecba95741e01327f071c90b1763c97af2.tar.gz
Cygwin: Add private mountlist support.
https://bugzilla.gnome.org/show_bug.cgi?id=621820
-rw-r--r--libgtop-sysdeps.m41
-rw-r--r--sysdeps/cygwin/Makefile.am2
-rw-r--r--sysdeps/cygwin/mountlist.c164
3 files changed, 166 insertions, 1 deletions
diff --git a/libgtop-sysdeps.m4 b/libgtop-sysdeps.m4
index 6061fd9f..e960caee 100644
--- a/libgtop-sysdeps.m4
+++ b/libgtop-sysdeps.m4
@@ -108,6 +108,7 @@ AC_DEFUN([GNOME_LIBGTOP_SYSDEPS],[
libgtop_use_machine_h=no
libgtop_need_server=no
libgtop_have_sysinfo=yes
+ libgtop_sysdeps_private_mountlist=yes
;;
*)
if test x$hacker_mode = xyes ; then
diff --git a/sysdeps/cygwin/Makefile.am b/sysdeps/cygwin/Makefile.am
index 2701c9de..ec232f64 100644
--- a/sysdeps/cygwin/Makefile.am
+++ b/sysdeps/cygwin/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = @INCLUDES@
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la
libgtop_sysdeps_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \
- uptime.c loadavg.c shm_limits.c msg_limits.c \
+ uptime.c loadavg.c mountlist.c shm_limits.c msg_limits.c \
sem_limits.c proclist.c procstate.c procuid.c \
proctime.c procmem.c procsignal.c prockernel.c \
procsegment.c procargs.c procmap.c siglist.c \
diff --git a/sysdeps/cygwin/mountlist.c b/sysdeps/cygwin/mountlist.c
new file mode 100644
index 00000000..f6b2e204
--- /dev/null
+++ b/sysdeps/cygwin/mountlist.c
@@ -0,0 +1,164 @@
+/* mountlist.c -- return a list of mounted filesystems
+ Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+
+ This file is a fork of sysdeps/common/mountlist.c.
+
+ This program 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, or (at your option)
+ any later version.
+
+ This program 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 this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+
+/*
+Local Variables:
+mode: C
+c-file-style: "gnu"
+End:
+*/
+
+#include <config.h>
+
+#include <stdio.h>
+#include <mntent.h>
+
+#include <glibtop.h>
+#include <glibtop/mountlist.h>
+#include <glibtop/error.h>
+
+
+/* IgnoreList */
+
+
+typedef struct
+{
+ GHashTable *table;
+} IgnoreList;
+
+
+static IgnoreList*
+ignore_list_new(void)
+{
+ IgnoreList* ig;
+ ig = g_new(IgnoreList, 1);
+ ig->table = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
+ return ig;
+}
+
+
+static void
+ignore_list_delete(IgnoreList* ig)
+{
+ if (ig) {
+ g_hash_table_destroy(ig->table);
+ g_free(ig);
+ }
+}
+
+
+static void
+ignore_list_add(IgnoreList* ig, const char* fs)
+{
+ g_hash_table_insert(ig->table, g_strdup(fs), GINT_TO_POINTER(1));
+}
+
+
+static gboolean
+ignore_list_has(IgnoreList* ig, const char* fs)
+{
+ gpointer data;
+ data = g_hash_table_lookup(ig->table, fs);
+ return data != NULL;
+}
+
+
+/* ~IgnoreList */
+
+
+static gboolean
+ignore_fs(const char *fstype, IgnoreList** ig)
+{
+ if (!*ig) {
+ FILE* fs;
+ char line[128];
+
+ *ig = ignore_list_new();
+
+ ignore_list_add(*ig, "none");
+
+ if ((fs = fopen("/proc/filesystems", "r")) != NULL) {
+ while (fgets(line, sizeof line, fs)) {
+ if (!strncmp(line, "nodev", 5)) {
+ char *type;
+ type = g_strstrip(line + 5);
+ ignore_list_add(*ig, type);
+ }
+ }
+ fclose(fs);
+ }
+ }
+
+ return ignore_list_has(*ig, fstype);
+}
+
+
+glibtop_mountentry *
+glibtop_get_mountlist_s(glibtop *server, glibtop_mountlist *buf, int all_fs)
+{
+ const struct mntent *mnt;
+ FILE *fp;
+ GArray* entries;
+ IgnoreList* ig = NULL;
+
+ memset(buf, 0, sizeof(glibtop_mountlist));
+
+ /* wild guess, preallocate 8 entries
+ on a desktop, almost everyone has / and a tmpfs for udev
+ if all_fs, there are also proc, sys, fuse, binfmt, etc */
+ entries = g_array_sized_new(FALSE, FALSE, sizeof(glibtop_mountentry), 8);
+
+ if (!(fp = setmntent(MOUNTED, "r"))) {
+ glibtop_warn_io_r(server, "Could not open %s", MOUNTED);
+ goto out;
+ }
+
+ while ((mnt = getmntent(fp)))
+ {
+ glibtop_mountentry *me;
+ gsize len;
+
+ if (!all_fs && ignore_fs(mnt->mnt_type, &ig))
+ continue;
+
+ len = entries->len;
+ g_array_set_size(entries, len + 1);
+ me = &g_array_index(entries, glibtop_mountentry, len);
+
+ g_strlcpy(me->devname, mnt->mnt_fsname, sizeof me->devname);
+ g_strlcpy(me->mountdir, mnt->mnt_dir, sizeof me->mountdir);
+ g_strlcpy(me->type, mnt->mnt_type, sizeof me->type);
+ }
+
+ endmntent(fp);
+
+
+ out:
+ ignore_list_delete(ig);
+
+ buf->size = sizeof(glibtop_mountentry);
+ buf->number = entries->len;
+ buf->total = buf->number * buf->size;
+ buf->flags = (1 << GLIBTOP_MOUNTLIST_SIZE)
+ | (1 << GLIBTOP_MOUNTLIST_NUMBER)
+ | (1 << GLIBTOP_MOUNTLIST_TOTAL);
+
+ return (glibtop_mountentry*) g_array_free(entries, FALSE);
+}