Move the resourcecollector to the backend, closes #521

src/backend/Makefile.am

@@ -35,6 +35,7 @@ liblumierabackend_la_SOURCES =					\
 	$(liblumierabackend_la_srcdir)/mmap.c			\
 	$(liblumierabackend_la_srcdir)/mmapings.c		\
 	$(liblumierabackend_la_srcdir)/mmapcache.c		\
+	$(liblumierabackend_la_srcdir)/resourcecollector.c	\
 	$(liblumierabackend_la_srcdir)/threadpool-init.cpp	\
 	$(liblumierabackend_la_srcdir)/enginefacade.cpp		\
 	$(liblumierabackend_la_srcdir)/scriptrunnerfacade.cpp	\
@@ -52,5 +53,6 @@ noinst_HEADERS +=						\
 	$(liblumierabackend_la_srcdir)/filehandlecache.h	\
 	$(liblumierabackend_la_srcdir)/mmap.h			\
 	$(liblumierabackend_la_srcdir)/mmapings.h		\
-	$(liblumierabackend_la_srcdir)/mmapcache.h
+	$(liblumierabackend_la_srcdir)/mmapcache.h		\
+	$(liblumierabackend_la_srcdir)/resourcecollector.h
 

src/lib/Makefile.am

@@ -47,7 +47,6 @@ liblumiera_la_SOURCES =						\
 	$(liblumiera_la_srcdir)/psplay.c			\
 	$(liblumiera_la_srcdir)/mrucache.c			\
 	$(liblumiera_la_srcdir)/time.c				\
-	$(liblumiera_la_srcdir)/resourcecollector.c		\
 	$(liblumiera_la_srcdir)/allocationcluster.cpp		\
 	$(liblumiera_la_srcdir)/lumitime.cpp			\
 	$(liblumiera_la_srcdir)/lifecycle.cpp			\
@@ -77,7 +76,6 @@ noinst_HEADERS +=						\
 	$(liblumiera_la_srcdir)/psplay.h			\
 	$(liblumiera_la_srcdir)/mrucache.h			\
 	$(liblumiera_la_srcdir)/time.h				\
-	$(liblumiera_la_srcdir)/resourcecollector.h		\
 	$(liblumiera_la_srcdir)/ppmpl.h				\
 	$(liblumiera_la_srcdir)/allocationcluster.hpp		\
 	$(liblumiera_la_srcdir)/scoped-holder.hpp		\

tests/Makefile.am

@@ -73,9 +73,10 @@ test_filemmap_LDADD = $(LUMIERA_LIBS) liblumierabackend.la liblumieracommon.la l
 # FIXME stray dependencies on proc
 
 check_PROGRAMS += test-resourcecollector
-test_resourcecollector_SOURCES = $(tests_srcdir)/library/test-resourcecollector.c
+test_resourcecollector_SOURCES = $(tests_srcdir)/backend/test-resourcecollector.c
 test_resourcecollector_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
-test_resourcecollector_LDADD = $(LUMIERA_LIBS) liblumiera.la
+test_resourcecollector_LDADD = $(LUMIERA_LIBS) liblumiera.la liblumierabackend.la liblumieraproc.la liblumieracommon.la
+# FIXME stray dependencies on proc
 
 check_PROGRAMS += test-slist
 test_slist_SOURCES = $(tests_srcdir)/library/test-slist.c

tests/backend/test-resourcecollector.c

@@ -19,7 +19,7 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "lib/resourcecollector.h"
+#include "backend/resourcecollector.h"
 
 #include "tests/test.h"