Cleanup get_mem for Open-/FreeBSD

Remove unnecessary files, use ifdef to decide for which platform to compile for.
Typo in Makefile
2020-11-17 18:14:24 +01:00 · 2020-11-16 18:40:32 +01:00 · 2020-11-16 14:13:39 +00:00 · 2020-11-16 14:13:19 +00:00 · 2020-11-16 15:11:08 +01:00 · 2020-11-16 14:56:56 +01:00
9 changed files with 388 additions and 141 deletions
--- a/27
+++ b/27
@@ -1,8 +1,17 @@
 PROG=       xmem
-VERSION=    1.26
-LDFLAGS+=   -L/usr/X11R6/lib -lX11 -lXt -lXaw -lXmu 
-CFLAGS+=    -Wall -I/usr/X11R6/include/
-OBJECTS=    xmem.o get_mem.o MemStripChart.o
+VERSION=    1.27
+LDFLAGS+=   -L/usr/X11R6/lib -L/usr/local/lib/ -lX11 -lXt -lXaw -lXmu
+LDFLAGS+=   -lkvm
+CFLAGS+=    -Wall -I/usr/X11R6/include/ -I/usr/local/include/
+OBJECTS=    xmem.o  MemStripChart.o get_mem.o
+
+all: xmem
+
+xmem.full:
+	@echo "full not supported yet"
+
+xmem.debug:
+	@echo "debug not supported yet"

 xmem: $(OBJECTS)
 	$(CC) -o xmem $(OBJECTS) $(LDFLAGS)
@@ -10,10 +19,10 @@ xmem: $(OBJECTS)
 %.o: %c
 	$(CC) $(CFLAGS) -c $<

-clean: 
+clean:
 	-rm -rf $(OBJECTS) $(PROG)

-dist: 
+dist:
 	mkdir -p ${PROG}-${VERSION}
 	cp *.h *.c Makefile xmem.1 xmem.bit copyright XMem.ad ${PROG}-${VERSION}
 	tar cfvz ${PROG}-${VERSION}.tar.gz ${PROG}-${VERSION}
@@ -23,16 +32,14 @@ dist-clean:
 	-rm ${PROG}-${VERSION}.tar.gz

 install:
-	install -d -m 755 {PREFIX}/bin/
+	install -d -m 755 ${PREFIX}/bin/
 	install -c -S -s -o root -g bin -m 755 xmem ${PREFIX}/bin/xmem
 	install -d -m 755 ${PREFIX}/man/man1/
 	install -c -o root -g bin -m 644 xmem.1 ${PREFIX}/man/man1/xmem.1
 	install -d -m 755 ${PREFIX}/lib/X11/app-defaults/
 	install -c -o root -g bin -m 644 XMem.ad ${PREFIX}/lib/X11/app-defaults/XMem
-	install -d -m 755 ${PREFIX}/share/${PROG}/ 
+	install -d -m 755 ${PREFIX}/share/${PROG}/
 	install -c -o root -g bin -m 644 xmem.bit ${PREFIX}/share/${PROG}/xmem.bit
 	install -c -o root -g bin -m 644 copyright ${PREFIX}/share/${PROG}/copyright

-all: xmem
-
 .include <bsd.prog.mk>
--- a/README.md
+++ b/README.md
@@ -0,0 +1,2 @@
+# xmem(1) X11 Utility
+![fvwm and xmem](https://git.sdf.org/bch/xmem/raw/branch/master/www/xmem_fvwmbar.png)
--- a/get_mem.c
+++ b/get_mem.c
@@ -1,14 +1,18 @@
-/*  $Id: get_mem.c,v 1.4 2017/02/26 16:03:48 bch Exp $
- * Adapted: get memory usage on OpenBSD
- * Author: Christian Barthel <bch@vcs.onfire.org>
+/*  $Id: get_mem.c,v 1.5 2018/12/26 18:46:04 bch Exp $
+ *
+ * xmem(1) utility adapted by Christian Barthel <bch@online.de>:
+ *   - Added OpenBSD support
+ *   - Added FreeBSD support
 *
 * get memory usage, from get_load.c derived
 *
 * Author:  Hans-Helmut Buehmann 20. Jan. 1996
- * 
+ *
 * Modified for more recent kernels Helmut Geyer Oct. 1996
 */

+#if __OpenBSD__
+
 #include <sys/param.h>	/* DEV_BSIZE MAXCOMLEN PZERO */
 #include <sys/sysctl.h>
 #include <sys/swap.h>
@@ -24,11 +28,11 @@
 #include <err.h>
 #include "MemStripChart.h"

-static int pageshift = -1; 
+static int pageshift = -1;
 #define pagetok(size) ((size) << pageshift)
-#define LOG1024 10 
+#define LOG1024 10

-static double allmem_kb = 0; 
+static double allmem_kb = 0;

 static void initPageShift(void)
 {
@@ -41,7 +45,7 @@ static void initPageShift(void)
 	pageshift -= LOG1024;
 }

-static double getSwapFrac() 
+static double getSwapFrac()
 {
 	struct swapent *swdev;
 	int used, total, nswap, rnswap, i;
@@ -74,17 +78,17 @@ static double getSwapFrac()
 	return (double)used/total;
 }

-void GetMemLoadPoint(Widget w, caddr_t closure, caddr_t call_data)	
+void GetMemLoadPoint(Widget w, caddr_t closure, caddr_t call_data)
 {
 	static int bcstats_mib[] = {CTL_VFS, VFS_GENERIC, VFS_BCACHESTAT};
 	static int uvmexp_mib[] = {CTL_VM, VM_UVMEXP};
 	MemStripChartCallbackData ret;
 	struct uvmexp uvmexp;
 	struct bcachestats bcstats;
-	size_t size; 
-	
-	if (pageshift < 0) 
-		initPageShift(); 
+	size_t size;
+
+	if (pageshift < 0)
+		initPageShift();

 	size = sizeof(uvmexp);
 	if (sysctl(uvmexp_mib, 2, &uvmexp, &size, NULL, 0) < 0) {
@@ -98,7 +102,7 @@ void GetMemLoadPoint(Widget w, caddr_t closure, caddr_t call_data)
 	}


-	allmem_kb = pagetok(uvmexp.npages); 
+	allmem_kb = pagetok(uvmexp.npages);
 	ret.cached = pagetok(bcstats.numbufpages) / allmem_kb;
 	ret.free = pagetok(uvmexp.free) / allmem_kb;
 	ret.buffer = 0;
@@ -106,9 +110,137 @@ void GetMemLoadPoint(Widget w, caddr_t closure, caddr_t call_data)
 	ret.swap = getSwapFrac();

 #ifdef DEBUG
-	printf("%lf  %lf %lf  %lf %lf\n", allmem_kb, ret.code, ret.cached, ret.free, ret.swap);
+	printf("%lf  %lf %lf  %lf %lf\n",
+	    allmem_kb,
+	    ret.code,
+	    ret.cached,
+	    ret.free,
+	    ret.swap);
 #endif
-	
+
 	memcpy(call_data, &ret, sizeof(MemStripChartCallbackData));
 }

+#endif
+
+/* ------------------------------------------------------------------- */
+
+#if __FreeBSD__
+
+/*  $Id: get_mem_fbsd.c,v 1.1 2018/12/26 18:46:16 bch Exp $
+ *
+ * Author: Christian Barthel <bch@online.de>
+ */
+
+
+#include <sys/types.h>	/* DEV_BSIZE MAXCOMLEN PZERO */
+#include <sys/sysctl.h>
+
+#include <unistd.h>
+#include <kvm.h>
+
+#include <X11/Xos.h>
+#include <X11/Intrinsic.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <err.h>
+#include "MemStripChart.h"
+
+static int pageshift = -1;
+static int pagesize  = 0;
+static kvm_t *kd = 0;
+#define pagetok(size) ((size) << pageshift)
+#define LOG1024 10
+
+static unsigned int allmem_pages = 0;
+
+static void initPageShift(void)
+{
+	pagesize = getpagesize();
+	size_t len = sizeof(allmem_pages);
+	int mib[len];
+	pageshift = 0;
+	while (pagesize > 1) {
+		pageshift++;
+		pagesize >>= 1;
+	}
+	pageshift -= LOG1024;
+
+	kd = kvm_open(NULL, "/dev/null" ,NULL, O_RDONLY, "kvm_open");
+
+	if (sysctlbyname("vm.stats.vm.v_page_count", &allmem_pages, &len, NULL, 0) == -1)
+			perror("sysctl");
+#ifdef DEBUG
+	printf("page_count: %d\n", allmem_pages);
+#endif
+}
+
+static double getSwapFrac()
+{
+		/* XXX Borrowed from top(1) code: */
+		int n;
+		struct kvm_swap swapary[1];
+		static int pagesize = 0;
+		static unsigned long swap_maxpages = 0;
+		size_t sz = sizeof(swap_maxpages);
+
+		int retavail = 0;
+		int retfree = 0;
+
+
+		n = kvm_getswapinfo(kd, swapary, 1, 0);
+		if (n < 0 || swapary[0].ksw_total == 0)
+				return (0);
+
+		if (swap_maxpages == 0)
+				sysctlbyname("vm.swap_maxpages",
+					     &swap_maxpages, &sz, NULL, 0);
+
+		if ( swapary[0].ksw_total > swap_maxpages )
+				swapary[0].ksw_total = swap_maxpages;
+
+		retavail = swapary[0].ksw_total;
+		retfree = swapary[0].ksw_total - swapary[0].ksw_used;
+
+#ifdef DEBUG
+		printf("swap: %d %d %d %d\n", retavail,
+		       retavail, swapary[0].ksw_total,
+		       swapary[0].ksw_used);
+#endif
+		return (double)(retavail-retfree)/(double)retavail;
+}
+
+void GetMemLoadPoint(Widget w, caddr_t closure, caddr_t call_data)
+{
+	MemStripChartCallbackData ret;
+	int a, b;
+	size_t sz = sizeof(int);
+	double cache = 0;
+
+	if (pageshift < 0)
+		initPageShift();
+
+	sysctlbyname("vm.stats.vm.v_wire_count", &a, &sz, NULL, 0);
+	ret.code = (double)a / (double)allmem_pages;
+
+	sysctlbyname("vm.stats.vm.v_active_count", &a, &sz, NULL, 0);
+	ret.buffer = (double)a / (double)allmem_pages;
+
+	/* v_cache_count and v_inactive_count are treated similarly */
+	sysctlbyname("vm.stats.vm.v_inactive_count", &a, &sz, NULL, 0);
+	sysctlbyname("vm.stats.vm.v_cache_count", &b, &sz, NULL, 0);
+	ret.cached = (double)(a + b) / allmem_pages;
+
+
+	sysctlbyname("vm.stats.vm.v_free_count", &a, &sz, NULL, 0);
+	ret.free = (double)a / allmem_pages;
+	ret.swap = getSwapFrac();
+
+#ifdef DEBUG
+	printf("%u  %lf %lf  %lf %lf\n", allmem_pages,
+				 ret.code, ret.cached, ret.free, ret.swap);
+#endif
+	memcpy(call_data, &ret, sizeof(MemStripChartCallbackData));
+}
+
+#endif
--- a/www/index.html
+++ b/www/index.html
@@ -0,0 +1,104 @@
+<head>
+<link rel="shortcut icon" href="stat//icons/favicon.ico" />
+
+
+    <title>onfire.org</title>
+	<style type="text/css">
+  	body {font-family:"Comic Sans MS", cursive, sans-serif; 
+          color: black;
+	}
+	#footer {
+	 position:relative;
+	 bottom:-5em;
+	 text-align:right;
+	 margin-top: 10px;
+         width: 100%;
+         height: 2em;
+	 text-align: right;
+	 line-height: 2.0em;	
+	 padding-right=5px;
+	}
+
+	#all {
+	 position: relative;
+	 padding-left: 10px;
+	 padding-right: 38px;
+ 	}
+
+.blink {
+  animation: blink 1s steps(5, start) infinite;
+  -webkit-animation: blink 1s steps(5, start) infinite;
+}
+@keyframes blink {
+  to {
+    visibility: hidden;
+  }
+}
+@-webkit-keyframes blink {
+  to {
+    visibility: hidden;
+  }
+}
+
+  </style>
+
+</head>
+
+<body bgcolor="white">
+  <h1>xmem</h1>
+  <tt>xmem</tt> is an X11 utility to display memory and swap usage.  It was initially 
+  created by the K. Shane Hartman (MIT-LCS) and Stuart A. Malone (MIT-LCS); with
+  features added by Jim Gettys (MIT-Athena), Bob Scheifler (MIT-LCS),
+  Tony Della Fera (MIT-Athena), and Chris Peterson (MIT-LCS).  I did the initial 
+   import from a Debian package and added support for OpenBSD and pledged the code.  
+  <br>
+  I wasn't able to find any homepage, so I decided to host
+  <a href="https://git.onfire.org/bch/cgi-bin/gitweb.cgi?p=unix/xmem;a=summary">code</a>
+  and
+  <a href="http://onfire.org/snapshots/xmem/xmem-1.26.tar.gz">snapshots</a> here.
+  Current version is 1.26.
+  If you are, or know the author, please let <a href="mailto:bch@online.de">me</a> know! 
+  <br>
+  <h2>Sample: running xmem on my system: </h2>
+<table border=0>
+ <tr>
+ <td>
+  <a href="./xmem.png"><img src="./xmem_s.png" alt="xmem pic"></a>
+ </td>
+ <td>
+  <a href="./xmem_fvwmbar.png"><img src="./xmem_fvwmbar_s.png" alt="xmem pic"></a>
+ </td>
+ </tr>
+</table>
+<p>Another xmem(1) user: <a href="https://xteddy.org/xmem.html">xteddy.org/xmem</a></p> 
+  <h2>xmem license</h2>
+<pre>
+Copyright (C) 1987 X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall
+not be used in advertising or otherwise to promote the sale, use or
+other dealings in this Software without prior written authorization from
+the X Consortium.
+</pre>
+  </body>
+</html>
+
--- a/www/xmem.png
+++ b/www/xmem.png
--- a/www/xmem_fvwmbar.png
+++ b/www/xmem_fvwmbar.png
--- a/www/xmem_fvwmbar_s.png
+++ b/www/xmem_fvwmbar_s.png
--- a/www/xmem_s.png
+++ b/www/xmem_s.png
--- a/xmem.c
+++ b/xmem.c
@@ -1,7 +1,7 @@
 /*
 * xmem - display memory/swap usage utility for X
 *
- * Updated by Christian Barthel <bch@onfire.org>
+ * Updated by Christian Barthel <bch@online.de>
 *
 * Copyright 1989 Massachusetts Institute of Technology
 *
@@ -47,19 +47,19 @@ typedef struct _XLoadResources {
 */

 static XrmOptionDescRec options_mem[] = {
-    {"-scale",		"*mem.minScale",	XrmoptionSepArg,	NULL},
-    {"-update",		"*mem.update",		XrmoptionSepArg,	NULL},
-    {"-hl",		"*mem.highlight",	XrmoptionSepArg,	NULL},
-    {"-highlight",		"*mem.highlight",	XrmoptionSepArg,	NULL},
-    {"-codecolor",		"*mem.codecolor",       XrmoptionSepArg,	NULL},
-    {"-cachedcolor",	"*mem.cachedcolor",	XrmoptionSepArg,	NULL},
-    {"-buffercolor",	"*mem.buffercolor",	XrmoptionSepArg,	NULL},
-    {"-freecolor",		"*mem.freecolor",	XrmoptionSepArg,	NULL},
-    {"-swapcolor",		"*mem.swapcolor",	XrmoptionSepArg,	NULL},
-    {"-jumpscroll",	"*mem.jumpScroll",	XrmoptionSepArg,	NULL},
-    {"-label",		"*label.label",		XrmoptionSepArg,	NULL},
-    {"-nolabel",		"*showLabel",	        XrmoptionNoArg,       "False"},
-    {"-lights",		"*useLights",		XrmoptionNoArg,	      "True"},
+    {"-scale",    "*mem.minScale",  XrmoptionSepArg,  NULL},
+    {"-update",   "*mem.update",    XrmoptionSepArg,  NULL},
+    {"-hl",   "*mem.highlight", XrmoptionSepArg,  NULL},
+    {"-highlight",    "*mem.highlight", XrmoptionSepArg,  NULL},
+    {"-codecolor",    "*mem.codecolor",       XrmoptionSepArg,  NULL},
+    {"-cachedcolor",  "*mem.cachedcolor", XrmoptionSepArg,  NULL},
+    {"-buffercolor",  "*mem.buffercolor", XrmoptionSepArg,  NULL},
+    {"-freecolor",    "*mem.freecolor", XrmoptionSepArg,  NULL},
+    {"-swapcolor",    "*mem.swapcolor", XrmoptionSepArg,  NULL},
+    {"-jumpscroll", "*mem.jumpScroll",  XrmoptionSepArg,  NULL},
+    {"-label",    "*label.label",   XrmoptionSepArg,  NULL},
+    {"-nolabel",    "*showLabel",         XrmoptionNoArg,       "False"},
+    {"-lights",   "*useLights",   XrmoptionNoArg,       "True"},
 };

 /*
@@ -71,7 +71,7 @@ static XrmOptionDescRec options_mem[] = {

 static XtResource my_resources_mem[] = {
    {"showLabel", XtCBoolean, XtRBoolean, sizeof(Boolean),
-	 Offset(show_label), XtRImmediate, (XtPointer) TRUE},
+   Offset(show_label), XtRImmediate, (XtPointer) TRUE},
 };

 #undef Offset
@@ -79,7 +79,7 @@ static XtResource my_resources_mem[] = {
 static XLoadResources resources;

 static XtActionsRec xload_actions[] = {
-    { "quit",	quit },
+    { "quit", quit },
 };
 static Atom wm_delete_window;

@@ -92,38 +92,38 @@ void usage(char *progname)
    fprintf (stderr, "usage:  %s [-options ...]\n\n", progname);
    fprintf (stderr, "where options include:\n");
    fprintf (stderr,
-	     "    -display dpy            X server on which to display\n");
+       "    -display dpy            X server on which to display\n");
    fprintf (stderr,
-	     "    -geometry geom          size and location of window\n");
+       "    -geometry geom          size and location of window\n");
    fprintf (stderr,
-	     "    -fn font                font to use in label\n");
+       "    -fn font                font to use in label\n");
    fprintf (stderr,
-	     "    -update seconds         interval between updates\n");
+       "    -update seconds         interval between updates\n");
    fprintf (stderr,
-	     "    -label string           annotation text\n");
+       "    -label string           annotation text\n");
    fprintf (stderr,
-	     "    -bg color               background color\n");
+       "    -bg color               background color\n");
    fprintf (stderr,
-	     "    -fg color               text color\n");
+       "    -fg color               text color\n");

    fprintf (stderr,
-	     "    -hl color               scale color\n");
+       "    -hl color               scale color\n");
    fprintf (stderr,
-	     "    -codecolor color        used code and stack memory color\n");
+       "    -codecolor color        used code and stack memory color\n");
    fprintf (stderr,
-	     "    -cachedcolor color      used cached memory color\n");
+       "    -cachedcolor color      used cached memory color\n");
    fprintf (stderr,
-	     "    -buffercolor color      used buffer memory color\n");
+       "    -buffercolor color      used buffer memory color\n");
    fprintf (stderr,
-	     "    -freecolor color        used free memory color\n");
+       "    -freecolor color        used free memory color\n");
    fprintf (stderr,
-	     "    -swapcolor color        used swap memory color\n");
+       "    -swapcolor color        used swap memory color\n");
    fprintf (stderr,
-	     "    -nolabel                removes the label from above the chart.\n");
+       "    -nolabel                removes the label from above the chart.\n");
    fprintf (stderr,
-	     "    -jumpscroll value       number of pixels to scroll on overflow\n");
+       "    -jumpscroll value       number of pixels to scroll on overflow\n");
    fprintf (stderr,
-	     "The reference line refers to the avaible installed ram\n");
+       "The reference line refers to the avaible installed ram\n");

    fprintf (stderr, "\n");
    exit(1);
@@ -131,94 +131,96 @@ void usage(char *progname)

 int main(int argc, char **argv)
 {
-	XtAppContext app_con;
-	Widget toplevel, load, pane, label_wid, load_parent;
-	Arg args[1];
-	Pixmap icon_pixmap = None;
-	char *label, host[256];
-	
-	/* For security reasons, we reset our uid/gid after doing the necessary
-		 system initialization and before calling any X routines. */
-	
-	if (setgid(getgid()) == -1) 
-		errx(1, "%s: setgid failed: %s\n", argv[0], strerror(errno));
-	if (setuid(getuid()) == -1) 
-		errx(1, "%s: setuid failed: %s\n", argv[0], strerror(errno));
-	
-	toplevel = XtAppInitialize(&app_con, "XMem", options_mem, XtNumber(options_mem),
-														 &argc, argv, NULL, NULL, (Cardinal) 0);
-	
-	if (argc != 1) usage(argv[0]);
-	
-	XtGetApplicationResources( toplevel, (XtPointer) &resources,
-														 my_resources_mem, XtNumber(my_resources_mem),
-														 NULL, (Cardinal) 0);
-	/*
-	 * This is a hack so that f.delete will do something useful in this
-	 * single-window application.
-	 */
-	XtAppAddActions (app_con, xload_actions, XtNumber(xload_actions));
-	XtOverrideTranslations(toplevel,
-												 XtParseTranslationTable ("<Message>WM_PROTOCOLS: quit()"));
-	
-	XtSetArg (args[0], XtNiconPixmap, &icon_pixmap);
-	XtGetValues(toplevel, args, ONE);
-	if (icon_pixmap == None) {
-		XtSetArg(args[0], XtNiconPixmap,
-						 XCreateBitmapFromData(XtDisplay(toplevel),
-																	 XtScreen(toplevel)->root,
-																	 (char *)xload_bits,
-																	 xload_width, xload_height));
-		XtSetValues (toplevel, args, ONE);
-	}
-	
-	if (resources.show_label) {
-		pane = XtCreateManagedWidget ("paned", panedWidgetClass,
-																	toplevel, NULL, ZERO);
-		
-		label_wid = XtCreateManagedWidget ("label", labelWidgetClass,
-																			 pane, NULL, ZERO);
-		
-		XtSetArg (args[0], XtNlabel, &label);
-		XtGetValues(label_wid, args, ONE);
-		
-		if ( strcmp("label", label) == 0 ) {
-	    (void) XmuGetHostname (host, 255);
-	    XtSetArg (args[0], XtNlabel, host);
-	    XtSetValues (label_wid, args, ONE);
-		}
-		
-		load_parent = pane;
-	}
-	else
-		load_parent = toplevel;
-	
-	
-	load = XtCreateManagedWidget ("mem", memStripChartWidgetClass,
-																load_parent, NULL, ZERO);
-	XtAddCallback(load, XtNgetValue, (void*)GetMemLoadPoint, NULL);
-	
-	XtRealizeWidget (toplevel);
-	wm_delete_window = XInternAtom (XtDisplay(toplevel), "WM_DELETE_WINDOW",
-																	False);
-	(void) XSetWMProtocols (XtDisplay(toplevel), XtWindow(toplevel),
-													&wm_delete_window, 1);
+  XtAppContext app_con;
+  Widget toplevel, load, pane, label_wid, load_parent;
+  Arg args[1];
+  Pixmap icon_pixmap = None;
+  char *label, host[256];
+  
+  /* For security reasons, we reset our uid/gid after doing the necessary
+     system initialization and before calling any X routines. */
+  
+  if (setgid(getgid()) == -1) 
+    errx(1, "%s: setgid failed: %s\n", argv[0], strerror(errno));
+  if (setuid(getuid()) == -1) 
+    errx(1, "%s: setuid failed: %s\n", argv[0], strerror(errno));
+  
+  toplevel = XtAppInitialize(&app_con, "XMem", options_mem, XtNumber(options_mem),
+                             &argc, argv, NULL, NULL, (Cardinal) 0);
+  
+  if (argc != 1) usage(argv[0]);
+  
+  XtGetApplicationResources( toplevel, (XtPointer) &resources,
+                             my_resources_mem, XtNumber(my_resources_mem),
+                             NULL, (Cardinal) 0);
+  /*
+   * This is a hack so that f.delete will do something useful in this
+   * single-window application.
+   */
+  XtAppAddActions (app_con, xload_actions, XtNumber(xload_actions));
+  XtOverrideTranslations(toplevel,
+                         XtParseTranslationTable ("<Message>WM_PROTOCOLS: quit()"));
+  
+  XtSetArg (args[0], XtNiconPixmap, &icon_pixmap);
+  XtGetValues(toplevel, args, ONE);
+  if (icon_pixmap == None) {
+    XtSetArg(args[0], XtNiconPixmap,
+             XCreateBitmapFromData(XtDisplay(toplevel),
+                                   XtScreen(toplevel)->root,
+                                   (char *)xload_bits,
+                                   xload_width, xload_height));
+    XtSetValues (toplevel, args, ONE);
+  }
+  
+  if (resources.show_label) {
+    pane = XtCreateManagedWidget ("paned", panedWidgetClass,
+                                  toplevel, NULL, ZERO);
+    
+    label_wid = XtCreateManagedWidget ("label", labelWidgetClass,
+                                       pane, NULL, ZERO);
+    
+    XtSetArg (args[0], XtNlabel, &label);
+    XtGetValues(label_wid, args, ONE);
+    
+    if ( strcmp("label", label) == 0 ) {
+      (void) XmuGetHostname (host, 255);
+      XtSetArg (args[0], XtNlabel, host);
+      XtSetValues (label_wid, args, ONE);
+    }
+    
+    load_parent = pane;
+  }
+  else
+    load_parent = toplevel;
+  
+  
+  load = XtCreateManagedWidget ("mem", memStripChartWidgetClass,
+                                load_parent, NULL, ZERO);
+  XtAddCallback(load, XtNgetValue, (void*)GetMemLoadPoint, NULL);
+  
+  XtRealizeWidget (toplevel);
+  wm_delete_window = XInternAtom (XtDisplay(toplevel), "WM_DELETE_WINDOW",
+                                  False);
+  (void) XSetWMProtocols (XtDisplay(toplevel), XtWindow(toplevel),
+                          &wm_delete_window, 1);

-	if (pledge("ps vminfo stdio", NULL) == -1) 
-		errx(1, "pledge failed: %s", strerror(errno)); 
+#if __OpenBSD__
+  if (pledge("ps vminfo stdio", NULL) == -1) 
+    errx(1, "pledge failed: %s", strerror(errno)); 
+#endif

-	XtAppMainLoop(app_con);
-	return 0; 
+  XtAppMainLoop(app_con);
+  return 0; 
 }


 static void quit (Widget w, XEvent *event, String *params, Cardinal *num_params)
 {
-	if (event->type == ClientMessage &&
-			event->xclient.data.l[0] != wm_delete_window) {
-		XBell (XtDisplay(w), 0);
-		return;
-	}
-	XtDestroyApplicationContext(XtWidgetToApplicationContext(w));
-	exit (0);
+  if (event->type == ClientMessage &&
+      event->xclient.data.l[0] != wm_delete_window) {
+    XBell (XtDisplay(w), 0);
+    return;
+  }
+  XtDestroyApplicationContext(XtWidgetToApplicationContext(w));
+  exit (0);
 }
Author	SHA1	Message	Date
Christian Barthel	65bf48110a	Cleanup get_mem for Open-/FreeBSD Remove unnecessary files, use ifdef to decide for which platform to compile for.	2020-11-17 18:14:24 +01:00
Christian Barthel	1268b76c3c	Typo in Makefile	2020-11-16 18:40:32 +01:00
bch	d3837a3dbf	Update 'README.md'	2020-11-16 14:13:39 +00:00
bch	25677ed9ff	Update 'README.md'	2020-11-16 14:13:19 +00:00
christian barthel	382c8ec129	Add web stuff etc	2020-11-16 15:11:08 +01:00
Christian Barthel	34548bbd21	Makefile - default to OpenBSD	2020-11-16 14:56:56 +01:00
Christian Barthel	fcd19adc54	makefile update	2019-01-11 22:53:40 +01:00
bch	75987c50d6	freebsd memory usage	2018-12-26 18:46:16 +00:00
bch	3b3d39c18c	formatting, add freebsd support	2018-12-26 18:46:04 +00:00