feat(usability): Print message on ^C (#201)

Co-authored-by: Mario Bielert <[email protected]>
tud-zih-energy · Mar 9, 2022 · 05e2278 · 05e2278
1 parent fc255d9
commit 05e2278
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 16 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -35,7 +35,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: /opt/otf2/
-          key: ${{ matrix.os }}-otf2
+          key: ${{ matrix.os }}-otf2-${OTF2_VERSION}
       - name: Install OTF2
         if: steps.cache-otf2.outputs.cache-hit != 'true'
         run: |
@@ -49,7 +49,7 @@ jobs:
           CXX: ${{ matrix.compiler }}
         run: cmake . -DCMAKE_BUILD_TYPE=${{ matrix.build-type }}
       - name: Build
-        run: make -j
+        run: make -j 2
       - name: Create source tarball
         if: ${{ matrix.compiler == 'g++-10' && matrix.os == 'ubuntu-20.04' && matrix.build-type == 'RelWithDebInfo' }}
         run: make dist

diff --git a/include/lo2s/bfd_resolve.hpp b/include/lo2s/bfd_resolve.hpp
@@ -149,9 +149,9 @@ class Lib
 private:
     void filter_symbols()
     {
-        symbols_.erase(std::remove_if(symbols_.begin(), symbols_.end(), [](const asymbol* sym) {
-            return (sym != nullptr) && !(sym->flags & BSF_FUNCTION);
-        }));
+        symbols_.erase(std::remove_if(
+            symbols_.begin(), symbols_.end(),
+            [](const asymbol* sym) { return (sym != nullptr) && !(sym->flags & BSF_FUNCTION); }));
     }
 
     void read_symbols();

diff --git a/src/monitor/cpu_set_monitor.cpp b/src/monitor/cpu_set_monitor.cpp
@@ -74,6 +74,8 @@ void CpuSetMonitor::run()
     {
         int sig;
         auto ret = sigwait(&ss, &sig);
+        std::cout << "[ lo2s: Encountered SIGINT. Stopping measurements and closing trace ]"
+                  << std::endl;
         if (ret)
         {
             throw make_system_error();

diff --git a/src/monitor/process_monitor_main.cpp b/src/monitor/process_monitor_main.cpp
@@ -63,7 +63,8 @@ namespace monitor
 
     std::vector<char*> tmp;
     std::transform(command_and_args.begin(), command_and_args.end(), std::back_inserter(tmp),
-                   [](const std::string& s) {
+                   [](const std::string& s)
+                   {
                        char* pc = new char[s.size() + 1];
                        std::strcpy(pc, s.c_str());
                        return pc;

diff --git a/src/process_controller.cpp b/src/process_controller.cpp
@@ -265,7 +265,8 @@ void ProcessController::handle_signal(Thread child, int status)
             // exit if detached from first child (the original sampled process)
             if (child == first_child_)
             {
-                Log::info() << "Exiting monitor with status " << 0;
+                std::cout << "[ lo2s: Child exited. Stopping measurements and closing trace. ]"
+                          << std::endl;
                 throw std::system_error(0, std::system_category());
             }
         }
@@ -307,6 +308,8 @@ void ProcessController::handle_signal(Thread child, int status)
         // exit if first child (the original sampled process) is dead
         if (child == first_child_)
         {
+            std::cout << "[ lo2s: Child exited. Stopping measurements and closing trace. ]"
+                      << std::endl;
             summary().set_exit_code(WEXITSTATUS(status));
             throw std::system_error(0, std::system_category());
         }
@@ -318,6 +321,8 @@ void ProcessController::handle_signal(Thread child, int status)
         // exit if first child (the original sampled process) is dead
         if (child == first_child_)
         {
+            std::cout << "[ lo2s: Child exited. Stopping measurements and closing trace. ]"
+                      << std::endl;
             throw std::system_error(0, std::system_category());
         }
         return;

diff --git a/src/summary.cpp b/src/summary.cpp
@@ -97,15 +97,15 @@ void Summary::show()
 
     std::filesystem::recursive_directory_iterator it(trace_dir_), end;
 
-    trace_size =
-        std::accumulate(it, end, static_cast<size_t>(0),
-                        [](std::size_t sum, const std::filesystem::directory_entry& entry) {
-                            if (!std::filesystem::is_directory(entry))
-                            {
-                                return sum + std::filesystem::file_size(entry);
-                            }
-                            return sum;
-                        });
+    trace_size = std::accumulate(it, end, static_cast<size_t>(0),
+                                 [](std::size_t sum, const std::filesystem::directory_entry& entry)
+                                 {
+                                     if (!std::filesystem::is_directory(entry))
+                                     {
+                                         return sum + std::filesystem::file_size(entry);
+                                     }
+                                     return sum;
+                                 });
 
     if (config().monitor_type == lo2s::MonitorType::PROCESS)
     {