Merge remote-tracking branch 'origin/fix/performance' into merge-all-v2

# Conflicts:
#	src/client/client_send.c
#	src/client/scanner.h
#	src/shared/compression.c

src/shared/compression.c

@@ -1,26 +1,31 @@
 #include "compression.h"
 #include "data.h"
 #include "log.h"
-#include <stdint.h>
-#include <stdlib.h>
+#include "stdlib.h"
+#include "string.h"
+#include <strings.h>
 #include "zstd.h"
 
 #define INITIAL_DECOMPRESS_BUF_SIZE (1024 * 1024)
 
+static const char* SKIP_COMPRESSION_EXTENSIONS[] = {".jpg", ".jpeg", ".png", ".gif", ".mp4", ".mkv",
+                                                    ".zip", ".gz",   ".xz",  ".zst", NULL};
+
+bool compression_should_skip(const char* path) {
+  if (!path)
+    return false;
+  const char* dot = strrchr(path, '.');
+  if (!dot)
+    return false;
+  for (int i = 0; SKIP_COMPRESSION_EXTENSIONS[i]; i++) {
+    if (strcasecmp(dot, SKIP_COMPRESSION_EXTENSIONS[i]) == 0)
+      return true;
+  }
+  return false;
+}
+
 Data* data_compress(Data* data_to_compress, int compression_level) {
   log_message(LOG_LEVEL_DEBUG, "Starting to compress data");
-
-  /* Clamp compression level to valid zstd range [1, 22] */
-  if (compression_level < 1) {
-    log_message(LOG_LEVEL_WARNING, "compression_level %d out of range [1,22], using 1",
-                compression_level);
-    compression_level = 1;
-  } else if (compression_level > 22) {
-    log_message(LOG_LEVEL_WARNING, "compression_level %d out of range [1,22], using 22",
-                compression_level);
-    compression_level = 22;
-  }
-
   size_t dst_size = ZSTD_compressBound(data_to_compress->size);
   Data* compressed_data = data_create_empty(dst_size);
   if (compressed_data == NULL)
@@ -79,16 +84,8 @@ Data* data_decompress(Data* compressed_data) {
     return NULL;
   }
 
-  size_t buf_size = INITIAL_DECOMPRESS_BUF_SIZE;
-  if (!ZSTD_isError(dst_size) && dst_size > 0) {
-    if (dst_size > SIZE_MAX) {
-      log_message(LOG_LEVEL_ERROR,
-                  "Decompressed size %llu exceeds addressable memory, using fallback buffer",
-                  dst_size);
-    } else {
-      buf_size = (size_t)dst_size;
-    }
-  }
+  size_t buf_size =
+      (!ZSTD_isError(dst_size) && dst_size > 0) ? (size_t)dst_size : INITIAL_DECOMPRESS_BUF_SIZE;
   Data* uncompressed_data = data_create_empty(buf_size);
   if (!uncompressed_data) {
     log_message(LOG_LEVEL_ERROR, "Failed to allocate decompression buffer");

src/shared/compression.h

@@ -2,8 +2,10 @@
 #define COMPRESSION_H
 
 #include "data.h"
+#include <stdbool.h>
 
 Data* data_compress(Data* data_to_compress, int compression_level);
 Data* data_decompress(Data* compressed_data);
+bool compression_should_skip(const char* path);
 
 #endif

src/shared/file.c

@@ -104,7 +104,7 @@ bool file_send_single_calls(File* file, int file_descriptor, bool use_metadata,
                             int compression_level, bool send_path) {
   const Data* data_to_send = file->data;
   Data* compressed_data = NULL;
-  if (compression_level > 0) {
+  if (compression_level > 0 && !compression_should_skip(file->path)) {
     compressed_data = data_compress(file->data, compression_level);
     if (compressed_data == NULL) {
       log_message(LOG_LEVEL_ERROR, "Failed to compress file data");

src/shared/protocol.c

@@ -2,6 +2,7 @@
 #include "log.h"
 #include <errno.h>
 #include <openssl/ssl.h>
+#include <poll.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -14,7 +15,7 @@
 
 static __thread int io_read_fd = -1;
 static __thread int io_write_fd = -1;
-static SSL* io_ssl = NULL;
+static SSL* io_ssl;
 
 static unsigned long long io_bwlimit = 0;
 static long long bw_tokens = 0;
@@ -52,12 +53,11 @@ static void bw_throttle(size_t bytes_written) {
   bw_tokens -= (long long)bytes_written;
 
   if (bw_tokens < 0) {
-    long long deficit_ns = (long long)((double)(-bw_tokens) / io_bwlimit * 1000000000.0);
-    struct timespec sleep_time, remaining;
-    sleep_time.tv_sec = deficit_ns / 1000000000LL;
-    sleep_time.tv_nsec = deficit_ns % 1000000000LL;
-    while (nanosleep(&sleep_time, &remaining) < 0 && errno == EINTR)
-      sleep_time = remaining;
+    long long deficit_us = (long long)((double)(-bw_tokens) / io_bwlimit * 1000000.0);
+    if (deficit_us >= 1000)
+      poll(NULL, 0, (int)(deficit_us / 1000));
+    else
+      usleep((useconds_t)deficit_us);
     bw_tokens = 0;
     clock_gettime(CLOCK_MONOTONIC, &bw_last_refill);
   }