ekfsm 1.4.0a60__tar.gz → 1.5.0a1__tar.gz

{ekfsm-1.4.0a60 → ekfsm-1.5.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ekfsm
-Version: 1.4.0a60
+Version: 1.5.0a1
 Summary: The EKF System Management Library (ekfsm) is a sensor monitoring suite for Compact PCI Serial devices.
 Author-email: Jan Jansen <jan@ekf.de>, Klaus Popp <klaus.popp@ci4rail.com>, Felix Päßler <fp@ekf.de>
 Requires-Python: >=3.12

{ekfsm-1.4.0a60 → ekfsm-1.5.0a1}/devenv.lock

@@ -75,10 +75,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1759523803,
+        "lastModified": 1760392170,
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835",
+        "rev": "46d55f0aeb1d567a78223e69729734f3dca25a85",
         "type": "github"
       },
       "original": {

{ekfsm-1.4.0a60 → ekfsm-1.5.0a1}/pyproject.toml

@@ -27,7 +27,7 @@ authors = [
 ]
 description = "The EKF System Management Library (ekfsm) is a sensor monitoring suite for Compact PCI Serial devices."
 requires-python = ">=3.12"
-version = "1.4.0-alpha.60"
+version = "1.5.0-alpha.1"
 
 [project.scripts]
 ekfsm-cli = "ekfsm.cli:main"

ekfsm-1.5.0a1/tests/analyze_cctv_profile.py

@@ -0,0 +1,73 @@
+#!/usr/bin/env python3
+"""
+Enhanced profiling analysis script for cctv_profile.prof
+Analyzes CCTV system profiling results focusing on:
+- Watchdog operations
+- LED control functions
+- Button array operations
+- ekfsm and io4edge_client module usage
+"""
+
+import pstats
+from pathlib import Path
+
+
+def analyze_cctv_profile():
+    profile_file = Path(__file__).parent / "cctv_profile.prof"
+
+    if not profile_file.exists():
+        print(f"Profile file not found: {profile_file}")
+        print("Run cctv.py first to generate the profile")
+        return
+
+    stats = pstats.Stats(str(profile_file))
+    stats.strip_dirs()
+
+    print("=" * 80)
+    print("DETAILED ANALYSIS OF CCTV PROFILING")
+    print("=" * 80)
+
+    print("\n1. EKFSM MODULE ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(r"ekfsm", 15)
+
+    print("\n2. IO4EDGE_CLIENT MODULE ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(r"io4edge_client", 15)
+
+    print("\n3. WATCHDOG OPERATIONS ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(r"watchdog|kick", 10)
+
+    print("\n4. LED CONTROL OPERATIONS ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(r"led|colorLED|set", 10)
+
+    print("\n5. BUTTON OPERATIONS ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(r"button|eject|read_stream", 10)
+
+    print("\n6. SOCKET/TRANSPORT LAYER ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(r"socket|transport", 10)
+
+    print("\n7. MOST TIME-CONSUMING FUNCTIONS (ALL)")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(20)
+
+    print("\n8. FUNCTIONS WITH MOST CALLS")
+    print("-" * 40)
+    stats.sort_stats("ncalls").print_stats(15)
+
+    print("\n9. CUMULATIVE TIME ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("cumtime").print_stats(15)
+
+    print("\n10. CCTV-SPECIFIC HARDWARE INTERACTIONS")
+    print("-" * 40)
+    # Look for CCTV-specific patterns
+    stats.sort_stats("tottime").print_stats(r"smc|i4e", 10)
+
+
+if __name__ == "__main__":
+    analyze_cctv_profile()

ekfsm-1.5.0a1/tests/analyze_profile.py

@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+"""
+Enhanced profiling analysis script for sq3_profile.prof
+"""
+
+import pstats
+from pathlib import Path
+
+
+def analyze_profile():
+    profile_file = Path(__file__).parent / "sq3_profile.prof"
+
+    if not profile_file.exists():
+        print(f"Profile file not found: {profile_file}")
+        print("Run sq3-only.py first to generate the profile")
+        return
+
+    stats = pstats.Stats(str(profile_file))
+    stats.strip_dirs()
+
+    print("=" * 80)
+    print("DETAILED ANALYSIS OF SQ3 PROFILING")
+    print("=" * 80)
+
+    print("\n1. EKFSM MODULE ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(r"ekfsm", 15)
+
+    print("\n2. IO4EDGE_CLIENT MODULE ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(r"io4edge_client", 15)
+
+    print("\n3. SOCKET/TRANSPORT LAYER ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(r"socket|transport", 10)
+
+    print("\n4. DISPLAY OPERATIONS ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(r"display|pixel|image", 10)
+
+    print("\n5. BUTTON OPERATIONS ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(r"button|read_stream", 10)
+
+    print("\n6. MOST TIME-CONSUMING FUNCTIONS (ALL)")
+    print("-" * 40)
+    stats.sort_stats("tottime").print_stats(20)
+
+    print("\n7. FUNCTIONS WITH MOST CALLS")
+    print("-" * 40)
+    stats.sort_stats("ncalls").print_stats(15)
+
+    print("\n8. CUMULATIVE TIME ANALYSIS")
+    print("-" * 40)
+    stats.sort_stats("cumtime").print_stats(15)
+
+
+if __name__ == "__main__":
+    analyze_profile()

ekfsm-1.5.0a1/tests/cctv.py

@@ -0,0 +1,163 @@
+import pprint
+import logging
+from pathlib import Path
+import threading
+from time import sleep
+import cProfile
+import pstats
+
+from ekfsm.system import System
+
+logging.basicConfig(
+    level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+)
+
+# Initialize system first (without profiling the setup)
+config = Path(__file__).parent / "cctv.yaml"
+try:
+    system = System(config, abort=True)
+    system_initialized = True
+except Exception as e:
+    print(f"System initialization failed: {e}")
+    print("Continuing with mock profiling demonstration...")
+    system_initialized = False
+    system = None
+
+if not system_initialized:
+    print("System not available, creating mock profiling demonstration...")
+    print(
+        "This demonstrates the profiling structure that would be used with real hardware."
+    )
+    print("The same profiling patterns from sq3-only.py can be applied here.")
+    exit(0)
+
+# Start profiling HIER - nach System-Setup, vor io4edge_client Aufrufen
+profiler = cProfile.Profile(builtins=False)
+profiler.enable()
+
+try:
+    pprint.pprint(f"System slots {system.slots}")
+
+    system.print()
+
+    print(system.smc.i4e.leds.client._fb_client.connected)
+
+    cpu = system["CPU"]
+    cpuB = system.cpu
+    cpuC = system[0]
+
+    assert cpu == cpuB == cpuC
+
+    # To check why below is failing
+    # cpu_slot = system.slots["SYSTEM_SLOT"]
+    # cpu_slotB = system.slots.SYSTEM_SLOT
+    # cpu_slotC = system.slots[0]
+
+    # assert cpu_slot == cpu_slotB == cpu_slotC
+
+    cpu.print()
+    print(f"probing CPU: {cpu.probe()}")
+    print(
+        f"inventory: {cpu.inventory.vendor()} {cpu.inventory.model()} {cpu.inventory.serial()}"
+    )
+
+    smc = system.smc
+
+    smc.print()
+
+    i4e = smc.i4e
+    i4e.watchdog.kick()
+    print(i4e.watchdog.client._fb_client.connected)
+    i4e.leds.led2.set(0, True)
+    print(system.smc.i4e.leds.client._fb_client.connected)
+    i4e.leds.led5.set(3, True)
+    print(system.smc.i4e.leds.client._fb_client.connected)
+    i4e.leds.led3.set(5, False)
+    print(system.smc.i4e.leds.client._fb_client.connected)
+
+    button_array = i4e.buttons
+    # print(button_array._client._fb_client.connected)
+
+    eject = button_array.eject
+
+    eject.handler = lambda: print("Eject pressed")
+
+    stop_event = threading.Event()
+    button_thread = threading.Thread(target=button_array.read, args=(stop_event,))
+    button_thread.start()
+
+    for i in range(30):
+        print("Main thread running...")
+        # i4e.watchdog.kick()
+        # print(i4e.watchdog.client._fb_client.connected)
+        # i4e.leds.led2.set(0, True)
+        # print(system.smc.i4e.leds.client._fb_client.connected)
+        # i4e.leds.led5.set(3, True)
+        # print(system.smc.i4e.leds.client._fb_client.connected)
+        # i4e.leds.led3.set(5, False)
+        # print(system.smc.i4e.leds.client._fb_client.connected)
+        sleep(1)
+
+    # To stop the thread:
+    stop_event.set()
+    button_thread.join()
+
+except Exception as e:
+    print(f"Error during execution: {e}")
+    print("This is expected on systems without the required hardware.")
+
+finally:
+    profiler.disable()
+
+    print("\n" + "=" * 80)
+    print("PROFILING RESULTS - ekfsm and io4edge_client modules (CCTV)")
+    print("=" * 80)
+
+    # Create stats object and filter for our modules
+    stats = pstats.Stats(profiler)
+    stats.strip_dirs()  # clean paths
+
+    # Print comprehensive profiling results
+    print("\n1. TOP FUNCTIONS BY TOTAL TIME (including subcalls)")
+    stats.sort_stats("tottime").print_stats(
+        r"ekfsm|io4edge_client|client\.py|watchdog|led|button", 30
+    )
+
+    print("\n2. TOP FUNCTIONS BY CUMULATIVE TIME (time + subcalls)")
+    stats.sort_stats("cumtime").print_stats(
+        r"ekfsm|io4edge_client|client\.py|watchdog|led|button", 30
+    )
+
+    print("\n3. TOP FUNCTIONS BY NUMBER OF CALLS")
+    stats.sort_stats("ncalls").print_stats(
+        r"ekfsm|io4edge_client|client\.py|watchdog|led|button", 20
+    )
+
+    print("\n3a. ALL FUNCTIONS - DEBUGGING VIEW (to see what's actually being called)")
+    stats.sort_stats("tottime").print_stats(50)  # Show top 50 functions overall
+
+    print("\n4. CALLERS/CALLEES ANALYSIS FOR TOP 5 FUNCTIONS")
+    # Get the top 5 functions by total time
+    top_funcs = stats.get_stats_profile().func_profiles
+    filtered_funcs = {
+        k: v
+        for k, v in top_funcs.items()
+        if any(mod in str(k) for mod in ["ekfsm", "io4edge_client"])
+    }
+    sorted_funcs = sorted(
+        filtered_funcs.items(), key=lambda x: x[1].tottime, reverse=True
+    )
+
+    for i, (func_key, func_stats) in enumerate(sorted_funcs[:5]):
+        print(f"\n--- Function #{i+1}: {func_key} ---")
+        print(f"Total time: {func_stats.tottime:.6f}s, Calls: {func_stats.ncalls}")
+        stats.print_callers(func_key)
+
+    # Save detailed profile to file for later analysis
+    profile_file = Path(__file__).parent / "cctv_profile.prof"
+    profiler.dump_stats(str(profile_file))
+    print(f"\n5. Detailed profile saved to: {profile_file}")
+    print("   Use: python -m pstats cctv_profile.prof")
+    print("   Or: snakeviz cctv_profile.prof (install: pip install snakeviz)")
+
+    print("\n" + "=" * 80)

ekfsm-1.5.0a1/tests/profiling_template.py

@@ -0,0 +1,188 @@
+#!/usr/bin/env python3
+"""
+Template für Profiling von ekfsm und io4edge_client Modulen
+
+Dieses Template zeigt, wie das Profiling-Prinzip auf beliebige Scripts angewendet wird.
+Kopieren Sie diesen Code und passen Sie ihn an Ihr spezifisches Script an.
+
+Verwendung:
+1. Importieren Sie cProfile und pstats
+2. Initialisieren Sie das System OHNE Profiling
+3. Starten Sie das Profiling VOR den io4edge_client Aufrufen
+4. Führen Sie Ihre io4edge_client/ekfsm Operationen aus
+5. Stoppen Sie das Profiling und analysieren Sie die Ergebnisse
+"""
+
+import cProfile
+import pstats
+from pathlib import Path
+import logging
+
+# Optional: Setzen Sie Logging-Level für bessere Sichtbarkeit
+logging.basicConfig(
+    level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+)
+
+
+def profile_ekfsm_io4edge_operations():
+    """
+    Template-Funktion für Profiling von ekfsm und io4edge_client Operationen
+    """
+
+    # SCHRITT 1: System-Initialisierung OHNE Profiling
+    print("Initializing system...")
+    try:
+        from ekfsm.system import System
+
+        # Passen Sie den Konfigurationspfad an Ihr Script an
+        config = Path(__file__).parent / "your-config.yaml"
+        system = System(config, abort=True)
+        system_available = True
+
+    except Exception as e:
+        print(f"System initialization failed: {e}")
+        print("Continuing with demonstration of profiling structure...")
+        system_available = False
+
+    if not system_available:
+        print("\n" + "=" * 60)
+        print("PROFILING TEMPLATE STRUCTURE")
+        print("=" * 60)
+        print("1. Import cProfile and pstats")
+        print("2. Initialize system WITHOUT profiling")
+        print("3. Start profiler BEFORE io4edge_client calls")
+        print("4. Execute your io4edge_client operations")
+        print("5. Stop profiler and analyze results")
+        print("6. Filter results for ekfsm|io4edge_client modules")
+        return
+
+    # SCHRITT 2: Profiling starten - NACH System-Setup, VOR io4edge_client Aufrufen
+    print("Starting profiler...")
+    profiler = cProfile.Profile(builtins=False)
+    profiler.enable()
+
+    try:
+        # SCHRITT 3: Ihre io4edge_client/ekfsm Operationen hier
+        print("Executing monitored operations...")
+
+        # Beispiel-Operationen (passen Sie diese an Ihr Script an):
+
+        # System-Operationen
+        system.print()
+
+        # Beispiel: CPU-Zugriff
+        cpu = system["CPU"]  # Ändern Sie "CPU" entsprechend Ihrer Konfiguration
+        cpu.print()
+
+        # Beispiel: Hardware-Module Zugriff
+        # board = system["your_board_name"]
+        # i4e = board.your_io4edge_device
+
+        # Beispiel: io4edge_client Operationen
+        # i4e.watchdog.kick()
+        # i4e.leds.led1.set(0, True)
+        # button_array = i4e.buttons
+        # button_array.some_button.handler = lambda: print("Button pressed")
+
+        # Beispiel: Streaming-Operationen
+        # stop_event = threading.Event()
+        # button_thread = threading.Thread(target=button_array.read, args=(stop_event,))
+        # button_thread.start()
+        # time.sleep(5)  # Simulate some work
+        # stop_event.set()
+        # button_thread.join()
+
+        print("Operations completed successfully")
+
+    except Exception as e:
+        print(f"Error during monitored operations: {e}")
+
+    finally:
+        # SCHRITT 4: Profiling stoppen und analysieren
+        profiler.disable()
+
+        print("\n" + "=" * 80)
+        print("PROFILING RESULTS - ekfsm and io4edge_client modules")
+        print("=" * 80)
+
+        # Stats-Objekt erstellen
+        stats = pstats.Stats(profiler)
+        stats.strip_dirs()
+
+        # SCHRITT 5: Analysieren Sie die Ergebnisse
+
+        print("\n1. TOP FUNCTIONS BY TOTAL TIME")
+        # Passen Sie den Regex-Filter an Ihre spezifischen Module an
+        stats.sort_stats("tottime").print_stats(r"ekfsm|io4edge_client|your_module", 20)
+
+        print("\n2. TOP FUNCTIONS BY CUMULATIVE TIME")
+        stats.sort_stats("cumtime").print_stats(r"ekfsm|io4edge_client|your_module", 20)
+
+        print("\n3. TOP FUNCTIONS BY NUMBER OF CALLS")
+        stats.sort_stats("ncalls").print_stats(r"ekfsm|io4edge_client|your_module", 15)
+
+        print("\n4. ALL FUNCTIONS OVERVIEW")
+        stats.sort_stats("tottime").print_stats(30)
+
+        # SCHRITT 6: Profiling-Datei speichern für detaillierte Analyse
+        profile_file = Path(__file__).parent / "your_script_profile.prof"
+        profiler.dump_stats(str(profile_file))
+
+        print(f"\n5. PROFILE FILE SAVED: {profile_file}")
+        print(f"   Detailed analysis: python -m pstats {profile_file}")
+        print(f"   Visual analysis: pip install snakeviz && snakeviz {profile_file}")
+
+        print("\n" + "=" * 80)
+
+
+def create_profile_analysis_script(script_name):
+    """
+    Erstellt ein Analyse-Script für ein spezifisches Profiling
+    """
+    analysis_script = f"""#!/usr/bin/env python3
+'''
+Analysis script for {script_name}_profile.prof
+'''
+
+import pstats
+from pathlib import Path
+
+def analyze_{script_name}_profile():
+    profile_file = Path(__file__).parent / "{script_name}_profile.prof"
+
+    if not profile_file.exists():
+        print(f"Profile file not found: {{profile_file}}")
+        return
+
+    stats = pstats.Stats(str(profile_file))
+    stats.strip_dirs()
+
+    print("="*80)
+    print("DETAILED ANALYSIS OF {script_name.upper()} PROFILING")
+    print("="*80)
+
+    # Modulspezifische Analysen
+    print("\\n1. EKFSM MODULE ANALYSIS")
+    stats.sort_stats("tottime").print_stats(r"ekfsm", 15)
+
+    print("\\n2. IO4EDGE_CLIENT MODULE ANALYSIS")
+    stats.sort_stats("tottime").print_stats(r"io4edge_client", 15)
+
+    # Fügen Sie hier weitere spezifische Analysen ein
+
+if __name__ == "__main__":
+    analyze_{script_name}_profile()
+"""
+
+    analysis_file = Path(__file__).parent / f"analyze_{script_name}_profile.py"
+    analysis_file.write_text(analysis_script)
+    print(f"Analysis script created: {analysis_file}")
+
+
+if __name__ == "__main__":
+    print("PROFILING TEMPLATE FOR EKFSM AND IO4EDGE_CLIENT")
+    print("=" * 50)
+    profile_ekfsm_io4edge_operations()
+
+    # Optional: Erstellen Sie ein Analyse-Script
+    # create_profile_analysis_script("your_script_name")

ekfsm-1.5.0a1/tests/sq3-only.py

@@ -0,0 +1,112 @@
+import logging
+import pprint
+from pathlib import Path
+import cProfile
+import pstats
+
+from ekfsm.system import System
+
+logging.basicConfig(
+    level=logging.DEBUG, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+)
+
+# Initialize system first (without profiling the setup)
+config = Path(__file__).parent / "sq3-only.yaml"
+system = System(config, abort=True)
+
+pprint.pprint(f"System slots {system.slots}")
+
+system.print()
+
+cpu = system["CPU"]
+cpuB = system.cpu
+cpuC = system[0]
+
+assert cpu == cpuB == cpuC
+
+print(cpu.hwmon.cputemp())
+
+eeprom = cpu.eeprom
+eeprom.manufactured_at()
+
+cpu_slot = system.slots["SYSTEM_SLOT"]
+cpu_slotB = system.slots.SYSTEM_SLOT
+cpu_slotC = system.slots[0]
+
+assert cpu_slot == cpu_slotB == cpu_slotC
+
+cpu.print()
+print(f"probing CPU: {cpu.probe()}")
+print(
+    f"inventory: {cpu.inventory.vendor()} {cpu.inventory.model()} {cpu.inventory.serial()}"
+)
+
+sq3 = system["info"]
+i4e = sq3.bmc
+
+# Start profiling HIER - nach System-Setup, vor io4edge_client Aufrufen
+profiler = cProfile.Profile(builtins=False)
+profiler.enable()
+
+fw_title, fw_name = i4e.identify_firmware()
+
+print(f"Firmware: {fw_title} {fw_name}")
+
+pixel = i4e.display
+
+pixel.off()
+pixel.display_image(str(Path(__file__).parent / "sim/SQ3.png"))
+
+
+profiler.disable()
+
+print("\n" + "=" * 80)
+print("PROFILING RESULTS - ekfsm and io4edge_client modules")
+print("=" * 80)
+
+# Create stats object and filter for our modules
+stats = pstats.Stats(profiler)
+stats.strip_dirs()  # clean paths
+
+# Print comprehensive profiling results
+print("\n1. TOP FUNCTIONS BY TOTAL TIME (including subcalls)")
+stats.sort_stats("tottime").print_stats(
+    r"ekfsm|io4edge_client|client\.py|display|button", 30
+)
+
+print("\n2. TOP FUNCTIONS BY CUMULATIVE TIME (time + subcalls)")
+stats.sort_stats("cumtime").print_stats(
+    r"ekfsm|io4edge_client|client\.py|display|button", 30
+)
+
+print("\n3. TOP FUNCTIONS BY NUMBER OF CALLS")
+stats.sort_stats("ncalls").print_stats(
+    r"ekfsm|io4edge_client|client\.py|display|button", 20
+)
+
+print("\n3a. ALL FUNCTIONS - DEBUGGING VIEW (to see what's actually being called)")
+stats.sort_stats("tottime").print_stats(50)  # Show top 50 functions overall
+
+print("\n4. CALLERS/CALLEES ANALYSIS FOR TOP 5 FUNCTIONS")
+# Get the top 5 functions by total time
+top_funcs = stats.get_stats_profile().func_profiles
+filtered_funcs = {
+    k: v
+    for k, v in top_funcs.items()
+    if any(mod in str(k) for mod in ["ekfsm", "io4edge_client"])
+}
+sorted_funcs = sorted(filtered_funcs.items(), key=lambda x: x[1].tottime, reverse=True)
+
+for i, (func_key, func_stats) in enumerate(sorted_funcs[:5]):
+    print(f"\n--- Function #{i+1}: {func_key} ---")
+    print(f"Total time: {func_stats.tottime:.6f}s, Calls: {func_stats.ncalls}")
+    stats.print_callers(func_key)
+
+# Save detailed profile to file for later analysis
+profile_file = Path(__file__).parent / "sq3_profile.prof"
+profiler.dump_stats(str(profile_file))
+print(f"\n5. Detailed profile saved to: {profile_file}")
+print("   Use: python -m pstats sq3_profile.prof")
+print("   Or: snakeviz sq3_profile.prof (install: pip install snakeviz)")
+
+print("\n" + "=" * 80)