Merge pull request #14 from SHMModbus/main

update to 1.4.1

Author: NikolasK-source

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.22.0 FATAL_ERROR)
 # ======================================================================================================================
 
 # project
-project(shared-mem-random LANGUAGES CXX VERSION 1.4.0)
+project(shared-mem-random LANGUAGES CXX VERSION 1.4.1)
 
 # settings
 set(Target "shared-mem-random")          # Executable name (without file extension!)

src/main.cpp

@@ -365,6 +365,8 @@ int main(int argc, char **argv) {  // NOLINT
     sigemptyset(&sleep_sigset);
     sigaddset(&sleep_sigset, SIGALRM);
     sigprocmask(SIG_BLOCK, &sleep_sigset, nullptr);
+    sigaddset(&sleep_sigset, SIGINT);
+    sigaddset(&sleep_sigset, SIGTERM);
 
     // MAIN loop
     std::size_t counter = 0;
@@ -393,22 +395,24 @@ int main(int argc, char **argv) {  // NOLINT
     };
 
     auto handle_sleep = [&]() {
-        if (random_interval_ms == 0) return;
+        if (random_interval_ms == 0) return false;
 
         int  sig = 0;
         auto tmp = sigwait(&sleep_sigset, &sig);
         if (tmp == -1) {
             perror("sigwait");
             exit(EX_OSERR);
         }
+
+        return sig != SIGALRM;
     };
 
     switch (alignment) {
         case BYTE:
             while (!terminate) {
                 random_data<uint8_t>(
                         shm->get_addr<uint8_t *>() + OFFSET, shm_elements, bitmask, semaphore, semaphore_max_time);
-                handle_sleep();
+                if (handle_sleep()) break;
                 if (handle_counter()) break;
                 if (check_owner_pid()) break;
             }
@@ -417,7 +421,7 @@ int main(int argc, char **argv) {  // NOLINT
             while (!terminate) {
                 random_data<uint16_t>(
                         shm->get_addr<uint8_t *>() + OFFSET, shm_elements, bitmask, semaphore, semaphore_max_time);
-                handle_sleep();
+                if (handle_sleep()) break;
                 if (handle_counter()) break;
                 if (check_owner_pid()) break;
             }
@@ -426,7 +430,7 @@ int main(int argc, char **argv) {  // NOLINT
             while (!terminate) {
                 random_data<uint32_t>(
                         shm->get_addr<uint8_t *>() + OFFSET, shm_elements, bitmask, semaphore, semaphore_max_time);
-                handle_sleep();
+                if (handle_sleep()) break;
                 if (handle_counter()) break;
                 if (check_owner_pid()) break;
             }
@@ -435,7 +439,7 @@ int main(int argc, char **argv) {  // NOLINT
             while (!terminate) {
                 random_data<uint64_t>(
                         shm->get_addr<uint8_t *>() + OFFSET, shm_elements, bitmask, semaphore, semaphore_max_time);
-                handle_sleep();
+                if (handle_sleep()) break;
                 if (handle_counter()) break;
                 if (check_owner_pid()) break;
             }