Feature: Detaillierte Worker-Pool Performance-Metriken mit psutil
Neue Metrik-Erfassung für Saxon- und FOP-Worker-Pools: - Kompilierungszeit der Java-Worker-Klassen - Worker-Startzeiten (Summe + Durchschnitt pro Worker) - RAM-Verbrauch vor/nach Transformation (Summe + Durchschnitt) - Automatische Berechnung der RAM-Zunahme in MB und Prozent Technische Details: - Neue WorkerPoolMetrics-Datenklasse in worker_metrics.py - RAM-Messung via psutil (v7.2.1, neu hinzugefügt) - Metriken für beide Saxon-Varianten (JAXP + s9api) - WorkerPoolMetricsDialog mit Tab-basierter UI - Menüeintrag "Projekt → Worker-Pool-Metriken" Metriken werden automatisch erfasst: - Bei Worker-Pool-Initialisierung (Kompilierung + Start) - Vor erster Transformation (RAM-Baseline) - Nach allen Transformationen (RAM-Endwert) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
+78
-4
@@ -8,11 +8,15 @@ Jeder Worker läuft als Daemon und verarbeitet mehrere FO→PDF Transformationen
|
||||
import logging
|
||||
import subprocess
|
||||
import threading
|
||||
import time
|
||||
import psutil
|
||||
from pathlib import Path
|
||||
from queue import Queue
|
||||
from typing import Optional
|
||||
import tempfile
|
||||
|
||||
from worker_metrics import WorkerPoolMetrics
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Java-Worker-Code (wird zur Laufzeit kompiliert)
|
||||
@@ -206,6 +210,9 @@ class FopWorkerPool:
|
||||
# Classpath für FOP
|
||||
self.fop_classpath: Optional[str] = None
|
||||
|
||||
# Performance-Metriken
|
||||
self.metrics = WorkerPoolMetrics()
|
||||
|
||||
# Initialisierung
|
||||
self._build_fop_classpath()
|
||||
self._compile_worker_class()
|
||||
@@ -236,6 +243,7 @@ class FopWorkerPool:
|
||||
|
||||
def _compile_worker_class(self):
|
||||
"""Kompiliert die FopWorker-Java-Klasse."""
|
||||
start_time = time.time()
|
||||
try:
|
||||
# Erstelle temporäres Verzeichnis
|
||||
self.temp_dir = Path(tempfile.mkdtemp(prefix="fop_worker_"))
|
||||
@@ -261,7 +269,12 @@ class FopWorkerPool:
|
||||
|
||||
self.worker_class_path = self.temp_dir
|
||||
|
||||
logger.info(f"FopWorker erfolgreich kompiliert: {self.temp_dir}")
|
||||
# Speichere Kompilierungszeit
|
||||
self.metrics.compilation_time_seconds = time.time() - start_time
|
||||
|
||||
logger.info(
|
||||
f"FopWorker erfolgreich kompiliert: {self.temp_dir} " f"({self.metrics.compilation_time_seconds:.3f}s)"
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Kompilieren von FopWorker: {e}")
|
||||
@@ -281,6 +294,7 @@ class FopWorkerPool:
|
||||
self.worker_log_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
for i in range(self.num_workers):
|
||||
worker_start_time = time.time()
|
||||
try:
|
||||
# Starte JVM-Prozess mit FopWorker
|
||||
# Übergebe fop.xconf als Argument falls vorhanden
|
||||
@@ -308,8 +322,6 @@ class FopWorkerPool:
|
||||
logger.debug(f"FOP Worker {i} gestartet (PID: {process.pid}, stderr: {stderr_log})")
|
||||
|
||||
# Warte kurz damit Worker initialisieren kann
|
||||
import time
|
||||
|
||||
time.sleep(0.2) # FOP braucht etwas länger zum Initialisieren
|
||||
|
||||
# Prüfe ob Worker noch läuft
|
||||
@@ -322,11 +334,22 @@ class FopWorkerPool:
|
||||
f"FOP Worker {i} ist sofort beendet (Exit Code: {process.returncode})\nstderr:\n{stderr_content}"
|
||||
)
|
||||
|
||||
# Speichere Worker-Startzeit
|
||||
worker_elapsed = time.time() - worker_start_time
|
||||
self.metrics.worker_start_times.append(worker_elapsed)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Starten von FOP Worker {i}: {e}")
|
||||
raise
|
||||
|
||||
logger.info(f"{len(self.workers)} FOP-Worker erfolgreich gestartet")
|
||||
# Berechne Aggregat-Werte für Worker-Startzeiten
|
||||
self.metrics.calculate_aggregates()
|
||||
|
||||
logger.info(
|
||||
f"{len(self.workers)} FOP-Worker erfolgreich gestartet "
|
||||
f"(Summe: {self.metrics.total_worker_start_time_seconds:.3f}s, "
|
||||
f"Durchschnitt: {self.metrics.average_worker_start_time_seconds:.3f}s)"
|
||||
)
|
||||
|
||||
def build_pdf(self, input_fo: Path, output_pdf: Path) -> tuple[bool, str]:
|
||||
"""
|
||||
@@ -410,6 +433,57 @@ class FopWorkerPool:
|
||||
# Gebe Worker-Lock frei
|
||||
self.worker_locks[worker_idx].release()
|
||||
|
||||
def measure_ram_usage(self) -> tuple[float, float, list[float]]:
|
||||
"""
|
||||
Misst den aktuellen RAM-Verbrauch aller Worker-Prozesse.
|
||||
|
||||
Returns:
|
||||
tuple: (total_mb, average_mb, per_worker_mb_list)
|
||||
"""
|
||||
ram_per_worker = []
|
||||
|
||||
for i, worker in enumerate(self.workers):
|
||||
try:
|
||||
if worker.poll() is None: # Worker läuft noch
|
||||
process = psutil.Process(worker.pid)
|
||||
# Hole Speicherinfo (RSS = Resident Set Size in Bytes)
|
||||
mem_info = process.memory_info()
|
||||
ram_mb = mem_info.rss / (1024 * 1024) # Konvertiere zu MB
|
||||
ram_per_worker.append(ram_mb)
|
||||
else:
|
||||
logger.warning(f"Worker {i} ist nicht mehr aktiv (kann RAM nicht messen)")
|
||||
except (psutil.NoSuchProcess, psutil.AccessDenied) as e:
|
||||
logger.warning(f"Konnte RAM für Worker {i} nicht messen: {e}")
|
||||
|
||||
total_ram = sum(ram_per_worker)
|
||||
average_ram = total_ram / len(ram_per_worker) if ram_per_worker else 0.0
|
||||
|
||||
return total_ram, average_ram, ram_per_worker
|
||||
|
||||
def capture_ram_before_transform(self):
|
||||
"""Erfasst RAM-Verbrauch vor der ersten Transformation."""
|
||||
total, average, per_worker = self.measure_ram_usage()
|
||||
self.metrics.ram_before_transform_mb_per_worker = per_worker
|
||||
self.metrics.total_ram_before_mb = total
|
||||
self.metrics.average_ram_before_mb = average
|
||||
|
||||
logger.info(
|
||||
f"RAM vor Transformation: {self.metrics.total_ram_before_mb:.1f} MB "
|
||||
f"(Durchschnitt: {self.metrics.average_ram_before_mb:.1f} MB/Worker)"
|
||||
)
|
||||
|
||||
def capture_ram_after_transform(self):
|
||||
"""Erfasst RAM-Verbrauch nach allen Transformationen."""
|
||||
total, average, per_worker = self.measure_ram_usage()
|
||||
self.metrics.ram_after_transform_mb_per_worker = per_worker
|
||||
self.metrics.total_ram_after_mb = total
|
||||
self.metrics.average_ram_after_mb = average
|
||||
|
||||
logger.info(
|
||||
f"RAM nach Transformation: {self.metrics.total_ram_after_mb:.1f} MB "
|
||||
f"(Durchschnitt: {self.metrics.average_ram_after_mb:.1f} MB/Worker)"
|
||||
)
|
||||
|
||||
def shutdown(self):
|
||||
"""Beendet alle Worker-Prozesse sauber."""
|
||||
logger.info("Beende FOP-Worker-Pool...")
|
||||
|
||||
+78
-4
@@ -8,11 +8,15 @@ Jeder Worker läuft als Daemon und verarbeitet mehrere Transformationen nacheina
|
||||
import logging
|
||||
import subprocess
|
||||
import threading
|
||||
import time
|
||||
import psutil
|
||||
from pathlib import Path
|
||||
from queue import Queue
|
||||
from typing import Optional
|
||||
import tempfile
|
||||
|
||||
from worker_metrics import WorkerPoolMetrics
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Java-Worker-Code (wird zur Laufzeit kompiliert)
|
||||
@@ -197,6 +201,9 @@ class SaxonWorkerPool:
|
||||
self.worker_class_path: Optional[Path] = None
|
||||
self.worker_log_dir: Optional[Path] = None
|
||||
|
||||
# Performance-Metriken
|
||||
self.metrics = WorkerPoolMetrics()
|
||||
|
||||
# Initialisierung
|
||||
self._compile_worker_class()
|
||||
self._start_workers()
|
||||
@@ -205,6 +212,7 @@ class SaxonWorkerPool:
|
||||
|
||||
def _compile_worker_class(self):
|
||||
"""Kompiliert die SaxonWorker-Java-Klasse."""
|
||||
start_time = time.time()
|
||||
try:
|
||||
# Erstelle temporäres Verzeichnis
|
||||
self.temp_dir = Path(tempfile.mkdtemp(prefix="saxon_worker_"))
|
||||
@@ -242,7 +250,12 @@ class SaxonWorkerPool:
|
||||
|
||||
self.worker_class_path = self.temp_dir
|
||||
|
||||
logger.info(f"SaxonWorker erfolgreich kompiliert: {self.temp_dir}")
|
||||
# Speichere Kompilierungszeit
|
||||
self.metrics.compilation_time_seconds = time.time() - start_time
|
||||
|
||||
logger.info(
|
||||
f"SaxonWorker erfolgreich kompiliert: {self.temp_dir} " f"({self.metrics.compilation_time_seconds:.3f}s)"
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Kompilieren von SaxonWorker: {e}")
|
||||
@@ -266,6 +279,7 @@ class SaxonWorkerPool:
|
||||
self.worker_log_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
for i in range(self.num_workers):
|
||||
worker_start_time = time.time()
|
||||
try:
|
||||
# Starte JVM-Prozess mit SaxonWorker
|
||||
cmd = [str(self.java_vm_path), "-cp", full_classpath, "SaxonWorker"]
|
||||
@@ -289,8 +303,6 @@ class SaxonWorkerPool:
|
||||
logger.debug(f"Worker {i} gestartet (PID: {process.pid}, stderr: {stderr_log})")
|
||||
|
||||
# Warte kurz damit Worker initialisieren kann
|
||||
import time
|
||||
|
||||
time.sleep(0.1)
|
||||
|
||||
# Prüfe ob Worker noch läuft
|
||||
@@ -303,11 +315,22 @@ class SaxonWorkerPool:
|
||||
f"Worker {i} ist sofort beendet (Exit Code: {process.returncode})\nstderr:\n{stderr_content}"
|
||||
)
|
||||
|
||||
# Speichere Worker-Startzeit
|
||||
worker_elapsed = time.time() - worker_start_time
|
||||
self.metrics.worker_start_times.append(worker_elapsed)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Starten von Worker {i}: {e}")
|
||||
raise
|
||||
|
||||
logger.info(f"{len(self.workers)} Saxon-Worker erfolgreich gestartet")
|
||||
# Berechne Aggregat-Werte für Worker-Startzeiten
|
||||
self.metrics.calculate_aggregates()
|
||||
|
||||
logger.info(
|
||||
f"{len(self.workers)} Saxon-Worker erfolgreich gestartet "
|
||||
f"(Summe: {self.metrics.total_worker_start_time_seconds:.3f}s, "
|
||||
f"Durchschnitt: {self.metrics.average_worker_start_time_seconds:.3f}s)"
|
||||
)
|
||||
|
||||
def transform(
|
||||
self, source_xml: Path, xsl_stylesheet: Path, output_fo: Path, xslt_params: dict[str, str]
|
||||
@@ -398,6 +421,57 @@ class SaxonWorkerPool:
|
||||
# Gebe Worker-Lock frei
|
||||
self.worker_locks[worker_idx].release()
|
||||
|
||||
def measure_ram_usage(self) -> tuple[float, float, list[float]]:
|
||||
"""
|
||||
Misst den aktuellen RAM-Verbrauch aller Worker-Prozesse.
|
||||
|
||||
Returns:
|
||||
tuple: (total_mb, average_mb, per_worker_mb_list)
|
||||
"""
|
||||
ram_per_worker = []
|
||||
|
||||
for i, worker in enumerate(self.workers):
|
||||
try:
|
||||
if worker.poll() is None: # Worker läuft noch
|
||||
process = psutil.Process(worker.pid)
|
||||
# Hole Speicherinfo (RSS = Resident Set Size in Bytes)
|
||||
mem_info = process.memory_info()
|
||||
ram_mb = mem_info.rss / (1024 * 1024) # Konvertiere zu MB
|
||||
ram_per_worker.append(ram_mb)
|
||||
else:
|
||||
logger.warning(f"Worker {i} ist nicht mehr aktiv (kann RAM nicht messen)")
|
||||
except (psutil.NoSuchProcess, psutil.AccessDenied) as e:
|
||||
logger.warning(f"Konnte RAM für Worker {i} nicht messen: {e}")
|
||||
|
||||
total_ram = sum(ram_per_worker)
|
||||
average_ram = total_ram / len(ram_per_worker) if ram_per_worker else 0.0
|
||||
|
||||
return total_ram, average_ram, ram_per_worker
|
||||
|
||||
def capture_ram_before_transform(self):
|
||||
"""Erfasst RAM-Verbrauch vor der ersten Transformation."""
|
||||
total, average, per_worker = self.measure_ram_usage()
|
||||
self.metrics.ram_before_transform_mb_per_worker = per_worker
|
||||
self.metrics.total_ram_before_mb = total
|
||||
self.metrics.average_ram_before_mb = average
|
||||
|
||||
logger.info(
|
||||
f"RAM vor Transformation: {self.metrics.total_ram_before_mb:.1f} MB "
|
||||
f"(Durchschnitt: {self.metrics.average_ram_before_mb:.1f} MB/Worker)"
|
||||
)
|
||||
|
||||
def capture_ram_after_transform(self):
|
||||
"""Erfasst RAM-Verbrauch nach allen Transformationen."""
|
||||
total, average, per_worker = self.measure_ram_usage()
|
||||
self.metrics.ram_after_transform_mb_per_worker = per_worker
|
||||
self.metrics.total_ram_after_mb = total
|
||||
self.metrics.average_ram_after_mb = average
|
||||
|
||||
logger.info(
|
||||
f"RAM nach Transformation: {self.metrics.total_ram_after_mb:.1f} MB "
|
||||
f"(Durchschnitt: {self.metrics.average_ram_after_mb:.1f} MB/Worker)"
|
||||
)
|
||||
|
||||
def shutdown(self):
|
||||
"""Beendet alle Worker-Prozesse sauber."""
|
||||
logger.info("Beende Saxon-Worker-Pool...")
|
||||
|
||||
+79
-4
@@ -9,11 +9,15 @@ Jeder Worker läuft als Daemon und verarbeitet mehrere Transformationen nacheina
|
||||
import logging
|
||||
import subprocess
|
||||
import threading
|
||||
import time
|
||||
import psutil
|
||||
from pathlib import Path
|
||||
from queue import Queue
|
||||
from typing import Optional
|
||||
import tempfile
|
||||
|
||||
from worker_metrics import WorkerPoolMetrics
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Java-Worker-Code für s9api (wird zur Laufzeit kompiliert)
|
||||
@@ -179,6 +183,9 @@ class SaxonWorkerPoolS9Api:
|
||||
self.worker_class_path: Optional[Path] = None
|
||||
self.worker_log_dir: Optional[Path] = None
|
||||
|
||||
# Performance-Metriken
|
||||
self.metrics = WorkerPoolMetrics()
|
||||
|
||||
# Initialisierung
|
||||
self._compile_worker_class()
|
||||
self._start_workers()
|
||||
@@ -187,6 +194,7 @@ class SaxonWorkerPoolS9Api:
|
||||
|
||||
def _compile_worker_class(self):
|
||||
"""Kompiliert die SaxonS9ApiWorker-Java-Klasse."""
|
||||
start_time = time.time()
|
||||
try:
|
||||
# Erstelle temporäres Verzeichnis
|
||||
self.temp_dir = Path(tempfile.mkdtemp(prefix="saxon_s9api_worker_"))
|
||||
@@ -224,7 +232,13 @@ class SaxonWorkerPoolS9Api:
|
||||
|
||||
self.worker_class_path = self.temp_dir
|
||||
|
||||
logger.info(f"SaxonS9ApiWorker erfolgreich kompiliert: {self.temp_dir}")
|
||||
# Speichere Kompilierungszeit
|
||||
self.metrics.compilation_time_seconds = time.time() - start_time
|
||||
|
||||
logger.info(
|
||||
f"SaxonS9ApiWorker erfolgreich kompiliert: {self.temp_dir} "
|
||||
f"({self.metrics.compilation_time_seconds:.3f}s)"
|
||||
)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Kompilieren von SaxonS9ApiWorker: {e}")
|
||||
@@ -267,6 +281,7 @@ class SaxonWorkerPoolS9Api:
|
||||
self.worker_log_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
for i in range(self.num_workers):
|
||||
worker_start_time = time.time()
|
||||
try:
|
||||
# Starte JVM-Prozess mit SaxonS9ApiWorker
|
||||
cmd = [str(self.java_vm_path), "-cp", full_classpath, "SaxonS9ApiWorker"]
|
||||
@@ -290,8 +305,6 @@ class SaxonWorkerPoolS9Api:
|
||||
logger.debug(f"S9Api Worker {i} gestartet (PID: {process.pid}, stderr: {stderr_log})")
|
||||
|
||||
# Warte kurz damit Worker initialisieren kann
|
||||
import time
|
||||
|
||||
time.sleep(0.1)
|
||||
|
||||
# Prüfe ob Worker noch läuft
|
||||
@@ -304,11 +317,22 @@ class SaxonWorkerPoolS9Api:
|
||||
f"S9Api Worker {i} ist sofort beendet (Exit Code: {process.returncode})\nstderr:\n{stderr_content}"
|
||||
)
|
||||
|
||||
# Speichere Worker-Startzeit
|
||||
worker_elapsed = time.time() - worker_start_time
|
||||
self.metrics.worker_start_times.append(worker_elapsed)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Starten von S9Api Worker {i}: {e}")
|
||||
raise
|
||||
|
||||
logger.info(f"{len(self.workers)} Saxon-S9Api-Worker erfolgreich gestartet")
|
||||
# Berechne Aggregat-Werte für Worker-Startzeiten
|
||||
self.metrics.calculate_aggregates()
|
||||
|
||||
logger.info(
|
||||
f"{len(self.workers)} Saxon-S9Api-Worker erfolgreich gestartet "
|
||||
f"(Summe: {self.metrics.total_worker_start_time_seconds:.3f}s, "
|
||||
f"Durchschnitt: {self.metrics.average_worker_start_time_seconds:.3f}s)"
|
||||
)
|
||||
|
||||
def transform(
|
||||
self, source_xml: Path, xsl_stylesheet: Path, output_fo: Path, xslt_params: dict[str, str]
|
||||
@@ -399,6 +423,57 @@ class SaxonWorkerPoolS9Api:
|
||||
# Gebe Worker-Lock frei
|
||||
self.worker_locks[worker_idx].release()
|
||||
|
||||
def measure_ram_usage(self) -> tuple[float, float, list[float]]:
|
||||
"""
|
||||
Misst den aktuellen RAM-Verbrauch aller Worker-Prozesse.
|
||||
|
||||
Returns:
|
||||
tuple: (total_mb, average_mb, per_worker_mb_list)
|
||||
"""
|
||||
ram_per_worker = []
|
||||
|
||||
for i, worker in enumerate(self.workers):
|
||||
try:
|
||||
if worker.poll() is None: # Worker läuft noch
|
||||
process = psutil.Process(worker.pid)
|
||||
# Hole Speicherinfo (RSS = Resident Set Size in Bytes)
|
||||
mem_info = process.memory_info()
|
||||
ram_mb = mem_info.rss / (1024 * 1024) # Konvertiere zu MB
|
||||
ram_per_worker.append(ram_mb)
|
||||
else:
|
||||
logger.warning(f"Worker {i} ist nicht mehr aktiv (kann RAM nicht messen)")
|
||||
except (psutil.NoSuchProcess, psutil.AccessDenied) as e:
|
||||
logger.warning(f"Konnte RAM für Worker {i} nicht messen: {e}")
|
||||
|
||||
total_ram = sum(ram_per_worker)
|
||||
average_ram = total_ram / len(ram_per_worker) if ram_per_worker else 0.0
|
||||
|
||||
return total_ram, average_ram, ram_per_worker
|
||||
|
||||
def capture_ram_before_transform(self):
|
||||
"""Erfasst RAM-Verbrauch vor der ersten Transformation."""
|
||||
total, average, per_worker = self.measure_ram_usage()
|
||||
self.metrics.ram_before_transform_mb_per_worker = per_worker
|
||||
self.metrics.total_ram_before_mb = total
|
||||
self.metrics.average_ram_before_mb = average
|
||||
|
||||
logger.info(
|
||||
f"RAM vor Transformation: {self.metrics.total_ram_before_mb:.1f} MB "
|
||||
f"(Durchschnitt: {self.metrics.average_ram_before_mb:.1f} MB/Worker)"
|
||||
)
|
||||
|
||||
def capture_ram_after_transform(self):
|
||||
"""Erfasst RAM-Verbrauch nach allen Transformationen."""
|
||||
total, average, per_worker = self.measure_ram_usage()
|
||||
self.metrics.ram_after_transform_mb_per_worker = per_worker
|
||||
self.metrics.total_ram_after_mb = total
|
||||
self.metrics.average_ram_after_mb = average
|
||||
|
||||
logger.info(
|
||||
f"RAM nach Transformation: {self.metrics.total_ram_after_mb:.1f} MB "
|
||||
f"(Durchschnitt: {self.metrics.average_ram_after_mb:.1f} MB/Worker)"
|
||||
)
|
||||
|
||||
def shutdown(self):
|
||||
"""Beendet alle Worker-Prozesse sauber."""
|
||||
logger.info("Beende Saxon-S9Api-Worker-Pool...")
|
||||
|
||||
@@ -1078,6 +1078,25 @@ class MainWindow(QMainWindow):
|
||||
self.ui.actionNeu.triggered.connect(self.open_new_project_dialog)
|
||||
self.ui.actionEinstellungen.triggered.connect(self.open_settings_dialog)
|
||||
|
||||
# Worker-Pool-Metriken Menüeintrag (programmatisch hinzufügen)
|
||||
from PySide6.QtGui import QAction
|
||||
|
||||
self.action_worker_metrics = QAction("Worker-Pool-Metriken", self)
|
||||
self.action_worker_metrics.triggered.connect(self._show_worker_pool_metrics)
|
||||
# Füge die Aktion zum Projekt-Menü hinzu (nach Einstellungen, vor Beenden)
|
||||
actions = self.ui.menuProjekt.actions()
|
||||
# Finde die Position nach actionEinstellungen
|
||||
insert_index = len(actions) # Fallback: Am Ende
|
||||
for i, action in enumerate(actions):
|
||||
if action == self.ui.actionEinstellungen:
|
||||
insert_index = i + 1
|
||||
break
|
||||
before_action = actions[insert_index] if insert_index < len(actions) else None
|
||||
if before_action:
|
||||
self.ui.menuProjekt.insertAction(before_action, self.action_worker_metrics)
|
||||
else:
|
||||
self.ui.menuProjekt.addAction(self.action_worker_metrics)
|
||||
|
||||
# Button "lade aus FN2" verbinden
|
||||
self.ui.pB_lade_aus_fn2.clicked.connect(self.on_load_from_fn2_clicked)
|
||||
|
||||
@@ -1525,6 +1544,17 @@ class MainWindow(QMainWindow):
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Öffnen des Einstellungen-Dialogs: {e}")
|
||||
|
||||
def _show_worker_pool_metrics(self):
|
||||
"""Zeigt den Worker-Pool-Metriken-Dialog an."""
|
||||
try:
|
||||
from ui.WorkerPoolMetricsDialog import WorkerPoolMetricsDialog
|
||||
|
||||
dialog = WorkerPoolMetricsDialog(self)
|
||||
dialog.exec()
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Öffnen des Metriken-Dialogs: {e}")
|
||||
QMessageBox.critical(self, "Fehler", f"Fehler beim Öffnen des Metriken-Dialogs:\n{str(e)}")
|
||||
|
||||
def open_new_project_dialog(self):
|
||||
"""Öffnet Pdf-Projekt-Dialog."""
|
||||
try:
|
||||
@@ -4177,6 +4207,14 @@ class MainWindow(QMainWindow):
|
||||
# Zeige Progressbar
|
||||
self._show_transformation_progress_bar(len(jobs))
|
||||
|
||||
# Erfasse RAM-Verbrauch vor Transformation
|
||||
import transform
|
||||
|
||||
if transform._saxon_worker_pool:
|
||||
transform._saxon_worker_pool.capture_ram_before_transform()
|
||||
if transform._fop_worker_pool:
|
||||
transform._fop_worker_pool.capture_ram_before_transform()
|
||||
|
||||
# Starte Thread
|
||||
self.transformation_thread.start()
|
||||
|
||||
@@ -4331,6 +4369,14 @@ class MainWindow(QMainWindow):
|
||||
f"Alle Transformationen abgeschlossen: {successful_count}/{total_count} erfolgreich ({total_duration:.2f}s)"
|
||||
)
|
||||
|
||||
# Erfasse RAM-Verbrauch nach Transformation
|
||||
import transform
|
||||
|
||||
if transform._saxon_worker_pool:
|
||||
transform._saxon_worker_pool.capture_ram_after_transform()
|
||||
if transform._fop_worker_pool:
|
||||
transform._fop_worker_pool.capture_ram_after_transform()
|
||||
|
||||
# Verstecke Transformation-Progressbar
|
||||
self._hide_transformation_progress_bar()
|
||||
|
||||
|
||||
@@ -0,0 +1,250 @@
|
||||
"""
|
||||
Worker Pool Metriken-Dialog.
|
||||
|
||||
Zeigt Performance- und Ressourcenverbrauch-Metriken für Saxon- und FOP-Worker-Pools an.
|
||||
"""
|
||||
|
||||
import logging
|
||||
from PySide6.QtWidgets import (
|
||||
QDialog,
|
||||
QVBoxLayout,
|
||||
QHBoxLayout,
|
||||
QGroupBox,
|
||||
QLabel,
|
||||
QPushButton,
|
||||
QTextEdit,
|
||||
QTabWidget,
|
||||
QWidget,
|
||||
)
|
||||
from PySide6.QtCore import Qt
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class WorkerPoolMetricsDialog(QDialog):
|
||||
"""
|
||||
Dialog zur Anzeige von Worker-Pool-Metriken.
|
||||
"""
|
||||
|
||||
def __init__(self, parent=None):
|
||||
"""
|
||||
Initialisiert den Metriken-Dialog.
|
||||
|
||||
Args:
|
||||
parent: Eltern-Widget
|
||||
"""
|
||||
super().__init__(parent)
|
||||
self.setWindowTitle("Worker Pool Performance-Metriken")
|
||||
self.resize(800, 600)
|
||||
self._setup_ui()
|
||||
self._load_metrics()
|
||||
|
||||
def _setup_ui(self):
|
||||
"""Erstellt die UI-Elemente."""
|
||||
layout = QVBoxLayout(self)
|
||||
|
||||
# Tab-Widget für Saxon und FOP
|
||||
self.tab_widget = QTabWidget()
|
||||
layout.addWidget(self.tab_widget)
|
||||
|
||||
# Saxon-Tab
|
||||
self.saxon_tab = self._create_metrics_tab("Saxon Worker Pool")
|
||||
self.tab_widget.addTab(self.saxon_tab, "Saxon (XSLT)")
|
||||
|
||||
# FOP-Tab
|
||||
self.fop_tab = self._create_metrics_tab("FOP Worker Pool")
|
||||
self.tab_widget.addTab(self.fop_tab, "FOP (PDF)")
|
||||
|
||||
# Schließen-Button
|
||||
button_layout = QHBoxLayout()
|
||||
button_layout.addStretch()
|
||||
close_button = QPushButton("Schließen")
|
||||
close_button.clicked.connect(self.accept)
|
||||
button_layout.addWidget(close_button)
|
||||
layout.addLayout(button_layout)
|
||||
|
||||
def _create_metrics_tab(self, title: str) -> QWidget:
|
||||
"""
|
||||
Erstellt ein Tab-Widget für Metriken.
|
||||
|
||||
Args:
|
||||
title: Titel der Metrik-Gruppe
|
||||
|
||||
Returns:
|
||||
QWidget mit Metriken
|
||||
"""
|
||||
tab = QWidget()
|
||||
layout = QVBoxLayout(tab)
|
||||
|
||||
# Status-Label
|
||||
status_label = QLabel("Status: <i>Nicht initialisiert</i>")
|
||||
status_label.setObjectName("status_label")
|
||||
layout.addWidget(status_label)
|
||||
|
||||
# Kompilierungs-Metriken
|
||||
compile_group = QGroupBox("Kompilierung")
|
||||
compile_layout = QVBoxLayout(compile_group)
|
||||
|
||||
compile_time_label = QLabel("Kompilierungszeit: -")
|
||||
compile_time_label.setObjectName("compile_time_label")
|
||||
compile_layout.addWidget(compile_time_label)
|
||||
|
||||
layout.addWidget(compile_group)
|
||||
|
||||
# Worker-Start-Metriken
|
||||
worker_start_group = QGroupBox("Worker-Start")
|
||||
worker_start_layout = QVBoxLayout(worker_start_group)
|
||||
|
||||
worker_count_label = QLabel("Anzahl Worker: -")
|
||||
worker_count_label.setObjectName("worker_count_label")
|
||||
worker_start_layout.addWidget(worker_count_label)
|
||||
|
||||
total_start_time_label = QLabel("Summe Startzeit: -")
|
||||
total_start_time_label.setObjectName("total_start_time_label")
|
||||
worker_start_layout.addWidget(total_start_time_label)
|
||||
|
||||
avg_start_time_label = QLabel("Durchschnitt Startzeit: -")
|
||||
avg_start_time_label.setObjectName("avg_start_time_label")
|
||||
worker_start_layout.addWidget(avg_start_time_label)
|
||||
|
||||
layout.addWidget(worker_start_group)
|
||||
|
||||
# RAM-Metriken
|
||||
ram_group = QGroupBox("Arbeitsspeicher (RAM)")
|
||||
ram_layout = QVBoxLayout(ram_group)
|
||||
|
||||
ram_before_label = QLabel("RAM vor Transformation: -")
|
||||
ram_before_label.setObjectName("ram_before_label")
|
||||
ram_layout.addWidget(ram_before_label)
|
||||
|
||||
ram_before_avg_label = QLabel("RAM vor Transformation (Durchschnitt/Worker): -")
|
||||
ram_before_avg_label.setObjectName("ram_before_avg_label")
|
||||
ram_layout.addWidget(ram_before_avg_label)
|
||||
|
||||
ram_after_label = QLabel("RAM nach Transformation: -")
|
||||
ram_after_label.setObjectName("ram_after_label")
|
||||
ram_layout.addWidget(ram_after_label)
|
||||
|
||||
ram_after_avg_label = QLabel("RAM nach Transformation (Durchschnitt/Worker): -")
|
||||
ram_after_avg_label.setObjectName("ram_after_avg_label")
|
||||
ram_layout.addWidget(ram_after_avg_label)
|
||||
|
||||
ram_delta_label = QLabel("RAM-Zunahme: -")
|
||||
ram_delta_label.setObjectName("ram_delta_label")
|
||||
ram_layout.addWidget(ram_delta_label)
|
||||
|
||||
layout.addWidget(ram_group)
|
||||
|
||||
layout.addStretch()
|
||||
|
||||
return tab
|
||||
|
||||
def _load_metrics(self):
|
||||
"""Lädt und zeigt die Metriken an."""
|
||||
import transform
|
||||
|
||||
# Saxon Worker Pool
|
||||
if transform._saxon_worker_pool:
|
||||
self._update_metrics_tab(self.saxon_tab, transform._saxon_worker_pool, "Saxon Worker Pool")
|
||||
else:
|
||||
self._set_tab_status(self.saxon_tab, "<i>Nicht aktiviert</i>")
|
||||
|
||||
# FOP Worker Pool
|
||||
if transform._fop_worker_pool:
|
||||
self._update_metrics_tab(self.fop_tab, transform._fop_worker_pool, "FOP Worker Pool")
|
||||
else:
|
||||
self._set_tab_status(self.fop_tab, "<i>Nicht aktiviert</i>")
|
||||
|
||||
def _set_tab_status(self, tab: QWidget, status: str):
|
||||
"""
|
||||
Setzt den Status-Text eines Tabs.
|
||||
|
||||
Args:
|
||||
tab: Das Tab-Widget
|
||||
status: Der Status-Text
|
||||
"""
|
||||
status_label = tab.findChild(QLabel, "status_label")
|
||||
if status_label:
|
||||
status_label.setText(f"Status: {status}")
|
||||
|
||||
def _update_metrics_tab(self, tab: QWidget, pool, pool_name: str):
|
||||
"""
|
||||
Aktualisiert die Metriken in einem Tab.
|
||||
|
||||
Args:
|
||||
tab: Das Tab-Widget
|
||||
pool: Der Worker-Pool (Saxon oder FOP)
|
||||
pool_name: Name des Pools
|
||||
"""
|
||||
metrics = pool.metrics
|
||||
|
||||
# Status
|
||||
self._set_tab_status(tab, f"<b>Aktiviert</b> ({pool.num_workers} Worker)")
|
||||
|
||||
# Kompilierung
|
||||
compile_time_label = tab.findChild(QLabel, "compile_time_label")
|
||||
if compile_time_label:
|
||||
compile_time_label.setText(f"Kompilierungszeit: <b>{metrics.compilation_time_seconds:.3f} s</b>")
|
||||
|
||||
# Worker-Start
|
||||
worker_count_label = tab.findChild(QLabel, "worker_count_label")
|
||||
if worker_count_label:
|
||||
worker_count_label.setText(f"Anzahl Worker: <b>{len(metrics.worker_start_times)}</b>")
|
||||
|
||||
total_start_time_label = tab.findChild(QLabel, "total_start_time_label")
|
||||
if total_start_time_label:
|
||||
total_start_time_label.setText(
|
||||
f"Summe Startzeit: <b>{metrics.total_worker_start_time_seconds:.3f} s</b>"
|
||||
)
|
||||
|
||||
avg_start_time_label = tab.findChild(QLabel, "avg_start_time_label")
|
||||
if avg_start_time_label:
|
||||
avg_start_time_label.setText(
|
||||
f"Durchschnitt Startzeit: <b>{metrics.average_worker_start_time_seconds:.3f} s/Worker</b>"
|
||||
)
|
||||
|
||||
# RAM
|
||||
ram_before_label = tab.findChild(QLabel, "ram_before_label")
|
||||
if ram_before_label:
|
||||
if metrics.total_ram_before_mb > 0:
|
||||
ram_before_label.setText(f"RAM vor Transformation: <b>{metrics.total_ram_before_mb:.1f} MB</b>")
|
||||
else:
|
||||
ram_before_label.setText("RAM vor Transformation: <i>Noch nicht gemessen</i>")
|
||||
|
||||
ram_before_avg_label = tab.findChild(QLabel, "ram_before_avg_label")
|
||||
if ram_before_avg_label:
|
||||
if metrics.average_ram_before_mb > 0:
|
||||
ram_before_avg_label.setText(
|
||||
f"RAM vor Transformation (Durchschnitt/Worker): <b>{metrics.average_ram_before_mb:.1f} MB</b>"
|
||||
)
|
||||
else:
|
||||
ram_before_avg_label.setText(
|
||||
"RAM vor Transformation (Durchschnitt/Worker): <i>Noch nicht gemessen</i>"
|
||||
)
|
||||
|
||||
ram_after_label = tab.findChild(QLabel, "ram_after_label")
|
||||
if ram_after_label:
|
||||
if metrics.total_ram_after_mb > 0:
|
||||
ram_after_label.setText(f"RAM nach Transformation: <b>{metrics.total_ram_after_mb:.1f} MB</b>")
|
||||
else:
|
||||
ram_after_label.setText("RAM nach Transformation: <i>Noch nicht gemessen</i>")
|
||||
|
||||
ram_after_avg_label = tab.findChild(QLabel, "ram_after_avg_label")
|
||||
if ram_after_avg_label:
|
||||
if metrics.average_ram_after_mb > 0:
|
||||
ram_after_avg_label.setText(
|
||||
f"RAM nach Transformation (Durchschnitt/Worker): <b>{metrics.average_ram_after_mb:.1f} MB</b>"
|
||||
)
|
||||
else:
|
||||
ram_after_avg_label.setText(
|
||||
"RAM nach Transformation (Durchschnitt/Worker): <i>Noch nicht gemessen</i>"
|
||||
)
|
||||
|
||||
ram_delta_label = tab.findChild(QLabel, "ram_delta_label")
|
||||
if ram_delta_label:
|
||||
if metrics.total_ram_before_mb > 0 and metrics.total_ram_after_mb > 0:
|
||||
delta = metrics.total_ram_after_mb - metrics.total_ram_before_mb
|
||||
delta_percent = (delta / metrics.total_ram_before_mb * 100) if metrics.total_ram_before_mb > 0 else 0
|
||||
ram_delta_label.setText(f"RAM-Zunahme: <b>{delta:.1f} MB ({delta_percent:+.1f}%)</b>")
|
||||
else:
|
||||
ram_delta_label.setText("RAM-Zunahme: <i>Noch nicht gemessen</i>")
|
||||
@@ -0,0 +1,62 @@
|
||||
"""
|
||||
Worker Pool Performance-Metriken.
|
||||
|
||||
Gemeinsame Datenstrukturen für Performance- und Ressourcenverbrauch-Metriken
|
||||
der Worker-Pools (Saxon, FOP).
|
||||
"""
|
||||
|
||||
from dataclasses import dataclass, field
|
||||
|
||||
|
||||
@dataclass
|
||||
class WorkerPoolMetrics:
|
||||
"""
|
||||
Metriken für Worker-Pool Performance und Ressourcenverbrauch.
|
||||
"""
|
||||
|
||||
# Kompilierungszeit
|
||||
compilation_time_seconds: float = 0.0
|
||||
|
||||
# Worker-Start-Zeiten
|
||||
worker_start_times: list[float] = field(default_factory=list)
|
||||
total_worker_start_time_seconds: float = 0.0
|
||||
average_worker_start_time_seconds: float = 0.0
|
||||
|
||||
# RAM-Verbrauch (in MB)
|
||||
ram_before_transform_mb_per_worker: list[float] = field(default_factory=list)
|
||||
ram_after_transform_mb_per_worker: list[float] = field(default_factory=list)
|
||||
total_ram_before_mb: float = 0.0
|
||||
total_ram_after_mb: float = 0.0
|
||||
average_ram_before_mb: float = 0.0
|
||||
average_ram_after_mb: float = 0.0
|
||||
|
||||
# XSL-Kompilierungszeiten (nur für Saxon)
|
||||
xsl_compilation_times: list[float] = field(default_factory=list)
|
||||
total_xsl_compilation_time_seconds: float = 0.0
|
||||
average_xsl_compilation_time_seconds: float = 0.0
|
||||
|
||||
def calculate_aggregates(self):
|
||||
"""Berechnet aggregierte Werte (Summen, Durchschnitte)."""
|
||||
# Worker-Start-Zeiten
|
||||
if self.worker_start_times:
|
||||
self.total_worker_start_time_seconds = sum(self.worker_start_times)
|
||||
self.average_worker_start_time_seconds = self.total_worker_start_time_seconds / len(
|
||||
self.worker_start_times
|
||||
)
|
||||
|
||||
# RAM vor Transformation
|
||||
if self.ram_before_transform_mb_per_worker:
|
||||
self.total_ram_before_mb = sum(self.ram_before_transform_mb_per_worker)
|
||||
self.average_ram_before_mb = self.total_ram_before_mb / len(self.ram_before_transform_mb_per_worker)
|
||||
|
||||
# RAM nach Transformation
|
||||
if self.ram_after_transform_mb_per_worker:
|
||||
self.total_ram_after_mb = sum(self.ram_after_transform_mb_per_worker)
|
||||
self.average_ram_after_mb = self.total_ram_after_mb / len(self.ram_after_transform_mb_per_worker)
|
||||
|
||||
# XSL-Kompilierungszeiten
|
||||
if self.xsl_compilation_times:
|
||||
self.total_xsl_compilation_time_seconds = sum(self.xsl_compilation_times)
|
||||
self.average_xsl_compilation_time_seconds = self.total_xsl_compilation_time_seconds / len(
|
||||
self.xsl_compilation_times
|
||||
)
|
||||
Reference in New Issue
Block a user