Merge branch 'main' into metadata-transfer, resolve conflicts

Conflicts resolved:
- config_create signature: added both use_metadata and use_sendfile params
- config_send/config_receive: wire protocol includes both use_metadata and use_sendfile
- client.c: config_create call updated, arg parsing includes both -M/--preserve and -f/--sendfile
- test_config.c: all three config_create calls updated
- file_send_sendfile: use file->data->size instead of removed struct stat

src/client/client.c

@@ -29,6 +29,11 @@ int send_chunk(Client *client, Chunk *chunk, Config *config) {
     }
     send_data(client->file_descriptor, data->data, data->size);
     data_destroy(data);
+  } else if (config->use_sendfile && !config->use_compression) {
+    for (int i = 0; i < chunk->element_count; i++) {
+      send_status(client->file_descriptor, STATUS_NEXT);
+      file_send_sendfile(chunk->items[i], client->file_descriptor);
+    }
   } else {
     for (int i = 0; i < chunk->element_count; i++) {
       send_status(client->file_descriptor, STATUS_NEXT);
@@ -81,8 +86,10 @@ int load_files_multithreaded(void *pipeline_context) {
       mtx_unlock(&context->mutex_loader);
       return thrd_success;
     }
-    for (int i = 0; i < chunk->element_count; i++)
-      file_load_data(chunk->items[i]);
+    if (!context->config->use_sendfile) {
+      for (int i = 0; i < chunk->element_count; i++)
+        file_load_data(chunk->items[i]);
+    }
     queue_enqueue_multithreaded(context->queue_loader, chunk,
                                 &context->mutex_loader,
                                 &context->condition_not_empty_loader,
@@ -130,8 +137,10 @@ int send_files(Config *config) {
   DirectoryScanner *scanner = directory_scanner_create(config->send_directory, config->use_metadata);
   Chunk *current_chunk;
   while ((current_chunk = directory_scanner_next(scanner)) != NULL) {
-    for (int i = 0; i < current_chunk->element_count; i++)
-      file_load_data(current_chunk->items[i]);
+    if (!config->use_sendfile) {
+      for (int i = 0; i < current_chunk->element_count; i++)
+        file_load_data(current_chunk->items[i]);
+    }
     send_chunk(client, current_chunk, config);
     chunk_destroy(current_chunk);
   }
@@ -192,7 +201,7 @@ int main(int argc, char *argv[]) {
   }
 
   Config *config = config_create(str_dup("1.0.0"), source_dir, dest_dir,
-                                 save_to_disk, false, false, false, false, 5, 20);
+                                 save_to_disk, false, false, false, false, 5, 20, false);
   for (int i = 1; i < argc; i++) {
     if (strcmp(argv[i], "-c") == 0) {
       config->use_compression = true;
@@ -218,6 +227,9 @@ int main(int argc, char *argv[]) {
     } else if (strcmp(argv[i], "-M") == 0 || strcmp(argv[i], "--preserve") == 0) {
       config->use_metadata = true;
       log_message(LOG_LEVEL_INFO, "Enabled metadata preservation");
+    } else if (strcmp(argv[i], "-f") == 0 || strcmp(argv[i], "--sendfile") == 0) {
+      config->use_sendfile = true;
+      log_message(LOG_LEVEL_INFO, "Enabled sendfile");
     } else {
       handle_arg(argv[i], "-m", &config->use_multithreading,
                  "Enabled Multithreading");
@@ -226,6 +238,11 @@ int main(int argc, char *argv[]) {
     }
   }
 
+  if (config->use_sendfile && (config->use_chunk_serialization || config->use_compression)) {
+    fprintf(stderr, "Error: -f/--sendfile cannot be combined with -c (compression) or -s (chunk serialization)\n");
+    return 1;
+  }
+
   if (config->use_multithreading)
     return send_files_multithreaded(config);
   return send_files(config);

src/shared/config.c

@@ -7,8 +7,8 @@
 Config *config_create(char *version, char *send_directory,
                       char *receive_directory, bool save_to_disk,
                       bool use_multithreading, bool use_chunk_serialization,
-                      bool use_compression, bool use_metadata,
-                      int compression_level, int num_connections) {
+                       bool use_compression, bool use_metadata,
+                       int compression_level, int num_connections, bool use_sendfile) {
 
   Config *config = malloc(sizeof(Config));
   config->version = version;
@@ -21,6 +21,7 @@ Config *config_create(char *version, char *send_directory,
   config->use_metadata = use_metadata;
   config->compression_level = compression_level;
   config->num_connections = num_connections;
+  config->use_sendfile = use_sendfile;
   return config;
 }
 
@@ -42,6 +43,7 @@ void config_send(int file_descriptor, Config *config) {
   send_int(file_descriptor, config->use_metadata);
   send_int(file_descriptor, config->compression_level);
   send_int(file_descriptor, config->num_connections);
+  send_int(file_descriptor, config->use_sendfile);
   if (receive_status(file_descriptor) != STATUS_OK) {
     perror("Error transmitting config!");
     exit(EXIT_FAILURE);
@@ -60,6 +62,7 @@ Config *config_receive(int file_descriptor) {
   config->use_metadata = receive_int(file_descriptor);
   config->compression_level = receive_int(file_descriptor);
   config->num_connections = receive_int(file_descriptor);
+  config->use_sendfile = receive_int(file_descriptor);
   send_status(file_descriptor, STATUS_OK);
   return config;
 }

src/shared/config.h

@@ -11,6 +11,7 @@ typedef struct Config {
   bool use_multithreading;
   bool use_chunk_serialization;
   bool use_compression;
+  bool use_sendfile;
   bool use_single_send_per_file;
   bool use_metadata;
   int compression_level;
@@ -20,8 +21,8 @@ typedef struct Config {
 Config *config_create(char *version, char *send_directory,
                       char *receive_directory, bool save_to_disk,
                       bool use_multithreading, bool use_chunk_serialization,
-                      bool use_compression, bool use_metadata,
-                      int compression_level, int num_connections);
+                       bool use_compression, bool use_metadata,
+                       int compression_level, int num_connections, bool use_sendfile);
 void config_delete(Config *config);
 void config_send(int file_descriptor, Config *config);
 Config *config_receive(int file_descriptor);

src/shared/file.c

@@ -1,9 +1,12 @@
 #include <dirent.h>
+#include <fcntl.h>
 #include <libgen.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/sendfile.h>
+#include <unistd.h>
 #include <zstd.h>
 
 #include "data.h"
@@ -122,6 +125,31 @@ void file_send_single_calls(File *file, int file_descriptor) {
   send_data(file_descriptor, file->data->data, file->data->size);
 }
 
+void file_send_sendfile(File *file, int file_descriptor) {
+  send_str(file_descriptor, file->path);
+
+  int fd = open(file->path, O_RDONLY);
+  if (fd == -1) {
+    perror("Could not open file for sendfile");
+    exit(EXIT_FAILURE);
+  }
+
+  unsigned long long file_size = file->data->size;
+  send_n_data(file_descriptor, &file_size, sizeof(unsigned long long));
+
+  off_t offset = 0;
+  while (offset < file_size) {
+    ssize_t sent = sendfile(file_descriptor, fd, &offset, file_size - offset);
+    if (sent == -1) {
+      perror("sendfile failed");
+      close(fd);
+      exit(EXIT_FAILURE);
+    }
+  }
+
+  close(fd);
+}
+
 size_t file_content_to_buffer(File *file) {
   FILE *file_pointer = fopen(file->path, "rb");
   if (file_pointer == NULL) {

src/shared/file.h

@@ -23,6 +23,7 @@ void file_destroy(void *item);
 void file_load_data(File *file);
 void file_print(void *item);
 void file_send_single_calls(File *file, int file_descriptor);
+void file_send_sendfile(File *file, int file_descriptor);
 size_t file_content_to_buffer(File *file);
 FileMetadata *file_metadata_create(struct stat *stats);
 void file_metadata_destroy(void *metadata);