benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved the resourcecollector from backend to lib

Browse source
This commit is contained in:
Christian Thaeter 2008-12-24 00:26:32 +01:00
parent 2126b25604
commit c9d83d97c3
6 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/backend/Makefile.am
View file

@ -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

2
src/lib/Makefile.am
View file

@ -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 \

2
src/backend/resourcecollector.c → src/lib/resourcecollector.c
View file

@ -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;

0
src/backend/resourcecollector.h → src/lib/resourcecollector.h
View file

2
tests/Makefile.am
View file

@ -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

2
tests/backend/test-resourcecollector.c → tests/library/test-resourcecollector.c
View file

@ -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"