prevent busy waits and log errors

2bndy5 · 2bndy5 · commit 2ccff078670a · 2024-12-10T13:44:14.000-08:00
diff --git a/cpp_linter/clang_tools/__init__.py b/cpp_linter/clang_tools/__init__.py
@@ -6,7 +6,7 @@
 from typing import Optional, List, Dict, Tuple, cast
 import shutil
 
-from ..common_fs import FileObj
+from ..common_fs import FileObj, FileIOTimeout
 from ..common_fs.file_filter import TidyFileFilter, FormatFileFilter
 from ..loggers import start_log_group, end_log_group, worker_log_init, logger
 from .clang_tidy import run_clang_tidy, TidyAdvice
@@ -45,34 +45,52 @@ def _run_on_single_file(
     args: Args,
 ) -> Tuple[str, str, Optional[TidyAdvice], Optional[FormatAdvice]]:
     log_stream = worker_log_init(log_lvl)
+    filename = Path(file.name).as_posix()
 
-    format_advice = None
+    format_advice = FormatAdvice(filename)
     if format_cmd is not None and (
         format_filter is None or format_filter.is_source_or_ignored(file.name)
     ):
-        format_advice = run_clang_format(
-            command=format_cmd,
-            file_obj=file,
-            style=args.style,
-            lines_changed_only=args.lines_changed_only,
-            format_review=args.format_review,
-        )
+        try:
+            format_advice = run_clang_format(
+                command=format_cmd,
+                file_obj=file,
+                style=args.style,
+                lines_changed_only=args.lines_changed_only,
+                format_review=args.format_review,
+            )
+        except FileIOTimeout:  # pragma: no cover
+            logger.error(
+                "Failed to read or write contents of %s when running clang-format",
+                filename,
+            )
+        except OSError:  # pragma: no cover
+            logger.error(
+                "Failed to open the file %s when running clang-format", filename
+            )
 
-    tidy_note = None
+    tidy_note = TidyAdvice([])
     if tidy_cmd is not None and (
         tidy_filter is None or tidy_filter.is_source_or_ignored(file.name)
     ):
-        tidy_note = run_clang_tidy(
-            command=tidy_cmd,
-            file_obj=file,
-            checks=args.tidy_checks,
-            lines_changed_only=args.lines_changed_only,
-            database=args.database,
-            extra_args=args.extra_arg,
-            db_json=db_json,
-            tidy_review=args.tidy_review,
-            style=args.style,
-        )
+        try:
+            tidy_note = run_clang_tidy(
+                command=tidy_cmd,
+                file_obj=file,
+                checks=args.tidy_checks,
+                lines_changed_only=args.lines_changed_only,
+                database=args.database,
+                extra_args=args.extra_arg,
+                db_json=db_json,
+                tidy_review=args.tidy_review,
+                style=args.style,
+            )
+        except FileIOTimeout:  # pragma: no cover
+            logger.error(
+                "Failed to Read/Write contents of %s when running clang-tidy", filename
+            )
+        except OSError:  # pragma: no cover
+            logger.error("Failed to open the file %s when running clang-tidy", filename)
 
     return file.name, log_stream.getvalue(), tidy_note, format_advice
 
diff --git a/cpp_linter/common_fs/__init__.py b/cpp_linter/common_fs/__init__.py
@@ -184,6 +184,8 @@ def read_with_timeout(self, timeout_ns: int = 1_000_000_000) -> bytes:
                         if f.readable():
                             contents = f.read()
                             success = True
+                        else:  # pragma: no cover
+                            time.sleep(0.001)
             except OSError as exc:  # pragma: no cover
                 exception = exc
         if not success and exception:  # pragma: no cover
@@ -222,11 +224,14 @@ def read_write_with_timeout(
                             original_data = f.read()
                             f.seek(0)
                         else:  # pragma: no cover
+                            time.sleep(0.001)
                             continue
                         while not success and time.monotonic_ns() < timeout:
                             if f.writable():
                                 f.write(data)
                                 success = True
+                            else:  # pragma: no cover
+                                time.sleep(0.001)
             except OSError as exc:  # pragma: no cover
                 exception = exc
         if not success and exception:  # pragma: no cover
