Merge branch 'main' into cottsay/cmake-find-modules

Author: cottsay

src/createrepo-agent/agent.c

@@ -29,6 +29,9 @@
 #include "createrepo-agent/options.h"
 #include "createrepo-agent/server.h"
 
+static volatile sig_atomic_t g_sentinel = 0;
+static const char sigterm_msg[] = "Caught signal, shutting down...\n";
+
 void
 ignore_sigpipe()
 {
@@ -40,6 +43,28 @@ ignore_sigpipe()
   sigaction(SIGPIPE, &sa, NULL);
 }
 
+void
+handle_shutdown(int sig)
+{
+  // Here to squelch a compiler warning in a cross-toolchain way.
+  (void)sig;
+
+  write(2, sigterm_msg, sizeof(sigterm_msg));
+  g_sentinel = 1;
+}
+
+void
+attach_shutdown()
+{
+  struct sigaction sa;
+
+  sa.sa_handler = handle_shutdown;
+  sigemptyset(&sa.sa_mask);
+  sa.sa_flags = (int)SA_RESETHAND;
+  sigaction(SIGTERM, &sa, NULL);
+  sigaction(SIGINT, &sa, NULL);
+}
+
 static gpg_error_t
 set_option(assuan_context_t ctx, const char * option_name)
 {
@@ -407,8 +432,9 @@ main(int argc, char * argv[])
   }
 
   ignore_sigpipe();
+  attach_shutdown();
 
-  command_handler(fd, opts.path);
+  command_handler(fd, opts.path, &g_sentinel);
 
   assuan_sock_deinit();
 

src/createrepo-agent/command.c

@@ -15,6 +15,7 @@
 #include <assuan.h>
 #include <createrepo_c/createrepo_c.h>
 #include <errno.h>
+#include <signal.h>
 #include <string.h>
 
 #include "createrepo-agent/command.h"
@@ -33,7 +34,7 @@ struct command_context
   gboolean invalidate_dependants;
   gboolean missing_ok;
   GError * err;
-  gint * sentinel;
+  volatile sig_atomic_t * sentinel;
 };
 
 static const char * const greeting = "Greetings from creatrepo-agent " CRA_VERSION;
@@ -309,7 +310,7 @@ cmd_shutdown(assuan_context_t ctx, char * line)
     return cmd_error(ctx, GPG_ERR_ASSUAN_SERVER_FAULT, NULL);
   }
 
-  g_atomic_int_set(cmd_ctx->sentinel, 1);
+  *cmd_ctx->sentinel = 1;
   shutdown(cmd_ctx->listen_fd, SHUT_RD);
   assuan_set_flag(ctx, ASSUAN_FORCE_CLOSE, 1);
 
@@ -791,7 +792,7 @@ client_worker(assuan_context_t ctx, gpointer unused)
 
   cmd_ctx = (struct command_context *)assuan_get_pointer(ctx);
   if (cmd_ctx) {
-    while (!done && !g_atomic_int_get(cmd_ctx->sentinel)) {
+    while (!done && !*cmd_ctx->sentinel) {
       rc = assuan_process_next(ctx, &done);
       if (rc) {
         break;
@@ -803,14 +804,18 @@ client_worker(assuan_context_t ctx, gpointer unused)
 }
 
 void
-command_handler(int fd, const char * path)
+command_handler(int fd, const char * path, volatile sig_atomic_t * sentinel)
 {
   gpg_error_t rc;
   assuan_context_t ctx;
   struct command_context * cmd_ctx;
   cra_Coordinator * coordinator;
   GThreadPool * pool;
-  gint sentinel = 0;
+  volatile sig_atomic_t local_sentinel = 0;
+
+  if (NULL == sentinel) {
+    sentinel = &local_sentinel;
+  }
 
   coordinator = cra_coordinator_new(path);
   if (!coordinator) {
@@ -826,7 +831,7 @@ command_handler(int fd, const char * path)
     return;
   }
 
-  do {
+  while (!*sentinel) {
     rc = assuan_new(&ctx);
     if (rc) {
       fprintf(stderr, "server context creation failed: %s\n", gpg_strerror(rc));
@@ -841,7 +846,7 @@ command_handler(int fd, const char * path)
     }
 
     cmd_ctx->listen_fd = fd;
-    cmd_ctx->sentinel = &sentinel;
+    cmd_ctx->sentinel = sentinel;
     cmd_ctx->stage = cra_stage_new(coordinator);
     if (!cmd_ctx->stage) {
       fprintf(stderr, "stage init failed\n");
@@ -881,9 +886,10 @@ command_handler(int fd, const char * path)
 
     rc = assuan_accept(ctx);
     if (rc) {
-      if (!g_atomic_int_get(cmd_ctx->sentinel) ||
-        gpg_err_code(rc) != gpg_err_code_from_errno(EINVAL))
-      {
+      if (gpg_err_code(rc) == gpg_err_code_from_errno(EINTR)) {
+        client_worker_free(ctx);
+        continue;
+      } else if (!*sentinel || gpg_err_code(rc) != gpg_err_code_from_errno(EINVAL)) {
         fprintf(stderr, "accept failed: %s\n", gpg_strerror(rc));
       }
       client_worker_free(ctx);
@@ -895,7 +901,7 @@ command_handler(int fd, const char * path)
       client_worker_free(ctx);
       break;
     }
-  } while (!g_atomic_int_get(&sentinel));
+  }
 
   assuan_sock_close(fd);
   g_thread_pool_free(pool, FALSE, TRUE);

src/createrepo-agent/command.h

@@ -15,13 +15,15 @@
 #ifndef CREATEREPO_AGENT__COMMAND_H_
 #define CREATEREPO_AGENT__COMMAND_H_
 
+#include <signal.h>
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
 void
-command_handler(int fd, const char * path);
+command_handler(int fd, const char * path, volatile sig_atomic_t * sentinel);
 
 #ifdef __cplusplus
 }

test/CMakeLists.txt

@@ -10,6 +10,7 @@ find_package(GTest REQUIRED)
 macro(add_cache_test NAME)
   add_executable(test_${NAME} "main.cpp" "test_${NAME}.cpp")
   target_link_libraries(test_${NAME}
+    "$<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:-lstdc++fs>"
     createrepo-cache
     GTest::gtest)
   add_test(NAME ${NAME} COMMAND test_${NAME})
@@ -18,6 +19,7 @@ endmacro()
 macro(add_integration_test NAME)
   add_executable(test_${NAME} "integration_main.cpp" "test_${NAME}.cpp")
   target_link_libraries(test_${NAME}
+    "$<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_LESS:$<CXX_COMPILER_VERSION>,9.0>>:-lstdc++fs>"
     createrepo-agent-lib
     GTest::gtest)
   add_test(NAME ${NAME} COMMAND test_${NAME})

test/integration_utils.hpp

@@ -66,7 +66,7 @@ class CRATempServer : public TempRepo
     ASSERT_NE(server_fd, ASSUAN_INVALID_FD);
 
     /* Start the server thread */
-    handler_thread = std::thread(command_handler, server_fd, temp_dir.c_str());
+    handler_thread = std::thread(command_handler, server_fd, temp_dir.c_str(), nullptr);
 
     /* Wait for client to connect */
     for (int i = 0; assuan_socket_connect(client, sock_path.c_str(), ASSUAN_INVALID_PID, 0); i++) {

test/test_smoke.cpp

@@ -22,4 +22,4 @@ TEST_P(smoke, commit) {
   gpg_error_t rc = assuan_transact(client, "COMMIT", NULL, NULL, NULL, NULL, NULL, NULL);
   EXPECT_FALSE(rc);
 }
-INSTANTIATE_TEST_SUITE_P( , smoke, testing::Values("empty", "populated"), smoke::PrintParamName);
+INSTANTIATE_TEST_CASE_P(smoke, smoke, testing::Values("empty", "populated"), smoke::PrintParamName);