Clean up the Linux side of the build.

CLion on Windows missed a lot of stuff.
This commit is contained in:
Kyle Isom 2023-10-06 06:25:58 +00:00
parent f727ce4b5a
commit 36af6ac1f8
8 changed files with 27 additions and 25 deletions

View File

@ -69,18 +69,18 @@ AllocNewArena(Arena & arena, size_t size)
#if defined(__linux__) #if defined(__linux__)
int int
MMapArena(Arena &arena, int fd, size_t Size) MMapArena(Arena &arena, int fd, size_t size)
{ {
if (arena.Size > 0) { if (arena.Size > 0) {
if (arena_destroy(arena) != 0) { if (DestroyArena(arena) != 0) {
return -1; return -1;
} }
} }
arena.Type = ARENA_MMAP; arena.Type = ARENA_MMAP;
arena.Size = Size; arena.Size = size;
arena.store = (uint8_t *)mmap(NULL, Size, PROT_RW, MAP_SHARED, fd, 0); arena.Store = (uint8_t *)mmap(NULL, size, PROT_RW, MAP_SHARED, fd, 0);
if ((void *)arena.store == MAP_FAILED) { if ((void *)arena.Store == MAP_FAILED) {
return -1; return -1;
} }
arena.fd = fd; arena.fd = fd;
@ -94,7 +94,7 @@ OpenArena(Arena &arena, const char *path)
struct stat st; struct stat st;
if (arena.Size > 0) { if (arena.Size > 0) {
if (arena_destroy(arena) != 0) { if (DestroyArena(arena) != 0) {
return -1; return -1;
} }
} }
@ -113,12 +113,12 @@ OpenArena(Arena &arena, const char *path)
int int
CreateArena(Arena &arena, const char *path, size_t Size, mode_t mode) CreateArena(Arena &arena, const char *path, size_t size, mode_t mode)
{ {
int fd = 0; int fd = 0;
if (arena.Size > 0) { if (arena.Size > 0) {
if (arena_destroy(arena) != 0) { if (DestroyArena(arena) != 0) {
return -1; return -1;
} }
} }
@ -128,7 +128,7 @@ CreateArena(Arena &arena, const char *path, size_t Size, mode_t mode)
return -1; return -1;
} }
if (ftruncate(fd, Size) == -1) { if (ftruncate(fd, size) == -1) {
return -1; return -1;
} }
@ -170,7 +170,7 @@ DestroyArena(Arena &arena)
break; break;
#if defined(__linux__) #if defined(__linux__)
case ARENA_MMAP: case ARENA_MMAP:
if (munmap(arena.store, arena.Size) == -1) { if (munmap(arena.Store, arena.Size) == -1) {
return -1; return -1;
} }
@ -219,7 +219,7 @@ DisplayArena(const Arena &arena)
break; break;
#if defined(__linux__) #if defined(__linux__)
case ARENA_MMAP: case ARENA_MMAP:
std::cout << "mmap/file" std::cout << "mmap/file";
break; break;
#endif #endif
default: default:

View File

@ -38,8 +38,7 @@ int DestroyArena(Arena &); /* dispose of any memory used by arena */
* BACKING FILE! */ * BACKING FILE! */
int WriteArena(const Arena &arena, const char *path); int WriteArena(const Arena &arena, const char *path);
void void DisplayArena(const Arena &arena);
DisplayArena(const Arena &arena);
#endif #endif

View File

@ -135,17 +135,17 @@ Dictionary::DumpKVPairs()
} }
} }
#else
void
Dictionary::DumpKVPairs()
{
}
#endif
void void
Dictionary::DumpToFile(const char *path) Dictionary::DumpToFile(const char *path)
{ {
WriteArena(this->arena, path); WriteArena(this->arena, path);
} }
#else
void
Dictionary::dump_kvpairs()
{
}
#endif

View File

@ -5,7 +5,7 @@ SOURCES := $(wildcard *.cc)
OBJS := Arena.o Dictionary.o TLV.o OBJS := Arena.o Dictionary.o TLV.o
CXX := clang++ CXX := clang++
CXXFLAGS := -g -std=c++14 -Werror -Wall CXXFLAGS := -g -std=c++14 -Werror -Wall -DDESKTOP_BUILD
.PHONY: all .PHONY: all
all: $(TARGET) $(TESTS) tags run-tests all: $(TARGET) $(TESTS) tags run-tests
@ -17,10 +17,10 @@ $(TARGET): $(OBJS)
$(AR) rcs $@ $(OBJS) $(AR) rcs $@ $(OBJS)
tlv_test: tlvTest.o $(TARGET) tlv_test: tlvTest.o $(TARGET)
$(CXX) -o $@ $(CXXFLAGS) $@.o $(TARGET) $(CXX) -o $@ $(CXXFLAGS) tlvTest.o $(TARGET)
dictionary_test: dictionaryTest.o $(TARGET) dictionary_test: dictionaryTest.o $(TARGET)
$(CXX) -o $@ $(CXXFLAGS) $@.o $(TARGET) $(CXX) -o $@ $(CXXFLAGS) dictionaryTest.o $(TARGET)
.PHONY: print-% .PHONY: print-%
print-%: ; @echo '$(subst ','\'',$*=$($*))' print-%: ; @echo '$(subst ','\'',$*=$($*))'

BIN
dictionary_test Executable file

Binary file not shown.

View File

@ -2,6 +2,9 @@
#define KLIB_TESTFIXTURES_H #define KLIB_TESTFIXTURES_H
#include <string.h>
#define ARENA_SIZE 128 #define ARENA_SIZE 128
#define ARENA_FILE "arena_test.bin" #define ARENA_FILE "arena_test.bin"

View File

@ -97,7 +97,7 @@ main(int argc, const char *argv[])
if (-1 == CreateArena(arenaFile, ARENA_FILE, ARENA_SIZE, 0644)) { if (-1 == CreateArena(arenaFile, ARENA_FILE, ARENA_SIZE, 0644)) {
abort(); abort();
} else if (!run_suite(arenaFile, "arenaFile")) { } else if (!runSuite(arenaFile, "arenaFile")) {
abort(); abort();
} }
#endif #endif

BIN
tlv_test Executable file

Binary file not shown.