Added `Process current working directory' feature (proc_cwd).

2000-04-24  Martin Baulig  <baulig@suse.de>

	Added `Process current working directory' feature (proc_cwd).

	* include/glibtop/proc_cwd.h: New file.
	* features.def: Added `proc_cwd'.

	* include/glibtop/sysdeps.h (glibtop_sysdeps): Added `proc_cwd'.
	* include/glibtop/union.h (glibtop_union): Added `proc_cwd'.

	* sysdeps/stub/proc_cwd.c: New file.
	* sysdeps/names/proc_cwd.c: New file.

ChangeLog

@@ -1,3 +1,16 @@
+2000-04-24  Martin Baulig  <baulig@suse.de>
+
+	Added `Process current working directory' feature (proc_cwd).
+
+	* include/glibtop/proc_cwd.h: New file.
+	* features.def: Added `proc_cwd'.
+
+	* include/glibtop/sysdeps.h (glibtop_sysdeps): Added `proc_cwd'.
+	* include/glibtop/union.h (glibtop_union): Added `proc_cwd'.
+
+	* sysdeps/stub/proc_cwd.c: New file.
+	* sysdeps/names/proc_cwd.c: New file.
+
 2000-04-19  Pablo Saratxaga <pablo@mandrakesoft.com>
 
 	* configure.in (ALL_LINGUAS): added Catalan

features.def

@@ -14,6 +14,7 @@ retval|proc_time|long(start_time,rtime,utime,stime,cutime,cstime,timeout,it_real
 retval|proc_signal|ulong(signal[2],blocked[2],sigignore[2],sigcatch[2])|pid_t(pid)
 retval|proc_kernel|ulong(k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt,kstk_esp,kstk_eip,nwchan):string(wchan)|pid_t(pid)
 retval|proc_segment|ulong(text_rss,shlib_rss,data_rss,stack_rss,dirty_size,start_code,end_code,start_data,end_data,start_brk,end_brk,start_stack,start_mmap,arg_start,arg_end,env_start,env_end)|pid_t(pid)
+char *|proc_cwd|ulong(size,device,inode)|pid_t(pid)
 pointer(string)|proc_args|array|pid_t(pid)
 array(glibtop_map_entry)|proc_map|array|pid_t(pid)
 array(glibtop_mountentry)|@mountlist|array|int(all_fs)

include/glibtop/proccwd.h

@@ -0,0 +1,83 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/* $Id$ */
+
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
+
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+   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.
+*/
+
+#ifndef __GLIBTOP_PROCCWD_H__
+#define __GLIBTOP_PROCCWD_H__
+
+#include <glibtop.h>
+#include <glibtop/global.h>
+
+#include <glibtop/array.h>
+
+BEGIN_LIBGTOP_DECLS
+
+#define GLIBTOP_PROC_CWD_SIZE			0
+#define GLIBTOP_PROC_CWD_DEVICE			1
+#define GLIBTOP_PROC_CWD_INODE			2
+
+#define GLIBTOP_MAX_PROC_CWD			3
+
+typedef struct _glibtop_proc_cwd	glibtop_proc_cwd;
+
+/* Cwd stuff */
+
+struct _glibtop_proc_cwd
+{
+    u_int64_t	flags,
+	size,
+	device,
+	inode;
+};
+
+#define glibtop_get_proc_cwd(p1, p2)	glibtop_get_proc_cwd_l(glibtop_global_server, p1, p2)
+
+#if GLIBTOP_SUID_PROC_CWD
+#define glibtop_get_proc_cwd_r		glibtop_get_proc_cwd_p
+#else
+#define glibtop_get_proc_cwd_r		glibtop_get_proc_cwd_s
+#endif
+
+char *glibtop_get_proc_cwd_l (glibtop *server, glibtop_proc_cwd *buf, pid_t pid);
+
+#if GLIBTOP_SUID_PROC_CWD
+int glibtop_init_proc_cwd_p (glibtop *server);
+char *glibtop_get_proc_cwd_p (glibtop *server, glibtop_proc_cwd *buf, pid_t pid);
+#else
+int glibtop_init_proc_cwd_s (glibtop *server);
+char *glibtop_get_proc_cwd_s (glibtop *server, glibtop_proc_cwd *buf, pid_t pid);
+#endif
+
+#ifdef GLIBTOP_NAMES
+
+/* You need to link with -lgtop_names to get this stuff here. */
+
+extern const char *glibtop_names_proc_cwd [];
+extern const unsigned glibtop_types_proc_cwd [];
+extern const char *glibtop_labels_proc_cwd [];
+extern const char *glibtop_descriptions_proc_cwd [];
+
+#endif
+
+#endif

include/glibtop/sysdeps.h

@@ -46,16 +46,17 @@ BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_SYSDEPS_PROC_SIGNAL	13
 #define GLIBTOP_SYSDEPS_PROC_KERNEL	14
 #define GLIBTOP_SYSDEPS_PROC_SEGMENT	15
-#define GLIBTOP_SYSDEPS_PROC_ARGS	16
+#define GLIBTOP_SYSDEPS_PROC_CWD	16
-#define GLIBTOP_SYSDEPS_PROC_MAP	17
+#define GLIBTOP_SYSDEPS_PROC_ARGS	17
-#define GLIBTOP_SYSDEPS_MOUNTLIST	18
+#define GLIBTOP_SYSDEPS_PROC_MAP	18
-#define GLIBTOP_SYSDEPS_FSUSAGE		19
+#define GLIBTOP_SYSDEPS_MOUNTLIST	19
-#define GLIBTOP_SYSDEPS_INTERFACE_NAMES	20
+#define GLIBTOP_SYSDEPS_FSUSAGE		20
-#define GLIBTOP_SYSDEPS_NETINFO		21
+#define GLIBTOP_SYSDEPS_INTERFACE_NAMES	21
-#define GLIBTOP_SYSDEPS_NETLOAD		22
+#define GLIBTOP_SYSDEPS_NETINFO		22
-#define GLIBTOP_SYSDEPS_PPP		23
+#define GLIBTOP_SYSDEPS_NETLOAD		23
+#define GLIBTOP_SYSDEPS_PPP		24
 
-#define GLIBTOP_MAX_SYSDEPS		26
+#define GLIBTOP_MAX_SYSDEPS		27
 
 #define GLIBTOP_SYSDEPS_ALL		((1 << GLIBTOP_MAX_SYSDEPS) - 1)
 
@@ -86,6 +87,7 @@ struct _glibtop_sysdeps
 	proc_signal,		/* glibtop_proc_signal	*/
 	proc_kernel,		/* glibtop_proc_kernel	*/
 	proc_segment,		/* glibtop_proc_segment	*/
+	proc_cwd,		/* glibtop_proc_cwd	*/
 	proc_args,		/* glibtop_proc_args	*/
 	proc_map,		/* glibtop_proc_map	*/
 	mountlist,		/* glibtop_mountlist	*/

include/glibtop/union.h

@@ -46,6 +46,8 @@
 #include <glibtop/procargs.h>
 #include <glibtop/procmap.h>
 
+#include <glibtop/proccwd.h>
+
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
 
@@ -76,6 +78,7 @@ union _glibtop_union
     glibtop_proc_signal		proc_signal;
     glibtop_proc_kernel		proc_kernel;
     glibtop_proc_segment	proc_segment;
+    glibtop_proc_cwd		proc_cwd;
     glibtop_array		proc_args;
     glibtop_array		proc_map;
     glibtop_array		mountlist;

sysdeps/names/Makefile.am

@@ -8,7 +8,7 @@ libgtop_names_la_SOURCES	= cpu.c mem.c swap.c uptime.c loadavg.c \
 				  shm_limits.c msg_limits.c sem_limits.c \
 				  proclist.c sysdeps.c procstate.c procuid.c \
 				  proctime.c procmem.c procsignal.c \
-				  prockernel.c procsegment.c fsusage.c \
+				  prockernel.c procsegment.c proccwd.c fsusage.c \
 				  mountlist.c procargs.c procmap.c netinfo.c \
 				  netload.c interfaces.c ppp.c
 

sysdeps/names/proccwd.c

@@ -0,0 +1,47 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/* $Id$ */
+
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
+
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+   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 <glibtop.h>
+#include <glibtop/proccwd.h>
+
+const char *glibtop_names_proc_cwd[GLIBTOP_MAX_PROC_CWD] =
+{
+    "size", "device", "inode"
+};
+
+const unsigned glibtop_types_proc_cwd[GLIBTOP_MAX_PROC_CWD] =
+{
+    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
+};
+
+const char *glibtop_labels_proc_cwd[GLIBTOP_MAX_PROC_CWD] =
+{
+    N_ ("Size"), N_ ("Device"), N_ ("Inode")
+};
+
+const char *glibtop_descriptions_proc_cwd[GLIBTOP_MAX_PROC_CWD] =
+{
+    N_ ("Size"), N_ ("Device"), N_ ("Inode")
+};

sysdeps/names/sysdeps.c

@@ -30,7 +30,7 @@ const char *glibtop_names_sysdeps[GLIBTOP_MAX_SYSDEPS] =
     "features", "pointer_size", "cpu", "mem", "swap", "uptime",
     "loadavg", "shm_limits", "msg_limits", "sem_limits", "proclist",
     "proc_state", "proc_uid", "proc_mem", "proc_time",
-    "proc_signal", "proc_kernel", "proc_segment", "proc_args",
+    "proc_signal", "proc_kernel", "proc_segment", "proc_cwd", "proc_args",
     "proc_map", "mountlist", "fsusage", "netload", "interface_names",
     "ppp"
 };
@@ -45,7 +45,7 @@ const unsigned glibtop_types_sysdeps[GLIBTOP_MAX_SYSDEPS] =
     GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
     GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
     GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG,
-    GLIBTOP_TYPE_ULONG
+    GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG
 };
 
 const char *glibtop_labels_sysdeps[GLIBTOP_MAX_SYSDEPS] =
@@ -68,6 +68,7 @@ const char *glibtop_labels_sysdeps[GLIBTOP_MAX_SYSDEPS] =
     N_ ("Process Signal information"),
     N_ ("Process Kernel Data information"),
     N_ ("Process Segment information"),
+    N_ ("Process CWD"),
     N_ ("Process Arguments"),
     N_ ("Process Memory Map"),
     N_ ("Mount List"),
@@ -97,6 +98,7 @@ const char *glibtop_descriptions_sysdeps[GLIBTOP_MAX_SYSDEPS] =
     N_ ("Process Signal information"),
     N_ ("Process Kernel Data information"),
     N_ ("Process Segment information"),
+    N_ ("Current working directory of the process"),
     N_ ("Command line arguments of the process"),
     N_ ("Process Memory Map"),
     N_ ("List of currently mounted filesystems"),

sysdeps/stub/proccwd.c

@@ -0,0 +1,51 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
+
+/* $Id$ */
+
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
+
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+   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 <glibtop.h>
+#include <glibtop/error.h>
+#include <glibtop/xmalloc.h>
+#include <glibtop/proccwd.h>
+
+static const unsigned long _glibtop_sysdeps_proc_cwd = 0;
+
+/* Init function. */
+
+int
+glibtop_init_proc_cwd_s (glibtop *server)
+{
+    server->sysdeps.proc_cwd = _glibtop_sysdeps_proc_cwd;
+
+    return 0;
+}
+
+/* Provides detailed information about a process. */
+
+char *
+glibtop_get_proc_cwd_s (glibtop *server, glibtop_proc_cwd *buf, pid_t pid)
+{
+    memset (buf, 0, sizeof (glibtop_proc_cwd));
+
+    return NULL;
+}