bug fixes and modern CI

Author: splitice

.github/workflows/build-test.yml

@@ -0,0 +1,30 @@
+name: build and test
+
+on: [push]
+
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        release: ["Release", "Debug"]
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Build
+      run: |
+        make all CONFIG=${{ matrix.release }}
+    - name: Main tests
+      run: |
+        PWD=$(pwd)
+        ./tests/${{ matrix.release }}/tests $PWD/src/server/${{ matrix.release }}/scache $PWD/testcases/
+    - name: valgrind test
+      run: |
+        PWD=$(pwd)
+        sudo apt-get install valgrind
+        valgrind ./tests/${{ matrix.release }}/tests $PWD/src/server/${{ matrix.release }}/scache $PWD/testcases/
+    - name: Spam test
+      run: |
+        echo "todo"

.gitignore

@@ -6,6 +6,8 @@
 *.user
 *.sln.docstates
 
+.vscode/
+
 # Build results
 
 CodeDB/

src/core/config.h

@@ -2,6 +2,7 @@
 #define BLOCK_LENGTH 4096
 #define BLOCK_MAX_LOAD 8192
 #define MAX_PATH 512
+#define SHORT_PATH 400
 #define NUM_EVENTS 32
 
 #define CONNECTION_HASH_ENTRIES 1024

src/core/connection.cpp

@@ -425,6 +425,8 @@ static void* connection_handle_accept(void *arg)
 	}
 
 	close(epfd);
+
+	return NULL;
 }
 
 void connection_event_loop(void (*connection_handler)(cache_connection* connection)) {
@@ -500,7 +502,7 @@ void connection_event_loop(void (*connection_handler)(cache_connection* connecti
 					ev.data.fd = client_sock;
 					res = epoll_ctl(epfd, EPOLL_CTL_ADD, client_sock, &ev);
 					if (res != 0) {
-						PWARN("epoll_ctl() failed to add %s.", client_sock);
+						PWARN("epoll_ctl() failed to add %d.", client_sock);
 					}
 				}
 			}
@@ -555,9 +557,9 @@ void connection_event_loop(void (*connection_handler)(cache_connection* connecti
 						close(fd);
 					}
 				}
-				else
+				else if(fd == efd)
 				{
-					WARN("Unknown connection %d\n", fd);
+					WARN("Unknown connection %d (in=%d, out=%d, hup=%d)\n", fd, events[n].events & EPOLLIN ? 1 : 0, events[n].events & EPOLLOUT ? 1 : 0, events[n].events & EPOLLHUP ? 1 : 0);
 					if(fd) assert(fd);
 					assert(fd != 0 || (settings.daemon_mode && fd >= 0));
 

src/core/connection.h

@@ -12,6 +12,13 @@ void connection_event_loop(void(*connection_handler)(cache_connection* connectio
 void connection_setup(struct scache_bind* binds, uint32_t num_binds);
 void connection_cleanup();
 
-#define CONNECTION_HASH_KEY(x) x%CONNECTION_HASH_ENTRIES
+#define _DEBUG_CONNECTION_HANDLER
+#ifdef DEBUG_CONNECTION_HANDLER
+#define CONNECTION_HANDLER(con, value) printf("Setting connection handler to " #value "\n"); (con)->handler = (value) 
+#else
+#define CONNECTION_HANDLER(con, value) (con)->handler = (value) 
+#endif
+
+#define CONNECTION_HASH_KEY(x) (x)%CONNECTION_HASH_ENTRIES
 
 #endif // !defined(CONNECTION_H_INCLUDED_0986159D_B42F_44F7_AC22_75D7DDA2994D)

src/core/db.cpp

@@ -623,7 +623,7 @@ static bool db_load_from_save(){
 				db_block_free(u1);
 			break;
 			case 't':
-				if(sscanf(bp, "t:%s", &buffer2) != 1){
+				if(sscanf(bp, "t:%s", buffer2) != 1){
 					WARN("Table parsing error\n");
 					continue;
 				}
@@ -640,7 +640,7 @@ static bool db_load_from_save(){
 					WARN("File entry must be after table\n");
 					continue;
 				}
-				if(sscanf(bp+1, ":%d:%u:%u:%u:%s", &d1, &u2, &u3, &u4, &buffer2) != 5){
+				if(sscanf(bp+1, ":%d:%u:%u:%u:%s", &d1, &u2, &u3, &u4, buffer2) != 5){
 					WARN("Entry parsing error\n");
 					continue;
 				}
@@ -704,8 +704,8 @@ bool db_open(const char* path) {
 	bool will_black = false;
 
 	//Create paths as char*'s
-	snprintf(db.path_root, MAX_PATH, "%s/", path);
-	snprintf(db.path_single, MAX_PATH, "%s/files/", path);
+	snprintf(db.path_root, SHORT_PATH, "%s/", path);
+	snprintf(db.path_single, SHORT_PATH, "%s/files/", path);
 
 	//Initialize folder structure if it doesnt exist
 	db_init_folders();
@@ -715,7 +715,7 @@ bool db_open(const char* path) {
 	db.table_gc = kh_begin(db.tables);
 
 	//Load from index if available
-	snprintf(db.path_blockfile, MAX_PATH, "%s/blockfile.db", path);
+	snprintf(db.path_blockfile, SHORT_PATH, "%s/blockfile.db", path);
 
 	if(!db_load_from_save()){
 		PWARN("Unable to load index from disk, will blank database");
@@ -736,7 +736,9 @@ bool db_open(const char* path) {
 	if(will_black){
 		if(size > (BLOCK_MAX_LOAD * BLOCK_LENGTH)) {
 			size = BLOCK_MAX_LOAD * BLOCK_LENGTH;
-			ftruncate(db.fd_blockfile, size);
+			if(ftruncate(db.fd_blockfile, size) == -1){
+				PFATAL("Failed to truncate blockfile: %s", db.path_blockfile);
+			}
 			db.blocks_exist = (uint32_t)(size / BLOCK_LENGTH);
 		}
 		for (off64_t i = 0; i < size; i += BLOCK_LENGTH) {
@@ -782,7 +784,7 @@ void db_target_open(struct cache_target* target, bool write) {
 			target->fd = db_entry_open(target->entry, 0);
 		}
 		if (target->fd <= 0) {
-			WARN("Unable to open cache file: %d", target->entry);
+			WARN("Unable to open cache file: %s", target->entry->key);
 		}
 	}
 	else{
@@ -1391,7 +1393,7 @@ static pid_t db_index_flush(bool copyOnWrite){
 					if(ce->writing || ce->deleted) continue;
 
 					//Write entry key to index
-					temp = snprintf(buffer, sizeof(buffer), "%s:%d:%u:%u:%u:", ce->block >= 0 ? "b":"e", ce->block, ce->data_length, ce->expires, ce->it);
+					temp = snprintf(buffer, sizeof(buffer), "%s:%d:%u:%lu:%u:", ce->block >= 0 ? "b":"e", ce->block, ce->data_length, ce->expires, ce->it);
 					if(!full_write(fd, buffer, temp)) goto close_fd;
 					if(!full_write(fd, ce->key, ce->key_length)) goto close_fd;
 					if(!full_write(fd, "\n", 1)) goto close_fd;

src/core/db.h

@@ -17,9 +17,9 @@ struct block_free_node {
 /* Details regarding a database */
 struct db_details {
 	//Paths
-	char path_root[MAX_PATH];
-	char path_single[MAX_PATH];
-	char path_blockfile[MAX_PATH];
+	char path_root[SHORT_PATH];
+	char path_single[SHORT_PATH];
+	char path_blockfile[SHORT_PATH];
 
 	//Blockfile
 	int fd_blockfile;

src/core/debug.h

@@ -21,7 +21,11 @@
 #define PWARN(...) do {} while(0)
 #else
 
-#ifdef DEBUG_BUILD
+#if defined(DEBUG_BUILD)
+#define DEBUG_OUTPUT_ENABLED DEBUG_BUILD
+#endif
+
+#ifdef DEBUG_OUTPUT_ENABLED
 #  define DEBUG(x...) fprintf(stderr, x)
 #else
 #  define DEBUG(x...) do {} while (0)

src/core/http.cpp

@@ -76,7 +76,7 @@ state_action http_read_handle(int epfd, cache_connection* connection) {
 	do {
 		run = http_read_handle_state(epfd, connection);
 		to_end_old = to_end;
-		to_end = rbuf_read_to_end(&connection->input);
+		to_end = rbuf_read_remaining(&connection->input);
 	} while (run == needs_more && to_end != 0 && to_end != to_end_old);
 
 	//Handle buffer is full, not being processed
@@ -177,6 +177,6 @@ void http_templates_init() {
 }
 
 void http_connection_handler(cache_connection* connection) {
-	connection->handler = http_handle_method;
+	CONNECTION_HANDLER(connection,  http_handle_method);
 	connection->state = 0;
 }