cozis/ToastyFS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fixes

Browse Source
This commit is contained in:
cozis
2025-11-03 18:32:14 +01:00
parent e135d871c1
commit 31a4b2cc32
5 changed files with 38 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client.c
+3 -4
View File
@@ -15,8 +15,7 @@
#include "message.h" #include "message.h"
#include <TinyDFS.h> #include <TinyDFS.h>
#define TAG_METADATA_SERVER -2 #define TAG_METADATA_SERVER -1
#define TAG_METADATA_SERVER_TO_CLIENT -3
#define TAG_RETRIEVE_METADATA_FOR_READ 1 #define TAG_RETRIEVE_METADATA_FOR_READ 1
#define TAG_RETRIEVE_METADATA_FOR_WRITE 2 #define TAG_RETRIEVE_METADATA_FOR_WRITE 2
@@ -977,7 +976,7 @@ int tinydfs_process_events(TinyDFS *tdfs, void **contexts, struct pollfd *polled
RequestQueue *reqs; RequestQueue *reqs;
int tag = tcp_get_tag(&tdfs->tcp, conn_idx); int tag = tcp_get_tag(&tdfs->tcp, conn_idx);
if (tag == TAG_METADATA_SERVER_TO_CLIENT) if (tag == TAG_METADATA_SERVER)
reqs = &tdfs->metadata_server.reqs; reqs = &tdfs->metadata_server.reqs;
else { else {
assert(tag > -1); assert(tag > -1);
@@ -1006,7 +1005,7 @@ int tinydfs_process_events(TinyDFS *tdfs, void **contexts, struct pollfd *polled
RequestQueue *reqs; RequestQueue *reqs;
int tag = tcp_get_tag(&tdfs->tcp, conn_idx); int tag = tcp_get_tag(&tdfs->tcp, conn_idx);
if (tag == TAG_METADATA_SERVER_TO_CLIENT) if (tag == TAG_METADATA_SERVER)
reqs = &tdfs->metadata_server.reqs; reqs = &tdfs->metadata_server.reqs;
else { else {
assert(tag > -1); assert(tag > -1);
src/message.c
+1 -1
View File
@@ -15,7 +15,7 @@ bool binary_read(BinaryReader *reader, void *dst, int len)
void message_writer_init(MessageWriter *writer, ByteQueue *output, uint16_t type) void message_writer_init(MessageWriter *writer, ByteQueue *output, uint16_t type)
{ {
uint16_t version = MESSAGE_VERSION; uint16_t version = MESSAGE_VERSION;
uint16_t dummy = 0; // Dummy value uint32_t dummy = 0; // Dummy value
writer->output = output; writer->output = output;
writer->start = byte_queue_offset(output); writer->start = byte_queue_offset(output);
byte_queue_write(output, &version, sizeof(version)); byte_queue_write(output, &version, sizeof(version));
src/metadata_server.c
+23 -23
View File
@@ -185,26 +185,26 @@ process_client_create(MetadataServer *state, int conn_idx, ByteView msg)
char path_mem[1<<10]; char path_mem[1<<10];
uint16_t path_len; uint16_t path_len;
if (binary_read(&reader, &path_len, sizeof(path_len))) if (!binary_read(&reader, &path_len, sizeof(path_len)))
return -1; return -1;
if (path_len > sizeof(path_mem)) if (path_len > sizeof(path_mem))
return -2; return -2;
if (binary_read(&reader, &path_mem, path_len)) if (!binary_read(&reader, &path_mem, path_len))
return -1; return -1;
string path = { path_mem, path_len }; string path = { path_mem, path_len };
uint8_t is_dir; uint8_t is_dir;
if (binary_read(&reader, &is_dir, sizeof(path_len))) if (!binary_read(&reader, &is_dir, sizeof(is_dir)))
return -1; return -1;
uint32_t chunk_size; uint32_t chunk_size;
if (is_dir) if (is_dir)
chunk_size = 0; chunk_size = 0;
else { else {
if (binary_read(&reader, &chunk_size, sizeof(chunk_size))) if (!binary_read(&reader, &chunk_size, sizeof(chunk_size)))
return -1; return -1;
} }
@@ -256,13 +256,13 @@ process_client_delete(MetadataServer *state, int conn_idx, ByteView msg)
char path_mem[1<<10]; char path_mem[1<<10];
uint16_t path_len; uint16_t path_len;
if (binary_read(&reader, &path_len, sizeof(path_len))) if (!binary_read(&reader, &path_len, sizeof(path_len)))
return -1; return -1;
if (path_len > sizeof(path_mem)) if (path_len > sizeof(path_mem))
return -2; return -2;
if (binary_read(&reader, &path_mem, path_len)) if (!binary_read(&reader, &path_mem, path_len))
return -1; return -1;
string path = { path_mem, path_len }; string path = { path_mem, path_len };
@@ -315,13 +315,13 @@ process_client_list(MetadataServer *state, int conn_idx, ByteView msg)
char path_mem[1<<10]; char path_mem[1<<10];
uint16_t path_len; uint16_t path_len;
if (binary_read(&reader, &path_len, sizeof(path_len))) if (!binary_read(&reader, &path_len, sizeof(path_len)))
return -1; return -1;
if (path_len > sizeof(path_mem)) if (path_len > sizeof(path_mem))
return -2; return -2;
if (binary_read(&reader, &path_mem, path_len)) if (!binary_read(&reader, &path_mem, path_len))
return -1; return -1;
string path = { path_mem, path_len }; string path = { path_mem, path_len };
@@ -401,23 +401,23 @@ process_client_read(MetadataServer *state, int conn_idx, ByteView msg)
char path_mem[1<<10]; char path_mem[1<<10];
uint16_t path_len; uint16_t path_len;
if (binary_read(&reader, &path_len, sizeof(path_len))) if (!binary_read(&reader, &path_len, sizeof(path_len)))
return -1; return -1;
if (path_len > sizeof(path_mem)) if (path_len > sizeof(path_mem))
return -2; return -2;
if (binary_read(&reader, &path_mem, path_len)) if (!binary_read(&reader, &path_mem, path_len))
return -1; return -1;
string path = { path_mem, path_len }; string path = { path_mem, path_len };
uint32_t offset; uint32_t offset;
if (binary_read(&reader, &offset, sizeof(offset))) if (!binary_read(&reader, &offset, sizeof(offset)))
return -1; return -1;
uint32_t length; uint32_t length;
if (binary_read(&reader, &length, sizeof(length))) if (!binary_read(&reader, &length, sizeof(length)))
return -1; return -1;
// Check that there are no more bytes to read // Check that there are no more bytes to read
@@ -502,27 +502,27 @@ process_client_write(MetadataServer *state, int conn_idx, ByteView msg)
char path_mem[1<<10]; char path_mem[1<<10];
uint16_t path_len; uint16_t path_len;
if (binary_read(&reader, &path_len, sizeof(path_len))) if (!binary_read(&reader, &path_len, sizeof(path_len)))
return -1; return -1;
if (path_len > sizeof(path_mem)) if (path_len > sizeof(path_mem))
return -2; return -2;
if (binary_read(&reader, &path_mem, path_len)) if (!binary_read(&reader, &path_mem, path_len))
return -1; return -1;
string path = { path_mem, path_len }; string path = { path_mem, path_len };
uint32_t offset; uint32_t offset;
if (binary_read(&reader, &offset, sizeof(offset))) if (!binary_read(&reader, &offset, sizeof(offset)))
return -1; return -1;
uint32_t length; uint32_t length;
if (binary_read(&reader, &length, sizeof(length))) if (!binary_read(&reader, &length, sizeof(length)))
return -1; return -1;
uint32_t num_chunks; uint32_t num_chunks;
if (binary_read(&reader, &num_chunks, sizeof(num_chunks))) if (!binary_read(&reader, &num_chunks, sizeof(num_chunks)))
return -1; return -1;
#define MAX_CHUNKS_PER_WRITE 32 #define MAX_CHUNKS_PER_WRITE 32
@@ -534,29 +534,29 @@ process_client_write(MetadataServer *state, int conn_idx, ByteView msg)
for (uint32_t i = 0; i < num_chunks; i++) { for (uint32_t i = 0; i < num_chunks; i++) {
SHA256 old_hash; SHA256 old_hash;
if (binary_read(&reader, &old_hash, sizeof(old_hash))) if (!binary_read(&reader, &old_hash, sizeof(old_hash)))
return -1; return -1;
SHA256 new_hash; SHA256 new_hash;
if (binary_read(&reader, &new_hash, sizeof(new_hash))) if (!binary_read(&reader, &new_hash, sizeof(new_hash)))
return -1; return -1;
uint8_t is_ipv4; uint8_t is_ipv4;
if (binary_read(&reader, &is_ipv4, sizeof(is_ipv4))) if (!binary_read(&reader, &is_ipv4, sizeof(is_ipv4)))
return -1; return -1;
Address addr; Address addr;
addr.is_ipv4 = is_ipv4; addr.is_ipv4 = is_ipv4;
if (is_ipv4) { if (is_ipv4) {
if (binary_read(&reader, &addr.ipv4, sizeof(addr.ipv4))) if (!binary_read(&reader, &addr.ipv4, sizeof(addr.ipv4)))
return -1; return -1;
} else { } else {
if (binary_read(&reader, &addr.ipv6, sizeof(addr.ipv6))) if (!binary_read(&reader, &addr.ipv6, sizeof(addr.ipv6)))
return -1; return -1;
} }
if (binary_read(&reader, &addr.port, sizeof(addr.port))) if (!binary_read(&reader, &addr.port, sizeof(addr.port)))
return -1; return -1;
addrs[i] = addr; addrs[i] = addr;
src/system.c
+6
View File
@@ -640,6 +640,7 @@ void update_simulation(void)
polled[num_polled].fd = (SOCKET) j; polled[num_polled].fd = (SOCKET) j;
polled[num_polled].events = desc->events; polled[num_polled].events = desc->events;
polled[num_polled].revents = revents; polled[num_polled].revents = revents;
contexts[num_polled] = desc->context;
num_polled++; num_polled++;
} }
} }
@@ -651,17 +652,22 @@ void update_simulation(void)
assert(current_time <= wakeup_time); assert(current_time <= wakeup_time);
current_time = wakeup_time; current_time = wakeup_time;
//printf("T=%2.2f ms\n", (float) current_time / 1000000);
} }
int timeout = -1; int timeout = -1;
switch (current_process->type) { switch (current_process->type) {
case PROCESS_TYPE_METADATA_SERVER: case PROCESS_TYPE_METADATA_SERVER:
//printf(" Metadata server woke up\n");
num_polled = metadata_server_step(&current_process->metadata_server, contexts, polled, num_polled, &timeout); num_polled = metadata_server_step(&current_process->metadata_server, contexts, polled, num_polled, &timeout);
break; break;
case PROCESS_TYPE_CHUNK_SERVER: case PROCESS_TYPE_CHUNK_SERVER:
//printf(" Chunk server woke up\n");
num_polled = chunk_server_step(&current_process->chunk_server, contexts, polled, num_polled, &timeout); num_polled = chunk_server_step(&current_process->chunk_server, contexts, polled, num_polled, &timeout);
break; break;
case PROCESS_TYPE_CLIENT: case PROCESS_TYPE_CLIENT:
//printf(" Client woke up\n");
num_polled = simulation_client_step(&current_process->simulation_client, contexts, polled, num_polled, &timeout); num_polled = simulation_client_step(&current_process->simulation_client, contexts, polled, num_polled, &timeout);
break; break;
} }
src/tcp.c
+5 -3
View File
@@ -224,25 +224,25 @@ int tcp_translate_events(TCP *tcp, Event *events, void **contexts, struct pollfd
} else { } else {
if (polled[i].revents & POLLIN) { if (polled[i].revents & POLLIN) {
byte_queue_write_setmincap(&conn->input, 1<<9);
ByteView buf = byte_queue_write_buf(&conn->input); ByteView buf = byte_queue_write_buf(&conn->input);
int num = sys_recv(conn->fd, (char*) buf.ptr, buf.len, 0); int num = sys_recv(conn->fd, (char*) buf.ptr, buf.len, 0);
if (num == 0) if (num == 0)
defer_close = true; defer_close = true;
else if (num < 0) { else if (num < 0) {
if (errno != EINTR && errno != EWOULDBLOCK && errno != EAGAIN) if (errno != EINTR && errno != EWOULDBLOCK && errno != EAGAIN) // TODO: does Windows return these error codes or not?
defer_close = true; defer_close = true;
num = 0; num = 0;
} }
byte_queue_write_ack(&conn->input, num); byte_queue_write_ack(&conn->input, num);
ByteView msg = byte_queue_read_buf(&conn->input); ByteView msg = byte_queue_read_buf(&conn->input);
int ret = message_peek(msg, NULL, NULL); int ret = message_peek(msg, NULL, NULL);
byte_queue_read_ack(&conn->input, 0);
if (ret < 0) { if (ret < 0) {
// Invalid message // Invalid message
byte_queue_read_ack(&conn->input, 0);
defer_close = true; defer_close = true;
} else if (ret == 0) { } else if (ret == 0) {
// Still buffering // Still buffering
byte_queue_read_ack(&conn->input, 0);
if (byte_queue_full(&conn->input)) if (byte_queue_full(&conn->input))
defer_close = true; defer_close = true;
} else { } else {
@@ -266,6 +266,8 @@ int tcp_translate_events(TCP *tcp, Event *events, void **contexts, struct pollfd
} }
} }
// TODO: byte_queue_error here?
removed[i] = defer_close; removed[i] = defer_close;
if (0) {} if (0) {}
else if (defer_close) events[num_events++] = (Event) { EVENT_DISCONNECT, conn - tcp->conns }; else if (defer_close) events[num_events++] = (Event) { EVENT_DISCONNECT, conn - tcp->conns };