X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fserver%2Fsysinfo.h;h=3330eb7ba913d489b90bb102cadac8c3f579b9dc;hb=f3b05dae619a7909bd7422b3a82422c9442aa114;hp=9a55d28dac2d881ee2ca2b09ac632dfa4b60fb33;hpb=cde76fd1723bbdad164adac96d105111b831bf50;p=psensor.git

diff --git a/src/server/sysinfo.h b/src/server/sysinfo.h
index 9a55d28..3330eb7 100644
--- a/src/server/sysinfo.h
+++ b/src/server/sysinfo.h
@@ -1,34 +1,44 @@
 /*
-    Copyright (C) 2010-2011 jeanfi@gmail.com
-
-    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 of the License, 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., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
+ *
+ * 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 of the
+ * License, 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 #ifndef _PSENSOR_SYSINFO_H_
 #define _PSENSOR_SYSINFO_H_
 
-#include <sys/sysinfo.h>
+#include <config.h>
+#include <glibtop/loadavg.h>
+#include <glibtop/mem.h>
+#include <glibtop/swap.h>
+#include <glibtop/uptime.h>
 
 struct psysinfo {
+	glibtop_loadavg loadavg;
+	glibtop_mem mem;
+	glibtop_swap swap;
+	glibtop_uptime uptime;
+
 	float cpu_rate;
 
-	struct sysinfo sysinfo;
+	char **interfaces;
 };
 
 void sysinfo_update(struct psysinfo *sysinfo);
 void sysinfo_cleanup();
 
+char *sysinfo_to_json_string(const struct psysinfo *sysinfo);
+
 #endif