[GNUnet-SVN] r25148 - gnunet/src/sysmon

[gnunet]

Author: wachs
Date: 2012-11-28 14:50:10 +0100 (Wed, 28 Nov 2012)
New Revision: 25148

Modified:
   gnunet/src/sysmon/Makefile.am
   gnunet/src/sysmon/gnunet-daemon-sysmon.c
Log:
add a test for glibtop


Modified: gnunet/src/sysmon/Makefile.am
===================================================================
--- gnunet/src/sysmon/Makefile.am       2012-11-28 13:49:43 UTC (rev 25147)
+++ gnunet/src/sysmon/Makefile.am       2012-11-28 13:50:10 UTC (rev 25148)
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/src/include
+INCLUDES = -I$(top_srcdir)/src/include -I/usr/include/glib-2.0 -I/usr/include 
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include/ -I/usr/include/libgtop-2.0/
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
@@ -18,6 +18,9 @@
 libexec_PROGRAMS = \
  gnunet_daemon_sysmon
 
+check_PROGRAMS = \
+ test_glibtop
+ 
 gnunet_daemon_sysmon_SOURCES = \
  gnunet-daemon-sysmon.c         
 gnunet_daemon_sysmon_LDADD = \
@@ -25,6 +28,15 @@
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(GN_LIBINTL)
 
+test_glibtop_SOURCES = \
+ test_glibtop.c      
+test_glibtop_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  -lgtop-2.0 \
+  $(GN_LIBINTL)
+
+
 if ENABLE_TEST_RUN
 TESTS = $(check_PROGRAMS)
 endif

Modified: gnunet/src/sysmon/gnunet-daemon-sysmon.c
===================================================================
--- gnunet/src/sysmon/gnunet-daemon-sysmon.c    2012-11-28 13:49:43 UTC (rev 
25147)
+++ gnunet/src/sysmon/gnunet-daemon-sysmon.c    2012-11-28 13:50:10 UTC (rev 
25148)
@@ -224,6 +224,7 @@
 exec_cmd_proc (void *cls, const char *line)
 {
   struct SysmonProperty *sp = cls;
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Property output: `%s'\n", line);
   if (NULL == line)
   {
       GNUNET_OS_command_stop (sp->cmd_exec_handle);
@@ -264,6 +265,7 @@
     sp->cmd_exec_handle = NULL;
     GNUNET_break (0);
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Property `%s': command `%s' `%s'\n", 
sp->desc, sp->cmd, sp->cmd_args);
   if (NULL == (sp->cmd_exec_handle = GNUNET_OS_command_run (&exec_cmd_proc, sp,
       GNUNET_TIME_UNIT_SECONDS,
       sp->cmd, sp->cmd,