Hash :
15da5ee8
Author :
Date :
2024-11-14T19:27:22
Improve xkeyboard-config test script - Refactored to write files within the workers, else we have only one worker writing, slowly consuming the result queue. In some scenarios it may even result in out-of-memory as the resulting keymaps piles up. - Added the option `--compress` to allow compressing keymaps files with gunzip. - Use the recently added `--test` option for `xkbcli-compile-keymap` when we only want to test compilation, not the resulting keymap file. This speeds up the test suite of `xkeyboard-config`.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523
#!/usr/bin/env python3
from __future__ import annotations
import argparse
import gzip
import itertools
import multiprocessing
import os
import subprocess
import sys
import xml.etree.ElementTree as ET
from abc import ABCMeta, abstractmethod
from dataclasses import dataclass
from functools import partial
from pathlib import Path
from typing import (
TYPE_CHECKING,
ClassVar,
Iterable,
Iterator,
NoReturn,
Protocol,
Sequence,
TextIO,
TypeVar,
cast,
)
# TODO: import unconditionnaly Self from typing once we raise Python requirement to 3.11+
if TYPE_CHECKING:
from typing_extensions import Self
WILDCARD = "*"
DEFAULT_RULES_XML = "@XKB_CONFIG_ROOT@/rules/evdev.xml"
# Meson needs to fill this in so we can call the tool in the buildir.
EXTRA_PATH = "@MESON_BUILD_ROOT@"
os.environ["PATH"] = ":".join(filter(bool, (EXTRA_PATH, os.getenv("PATH"))))
# Environment variable to get the right level of log
os.environ["XKB_LOG_LEVEL"] = "warning"
os.environ["XKB_LOG_VERBOSITY"] = "10"
@dataclass
class RMLVO:
DEFAULT_RULES: ClassVar[str] = "evdev"
DEFAULT_MODEL: ClassVar[str] = "pc105"
DEFAULT_LAYOUT: ClassVar[str] = "us"
rules: str
model: str
layout: str
variant: str | None
option: str | None
@property
def __iter__(self) -> Iterator[str | None]:
yield self.rules
yield self.model
yield self.layout
yield self.variant
yield self.option
@property
def rmlvo(self) -> Iterator[tuple[str, str]]:
yield ("rules", self.rules)
yield ("model", self.model)
yield ("layout", self.layout)
# Keep only defined and non-empty values
if self.variant is not None:
yield ("variant", self.variant)
if self.option is not None:
yield ("option", self.option)
@classmethod
def from_rmlvo(
cls,
rules: str | None = None,
model: str | None = None,
layout: str | None = None,
variant: str | None = None,
option: str | None = None,
) -> Self:
return cls(
# We need to force a value for RML components
rules or cls.DEFAULT_RULES,
model or cls.DEFAULT_MODEL,
layout or cls.DEFAULT_LAYOUT,
variant,
option,
)
@dataclass
class Invocation(RMLVO, metaclass=ABCMeta):
exitstatus: int = 77 # default to “skipped”
error: str | None = None
keymap: str = ""
command: str = "" # The fully compiled keymap
def __str_iter(self) -> Iterator[str]:
yield f"- rmlvo: {self.to_yaml(self.rmlvo)}"
yield f' cmd: "{self.escape(self.command)}"'
yield f" status: {self.exitstatus}"
if self.error:
yield f' error: "{self.escape(self.error.strip())}"'
def __str__(self) -> str:
return "\n".join(self.__str_iter())
@property
def short(self) -> Iterator[tuple[str, str | int]]:
yield from self.rmlvo
yield ("status", self.exitstatus)
if self.error is not None:
yield ("error", self.error)
@staticmethod
def to_yaml(xs: Iterable[tuple[str, str | int]]) -> str:
fields = ", ".join(f'{k}: "{v}"' for k, v in xs)
return f"{{ {fields} }}"
@staticmethod
def escape(s: str) -> str:
return s.replace('"', '\\"')
def _write(self, fd: TextIO) -> None:
fd.write(f"// {self.to_yaml(self.rmlvo)}\n")
fd.write(self.keymap)
def _write_keymap(self, output_dir: Path, compress: int) -> None:
layout = self.layout
if self.variant:
layout += f"({self.variant})"
(output_dir / self.model).mkdir(exist_ok=True)
keymap_file = output_dir / self.model / layout
if compress:
keymap_file = keymap_file.with_suffix(".gz")
with gzip.open(
keymap_file, "wt", compresslevel=compress, encoding="utf-8"
) as fd:
self._write(fd)
fd.close()
else:
with keymap_file.open("wt", encoding="utf-8") as fd:
self._write(fd)
@classmethod
@abstractmethod
def run(cls, i: Self, output_dir: Path | None, compress: int) -> Self: ...
@classmethod
def run_all(
cls,
combos: Iterable[Self],
combos_count: int,
njobs: int,
keymap_output_dir: Path | None,
verbose: bool,
short: bool,
progress_bar: ProgressBar[Iterable[Self]],
compress: int,
) -> bool:
if keymap_output_dir:
try:
keymap_output_dir.mkdir(parents=True)
except FileExistsError as e:
print(e, file=sys.stderr)
return False
failed = False
with multiprocessing.Pool(njobs) as p:
f = partial(cls.run, output_dir=keymap_output_dir, compress=compress)
results = p.imap_unordered(f, combos)
for invocation in progress_bar(
results, total=combos_count, file=sys.stdout
):
if invocation.exitstatus != 0:
failed = True
target = sys.stderr
else:
target = sys.stdout if verbose else None
if target:
if short:
print("-", cls.to_yaml(invocation.short), file=target)
else:
print(invocation, file=target)
return failed
@dataclass
class XkbCompInvocation(Invocation):
xkbcomp_args: ClassVar[tuple[str, ...]] = ("xkbcomp", "-xkb", "-", "-")
@classmethod
def run(cls, i: Self, output_dir: Path | None, compress: int) -> Self:
i._run(output_dir, compress)
return i
def _run(self, output_dir: Path | None, compress: int) -> None:
args = (
"setxkbmap",
"-print",
*itertools.chain.from_iterable((f"-{k}", v) for k, v in self.rmlvo),
)
self.command = " ".join(itertools.chain(args, "|", self.xkbcomp_args))
setxkbmap = subprocess.Popen(
args,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
universal_newlines=True,
)
stdout, stderr = setxkbmap.communicate()
if "Cannot open display" in stderr:
self.error = stderr
self.exitstatus = 90
else:
xkbcomp = subprocess.Popen(
self.xkbcomp_args,
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
universal_newlines=True,
)
stdout, stderr = xkbcomp.communicate(stdout)
if xkbcomp.returncode != 0:
self.error = "failed to compile keymap"
self.exitstatus = xkbcomp.returncode
else:
self.keymap = stdout
self.exitstatus = 0
if output_dir:
self._write_keymap(output_dir, compress)
@dataclass
class XkbcommonInvocation(Invocation):
UNRECOGNIZED_KEYSYM_ERROR: ClassVar[str] = "XKB-107"
@classmethod
def run(cls, i: Self, output_dir: Path | None, compress: int) -> Self:
i._run(output_dir, compress)
return i
def _run(self, output_dir: Path | None, compress: int) -> None:
args = (
"xkbcli-compile-keymap", # this is run in the builddir
# Not needed, because we set XKB_LOG_LEVEL and XKB_LOG_VERBOSITY in env
# "--verbose",
*itertools.chain.from_iterable((f"--{k}", v) for k, v in self.rmlvo),
)
if not output_dir:
args += ("--test",)
self.command = " ".join(args)
try:
completed = subprocess.run(args, text=True, check=True, capture_output=True)
except subprocess.CalledProcessError as err:
self.error = "failed to compile keymap"
self.exitstatus = err.returncode
else:
if self.UNRECOGNIZED_KEYSYM_ERROR in completed.stderr:
for line in completed.stderr.splitlines():
if self.UNRECOGNIZED_KEYSYM_ERROR in line:
self.error = line
break
self.exitstatus = 99 # tool doesn't generate this one
else:
self.exitstatus = 0
self.keymap = completed.stdout
if output_dir:
self._write_keymap(output_dir, compress)
@dataclass
class Layout:
name: str
variants: list[str | None]
@classmethod
def parse(cls, e: ET.Element, variant: list[str] | None = None) -> Self:
if (name_elem := e.find("configItem/name")) is None or name_elem is None:
raise ValueError("Layout name not found")
if not variant:
variants = [None] + [
cls.parse_text(v)
for v in e.findall("variantList/variant/configItem/name")
]
else:
variants = cast(list[str | None], variant)
return cls(cls.parse_text(e.find("configItem/name")), variants)
@staticmethod
def parse_text(e: ET.Element | None) -> str:
if e is None or not e.text:
raise ValueError("Name not found")
return e.text
def parse_registry(
paths: Sequence[Path],
tool: type[Invocation],
model: str | None,
layout: str | None,
variant: str | None,
option: str | None,
) -> tuple[int, Iterator[Invocation]]:
models: tuple[str, ...] = ()
layouts: tuple[Layout, ...] = ()
options: tuple[str, ...] = ()
if variant and not layout:
raise ValueError("Variant must be set together with layout")
for path in paths:
root = ET.fromstring(open(path).read())
# Models
if model is None:
models += tuple(
e.text
for e in root.findall("modelList/model/configItem/name")
if e.text
)
elif not models:
models += (model,)
# Layouts/variants
if layout:
if variant is None:
layouts += tuple(
map(
Layout.parse,
(
e
for e in root.findall("layoutList/layout")
if e.find(f"configItem/name[.='{layout}']") is not None
),
)
)
elif not layouts:
layouts += (Layout(layout, cast(list[str | None], variant.split(":"))),)
else:
layouts += tuple(map(Layout.parse, root.findall("layoutList/layout")))
# Options
if option is None:
options += tuple(
e.text
for e in root.findall("optionList/group/option/configItem/name")
if e.text
)
elif not options and option:
options += (option,)
# Some registry may be only partial, e.g.: *.extras.xml
if not models:
models = (RMLVO.DEFAULT_MODEL,)
if not layouts:
layouts = (Layout(RMLVO.DEFAULT_LAYOUT, [None]),)
count = len(models) * sum(len(l.variants) for l in layouts) * (1 + len(options))
# The list of combos can be huge, so better to use a generator instead
def iter_combos() -> Iterator[Invocation]:
for m in models:
for l in layouts:
for v in l.variants:
yield tool.from_rmlvo(
rules=None, model=m, layout=l.name, variant=v, option=None
)
for opt in options:
yield tool.from_rmlvo(
rules=None, model=m, layout=l.name, variant=v, option=opt
)
return count, iter_combos()
T = TypeVar("T")
# Needed because Callable does not handle keywords args
class ProgressBar(Protocol[T]):
def __call__(self, x: T, total: int, file: TextIO | None) -> T: ...
# The function generating the progress bar (if any).
def create_progress_bar(verbose: bool) -> ProgressBar[T]:
def noop_progress_bar(x: T, total: int, file: TextIO | None = None) -> T:
return x
progress_bar: ProgressBar[T] = noop_progress_bar
if not verbose and os.isatty(sys.stdout.fileno()):
try:
from tqdm import tqdm
progress_bar = cast(ProgressBar[T], tqdm)
except ImportError:
pass
return progress_bar
def main() -> NoReturn:
parser = argparse.ArgumentParser(
description="""
This tool compiles a keymap for each layout, variant and
options combination in the given rules XML file. The output
of this tool is YAML, use your favorite YAML parser to
extract error messages. Errors are printed to stderr.
"""
)
parser.add_argument(
"paths",
metavar="/path/to/evdev.xml",
nargs="*",
type=str,
default=(DEFAULT_RULES_XML,),
help="Path to xkeyboard-config's evdev.xml",
)
tools: dict[str, type[Invocation]] = {
"libxkbcommon": XkbcommonInvocation,
"xkbcomp": XkbCompInvocation,
}
parser.add_argument(
"--tool",
choices=tools.keys(),
type=str,
default="libxkbcommon",
help="parsing tool to use",
)
parser.add_argument(
"--jobs",
"-j",
type=int,
default=4 * (os.cpu_count() or 1),
help="number of processes to use",
)
parser.add_argument("--verbose", "-v", default=False, action="store_true")
parser.add_argument(
"--short", default=False, action="store_true", help="Concise output"
)
parser.add_argument(
"--keymap-output-dir",
default=None,
type=Path,
help="Directory to print compiled keymaps to",
)
parser.add_argument(
"--compress", type=int, default=0, help="Compression level of keymaps files"
)
parser.add_argument(
"--model", default="", type=str, help="Only test the given model"
)
parser.add_argument(
"--layout", default=WILDCARD, type=str, help="Only test the given layout"
)
parser.add_argument(
"--variant",
default=WILDCARD,
type=str,
help="Only test the given variants (colon-separated list)",
)
parser.add_argument(
"--option", default=WILDCARD, type=str, help="Only test the given option"
)
parser.add_argument(
"--no-iterations", "-1", action="store_true", help="Only test one combo"
)
args = parser.parse_args()
verbose: bool = args.verbose
short = args.short
keymapdir = args.keymap_output_dir
progress_bar: ProgressBar[Iterable[Invocation]] = create_progress_bar(verbose)
tool = tools[args.tool]
model: str | None = None if args.model == WILDCARD else args.model
layout: str | None = None if args.layout == WILDCARD else args.layout
variant: str | None = None if args.variant == WILDCARD else args.variant
option: str | None = None if args.option == WILDCARD else args.option
if args.no_iterations:
combos = (
tool.from_rmlvo(
rules=None, model=model, layout=layout, variant=variant, option=option
),
)
count = len(combos)
iter_combos = iter(combos)
else:
count, iter_combos = parse_registry(
args.paths, tool, model, layout, variant, option
)
failed = tool.run_all(
iter_combos,
count,
args.jobs,
keymapdir,
verbose,
short,
progress_bar,
args.compress,
)
sys.exit(failed)
if __name__ == "__main__":
try:
main()
except KeyboardInterrupt:
print("# Exiting after Ctrl+C")