From 9f75237d27d9449ec73e3b334c247b23a90a248d Mon Sep 17 00:00:00 2001 From: Qubasa Date: Mon, 1 Jan 2024 18:58:12 +0100 Subject: [PATCH] Removed unecessary debug.py and test code --- pkgs/clan-cli/clan_cli/debug.py | 90 ------------------- .../clan_vm_manager/__init__.py | 3 - pkgs/clan-vm-manager/clan_vm_manager/app.py | 32 +------ 3 files changed, 1 insertion(+), 124 deletions(-) delete mode 100644 pkgs/clan-cli/clan_cli/debug.py diff --git a/pkgs/clan-cli/clan_cli/debug.py b/pkgs/clan-cli/clan_cli/debug.py deleted file mode 100644 index a95661d0d..000000000 --- a/pkgs/clan-cli/clan_cli/debug.py +++ /dev/null @@ -1,90 +0,0 @@ -import logging -import os -import shlex -import stat -import subprocess -import sys -import time -from pathlib import Path - -import ipdb - -log = logging.getLogger(__name__) - - -def block_for_input() -> None: - log = logging.getLogger(__name__) - procid = os.getpid() - f"echo 'continue' > /sys/proc/{procid}/fd/{sys.stdin.fileno()}" - - while True: - log.warning("Use sudo cntr attach to attach to the container.") - # log.warning("Resume execution by executing '%s' in cntr shell", command) - time.sleep(1) - log.info("Resuming execution.") - - -def breakpoint_container( - work_dir: Path, - env: dict[str, str] | None = None, - cmd: list[str] | None = None, -) -> None: - if env is None: - env = os.environ.copy() - else: - env = env.copy() - - dump_env(env, work_dir / "env.sh") - - if cmd is not None: - log.debug("Command: %s", shlex.join(cmd)) - mycommand = shlex.join(cmd) - write_command(mycommand, work_dir / "cmd.sh") - - block_for_input() - - -def breakpoint_shell( - work_dir: Path = Path(os.getcwd()), - env: dict[str, str] | None = None, - cmd: list[str] | None = None, -) -> None: - if env is None: - env = os.environ.copy() - else: - env = env.copy() - - # Cmd appending - args = ["xterm", "-e", "zsh", "-df"] - if cmd is not None: - mycommand = shlex.join(cmd) - write_command(mycommand, work_dir / "cmd.sh") - proc = subprocess.Popen(args, env=env, cwd=work_dir.resolve()) - - with proc: - try: - ipdb.set_trace() - finally: - proc.terminate() - - -def write_command(command: str, loc: Path) -> None: - log.info("Dumping command to %s", loc) - with open(loc, "w") as f: - f.write("#!/usr/bin/env bash\n") - f.write(command) - st = os.stat(loc) - os.chmod(loc, st.st_mode | stat.S_IEXEC) - - -def dump_env(env: dict[str, str], loc: Path) -> None: - cenv = env.copy() - log.info("Dumping environment variables to %s", loc) - with open(loc, "w") as f: - f.write("#!/usr/bin/env bash\n") - for k, v in cenv.items(): - if v.count("\n") > 0 or v.count('"') > 0 or v.count("'") > 0: - continue - f.write(f"export {k}='{v}'\n") - st = os.stat(loc) - os.chmod(loc, st.st_mode | stat.S_IEXEC) diff --git a/pkgs/clan-vm-manager/clan_vm_manager/__init__.py b/pkgs/clan-vm-manager/clan_vm_manager/__init__.py index 25c75b085..d42d66831 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/__init__.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/__init__.py @@ -3,7 +3,6 @@ import argparse from .app import ( register_join_parser, register_overview_parser, - register_run_parser, show_overview, ) @@ -21,8 +20,6 @@ def main() -> None: register_overview_parser(subparser.add_parser("overview", help="overview screen")) - register_run_parser(subparser.add_parser("run", help="run a vm")) - # Executed when no command is given parser.set_defaults(func=show_overview) args = parser.parse_args() diff --git a/pkgs/clan-vm-manager/clan_vm_manager/app.py b/pkgs/clan-vm-manager/clan_vm_manager/app.py index fb3068d0d..fc070845c 100644 --- a/pkgs/clan-vm-manager/clan_vm_manager/app.py +++ b/pkgs/clan-vm-manager/clan_vm_manager/app.py @@ -14,7 +14,7 @@ from clan_cli.clan_uri import ClanURI from gi.repository import Gio, Gtk from .constants import constants -from .executor import ProcessManager, spawn +from .executor import ProcessManager from .interfaces import Callbacks, InitialFlashValues, InitialJoinValues from .windows.join import JoinWindow from .windows.overview import OverviewWindow @@ -163,33 +163,3 @@ def show_overview(args: argparse.Namespace) -> None: def register_overview_parser(parser: argparse.ArgumentParser) -> None: parser.set_defaults(func=show_overview) - - -# Define a function that writes to the memfd -def dummy_f(msg: str) -> None: - import sys - import time - - print(f"Receeived message {msg}") - c = 0 - while True: # Simulate a long running process - print(f"out: Hello from process c={c}", file=sys.stdout) - print(f"err: Hello from process c={c}", file=sys.stderr) - user = input("Enter to continue: \n") - if user == "q": - raise Exception("User quit") - print(f"User entered {user}", file=sys.stdout) - print(f"User entered {user}", file=sys.stderr) - time.sleep(1) # Wait for 1 second - c += 1 - - -def show_run_vm(parser: argparse.ArgumentParser) -> None: - log_path = Path(".").resolve() - proc = spawn(wait_stdin_con=True, log_path=log_path, func=dummy_f, msg="Hello") - input("Press enter to kill process: ") - proc.kill_group() - - -def register_run_parser(parser: argparse.ArgumentParser) -> None: - parser.set_defaults(func=show_run_vm)