Skip to content

Commit a4d3c74

Browse files
simonhfsimonhf
committed
Move sources into ./src/
1 parent 29afa5a commit a4d3c74

20 files changed

+30
-27
lines changed

‎GNUmakefile

+21-21
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ CC = gcc
2525
CXXFLAGS = -c -g -W -Waggregate-return -Wall -Werror -Wcast-align -Wcast-qual -Wchar-subscripts
2626
CXXFLAGS += -Wcomment -Wformat -Wmissing-declarations -Wparentheses -Wpointer-arith -Wredundant-decls
2727
CXXFLAGS += -Wreturn-type -Wshadow -Wswitch -Wtrigraphs -Wwrite-strings -O
28-
CXXFLAGS += -fno-inline-functions-called-once -fPIC -Wuninitialized -Wunused -march=x86-64 -I.
28+
CXXFLAGS += -fno-inline-functions-called-once -fPIC -Wuninitialized -Wunused -march=x86-64 -I. -Isrc
2929
CFLAGS = -Wimplicit -Wmissing-prototypes -Wnested-externs -Wstrict-prototypes -std=gnu99
3030
ifneq ($(filter debug,$(MAKECMDGOALS)),)
3131
BUILD_TYPE = debug
@@ -36,23 +36,23 @@ BUILD_TYPE = release
3636
BUILD_TYPE_NODE = Release
3737
CXXFLAGS += -O3
3838
endif
39-
DEPS_H = $(wildcard *.h)
40-
DEPS_HPP = $(wildcard *.hpp)
41-
NODE_SRCS = $(filter-out %build,$(wildcard ./wrappers/nodejs/*))
42-
PROD_SRCS_C = $(filter-out test%,$(wildcard *.c))
43-
PROD_SRCS_C = $(filter-out main%,$(wildcard *.c))
44-
PROD_OBJS_C = $(patsubst %,$(BUILD_TYPE)/%,$(filter-out test%,$(patsubst %.c,%.o,$(PROD_SRCS_C))))
45-
PROD_SRCS_CPP = $(filter-out test%,$(wildcard *.cpp))
46-
PROD_OBJS_CPP = $(patsubst %,$(BUILD_TYPE)/%,$(filter-out test%,$(patsubst %.cpp,%.o,$(PROD_SRCS_CPP))))
47-
MAIN_SRCS_C = $(filter main%,$(wildcard *.c))
48-
MAIN_OBJS_C = $(patsubst %,$(BUILD_TYPE)/%,$(filter main%,$(patsubst %.c,%.o,$(MAIN_SRCS_C))))
49-
MAIN_EXES = $(patsubst %,$(BUILD_TYPE)/%,$(filter %,$(patsubst main.%.c,%,$(MAIN_SRCS_C))))
50-
TEST_SRCS_C = $(filter test%,$(wildcard *.c))
51-
TEST_OBJS_C = $(patsubst %,$(BUILD_TYPE)/%,$(filter test%,$(patsubst %.c,%.o,$(TEST_SRCS_C))))
52-
TEST_SRCS_CPP = $(filter test%,$(wildcard *.cpp))
53-
TEST_OBJS_CPP = $(patsubst %,$(BUILD_TYPE)/%,$(filter test%,$(patsubst %.cpp,%.o,$(TEST_SRCS_CPP))))
54-
TEST_EXES = $(patsubst %,$(BUILD_TYPE)/%,$(filter test%,$(patsubst %.c,%.t,$(TEST_SRCS_C)))) \
55-
$(patsubst %,$(BUILD_TYPE)/%,$(filter test%,$(patsubst %.cpp,%.t,$(TEST_SRCS_CPP))))
39+
DEPS_H = $(wildcard ./src/*.h)
40+
DEPS_HPP = $(wildcard ./src/*.hpp)
41+
NODE_SRCS = $(filter-out %build,$(wildcard ./wrappers/nodejs/*))
42+
PROD_SRCS_C = $(filter-out ./src/test%,$(wildcard ./src/*.c))
43+
PROD_SRCS_C = $(filter-out ./src/main%,$(wildcard ./src/*.c))
44+
PROD_OBJS_C = $(patsubst ./src/%,$(BUILD_TYPE)/%,$(filter-out ./src/test%,$(patsubst %.c,%.o,$(PROD_SRCS_C))))
45+
PROD_SRCS_CPP = $(filter-out ./src/test%,$(wildcard ./src/*.cpp))
46+
PROD_OBJS_CPP = $(patsubst ./src/%,$(BUILD_TYPE)/%,$(filter-out ./src/test%,$(patsubst %.cpp,%.o,$(PROD_SRCS_CPP))))
47+
MAIN_SRCS_C = $(filter ./src/main%,$(wildcard ./src/*.c))
48+
MAIN_OBJS_C = $(patsubst ./src/%,$(BUILD_TYPE)/%,$(filter ./src/main%,$(patsubst %.c,%.o,$(MAIN_SRCS_C))))
49+
MAIN_EXES = $(patsubst %,$(BUILD_TYPE)/%,$(filter %,$(patsubst ./src/main.%.c,%,$(MAIN_SRCS_C))))
50+
TEST_SRCS_C = $(filter ./src/test%,$(wildcard ./src/*.c))
51+
TEST_OBJS_C = $(patsubst ./src/%,$(BUILD_TYPE)/%,$(filter ./src/test%,$(patsubst %.c,%.o,$(TEST_SRCS_C))))
52+
TEST_SRCS_CPP = $(filter ./src/test%,$(wildcard ./src/*.cpp))
53+
TEST_OBJS_CPP = $(patsubst ./src/%,$(BUILD_TYPE)/%,$(filter ./src/test%,$(patsubst %.cpp,%.o,$(TEST_SRCS_CPP))))
54+
TEST_EXES = $(patsubst ./src/%,$(BUILD_TYPE)/%,$(filter ./src/test%,$(patsubst %.c,%.t,$(TEST_SRCS_C)))) \
55+
$(patsubst ./src/%,$(BUILD_TYPE)/%,$(filter ./src/test%,$(patsubst %.cpp,%.t,$(TEST_SRCS_CPP))))
5656

5757
ifneq ($(filter clean,$(MAKECMDGOALS)),)
5858
else
@@ -88,11 +88,11 @@ all: tab $(MAIN_EXES) $(TEST_EXES) $(BUILD_TYPE)/SharedHashFile.a $(BUILD_TYPE)/
8888
@echo "make: note: prefix make with SHF_PERFORMANCE_TEST_(ENABLE|CPUS|KEYS)=(1|4|10000000) to run perf test"
8989
@echo "make: built and tested $(BUILD_TYPE) version"
9090

91-
$(BUILD_TYPE)/%.o: %.c $(DEPS_H)
91+
$(BUILD_TYPE)/%.o: ./src/%.c $(DEPS_H)
9292
@echo "make: compiling: $@"
9393
@$(CC) -o $@ $< $(CXXFLAGS) $(CFLAGS)
9494

95-
$(BUILD_TYPE)/%.o: %.cpp $(DEPS_H) $(DEPS_HPP)
95+
$(BUILD_TYPE)/%.o: ./src/%.cpp $(DEPS_H) $(DEPS_HPP)
9696
@echo "make: compiling: $@"
9797
@$(CC) -o $@ $< $(CXXFLAGS)
9898

@@ -123,7 +123,7 @@ ifneq ($(findstring node-gyp,$(NODE_GYP)),)
123123
@cd $(BUILD_TYPE) && NODE_DEBUG=mymod nodejs ./SharedHashFileDummy.js
124124
@echo "make: building and running test: IPC: Unix Domain Socket"
125125
@cd $(BUILD_TYPE) && cp ../wrappers/nodejs/TestIpcSocket.* .
126-
@cd $(BUILD_TYPE) && gcc -o TestIpcSocket.o $(CFLAGS) $(CXXFLAGS) -I .. TestIpcSocket.c
126+
@cd $(BUILD_TYPE) && gcc -o TestIpcSocket.o $(CFLAGS) $(CXXFLAGS) -I ../src TestIpcSocket.c
127127
@cd $(BUILD_TYPE) && gcc -o TestIpcSocket TestIpcSocket.o shf.o murmurhash3.o
128128
@cd $(BUILD_TYPE) && ./TestIpcSocket
129129
@echo "make: running test: IPC: SharedHashFile Queue"

‎perf-test-lmdb.pl

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
my $tar_gz = qq[2727e97de35320b0ac433ff2e811b9640bb66996.tar.gz];
44

5-
if ( ! -e qq[./release/] ) { printf qq[- mkdir release\n]; system qq[mkdir ./release]; }
5+
printf qq[- make\n]; system qq[make]; # first make SharedHashFile
66
if ( ! -e qq[./release/$tar_gz] ) { printf qq[- get $tar_gz\n]; system qq[cd ./release/ ; wget https://gitorious.org/mdb/mdb/archive/$tar_gz]; }
77
if ( ! -e qq[./release/mdb-mdb/] ) { printf qq[- untar $tar_gz\n]; system qq[cd ./release/ ; tar zxfv $tar_gz]; }
88
if ( ! -e qq[./release/mdb-mdb/libraries/liblmdb/liblmdb.a] ) { printf qq[- compile $tar_gz\n]; system qq[cd ./release/mdb-mdb/libraries/liblmdb ; make ; make test ; cp liblmdb.a ../../../.]; }
9-
system qq[rm -rf /dev/shm/test-*/ ; gcc -O3 -std=gnu99 -I./release/mdb-mdb/libraries/liblmdb -DTEST_LMDB -o ./release/perf-test-lmdb.t test.f.shf.c ./release/murmurhash3.o ./release/shf.o ./release/liblmdb.a -pthread && SHF_ENABLE_PERFORMANCE_TEST=1 ./release/perf-test-lmdb.t 2>&1 | tee ./release/perf-test-lmdb.txt];
9+
printf qq[- perf test\n]; system qq[rm -rf /dev/shm/test-*/ ; gcc -O3 -std=gnu99 -I./release/mdb-mdb/libraries/liblmdb -DTEST_LMDB -o ./release/perf-test-lmdb.t -I./src ./src/test.f.shf.c ./release/murmurhash3.o ./release/shf.o ./release/liblmdb.a -pthread && SHF_PERFORMANCE_TEST_ENABLE=1 ./release/perf-test-lmdb.t 2>&1 | tee ./release/perf-test-lmdb.txt];

‎SharedHashFile.cpp ‎src/SharedHashFile.cpp

File renamed without changes.

‎SharedHashFile.hpp ‎src/SharedHashFile.hpp

File renamed without changes.

‎main.shf.monitor.c ‎src/main.shf.monitor.c

File renamed without changes.

‎murmurhash3.c ‎src/murmurhash3.c

File renamed without changes.

‎murmurhash3.h ‎src/murmurhash3.h

File renamed without changes.

‎shf.c ‎src/shf.c

File renamed without changes.

‎shf.defines.h ‎src/shf.defines.h

File renamed without changes.

‎shf.h ‎src/shf.h

File renamed without changes.

‎shf.lock.h ‎src/shf.lock.h

File renamed without changes.

‎shf.private.h ‎src/shf.private.h

File renamed without changes.

‎tap.c ‎src/tap.c

File renamed without changes.

‎tap.h ‎src/tap.h

File renamed without changes.

‎test.1.tap.c ‎src/test.1.tap.c

File renamed without changes.

‎test.9.shf.c ‎src/test.9.shf.c

File renamed without changes.

‎test.a.shf.cpp ‎src/test.a.shf.cpp

File renamed without changes.

‎test.f.shf.c ‎src/test.f.shf.c

+6-3
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
#define TEST_FINI()
128128

129129
#define TEST_FINI_MASTER() \
130-
char test_du_folder[256]; SHF_SNPRINTF(1, test_du_folder, "du -h -d 0 %s; ; rm -rf %s", test_db_folder, test_db_folder); \
130+
char test_du_folder[256]; SHF_SNPRINTF(1, test_du_folder, "du -h -d 0 %s; rm -rf %s", test_db_folder, test_db_folder); \
131131
fprintf(stderr, "test: DB size before deletion: %s\n", shf_backticks(test_du_folder));
132132

133133
#else
@@ -217,9 +217,13 @@ int main(void)
217217

218218
#define TEST_MAX_PROCESSES (16)
219219

220+
#ifdef TEST_LMDB
221+
uint32_t test_keys_default = 100 * 1000000; /* assume enough RAM is available for LMDB */
222+
#else
220223
uint64_t vfs_available_md = shf_get_vfs_available(shf) / 1024 / 1024;
221224
uint32_t test_keys_10m = vfs_available_md / 436 * 10; /* 10M keys is about 436MB */
222-
uint32_t test_keys_default = test_keys_10m > 100 ? 100 * 1000000 : test_keys_10m * 1000000;
225+
uint32_t test_keys_default = test_keys_10m > 100 ? 100 * 1000000 : test_keys_10m * 1000000; SHF_ASSERT(test_keys_default > 0, "ERROR: only %luMB available on /dev/shm but 10M keys takes at least 436MB for SharedHashFile", vfs_available_md);
226+
#endif
223227
uint32_t test_keys = test_keys_desired ? test_keys_desired : test_keys_default;
224228
uint32_t cpu_count = cpu_count_desired ? cpu_count_desired : test_get_cpu_count();
225229
uint32_t process;
@@ -229,7 +233,6 @@ int main(void)
229233
volatile uint32_t * get_counts = mmap(NULL, SHF_MOD_PAGE(TEST_MAX_PROCESSES*sizeof(uint32_t)), PROT_READ|PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED | MAP_NORESERVE, -1, 0); SHF_ASSERT(MAP_FAILED != get_counts, "mmap(): %u: ", errno);
230234
volatile uint32_t * mix_counts = mmap(NULL, SHF_MOD_PAGE(TEST_MAX_PROCESSES*sizeof(uint32_t)), PROT_READ|PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED | MAP_NORESERVE, -1, 0); SHF_ASSERT(MAP_FAILED != mix_counts, "mmap(): %u: ", errno);
231235
volatile uint64_t * start_line = mmap(NULL, SHF_MOD_PAGE( 3*sizeof(uint64_t)), PROT_READ|PROT_WRITE, MAP_ANONYMOUS | MAP_SHARED | MAP_NORESERVE, -1, 0); SHF_ASSERT(MAP_FAILED != mix_counts, "mmap(): %u: ", errno);
232-
SHF_ASSERT(test_keys > 0, "ERROR: only %luMB available on /dev/shm but 10M keys takes at least 436MB for SharedHashFile", vfs_available_md);
233236
SHF_ASSERT(sizeof(uint64_t) == sizeof(long), "INTERNAL: expected sizeof(uint64_t) == sizeof(long), but got %lu == %lu", sizeof(uint64_t), sizeof(long));
234237
start_line[0] = 0;
235238
start_line[1] = 0;

‎test.q.shf.c ‎src/test.q.shf.c

File renamed without changes.

‎wrappers/nodejs/binding.gyp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{
66
"target_name": "SharedHashFile",
77
'include_dirs': [
8-
'../..',
8+
'../../src',
99
],
1010
"configurations": {
1111
# This augments the `Debug` configuration used when calling `node-gyp`

0 commit comments

Comments
 (0)