# HG changeset patch
# User Elie De Brauwer <eliedebrauwer@gmail.com>
# Date 1329149749 -3600
# Node ID 9f1e089262cbfdbfbadd3fb3c03b678ff17d4768
# Parent  ab6c0adfcc104df6f0d131df19f8cbf4e8c4d823
Adding free and uptime

diff -r ab6c0adfcc10 -r 9f1e089262cb toys/free.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toys/free.c	Mon Feb 13 17:15:49 2012 +0100
@@ -0,0 +1,61 @@
+/* vi: set sw=4 ts=4:
+ *
+ * free.c - Display amount of free and used memory in the system.
+ *
+ * Copyright 2012 Elie De Brauwer <eliedebrauwer@gmail.com>
+ *
+ * Not in SUSv3.
+
+USE_FREE(NEWTOY(free, "gmkb", TOYFLAG_USR|TOYFLAG_BIN))
+
+config FREE
+	bool "free"
+	default y
+	help
+	  usage: free [-bkmg]
+
+	  Display the total, free and used amount of physical memory and
+	  swap space.
+	  -bkmg    Output in bytes (default), KB, MB or GB
+*/
+
+#include "toys.h"
+#include <sys/sysinfo.h>
+
+
+static unsigned long long convert(unsigned long d, unsigned int iscale,
+				unsigned int oscale)
+{
+	return ((unsigned long long)d*iscale)>>oscale;
+}
+
+void free_main(void)
+{
+	struct sysinfo info;
+	unsigned int iscale = 1;
+	unsigned int oscale = 0;
+
+	sysinfo(&info);
+	if (info.mem_unit) iscale = info.mem_unit;
+	if (toys.optflags & 1) oscale = 0;
+	if (toys.optflags & 2) oscale = 10;
+	if (toys.optflags & 4) oscale = 20;
+	if (toys.optflags & 8) oscale = 30;
+
+	printf("              total        used        free      shared     buffers\n");
+	printf("Mem:   %12llu%12llu%12llu%12llu%12llu\n",
+		convert(info.totalram, iscale, oscale),
+		convert(info.totalram-info.freeram, iscale, oscale),
+		convert(info.freeram, iscale, oscale),
+		convert(info.sharedram, iscale, oscale),
+		convert(info.bufferram, iscale, oscale));
+
+	printf("-/+ buffers/cache: %12llu%12llu\n",
+		convert(info.totalram - info.freeram - info.bufferram, iscale, oscale),
+		convert(info.freeram + info.bufferram, iscale, oscale));
+
+	printf("Swap:  %12llu%12llu%12llu\n",
+		convert(info.totalswap, iscale, oscale),
+		convert(info.totalswap - info.freeswap, iscale, oscale),
+		convert(info.freeswap, iscale, oscale));
+}
diff -r ab6c0adfcc10 -r 9f1e089262cb toys/uptime.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toys/uptime.c	Mon Feb 13 17:15:49 2012 +0100
@@ -0,0 +1,54 @@
+/* vi: set sw=4 ts=4:
+ *
+ * uptime.c - Tell how long the system has been running.
+ *
+ * Copyright 2012 Elie De Brauwer <eliedebrauwer@gmail.com>
+ *
+ * Not in SUSv3.
+
+USE_UPTIME(NEWTOY(uptime, NULL, TOYFLAG_USR|TOYFLAG_BIN))
+
+config UPTIME
+	bool "uptime"
+	default y
+	help
+	  usage: uptime
+
+	  Tell how long the system has been running and the system load
+	  averages for the past 1, 5 and 15 minutes.
+*/
+
+#include "toys.h"
+#include <sys/sysinfo.h>
+#include <time.h>
+
+void uptime_main(void)
+{
+	struct sysinfo info;
+	time_t tmptime;
+	struct tm * now;
+	unsigned int days, hours, minutes;
+
+	// Obtain the data we need.
+	sysinfo(&info);
+	time(&tmptime);
+	now = localtime(&tmptime);
+
+	// Time
+	printf(" %02d:%02d:%02d up ", now->tm_hour, now->tm_min, now->tm_sec);
+	// Uptime
+	info.uptime /= 60;
+	minutes = info.uptime%60;
+	info.uptime /= 60;
+	hours = info.uptime%24;
+	days = info.uptime/24;
+	if (days) printf("%d day%s, ", days, (days!=1)?"s":"");
+	if (hours)
+		printf("%2d:%02d, ", hours, minutes);
+	else
+		printf("%d min, ", minutes);
+
+	printf(" load average: %.02f %.02f %.02f\n", info.loads[0]/65536.0,
+		info.loads[1]/65536.0, info.loads[2]/65536.0);
+
+}