Fix static analysis issues (#79)

Signed-off-by: Jemale Lockett <jemale.lockett@intel.com>
oneapi-src · Oct 1, 2024 · e0bae5a · e0bae5a
1 parent f62bdc4
commit e0bae5a
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 7 deletions.
diff --git a/conformance_tests/core/test_ipc/src/test_ipc_multidevice.cpp b/conformance_tests/core/test_ipc/src/test_ipc_multidevice.cpp
@@ -262,6 +262,9 @@ int main(int argc, char **argv) {
   } catch (const std::exception &e) {
     LOG_ERROR << "Failed to init google mock: " << e.what();
     return 1;
+  } catch (...) {
+    LOG_ERROR << "Failed to init google mock with unknown exception";
+    return 1;
   }
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);

diff --git a/conformance_tests/core/test_ipc/src/test_ipc_multisubdevice.cpp b/conformance_tests/core/test_ipc/src/test_ipc_multisubdevice.cpp
@@ -297,6 +297,9 @@ int main(int argc, char **argv) {
   } catch (std::exception &e) {
     std::cerr << "Failed to initialize GoogleMock: " << e.what() << std::endl;
     return 1;
+  } catch (...) {
+    std::cerr << "Failed to initialize GoogleMock" << std::endl;
+    return 1;
   }
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);

diff --git a/conformance_tests/core/test_ipc/src/test_ipc_p2p_memory.cpp b/conformance_tests/core/test_ipc/src/test_ipc_p2p_memory.cpp
@@ -479,7 +479,15 @@ INSTANTIATE_TEST_SUITE_P(
 // zeInit should be handled with fork(), so each process must call
 // zeInit
 int main(int argc, char **argv) {
-  ::testing::InitGoogleMock(&argc, argv);
+  try {
+    ::testing::InitGoogleMock(&argc, argv);
+  } catch (std::exception &e) {
+    std::cerr << "Failed to init Google Mock: " << e.what() << std::endl;
+    return 1;
+  } catch (...) {
+    std::cerr << "Failed to init Google Mock: unknown exception" << std::endl;
+    return 1;
+  }
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);
 

diff --git a/conformance_tests/core/test_ipc/src/test_ipc_put_handle.cpp b/conformance_tests/core/test_ipc/src/test_ipc_put_handle.cpp
@@ -541,6 +541,9 @@ int main(int argc, char **argv) {
   } catch (std::exception &e) {
     std::cerr << "Failed to initialize GoogleMock: " << e.what() << std::endl;
     return 1;
+  } catch (...) {
+    std::cerr << "Failed to initialize GoogleMock" << std::endl;
+    return 1;
   }
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);

diff --git a/perf_tests/cl_image_copy/src/cl_image_copy.cpp b/perf_tests/cl_image_copy/src/cl_image_copy.cpp
@@ -583,7 +583,11 @@ void measure_latency(ClImageCopyLatency &imageCopyLatency) {
   ptree ptree_param_array;
 
   if (imageCopyLatency.is_json_output_enabled()) {
-    pt::read_json(imageCopyLatency.JsonFileName, ptree_main);
+    try {
+      pt::read_json(imageCopyLatency.JsonFileName, ptree_main);
+    } catch (const std::exception &e) {
+      std::cerr << "Error reading json file:" << e.what() << std::endl;
+    }
   }
   measure_latency_Host2Device(imageCopyLatency, &ptree_Host2Device);
   measure_latency_Device2Host(imageCopyLatency, &ptree_Device2Host);

diff --git a/stress_tests/test_memory_allocation/src/main.cpp b/stress_tests/test_memory_allocation/src/main.cpp
@@ -23,5 +23,11 @@ int main(int argc, char **argv) {
   LOG_TRACE << "Driver initialized";
   level_zero_tests::print_platform_overview();
 
-  return RUN_ALL_TESTS();
+  try {
+    auto result = RUN_ALL_TESTS();
+    return result;
+  } catch (const std::exception &e) {
+    LOG_ERROR << "Error: " << e.what();
+    return 1;
+  }
 }
diff --git a/stress_tests/test_misc/src/main.cpp b/stress_tests/test_misc/src/main.cpp
@@ -71,6 +71,9 @@ int main(int argc, char **argv) {
   } catch (const std::exception &e) {
     LOG_ERROR << "Failed to init google mock: " << e.what();
     return 1;
+  } catch (...) {
+    LOG_ERROR << "Failed to init google mock";
+    return 1;
   }
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);

diff --git a/utils/logging/src/logging.cpp b/utils/logging/src/logging.cpp
@@ -64,9 +64,12 @@ void init_logging(const LoggingSettings settings) {
 
 void init_logging(std::vector<std::string> &command_line) {
   try {
-  init_logging(parse_command_line(command_line));
+    init_logging(parse_command_line(command_line));
   } catch (const boost::bad_lexical_cast &e) {
-    std::cerr << "Error initializing logging parsing command line: " << e.what() << std::endl;
+    std::cerr << "Error initializing logging parsing command line: " << e.what()
+              << std::endl;
+  } catch (std::exception &e) {
+    std::cerr << "Error initializing logging: " << e.what() << std::endl;
   }
 }
 

diff --git a/utils/random/test/main.cpp b/utils/random/test/main.cpp
@@ -13,5 +13,12 @@ int main(int argc, char **argv) {
   ::testing::InitGoogleTest(&argc, argv);
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);
-  return RUN_ALL_TESTS();
+
+  try {
+    auto result = RUN_ALL_TESTS();
+    return result;
+  } catch (std::exception &e) {
+    LOG_ERROR << "Error: " << e.what();
+    return 1;
+  }
 }
diff --git a/utils/test_harness/src/test_harness_event.cpp b/utils/test_harness/src/test_harness_event.cpp
@@ -282,7 +282,11 @@ zeEventPool::~zeEventPool() {
   if (event_pool_) {
     auto result = zeEventPoolDestroy(event_pool_);
     if (ZE_RESULT_SUCCESS != result) {
-      LOG_ERROR << "Failed to destroy event pool: " << result;
+      try {
+        LOG_ERROR << "Failed to destroy event pool: " << result;
+      } catch (...) {
+        // Do nothing
+      }
     }
   }
 }

diff --git a/utils/utils/test/main.cpp b/utils/utils/test/main.cpp
@@ -15,6 +15,9 @@ int main(int argc, char **argv) {
   } catch (std::exception &e) {
     std::cerr << "Test failed with exception: " << e.what() << std::endl;
     return 1;
+  } catch (...) {
+    std::cerr << "Test failed with unknown exception" << std::endl;
+    return 1;
   }
   std::vector<std::string> command_line(argv + 1, argv + argc);
   level_zero_tests::init_logging(command_line);