fix: address PR #200 review issues
CI / lint (pull_request) Successful in 22s
CI / sanitizers (address) (pull_request) Successful in 37s
CI / sanitizers (undefined) (pull_request) Successful in 36s
CI / fuzz-build (pull_request) Successful in 13s
CI / coverage (pull_request) Successful in 31s
CI / build-and-test (pull_request) Successful in 1m15s
CI / valgrind (pull_request) Successful in 33s

- Restore PROTOCOL_VERSION to a forward-compatible 2.1.0 and document wire format
- Add NULL guard to config_delete
- Add pipeline cancellation flag and cancellation-aware queue helper
- Join running threads before destroying pipeline contexts on creation failure
- Fix NULL dereference and memory leaks in manifest/chunk handling
- Fix TLS/TCP socket fd leak on connect error paths
- Add compression-level range validation (1-22)
- Close previous log file before opening a new one
- Use getline for unbounded pattern-file lines
- Fix thread-unsafe localtime() and add log level bounds check
- Fix file_load_data to clean up data on read size mismatch
- Add hard ceiling to decompression buffer growth
- Fix mkdir_r bounds check and restore glob comments
- Add send_str NULL guard and mutex-protect bandwidth limiter
- Update AGENTS.md for per-thread io_ssl contract
This commit is contained in:
2026-08-02 09:20:10 +02:00
parent 1064ae6c19
commit 05a74770ca
16 changed files with 344 additions and 68 deletions
+1 -1
View File
@@ -206,7 +206,7 @@ tea pr close <number> --repo TapTap/FastSync
## Common pitfalls ## Common pitfalls
- **`__thread` on shared SSL context**: io_ssl must NOT be thread-local — worker threads inherit the SSL context from the main thread. Use regular `static SSL* io_ssl`. - **Per-thread SSL context**: `io_ssl` is stored per-thread (`static __thread SSL* io_ssl`). Each thread that performs protocol I/O must call `io_set_ssl()` to install its own SSL object before using `send_*` / `receive_*` primitives. The main thread's SSL context is not automatically inherited by worker threads.
- **SSL WANT_READ/WANT_WRITE retry**: Always retry on `SSL_ERROR_WANT_READ` and `SSL_ERROR_WANT_WRITE` in `send_n_data`/`receive_n_data`. Removing these breaks TLS multithreaded transfers. - **SSL WANT_READ/WANT_WRITE retry**: Always retry on `SSL_ERROR_WANT_READ` and `SSL_ERROR_WANT_WRITE` in `send_n_data`/`receive_n_data`. Removing these breaks TLS multithreaded transfers.
- **clang-format version**: The CI image uses clang-format 18. Always format inside the CI Docker container for exact match. - **clang-format version**: The CI image uses clang-format 18. Always format inside the CI Docker container for exact match.
- **Merge order matters**: Merge the most comprehensive branch first, then smaller ones, to minimize conflicts when creating a combined branch. - **Merge order matters**: Merge the most comprehensive branch first, then smaller ones, to minimize conflicts when creating a combined branch.
+16 -4
View File
@@ -276,13 +276,16 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
if (set_nonneg_int_option(&config->max_depth, argv[++i], "--max-depth") != 0) if (set_nonneg_int_option(&config->max_depth, argv[++i], "--max-depth") != 0)
return -1; return -1;
} else if (strcmp(argv[i], "--log-file") == 0 && i + 1 < argc) { } else if (strcmp(argv[i], "--log-file") == 0 && i + 1 < argc) {
if (config->log_file) {
fclose(config->log_file);
config->log_file = NULL;
log_set_file(NULL);
}
FILE* lf = fopen(argv[++i], "a"); FILE* lf = fopen(argv[++i], "a");
if (!lf) { if (!lf) {
fprintf(stderr, "Error: could not open log file '%s': %s\n", argv[i], strerror(errno)); fprintf(stderr, "Error: could not open log file '%s': %s\n", argv[i], strerror(errno));
return -1; return -1;
} }
if (config->log_file)
fclose(config->log_file);
config->log_file = lf; config->log_file = lf;
log_set_file(lf); log_set_file(lf);
} else if (strcmp(argv[i], "--queue-size") == 0 && i + 1 < argc) { } else if (strcmp(argv[i], "--queue-size") == 0 && i + 1 < argc) {
@@ -427,6 +430,10 @@ static int parse_args(Config* config, int argc, char* argv[], int* positional_ar
} else if (strcmp(argv[i], "--compress-level") == 0 && i + 1 < argc) { } else if (strcmp(argv[i], "--compress-level") == 0 && i + 1 < argc) {
if (set_positive_int_option(&config->compression_level, argv[++i], "--compress-level") != 0) if (set_positive_int_option(&config->compression_level, argv[++i], "--compress-level") != 0)
return -1; return -1;
if (config->compression_level < 1 || config->compression_level > 22) {
fprintf(stderr, "Error: --compress-level must be between 1 and 22\n");
return -1;
}
} else if (argv[i][0] == '-') { } else if (argv[i][0] == '-') {
fprintf(stderr, "Unknown option: %s\n", argv[i]); fprintf(stderr, "Unknown option: %s\n", argv[i]);
print_usage(); print_usage();
@@ -600,8 +607,10 @@ static int read_patterns_from_file(const char* filepath, char*** patterns, int*
fprintf(stderr, "Error: could not open pattern file '%s': %s\n", filepath, strerror(errno)); fprintf(stderr, "Error: could not open pattern file '%s': %s\n", filepath, strerror(errno));
return -1; return -1;
} }
char line[4096]; char* line = NULL;
while (fgets(line, sizeof(line), fp)) { size_t line_size = 0;
ssize_t n;
while ((n = getline(&line, &line_size, fp)) != -1) {
char* p = line; char* p = line;
while (*p == ' ' || *p == '\t') while (*p == ' ' || *p == '\t')
p++; p++;
@@ -615,6 +624,7 @@ static int read_patterns_from_file(const char* filepath, char*** patterns, int*
char** tmp = realloc(*patterns, (*count + 1) * sizeof(char*)); char** tmp = realloc(*patterns, (*count + 1) * sizeof(char*));
if (!tmp) { if (!tmp) {
fprintf(stderr, "Error: memory allocation failed for pattern file\n"); fprintf(stderr, "Error: memory allocation failed for pattern file\n");
free(line);
fclose(fp); fclose(fp);
return -1; return -1;
} }
@@ -622,11 +632,13 @@ static int read_patterns_from_file(const char* filepath, char*** patterns, int*
char* dup = str_dup(p); char* dup = str_dup(p);
if (!dup) { if (!dup) {
fprintf(stderr, "Error: memory allocation failed for pattern file\n"); fprintf(stderr, "Error: memory allocation failed for pattern file\n");
free(line);
fclose(fp); fclose(fp);
return -1; return -1;
} }
(*patterns)[(*count)++] = dup; (*patterns)[(*count)++] = dup;
} }
free(line);
fclose(fp); fclose(fp);
return 0; return 0;
} }
+81 -16
View File
@@ -346,6 +346,7 @@ static int send_chunks_multithreaded(void* pipeline_context) {
} }
if (send_chunk(client, current_chunk, context->config) != 0) { if (send_chunk(client, current_chunk, context->config) != 0) {
fprintf(stderr, "Error: unexpected error while sending chunk\n"); fprintf(stderr, "Error: unexpected error while sending chunk\n");
chunk_destroy(current_chunk);
client_disconnect(client); client_disconnect(client);
client_delete(client); client_delete(client);
mtx_lock(&context->mutex_progress); mtx_lock(&context->mutex_progress);
@@ -385,13 +386,31 @@ static int scan_directory_multithreaded(void* pipeline_context) {
const char* p = current_chunk->items[i]->path; const char* p = current_chunk->items[i]->path;
if (*p == '/') if (*p == '/')
p++; p++;
array_list_add(context->manifest, str_dup(p)); char* manifest_entry = str_dup(p);
if (!manifest_entry) {
log_message(LOG_LEVEL_ERROR, "Failed to allocate manifest entry");
mtx_unlock(&context->mutex_scanner);
context->cancelled = true;
cnd_broadcast(&context->condition_not_full_scanner);
cnd_broadcast(&context->condition_not_empty_scanner);
parallel_scanner_destroy(scanner);
return thrd_error;
}
array_list_add(context->manifest, manifest_entry);
} }
mtx_unlock(&context->mutex_scanner); mtx_unlock(&context->mutex_scanner);
} }
queue_enqueue_multithreaded(context->queue_scanner, current_chunk, &context->mutex_scanner, if (!queue_enqueue_multithreaded_cancel(
&context->condition_not_empty_scanner, context->queue_scanner, current_chunk, &context->mutex_scanner,
&context->condition_not_full_scanner); &context->condition_not_empty_scanner, &context->condition_not_full_scanner,
&context->cancelled)) {
chunk_destroy(current_chunk);
context->cancelled = true;
cnd_broadcast(&context->condition_not_full_scanner);
cnd_broadcast(&context->condition_not_empty_scanner);
parallel_scanner_destroy(scanner);
return thrd_error;
}
} }
mtx_lock(&context->mutex_scanner); mtx_lock(&context->mutex_scanner);
context->scanner_done = true; context->scanner_done = true;
@@ -427,9 +446,16 @@ static int load_files_multithreaded(void* pipeline_context) {
} }
} }
} }
queue_enqueue_multithreaded(context->queue_loader, chunk, &context->mutex_loader, if (!queue_enqueue_multithreaded_cancel(context->queue_loader, chunk, &context->mutex_loader,
&context->condition_not_empty_loader, &context->condition_not_empty_loader,
&context->condition_not_full_loader); &context->condition_not_full_loader,
&context->cancelled)) {
chunk_destroy(chunk);
context->cancelled = true;
cnd_broadcast(&context->condition_not_full_loader);
cnd_broadcast(&context->condition_not_empty_loader);
return thrd_error;
}
} }
} }
@@ -487,16 +513,20 @@ int send_files(Config* config) {
client = client_create(); client = client_create();
if (!client || !client_connect_tls(client, config->server_host, config->server_port, if (!client || !client_connect_tls(client, config->server_host, config->server_port,
config->tls_cert, config->tls_key, config->tls_ca)) { config->tls_cert, config->tls_key, config->tls_ca)) {
if (client) if (client) {
client_disconnect(client);
client_delete(client); client_delete(client);
}
fprintf(stderr, "Error: could not connect to server via TLS\n"); fprintf(stderr, "Error: could not connect to server via TLS\n");
return 1; return 1;
} }
} else { } else {
client = client_create(); client = client_create();
if (!client || !client_connect(client, config->server_host, config->server_port)) { if (!client || !client_connect(client, config->server_host, config->server_port)) {
if (client) if (client) {
client_disconnect(client);
client_delete(client); client_delete(client);
}
fprintf(stderr, "Error: could not connect to server\n"); fprintf(stderr, "Error: could not connect to server\n");
return 1; return 1;
} }
@@ -526,7 +556,17 @@ int send_files(Config* config) {
const char* p = current_chunk->items[i]->path; const char* p = current_chunk->items[i]->path;
if (*p == '/') if (*p == '/')
p++; p++;
array_list_add(manifest, str_dup(p)); char* manifest_entry = str_dup(p);
if (!manifest_entry) {
log_message(LOG_LEVEL_ERROR, "Failed to allocate manifest entry");
chunk_destroy(current_chunk);
array_list_delete(manifest);
directory_scanner_destroy(scanner);
client_disconnect(client);
client_delete(client);
return 1;
}
array_list_add(manifest, manifest_entry);
} }
} }
if (!config->use_sendfile) { if (!config->use_sendfile) {
@@ -625,17 +665,42 @@ int send_files_multithreaded(Config* config) {
if (config->use_delete) if (config->use_delete)
context->manifest = array_list_create(free); context->manifest = array_list_create(free);
thrd_t scanner, loader, sender, progress; thrd_t scanner, loader, sender;
if (thrd_create(&scanner, scan_directory_multithreaded, context) != thrd_success || bool scanner_created = false;
thrd_create(&loader, load_files_multithreaded, context) != thrd_success || bool loader_created = false;
thrd_create(&sender, send_chunks_multithreaded, context) != thrd_success) { bool sender_created = false;
scanner_created = (thrd_create(&scanner, scan_directory_multithreaded, context) == thrd_success);
if (scanner_created)
loader_created = (thrd_create(&loader, load_files_multithreaded, context) == thrd_success);
if (scanner_created && loader_created)
sender_created = (thrd_create(&sender, send_chunks_multithreaded, context) == thrd_success);
if (!scanner_created || !loader_created || !sender_created) {
perror("Error creating threads.\n"); perror("Error creating threads.\n");
context->cancelled = true;
context->scanner_done = true;
context->loader_done = true;
context->sender_done = true;
cnd_broadcast(&context->condition_not_full_scanner);
cnd_broadcast(&context->condition_not_empty_scanner);
cnd_broadcast(&context->condition_not_full_loader);
cnd_broadcast(&context->condition_not_empty_loader);
if (sender_created)
thrd_join(sender, NULL);
if (loader_created)
thrd_join(loader, NULL);
if (scanner_created)
thrd_join(scanner, NULL);
pipeline_context_sender_destroy(context); pipeline_context_sender_destroy(context);
return 1; return 1;
} }
thrd_t progress;
bool progress_created = false;
if (config->show_progress) { if (config->show_progress) {
if (thrd_create(&progress, progress_thread_fn, context) != thrd_success) { progress_created = (thrd_create(&progress, progress_thread_fn, context) == thrd_success);
if (!progress_created) {
perror("Error creating progress thread.\n"); perror("Error creating progress thread.\n");
/* Non-fatal; continue without progress reporting */ /* Non-fatal; continue without progress reporting */
} }
@@ -646,7 +711,7 @@ int send_files_multithreaded(Config* config) {
thrd_join(loader, NULL); thrd_join(loader, NULL);
thrd_join(sender, &sender_result); thrd_join(sender, &sender_result);
if (config->show_progress) { if (progress_created) {
/* Signal progress thread to exit if it hasn't already */ /* Signal progress thread to exit if it hasn't already */
mtx_lock(&context->mutex_progress); mtx_lock(&context->mutex_progress);
context->sender_done = true; context->sender_done = true;
+42 -7
View File
@@ -27,10 +27,14 @@ static void dir_entry_destroy(void* item) {
static DirEntry* dir_entry_create(const char* path, int depth) { static DirEntry* dir_entry_create(const char* path, int depth) {
DirEntry* de = malloc(sizeof(DirEntry)); DirEntry* de = malloc(sizeof(DirEntry));
if (de) { if (!de)
de->path = str_dup(path); return NULL;
de->depth = depth; de->path = str_dup(path);
if (!de->path) {
free(de);
return NULL;
} }
de->depth = depth;
return de; return de;
} }
@@ -62,7 +66,18 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
scanner->safe_links = safe_links; scanner->safe_links = safe_links;
scanner->copy_unsafe_links = copy_unsafe_links; scanner->copy_unsafe_links = copy_unsafe_links;
scanner->checksum = checksum; scanner->checksum = checksum;
queue_enqueue(scanner->directories, dir_entry_create(root_directory, 0)); DirEntry* root = dir_entry_create(root_directory, 0);
if (!root) {
queue_destroy(scanner->directories);
free(scanner);
return NULL;
}
if (!queue_enqueue(scanner->directories, root)) {
dir_entry_destroy(root);
queue_destroy(scanner->directories);
free(scanner);
return NULL;
}
return scanner; return scanner;
} }
@@ -323,9 +338,28 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
free(ps); free(ps);
return NULL; return NULL;
} }
if (mtx_init(&ps->result_mutex, mtx_plain) != thrd_success || int init = 0;
cnd_init(&ps->result_not_empty) != thrd_success || bool ok = true;
cnd_init(&ps->result_not_full) != thrd_success) { if (mtx_init(&ps->result_mutex, mtx_plain) != thrd_success)
ok = false;
if (ok) {
init++;
if (cnd_init(&ps->result_not_empty) != thrd_success)
ok = false;
}
if (ok) {
// cppcheck-suppress unreadVariable
init++;
if (cnd_init(&ps->result_not_full) != thrd_success)
ok = false;
}
if (!ok) {
if (init >= 3)
cnd_destroy(&ps->result_not_full);
if (init >= 2)
cnd_destroy(&ps->result_not_empty);
if (init >= 1)
mtx_destroy(&ps->result_mutex);
queue_destroy(ps->result_queue); queue_destroy(ps->result_queue);
free(ps); free(ps);
return NULL; return NULL;
@@ -564,6 +598,7 @@ void parallel_scanner_destroy(ParallelScanner* ps) {
return; return;
ps->done = true; ps->done = true;
cnd_signal(&ps->result_not_empty); cnd_signal(&ps->result_not_empty);
cnd_broadcast(&ps->result_not_full);
for (int i = 0; i < ps->num_threads; i++) for (int i = 0; i < ps->num_threads; i++)
thrd_join(ps->threads[i], NULL); thrd_join(ps->threads[i], NULL);
free(ps->threads); free(ps->threads);
+19 -3
View File
@@ -135,11 +135,27 @@ void handler(int file_descriptor) {
return; return;
} }
thrd_t receiver, writer; thrd_t receiver, writer;
if (thrd_create(&receiver, receive_thread, context) != thrd_success || bool receiver_created = false;
thrd_create(&writer, write_thread, context) != thrd_success) { bool writer_created = false;
receiver_created = (thrd_create(&receiver, receive_thread, context) == thrd_success);
if (receiver_created)
writer_created = (thrd_create(&writer, write_thread, context) == thrd_success);
if (!receiver_created || !writer_created) {
perror("Error creating Threads"); perror("Error creating Threads");
if (receiver_created) {
mtx_lock(&context->mutex);
context->cancelled = true;
cnd_broadcast(&context->condition_not_full);
cnd_broadcast(&context->condition_not_empty);
mtx_unlock(&context->mutex);
close(file_descriptor);
thrd_join(receiver, NULL);
} else {
close(file_descriptor);
}
if (writer_created)
thrd_join(writer, NULL);
pipeline_context_receiver_destroy(context); pipeline_context_receiver_destroy(context);
close(file_descriptor);
return; return;
} }
thrd_join(receiver, NULL); thrd_join(receiver, NULL);
+20 -3
View File
@@ -1,12 +1,13 @@
#include "compression.h" #include "compression.h"
#include "data.h" #include "data.h"
#include "log.h" #include "log.h"
#include "stdlib.h" #include <stdlib.h>
#include "string.h" #include <string.h>
#include <strings.h> #include <strings.h>
#include "zstd.h" #include <zstd.h>
#define INITIAL_DECOMPRESS_BUF_SIZE (1024 * 1024) #define INITIAL_DECOMPRESS_BUF_SIZE (1024 * 1024)
#define MAX_DECOMPRESSED_SIZE (100ULL * 1024 * 1024) /* 100 MB hard ceiling */
static const char* SKIP_COMPRESSION_EXTENSIONS[] = {".jpg", ".jpeg", ".png", ".gif", ".mp4", ".mkv", static const char* SKIP_COMPRESSION_EXTENSIONS[] = {".jpg", ".jpeg", ".png", ".gif", ".mp4", ".mkv",
".zip", ".gz", ".xz", ".zst", NULL}; ".zip", ".gz", ".xz", ".zst", NULL};
@@ -84,6 +85,13 @@ Data* data_decompress(Data* compressed_data) {
dst_size = compressed_data->size * 3; dst_size = compressed_data->size * 3;
if (dst_size < INITIAL_DECOMPRESS_BUF_SIZE) if (dst_size < INITIAL_DECOMPRESS_BUF_SIZE)
dst_size = INITIAL_DECOMPRESS_BUF_SIZE; dst_size = INITIAL_DECOMPRESS_BUF_SIZE;
if (dst_size > MAX_DECOMPRESSED_SIZE)
dst_size = MAX_DECOMPRESSED_SIZE;
}
if (dst_size > MAX_DECOMPRESSED_SIZE) {
log_message(LOG_LEVEL_ERROR, "Declared decompressed size exceeds %llu bytes",
(unsigned long long)MAX_DECOMPRESSED_SIZE);
return NULL;
} }
ZSTD_DCtx* dctx = ZSTD_createDCtx(); ZSTD_DCtx* dctx = ZSTD_createDCtx();
@@ -113,7 +121,16 @@ Data* data_decompress(Data* compressed_data) {
return NULL; return NULL;
} }
if (ret > 0 && output.pos == output.size) { if (ret > 0 && output.pos == output.size) {
if (buf_size >= MAX_DECOMPRESSED_SIZE) {
log_message(LOG_LEVEL_ERROR, "Decompressed data exceeds %llu bytes",
(unsigned long long)MAX_DECOMPRESSED_SIZE);
ZSTD_freeDCtx(dctx);
data_destroy(uncompressed_data);
return NULL;
}
buf_size *= 2; buf_size *= 2;
if (buf_size > MAX_DECOMPRESSED_SIZE)
buf_size = MAX_DECOMPRESSED_SIZE;
void* new_data = realloc(uncompressed_data->data, buf_size); void* new_data = realloc(uncompressed_data->data, buf_size);
if (!new_data) { if (!new_data) {
log_message(LOG_LEVEL_ERROR, "Failed to grow decompression buffer"); log_message(LOG_LEVEL_ERROR, "Failed to grow decompression buffer");
+13
View File
@@ -131,6 +131,8 @@ void config_parse_ssh_dest(Config* config) {
} }
void config_delete(Config* config) { void config_delete(Config* config) {
if (config == NULL)
return;
free(config->version); free(config->version);
free(config->send_directory); free(config->send_directory);
free(config->receive_root_directory); free(config->receive_root_directory);
@@ -167,6 +169,16 @@ void config_delete(Config* config) {
free(config); free(config);
} }
/* Wire format order (must match config_receive and be updated when PROTOCOL_VERSION bumps):
* version, send_directory, receive_root_directory, save_to_disk, use_multithreading,
* use_chunk_serialization, use_compression, use_metadata, compression_level, chunk_size,
* use_sendfile, use_delete, use_incremental, use_delta, delta_block_size, delta_max_file_size,
* backup, backup_dir, follow_symlinks, copy_links, safe_links, copy_unsafe_links,
* preserve_hard_links, preserve_acls, preserve_xattrs, preserve_devices, preserve_sparse,
* update, inplace, append, append_verify, delete_excluded, delete_after, max_delete, relative,
* prune_empty_dirs, temp_dir, partial, partial_dir, suffix, delete_before, checksum,
* compress_choice, status
*/
bool config_send(int file_descriptor, const Config* config) { bool config_send(int file_descriptor, const Config* config) {
if (!send_str(file_descriptor, config->version)) if (!send_str(file_descriptor, config->version))
return false; return false;
@@ -264,6 +276,7 @@ bool config_send(int file_descriptor, const Config* config) {
return true; return true;
} }
/* Wire format order: see the comment above config_send. */
Config* config_receive(int file_descriptor) { Config* config_receive(int file_descriptor) {
Config* config = (Config*)malloc(sizeof(Config)); Config* config = (Config*)malloc(sizeof(Config));
if (config == NULL) if (config == NULL)
+2 -1
View File
@@ -128,7 +128,8 @@ typedef struct Config {
char* compress_choice; char* compress_choice;
} Config; } Config;
#define PROTOCOL_VERSION "1.3.0" /* This version must be bumped whenever config_send / config_receive wire format changes. */
#define PROTOCOL_VERSION "2.1.0"
#define DEFAULT_CHUNK_SIZE (10 * 1024 * 1024) #define DEFAULT_CHUNK_SIZE (10 * 1024 * 1024)
Config* config_create(void); Config* config_create(void);
+3 -1
View File
@@ -16,7 +16,6 @@
#include "config.h" #include "config.h"
#include "data.h" #include "data.h"
#include "file.h" #include "file.h"
#include "log.h"
#include "metadata.h" #include "metadata.h"
#include "protocol.h" #include "protocol.h"
#include "utils.h" #include "utils.h"
@@ -96,6 +95,9 @@ bool file_load_data(File* file) {
size_t bytes_read = file_content_to_buffer(file); size_t bytes_read = file_content_to_buffer(file);
if (bytes_read != file->data->size) { if (bytes_read != file->data->size) {
log_message(LOG_LEVEL_ERROR, "Did not read expected amount of bytes from file"); log_message(LOG_LEVEL_ERROR, "Did not read expected amount of bytes from file");
free(file->data->data);
file->data->data = NULL;
file->data->size = 0;
return false; return false;
} }
return true; return true;
+9 -5
View File
@@ -18,11 +18,15 @@ void log_set_file(FILE* fp) {
void log_message(LogLevel log_level, const char* format, ...) { void log_message(LogLevel log_level, const char* format, ...) {
if (log_level < current_log_level) if (log_level < current_log_level)
return; return;
if (log_level < 0 || log_level >= (int)(sizeof(log_level_strings) / sizeof(log_level_strings[0])))
return;
time_t now = time(NULL); time_t now = time(NULL);
const struct tm* t = localtime(&now); struct tm t;
if (!localtime_r(&now, &t))
return;
fprintf(stderr, "%04d-%02d-%02d %02d:%02d:%02d [%s]: ", t->tm_year + 1900, t->tm_mon + 1, fprintf(stderr, "%04d-%02d-%02d %02d:%02d:%02d [%s]: ", t.tm_year + 1900, t.tm_mon + 1, t.tm_mday,
t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, log_level_strings[log_level]); t.tm_hour, t.tm_min, t.tm_sec, log_level_strings[log_level]);
va_list args; va_list args;
va_start(args, format); va_start(args, format);
@@ -31,8 +35,8 @@ void log_message(LogLevel log_level, const char* format, ...) {
fprintf(stderr, "\n"); fprintf(stderr, "\n");
if (log_fp) { if (log_fp) {
fprintf(log_fp, "%04d-%02d-%02d %02d:%02d:%02d [%s]: ", t->tm_year + 1900, t->tm_mon + 1, fprintf(log_fp, "%04d-%02d-%02d %02d:%02d:%02d [%s]: ", t.tm_year + 1900, t.tm_mon + 1,
t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, log_level_strings[log_level]); t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, log_level_strings[log_level]);
va_start(args, format); va_start(args, format);
vfprintf(log_fp, format, args); vfprintf(log_fp, format, args);
va_end(args); va_end(args);
+83 -24
View File
@@ -26,18 +26,48 @@ PipelineContextSender* pipeline_context_sender_create(Config* config, Queue* que
context->manifest = NULL; context->manifest = NULL;
context->progress_bytes = 0; context->progress_bytes = 0;
context->sender_done = false; context->sender_done = false;
if (mtx_init(&context->mutex_scanner, mtx_plain) != thrd_success || context->cancelled = false;
cnd_init(&context->condition_not_full_scanner) != thrd_success || int init = 0;
cnd_init(&context->condition_not_empty_scanner) != thrd_success || if (mtx_init(&context->mutex_scanner, mtx_plain) != thrd_success)
mtx_init(&context->mutex_loader, mtx_plain) != thrd_success || goto fail;
cnd_init(&context->condition_not_full_loader) != thrd_success || init++;
mtx_init(&context->mutex_progress, mtx_plain) != thrd_success || if (cnd_init(&context->condition_not_full_scanner) != thrd_success)
cnd_init(&context->condition_not_empty_loader) != thrd_success) { goto fail;
perror("Error initializing synchronization objects"); init++;
free(context); if (cnd_init(&context->condition_not_empty_scanner) != thrd_success)
return NULL; goto fail;
} init++;
if (mtx_init(&context->mutex_loader, mtx_plain) != thrd_success)
goto fail;
init++;
if (cnd_init(&context->condition_not_full_loader) != thrd_success)
goto fail;
init++;
if (cnd_init(&context->condition_not_empty_loader) != thrd_success)
goto fail;
init++;
if (mtx_init(&context->mutex_progress, mtx_plain) != thrd_success)
goto fail;
// cppcheck-suppress unreadVariable
init++;
return context; return context;
fail:
perror("Error initializing synchronization objects");
if (init >= 6)
cnd_destroy(&context->condition_not_empty_loader);
if (init >= 5)
cnd_destroy(&context->condition_not_full_loader);
if (init >= 4)
mtx_destroy(&context->mutex_loader);
if (init >= 3)
cnd_destroy(&context->condition_not_empty_scanner);
if (init >= 2)
cnd_destroy(&context->condition_not_full_scanner);
if (init >= 1)
mtx_destroy(&context->mutex_scanner);
free(context);
return NULL;
} }
void pipeline_context_sender_destroy(PipelineContextSender* context) { void pipeline_context_sender_destroy(PipelineContextSender* context) {
@@ -67,14 +97,30 @@ PipelineContextReceiver* pipeline_context_receiver_create(Config* config, Queue*
context->file_descriptor = file_descriptor; context->file_descriptor = file_descriptor;
context->ssl = ssl; context->ssl = ssl;
context->receiver_done = false; context->receiver_done = false;
if (mtx_init(&context->mutex, mtx_plain) != thrd_success || context->cancelled = false;
cnd_init(&context->condition_not_full) != thrd_success || int init = 0;
cnd_init(&context->condition_not_empty) != thrd_success) { if (mtx_init(&context->mutex, mtx_plain) != thrd_success)
perror("Error initializing synchronization objects"); goto fail;
free(context); init++;
return NULL; if (cnd_init(&context->condition_not_full) != thrd_success)
} goto fail;
init++;
if (cnd_init(&context->condition_not_empty) != thrd_success)
goto fail;
// cppcheck-suppress unreadVariable
init++;
return context; return context;
fail:
perror("Error initializing synchronization objects");
if (init >= 3)
cnd_destroy(&context->condition_not_empty);
if (init >= 2)
cnd_destroy(&context->condition_not_full);
if (init >= 1)
mtx_destroy(&context->mutex);
free(context);
return NULL;
} }
void pipeline_context_receiver_destroy(PipelineContextReceiver* context) { void pipeline_context_receiver_destroy(PipelineContextReceiver* context) {
@@ -94,8 +140,13 @@ static bool receive_chunk_enqueue(int file_descriptor, PipelineContextReceiver*
for (int i = 0; i < chunk->element_count; i++) { for (int i = 0; i < chunk->element_count; i++) {
File* file = chunk->items[i]; File* file = chunk->items[i];
chunk->items[i] = NULL; chunk->items[i] = NULL;
queue_enqueue_multithreaded(context->queue, file, &context->mutex, if (!queue_enqueue_multithreaded_cancel(context->queue, file, &context->mutex,
&context->condition_not_empty, &context->condition_not_full); &context->condition_not_empty,
&context->condition_not_full, &context->cancelled)) {
file_destroy(file);
chunk_destroy(chunk);
return false;
}
} }
chunk_destroy(chunk); chunk_destroy(chunk);
return true; return true;
@@ -129,8 +180,12 @@ int receive_thread(void* pipeline_context) {
if (!skipped) { if (!skipped) {
if (file == NULL) if (file == NULL)
return thrd_error; return thrd_error;
queue_enqueue_multithreaded(context->queue, file, &context->mutex, if (!queue_enqueue_multithreaded_cancel(
&context->condition_not_empty, &context->condition_not_full); context->queue, file, &context->mutex, &context->condition_not_empty,
&context->condition_not_full, &context->cancelled)) {
file_destroy(file);
return thrd_error;
}
} }
} else if (status == STATUS_CHUNK) { } else if (status == STATUS_CHUNK) {
if (!receive_chunk_enqueue(file_descriptor, context)) if (!receive_chunk_enqueue(file_descriptor, context))
@@ -166,8 +221,12 @@ int receive_thread(void* pipeline_context) {
} else { } else {
File* file = file_receive(config, file_descriptor); File* file = file_receive(config, file_descriptor);
if (file) { if (file) {
queue_enqueue_multithreaded(context->queue, file, &context->mutex, if (!queue_enqueue_multithreaded_cancel(
&context->condition_not_empty, &context->condition_not_full); context->queue, file, &context->mutex, &context->condition_not_empty,
&context->condition_not_full, &context->cancelled)) {
file_destroy(file);
return thrd_error;
}
} else { } else {
log_message(LOG_LEVEL_ERROR, "Failed to receive file"); log_message(LOG_LEVEL_ERROR, "Failed to receive file");
return thrd_error; return thrd_error;
+2
View File
@@ -26,6 +26,7 @@ typedef struct {
mtx_t mutex_progress; mtx_t mutex_progress;
unsigned long long progress_bytes; unsigned long long progress_bytes;
bool sender_done; bool sender_done;
bool cancelled;
} PipelineContextSender; } PipelineContextSender;
typedef struct PipelineContextReceiver { typedef struct PipelineContextReceiver {
@@ -37,6 +38,7 @@ typedef struct PipelineContextReceiver {
cnd_t condition_not_full; cnd_t condition_not_full;
cnd_t condition_not_empty; cnd_t condition_not_empty;
bool receiver_done; bool receiver_done;
bool cancelled;
} PipelineContextReceiver; } PipelineContextReceiver;
PipelineContextSender* pipeline_context_sender_create(Config* config, Queue* queue_scanner, PipelineContextSender* pipeline_context_sender_create(Config* config, Queue* queue_scanner,
+15
View File
@@ -6,6 +6,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <threads.h>
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
@@ -20,6 +21,8 @@ static __thread SSL* io_ssl;
static unsigned long long io_bwlimit = 0; static unsigned long long io_bwlimit = 0;
static long long bw_tokens = 0; static long long bw_tokens = 0;
static struct timespec bw_last_refill = {0, 0}; static struct timespec bw_last_refill = {0, 0};
static mtx_t bw_mutex;
static once_flag bw_mutex_once = ONCE_FLAG_INIT;
static __thread unsigned long long total_allocated_bytes = 0; static __thread unsigned long long total_allocated_bytes = 0;
@@ -28,15 +31,24 @@ void io_set_fds(int read_fd, int write_fd) {
io_write_fd = write_fd; io_write_fd = write_fd;
} }
static void bw_mutex_init(void) {
mtx_init(&bw_mutex, mtx_plain);
}
void io_set_bwlimit(unsigned long long bytes_per_sec) { void io_set_bwlimit(unsigned long long bytes_per_sec) {
call_once(&bw_mutex_once, bw_mutex_init);
mtx_lock(&bw_mutex);
io_bwlimit = bytes_per_sec; io_bwlimit = bytes_per_sec;
bw_tokens = (long long)io_bwlimit; bw_tokens = (long long)io_bwlimit;
clock_gettime(CLOCK_MONOTONIC, &bw_last_refill); clock_gettime(CLOCK_MONOTONIC, &bw_last_refill);
mtx_unlock(&bw_mutex);
} }
static void bw_throttle(size_t bytes_written) { static void bw_throttle(size_t bytes_written) {
if (io_bwlimit == 0) if (io_bwlimit == 0)
return; return;
call_once(&bw_mutex_once, bw_mutex_init);
mtx_lock(&bw_mutex);
struct timespec now; struct timespec now;
clock_gettime(CLOCK_MONOTONIC, &now); clock_gettime(CLOCK_MONOTONIC, &now);
@@ -61,6 +73,7 @@ static void bw_throttle(size_t bytes_written) {
bw_tokens = 0; bw_tokens = 0;
clock_gettime(CLOCK_MONOTONIC, &bw_last_refill); clock_gettime(CLOCK_MONOTONIC, &bw_last_refill);
} }
mtx_unlock(&bw_mutex);
} }
void io_set_ssl(SSL* ssl) { void io_set_ssl(SSL* ssl) {
@@ -177,6 +190,8 @@ static const char* status_to_string(Status status) {
} }
bool send_str(int file_descriptor, const char* data) { bool send_str(int file_descriptor, const char* data) {
if (data == NULL)
return false;
size_t size = strlen(data); size_t size = strlen(data);
if (!send_n_data(file_descriptor, &size, sizeof(size_t))) if (!send_n_data(file_descriptor, &size, sizeof(size_t)))
return false; return false;
+16
View File
@@ -103,6 +103,22 @@ bool queue_enqueue_multithreaded(Queue* queue, void* item, mtx_t* mutex, cnd_t*
return ok; return ok;
} }
bool queue_enqueue_multithreaded_cancel(Queue* queue, void* item, mtx_t* mutex,
cnd_t* condition_not_empty, cnd_t* condition_not_full,
const bool* cancelled) {
mtx_lock(mutex);
while (queue_is_full(queue) && (cancelled == NULL || !*cancelled))
cnd_wait(condition_not_full, mutex);
if (cancelled != NULL && *cancelled) {
mtx_unlock(mutex);
return false;
}
bool ok = queue_enqueue(queue, item);
cnd_signal(condition_not_empty);
mtx_unlock(mutex);
return ok;
}
void* queue_dequeue(Queue* queue) { void* queue_dequeue(Queue* queue) {
if (queue == NULL || queue_is_empty(queue)) { if (queue == NULL || queue_is_empty(queue)) {
perror("ERROR: Could not dequeue from null or empty queue."); perror("ERROR: Could not dequeue from null or empty queue.");
+3
View File
@@ -20,6 +20,9 @@ bool queue_is_full(const Queue* queue);
bool queue_enqueue(Queue* queue, void* item); bool queue_enqueue(Queue* queue, void* item);
bool queue_enqueue_multithreaded(Queue* queue, void* item, mtx_t* mutex, cnd_t* condition_not_empty, bool queue_enqueue_multithreaded(Queue* queue, void* item, mtx_t* mutex, cnd_t* condition_not_empty,
cnd_t* condition_not_full); cnd_t* condition_not_full);
bool queue_enqueue_multithreaded_cancel(Queue* queue, void* item, mtx_t* mutex,
cnd_t* condition_not_empty, cnd_t* condition_not_full,
const bool* cancelled);
void* queue_dequeue(Queue* queue); void* queue_dequeue(Queue* queue);
void* queue_dequeue_multithreaded(Queue* queue, mtx_t* mutex, cnd_t* condition_not_empty, void* queue_dequeue_multithreaded(Queue* queue, mtx_t* mutex, cnd_t* condition_not_empty,
cnd_t* condition_not_full, const bool* other_thread_done); cnd_t* condition_not_full, const bool* other_thread_done);
+19 -3
View File
@@ -10,11 +10,13 @@
#include <unistd.h> #include <unistd.h>
bool mkdir_r(const char* path) { bool mkdir_r(const char* path) {
char* path_duplicate = malloc(strlen(path) + 1); size_t path_len = strlen(path);
char* path_duplicate = malloc(path_len + 1);
if (!path_duplicate) if (!path_duplicate)
return false; return false;
memcpy(path_duplicate, path, strlen(path) + 1); memcpy(path_duplicate, path, path_len + 1);
char* path_current = (char*)malloc((strlen(path) + 2) * sizeof(char)); size_t capacity = path_len + 2;
char* path_current = (char*)malloc(capacity * sizeof(char));
if (!path_current) { if (!path_current) {
free(path_duplicate); free(path_duplicate);
return false; return false;
@@ -33,6 +35,10 @@ bool mkdir_r(const char* path) {
bool ok = true; bool ok = true;
while (part != NULL) { while (part != NULL) {
size_t part_len = strlen(part); size_t part_len = strlen(part);
if ((size_t)(path_current_position - path_current) + part_len + 2 > capacity) {
ok = false;
break;
}
memcpy(path_current_position, part, part_len); memcpy(path_current_position, part, part_len);
path_current_position += part_len; path_current_position += part_len;
path_current_position[0] = '/'; path_current_position[0] = '/';
@@ -64,10 +70,18 @@ char* str_dup(const char* string) {
return new_string; return new_string;
} }
/* Match a glob pattern against a string. Supported wildcards:
* ? matches any single character except '/'.
* * matches any sequence of characters within one path component (no '/').
* ** matches any sequence of characters, including '/' (cross-directory).
* slash-star-star-slash is treated as a cross-directory wildcard when it appears between
* literals.
*/
bool glob_match(const char* pattern, const char* str) { bool glob_match(const char* pattern, const char* str) {
while (*pattern) { while (*pattern) {
if (*pattern == '*') { if (*pattern == '*') {
if (*(pattern + 1) == '*') { if (*(pattern + 1) == '*') {
/* globstar: match across directories */
pattern += 2; pattern += 2;
if (*pattern == '\0') if (*pattern == '\0')
return true; return true;
@@ -80,6 +94,7 @@ bool glob_match(const char* pattern, const char* str) {
} }
return glob_match(pattern, str); return glob_match(pattern, str);
} }
/* single *: match within one path component */
pattern++; pattern++;
while (*str && *str != '/') { while (*str && *str != '/') {
if (glob_match(pattern, str)) if (glob_match(pattern, str))
@@ -94,6 +109,7 @@ bool glob_match(const char* pattern, const char* str) {
str++; str++;
} else { } else {
if (*pattern != *str) { if (*pattern != *str) {
/* allow literal / ** / rest to match any number of directories */
if (*pattern == '/' && *(pattern + 1) == '*' && *(pattern + 2) == '*') { if (*pattern == '/' && *(pattern + 1) == '*' && *(pattern + 2) == '*') {
const char* rest = pattern + 3; const char* rest = pattern + 3;
if (*rest == '/') if (*rest == '/')