greg/stasis-aries-wal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do away with librw

Browse source
This commit is contained in:
Sears Russell 2008-11-07 03:44:41 +00:00
parent eb6ade59e4
commit fc5b5a2b29
21 changed files with 19 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -65,6 +65,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
# set linker path for this and all subdirs # set linker path for this and all subdirs
LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/src/stasis ${CMAKE_CURRENT_BINARY_DIR}/src/libdfa) LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/src/stasis ${CMAKE_CURRENT_BINARY_DIR}/src/libdfa)
SET(COMMON_LIBRARIES stasis rw m pthread) SET(COMMON_LIBRARIES stasis m pthread)
SET(CMAKE_C_FLAGS "-g -Wall -pedantic -std=gnu99 -DPBL_COMPAT ${CMAKE_C_FLAGS}") SET(CMAKE_C_FLAGS "-g -Wall -pedantic -std=gnu99 -DPBL_COMPAT ${CMAKE_C_FLAGS}")
SET(CMAKE_CXX_FLAGS "-g -Wall -Wno-variadic-macros -Wno-long-long -pedantic -DPBL_COMPAT ${CMAKE_CXX_FLAGS}") SET(CMAKE_CXX_FLAGS "-g -Wall -Wno-variadic-macros -Wno-long-long -pedantic -DPBL_COMPAT ${CMAKE_CXX_FLAGS}")

2
Makefile.am
View file

@ -2,7 +2,7 @@ EXTRA_DIST = reconf
SUBDIRS = stasis src test utilities benchmarks examples SUBDIRS = stasis src test utilities benchmarks examples
export GLOBAL_CFLAGS = -g -Wall -pedantic -std=gnu99 -DPBL_COMPAT export GLOBAL_CFLAGS = -g -Wall -pedantic -std=gnu99 -DPBL_COMPAT
nobase_include_HEADERS=libdfa/rw.h # XXX move rw.h into stasis/ !!! nobase_include_HEADERS=stasis/rw.h # XXX move rw.h into stasis/ !!!
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4

4
benchmarks/Makefile.am
View file

@ -1,6 +1,4 @@
LDADD=$(top_builddir)/src/stasis/libstasis.la \ LDADD=$(top_builddir)/src/stasis/libstasis.la
$(top_builddir)/src/libdfa/librw.la
rose_SOURCES=rose.cpp rose_SOURCES=rose.cpp
roseTable_SOURCES=roseTable.cpp roseTable_SOURCES=roseTable.cpp

3
examples/Makefile.am
View file

@ -1,4 +1,3 @@
LDADD=$(top_builddir)/src/stasis/libstasis.la \ LDADD=$(top_builddir)/src/stasis/libstasis.la
$(top_builddir)/src/libdfa/librw.la
noinst_PROGRAMS=ex1 ex2 noinst_PROGRAMS=ex1 ex2
AM_CFLAGS=${GLOBAL_CFLAGS} AM_CFLAGS=${GLOBAL_CFLAGS}

2
libdfa/libdfa.h
View file

@ -47,7 +47,7 @@ terms specified in this license.
/*#include "monotree.h"*/ /*#include "monotree.h"*/
#include <libdfa/smash.h> #include <libdfa/smash.h>
#include <libdfa/messages.h> #include <libdfa/messages.h>
#include <libdfa/rw.h> #include <stasis/rw.h>
/** /**
Maximum number of concurrent state machines. Maximum number of concurrent state machines.

2
src/apps/readOnlyHash/Makefile.am
View file

@ -1,3 +1,3 @@
LDADD=$(top_builddir)/src/stasis/libstasis.la $(top_builddir)/src/libdfa/librw.la LDADD=$(top_builddir)/src/stasis/libstasis.la
noinst_PROGRAMS=queryTable buildTable noinst_PROGRAMS=queryTable buildTable
AM_CFLAGS=-g -Wall -pedantic -std=gnu99 AM_CFLAGS=-g -Wall -pedantic -std=gnu99

2
src/apps/referential/Makefile.am
View file

@ -1,4 +1,4 @@
LDADD=$(top_builddir)/src/stasis/libstasis.la $(top_builddir)/src/libdfa/librw.la LDADD=$(top_builddir)/src/stasis/libstasis.la
## TODO: Get lex + yacc to work w/ automake ## TODO: Get lex + yacc to work w/ automake
#toplevel_SOURCES=toplevel.c algebra.c dml.c ddl.c tuple.c lang/ast.c lang/lexer.l lang/parse.y #toplevel_SOURCES=toplevel.c algebra.c dml.c ddl.c tuple.c lang/ast.c lang/lexer.l lang/parse.y
#noinst_PROGRAMS=toplevel #noinst_PROGRAMS=toplevel

1
src/libdfa/CMakeLists.txt
View file

@ -1,4 +1,3 @@
ADD_LIBRARY(rw rw.c)
IF(HAVE_CONFUSE) IF(HAVE_CONFUSE)
ADD_LIBRARY(libdfa libdfa.c monotree.c smash.c callbacks.c messages.c networksetup.c) ADD_LIBRARY(libdfa libdfa.c monotree.c smash.c callbacks.c messages.c networksetup.c)
ENDIF(HAVE_CONFUSE) ENDIF(HAVE_CONFUSE)

2
src/libdfa/Makefile.am
View file

@ -2,7 +2,5 @@ if HAVE_LIBCONFUSE
noinst_LTLIBRARIES=libdfa.la noinst_LTLIBRARIES=libdfa.la
#else #else
endif endif
lib_LTLIBRARIES=librw.la
libdfa_la_SOURCES=libdfa.c monotree.c smash.c callbacks.c messages.c networksetup.c libdfa_la_SOURCES=libdfa.c monotree.c smash.c callbacks.c messages.c networksetup.c
librw_la_SOURCES=rw.c
AM_CFLAGS=${GLOBAL_CFLAGS} AM_CFLAGS=${GLOBAL_CFLAGS}

2
src/stasis/CMakeLists.txt
View file

@ -1,4 +1,4 @@
ADD_LIBRARY(stasis crc32.c redblack.c lhtable.c doubleLinkedList.c ADD_LIBRARY(stasis crc32.c redblack.c lhtable.c rw.c doubleLinkedList.c
common.c flags.c stats.c io.c bufferManager.c common.c flags.c stats.c io.c bufferManager.c
linkedlist.c operations.c pageHandle.c pageFile.c linkedlist.c operations.c pageHandle.c pageFile.c
pageCache.c page.c bufferPool.c blobManager.c pageCache.c page.c bufferPool.c blobManager.c

3
src/stasis/Makefile.am
View file

@ -1,6 +1,7 @@
nobase_pkginclude_HEADERS=$(wildcard *.h) $(wildcard */*.h) nobase_pkginclude_HEADERS=$(wildcard *.h) $(wildcard */*.h)
lib_LTLIBRARIES=libstasis.la lib_LTLIBRARIES=libstasis.la
libstasis_la_SOURCES=crc32.c redblack.c lhtable.c doubleLinkedList.c common.c flags.c stats.c io.c bufferManager.c linkedlist.c operations.c \ libstasis_la_SOURCES=crc32.c redblack.c lhtable.c rw.c doubleLinkedList.c common.c flags.c \
stats.c io.c bufferManager.c linkedlist.c operations.c \
pageHandle.c pageFile.c pageCache.c page.c bufferPool.c blobManager.c recovery2.c truncation.c \ pageHandle.c pageFile.c pageCache.c page.c bufferPool.c blobManager.c recovery2.c truncation.c \
transactional2.c allocationPolicy.c \ transactional2.c allocationPolicy.c \
lockManager.c iterator.c consumer.c arrayCollection.c ringbuffer.c fifo.c multiplexer.c graph.c\ lockManager.c iterator.c consumer.c arrayCollection.c ringbuffer.c fifo.c multiplexer.c graph.c\

2
src/libdfa/rw.c → src/stasis/rw.c
View file

@ -1,4 +1,4 @@
#include <libdfa/rw.h> #include <stasis/rw.h>
#include <assert.h> #include <assert.h>
#undef pthread_cond_wait #undef pthread_cond_wait

2
stasis/latches.h
View file

@ -20,7 +20,7 @@ typedef struct {
void * lockpoints; void * lockpoints;
} lladd_pthread_mutex_t; } lladd_pthread_mutex_t;
#include <libdfa/rw.h> #include "rw.h"
/** /**
Keeps some profiling information along with a read/write lock. Keeps some profiling information along with a read/write lock.

0
libdfa/rw.h → stasis/rw.h
View file

2
test/2pc/Makefile.am
View file

@ -1,4 +1,4 @@
LDADD=$(top_builddir)/src/2pc/lib2pc.la $(top_builddir)/src/libdfa/libdfa.la \ LDADD=$(top_builddir)/src/2pc/lib2pc.la $(top_builddir)/src/libdfa/libdfa.la \
$(top_builddir)/src/stasis/libstasis.la $(top_builddir)/src/libdfa/librw.la -lconfuse $(top_builddir)/src/stasis/libstasis.la -lconfuse
noinst_PROGRAMS=always_commit noinst_PROGRAMS=always_commit
AM_CFLAGS=${GLOBAL_CFLAGS} AM_CFLAGS=${GLOBAL_CFLAGS}

2
test/cht/Makefile.am
View file

@ -1,5 +1,5 @@
TESTS=./run TESTS=./run
LDADD=-lconfuse $(top_builddir)/src/apps/cht/libcht.la $(top_builddir)/src/2pc/lib2pc.la $(top_builddir)/src/libdfa/libdfa.la \ LDADD=-lconfuse $(top_builddir)/src/apps/cht/libcht.la $(top_builddir)/src/2pc/lib2pc.la $(top_builddir)/src/libdfa/libdfa.la \
$(top_builddir)/src/stasis/libstasis.la $(top_builddir)/src/libdfa/librw.la $(top_builddir)/src/stasis/libstasis.la
noinst_PROGRAMS=simple cht_server client coordinator subordinate noinst_PROGRAMS=simple cht_server client coordinator subordinate
AM_CFLAGS=${GLOBAL_CFLAGS} AM_CFLAGS=${GLOBAL_CFLAGS}

2
test/dfa/Makefile.am
View file

@ -1,4 +1,4 @@
LDADD= $(top_builddir)/src/libdfa/libdfa.la $(top_builddir)/src/stasis/libstasis.la $(top_builddir)/src/libdfa/librw.la -lconfuse LDADD= $(top_builddir)/src/libdfa/libdfa.la $(top_builddir)/src/stasis/libstasis.la -lconfuse
AM_CFLAGS=${GLOBAL_CFLAGS} AM_CFLAGS=${GLOBAL_CFLAGS}
if HAVE_LIBCHECK if HAVE_LIBCHECK
TESTS = check_networksetup ping_pong_dfa TESTS = check_networksetup ping_pong_dfa

2
test/monotree/Makefile.am
View file

@ -1,4 +1,4 @@
LDADD=$(top_builddir)/src/libdfa/libdfa.la $(top_builddir)/src/stasis/libstasis.la $(top_builddir)/src/libdfa/librw.la -lconfuse LDADD=$(top_builddir)/src/libdfa/libdfa.la $(top_builddir)/src/stasis/libstasis.la -lconfuse
noinst_PROGRAMS=bit_arithmetic binary_search soundness noinst_PROGRAMS=bit_arithmetic binary_search soundness
soundness_SOURCES = soundness.c soundness_SOURCES = soundness.c
AM_CFLAGS=${GLOBAL_CFLAGS} AM_CFLAGS=${GLOBAL_CFLAGS}

3
test/pobj/Makefile.am
View file

@ -1,5 +1,4 @@
noinst_PROGRAMS = test-list test-multilist test-list2 noinst_PROGRAMS = test-list test-multilist test-list2
LDADD = $(top_builddir)/src/pobj/libpobj.la $(top_builddir)/src/stasis/libstasis.la \ LDADD = $(top_builddir)/src/pobj/libpobj.la $(top_builddir)/src/stasis/libstasis.la
$(top_builddir)/src/libdfa/librw.la
CLEANFILES = storefile.txt logfile.txt blob0_file.txt blob1_file.txt CLEANFILES = storefile.txt logfile.txt blob0_file.txt blob1_file.txt
AM_CFLAGS= -g -Wall -pedantic -std=gnu99 AM_CFLAGS= -g -Wall -pedantic -std=gnu99

2
test/stasis/Makefile.am
View file

@ -8,6 +8,6 @@ else
TESTS = TESTS =
endif endif
noinst_PROGRAMS = $(TESTS) noinst_PROGRAMS = $(TESTS)
LDADD = $(top_builddir)/src/stasis/libstasis.la $(top_builddir)/src/libdfa/librw.la LDADD = $(top_builddir)/src/stasis/libstasis.la
CLEANFILES = check_lht.log check_logEntry.log storefile.txt logfile.txt blob0_file.txt blob1_file.txt check_blobRecovery.log check_logWriter.log check_operations.log check_recovery.log check_transactional2.log check_page.log check_bufferManager.log check_indirect.log check_bufferMananger.log check_lladdhash.log check_pageOperations.log check_linearhash.log check_linkedListNTA.log check_linearHashNTA.log check_pageOrientedListNTA.log check_lockManager.log check_compensations.log check_errorhandling.log check_header.log check_iterator.log check_linearHash.log check_ringbuffer.log check_bTree.log CLEANFILES = check_lht.log check_logEntry.log storefile.txt logfile.txt blob0_file.txt blob1_file.txt check_blobRecovery.log check_logWriter.log check_operations.log check_recovery.log check_transactional2.log check_page.log check_bufferManager.log check_indirect.log check_bufferMananger.log check_lladdhash.log check_pageOperations.log check_linearhash.log check_linkedListNTA.log check_linearHashNTA.log check_pageOrientedListNTA.log check_lockManager.log check_compensations.log check_errorhandling.log check_header.log check_iterator.log check_linearHash.log check_ringbuffer.log check_bTree.log
AM_CFLAGS=${GLOBAL_CFLAGS} AM_CFLAGS=${GLOBAL_CFLAGS}

3
utilities/Makefile.am
View file

@ -1,5 +1,4 @@
LDADD=$(top_builddir)/src/stasis/libstasis.la \ LDADD=$(top_builddir)/src/stasis/libstasis.la
$(top_builddir)/src/libdfa/librw.la
noinst_PROGRAMS=logfile_dump run_recovery truncate_log noinst_PROGRAMS=logfile_dump run_recovery truncate_log
AM_CFLAGS=${GLOBAL_CFLAGS} AM_CFLAGS=${GLOBAL_CFLAGS}