From c9d83d97c3afa271e8b38c8bb999250355779f53 Mon Sep 17 00:00:00 2001
From: Christian Thaeter <ct@pipapo.org>
Date: Wed, 24 Dec 2008 00:26:32 +0100
Subject: [PATCH] Moved the resourcecollector from backend to lib

---
 src/backend/Makefile.am                           | 15 ---------------
 src/lib/Makefile.am                               |  2 ++
 src/{backend => lib}/resourcecollector.c          |  2 +-
 src/{backend => lib}/resourcecollector.h          |  0
 tests/Makefile.am                                 |  2 +-
 .../{backend => library}/test-resourcecollector.c |  2 +-
 6 files changed, 5 insertions(+), 18 deletions(-)
 rename src/{backend => lib}/resourcecollector.c (98%)
 rename src/{backend => lib}/resourcecollector.h (100%)
 rename tests/{backend => library}/test-resourcecollector.c (97%)

diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 201bcac0a..75bcc0d7e 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -28,7 +28,6 @@ liblumierabackend_la_SOURCES =					\
 	$(liblumierabackend_la_srcdir)/file.c			\
 	$(liblumierabackend_la_srcdir)/filehandle.c		\
 	$(liblumierabackend_la_srcdir)/filedescriptor.c		\
-	$(liblumierabackend_la_srcdir)/resourcecollector.c	\
 	$(liblumierabackend_la_srcdir)/mmap.c			\
 	$(liblumierabackend_la_srcdir)/mmapings.c		\
 	$(liblumierabackend_la_srcdir)/mmapcache.c		\
@@ -44,19 +43,6 @@ noinst_HEADERS +=						\
 	$(liblumierabackend_la_srcdir)/filehandle.h		\
 	$(liblumierabackend_la_srcdir)/filedescriptor.h		\
 	$(liblumierabackend_la_srcdir)/filehandlecache.h	\
-	$(liblumierabackend_la_srcdir)/resourcecollector.h	\
-	$(liblumierabackend_la_srcdir)/mmap.h			\
-	$(liblumierabackend_la_srcdir)/mmapings.h		\
-	$(liblumierabackend_la_srcdir)/mmapcache.h
-
-
-noinst_HEADERS +=						\
-	$(liblumierabackend_la_srcdir)/backend.h		\
-	$(liblumierabackend_la_srcdir)/file.h			\
-	$(liblumierabackend_la_srcdir)/filehandle.h		\
-	$(liblumierabackend_la_srcdir)/filedescriptor.h		\
-	$(liblumierabackend_la_srcdir)/filehandlecache.h	\
-	$(liblumierabackend_la_srcdir)/resourcecollector.h	\
 	$(liblumierabackend_la_srcdir)/mmap.h			\
 	$(liblumierabackend_la_srcdir)/mmapings.h		\
 	$(liblumierabackend_la_srcdir)/mmapcache.h
@@ -65,7 +51,6 @@ noinst_HEADERS +=						\
 	$(liblumierabackend_la_srcdir)/filehandle.h		\
 	$(liblumierabackend_la_srcdir)/filedescriptor.h		\
 	$(liblumierabackend_la_srcdir)/filehandlecache.h	\
-	$(liblumierabackend_la_srcdir)/resourcecollector.h	\
 	$(liblumierabackend_la_srcdir)/mmap.h			\
 	$(liblumierabackend_la_srcdir)/mmapings.h		\
 	$(liblumierabackend_la_srcdir)/mmapcache.h
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 4608feedb..d8c790269 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -32,6 +32,7 @@ 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)/external/libgavl.cpp		\
 	$(liblumiera_la_srcdir)/lumitime.cpp			\
@@ -53,6 +54,7 @@ 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)/scopedholdertransfer.hpp	\
diff --git a/src/backend/resourcecollector.c b/src/lib/resourcecollector.c
similarity index 98%
rename from src/backend/resourcecollector.c
rename to src/lib/resourcecollector.c
index 2e31c41c3..e9848d6f0 100644
--- a/src/backend/resourcecollector.c
+++ b/src/lib/resourcecollector.c
@@ -27,7 +27,7 @@
 
 #include <unistd.h>
 
-NOBUG_DEFINE_FLAG_PARENT (resourcecollector, backend);
+NOBUG_DEFINE_FLAG (resourcecollector); /* TODO: make this a hierachy, derrive from PARENT (library) ? */
 
 llist lumiera_resourcecollector_registry[LUMIERA_RESOURCE_END];
 lumiera_mutex lumiera_resourcecollector_lock;
diff --git a/src/backend/resourcecollector.h b/src/lib/resourcecollector.h
similarity index 100%
rename from src/backend/resourcecollector.h
rename to src/lib/resourcecollector.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3a2755ef2..2de2f44ba 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -92,7 +92,7 @@ test_filemmap_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)
 test_filemmap_LDADD = liblumierabackend.la liblumiera.la -lnobugmt -lpthread -ldl -lm     liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
 
 check_PROGRAMS += test-resourcecollector
-test_resourcecollector_SOURCES = $(tests_srcdir)/backend/test-resourcecollector.c
+test_resourcecollector_SOURCES = $(tests_srcdir)/library/test-resourcecollector.c
 test_resourcecollector_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
 test_resourcecollector_LDADD = liblumierabackend.la liblumiera.la -lnobugmt -lpthread -ldl -lm     liblumieracommon.la liblumieraproc.la -ldl -lboost_program_options-mt -lboost_regex-mt
 
diff --git a/tests/backend/test-resourcecollector.c b/tests/library/test-resourcecollector.c
similarity index 97%
rename from tests/backend/test-resourcecollector.c
rename to tests/library/test-resourcecollector.c
index c0e8380a9..d3e6d8483 100644
--- a/tests/backend/test-resourcecollector.c
+++ b/tests/library/test-resourcecollector.c
@@ -19,7 +19,7 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "backend/resourcecollector.h"
+#include "lib/resourcecollector.h"
 
 #include "tests/test.h"