rbx.cp 0.17.5__tar.gz → 0.17.6__tar.gz

{rbx_cp-0.17.5 → rbx_cp-0.17.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rbx.cp
-Version: 0.17.5
+Version: 0.17.6
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9.1,<4.0.0

{rbx_cp-0.17.5 → rbx_cp-0.17.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.17.5"
+version = "0.17.6"
 description = ""
 packages = [
   {include = "rbx"}

rbx_cp-0.17.6/rbx/__version__.py

@@ -0,0 +1 @@
+__version__ = '0.17.6'

{rbx_cp-0.17.5 → rbx_cp-0.17.6}/rbx/box/sanitizers/warning_stack.py

@@ -29,9 +29,9 @@ class WarningStack:
         f = reference.get_file(cacher)
         if f is None:
             return
-        with dest_path.open('wb') as fout:
-            shutil.copyfileobj(f, fout)
-        f.close()
+        with f:
+            with dest_path.open('wb') as fout:
+                shutil.copyfileobj(f, fout)
         self.sanitizer_warnings[code.path] = dest_path
 
     def clear(self):

{rbx_cp-0.17.5 → rbx_cp-0.17.6}/rbx/grading/judge/program.py

@@ -20,8 +20,12 @@ FileLike = Union[PathOrStr, IO[bytes], int]
 def _maybe_close_files(files):
     for fobj in files:
         if isinstance(fobj, int):
-            continue
-        fobj.close()
+            try:
+                os.close(fobj)
+            except OSError:
+                pass
+        else:
+            fobj.close()
 
 
 def _is_pathlike(obj: Any) -> bool:
@@ -250,6 +254,20 @@ class Program:
         threading.Thread(target=self._handle_wall, daemon=True).start()
         threading.Thread(target=self._handle_alarm, daemon=True).start()
 
+    def close_pipes(self):
+        if self.popen is None:
+            return
+        if self.params.io.input == subprocess.PIPE and self.pipes.input is not None:
+            self.pipes.input.close()
+        if self.params.io.output == subprocess.PIPE and self.pipes.output is not None:
+            self.pipes.output.close()
+        if self.params.io.stderr == subprocess.PIPE and self.pipes.stderr is not None:
+            self.pipes.stderr.close()
+
+    def close(self):
+        self.close_pipes()
+        _maybe_close_files(self._files)
+
     def process_exit(self, exitstatus, ru) -> ProgramResult:
         _maybe_close_files(self._files)
 
@@ -307,4 +325,6 @@ class Program:
     def wait(self):
         assert self.popen is not None
         _, exitstatus, ru = os.wait4(self.pid, 0)
-        return self.process_exit(exitstatus, ru)
+        res = self.process_exit(exitstatus, ru)
+        self.close_pipes()
+        return res

{rbx_cp-0.17.5 → rbx_cp-0.17.6}/rbx/grading/judge/sandboxes/stupid_sandbox.py

@@ -335,6 +335,9 @@ class StupidSandbox(SandboxBase):
             else:
                 raise RuntimeError(f'Unknown pid: {pid}')
 
+        for p in (interactor, program, solution_tee, interactor_tee):
+            p.close()
+
         return typing.cast(Tuple[SandboxLog, SandboxLog], tuple(results))
 
     def cleanup(self, delete=False):

{rbx_cp-0.17.5 → rbx_cp-0.17.6}/rbx/resources/presets/default/preset.rbx.yml

@@ -1,7 +1,7 @@
 ---
 # yaml-language-server: $schema=https://rsalesc.github.io/rbx/schemas/Preset.json
 name: "default"
-min_version: "0.17.5"
+min_version: "0.17.6"
 uri: "rsalesc/rbx/rbx/resources/presets/default"
 problem: "problem"
 contest: "contest"

{rbx_cp-0.17.5 → rbx_cp-0.17.6}/rbx/utils.py

@@ -1,13 +1,11 @@
 import contextlib
 import enum
-import fcntl
 import functools
 import json
 import os
 import os.path
 import pathlib
 import re
-import resource
 import shutil
 import subprocess
 import sys
@@ -75,19 +73,41 @@ def check_version_compatibility(required: str) -> SemVerCompatibility:
     return check_version_compatibility_between(installed, required)
 
 
-def print_open_fd_count() -> int:
+def print_open_fd_count(id: Optional[str] = None) -> int:
     import psutil
 
     try:
-        current_process = psutil.Process()
-        open_fds = len(current_process.open_files())
-        print(f'Number of opened file descriptors: {open_fds}')
+        open_fds = get_open_fds()
+        print(f'Number of opened file descriptors for {id or "..."}: {open_fds}')
     except psutil.AccessDenied:
         print('Access denied. Run with appropriate permissions (e.g., sudo) if needed.')
     except Exception as e:
         print(f'An error occurred: {e}')
 
 
+class FdLeakDetector:
+    def __init__(self, id: Optional[str] = None, diff: bool = False):
+        self.open_fds = 0
+        self.id = id
+        self.diff = diff
+
+    def __enter__(self):
+        self.open_fds = get_open_fds()
+        return self
+
+    def __exit__(self, *args, **kwargs):
+        open_fds = get_open_fds()
+        if open_fds > self.open_fds:
+            print(
+                f'File descriptor leak detected for {self.id or "..."}: {open_fds - self.open_fds} new file descriptors opened'
+            )
+        elif self.diff and open_fds < self.open_fds:
+            print(
+                f'File descriptor diff detected for {self.id or "..."}: {self.open_fds - open_fds} file descriptors closed'
+            )
+        self.open_fds = open_fds
+
+
 def create_and_write(path: pathlib.Path, *args, **kwargs):
     path.parent.mkdir(parents=True, exist_ok=True)
     path.write_text(*args, **kwargs)
@@ -256,16 +276,28 @@ def confirm_on_status(status: Optional[rich.status.Status], *args, **kwargs) ->
     return res
 
 
-def get_open_fds():
-    fds = []
-    soft, hard = resource.getrlimit(resource.RLIMIT_NOFILE)
-    for fd in range(0, soft):
-        try:
-            fcntl.fcntl(fd, fcntl.F_GETFD)
-        except IOError:
-            continue
-        fds.append(fd)
-    return fds
+def get_open_fds() -> int:
+    import psutil
+
+    try:
+        current_process = psutil.Process()
+        open_fds = current_process.num_fds()
+        return open_fds
+    except psutil.AccessDenied:
+        return 0
+    except Exception as e:
+        print(f'An error occurred: {e}')
+        return 0
+
+    # fds = []
+    # soft, hard = resource.getrlimit(resource.RLIMIT_NOFILE)
+    # for fd in range(0, soft):
+    #     try:
+    #         fcntl.fcntl(fd, fcntl.F_GETFD)
+    #     except IOError:
+    #         continue
+    #     fds.append(fd)
+    # return fds
 
 
 def command_exists(command):

rbx_cp-0.17.5/rbx/__version__.py

@@ -1 +0,0 @@
-__version__ = '0.17.5'