Complete binding for trace type

Author: haochengxia

libCacheSim-python/libcachesim/const.py

@@ -1,11 +1,4 @@
 from __future__ import annotations
 
-import enum
-
-
-class TraceType(enum.Enum):
-    CSV_TRACE = 0
-    BIN_TRACE = 1
-    PLAIN_TXT_TRACE = 2
-    ORACLE_GENERAL_TRACE = 3
-    LCS_TRACE = 4 # libCacheSim format
+# Import TraceType directly from the C++ binding to avoid duplication
+from ._libcachesim import TraceType

libCacheSim-python/src/pylibcachesim.cpp

@@ -161,8 +161,6 @@ struct ReaderDeleter {
   }
 };
 
-namespace py = pybind11;
-
 PYBIND11_MODULE(_libcachesim, m) {  // NOLINT(readability-named-parameter)
   m.doc() = R"pbdoc(
         libCacheSim Python bindings
@@ -178,9 +176,19 @@ PYBIND11_MODULE(_libcachesim, m) {  // NOLINT(readability-named-parameter)
 
   py::enum_<trace_type_e>(m, "TraceType")
       .value("CSV_TRACE", trace_type_e::CSV_TRACE)
-      .value("PLAIN_TXT_TRACE", trace_type_e::PLAIN_TXT_TRACE)
       .value("BIN_TRACE", trace_type_e::BIN_TRACE)
+      .value("PLAIN_TXT_TRACE", trace_type_e::PLAIN_TXT_TRACE)
+      .value("ORACLE_GENERAL_TRACE", trace_type_e::ORACLE_GENERAL_TRACE)
+      .value("LCS_TRACE", trace_type_e::LCS_TRACE)
       .value("VSCSI_TRACE", trace_type_e::VSCSI_TRACE)
+      .value("TWR_TRACE", trace_type_e::TWR_TRACE)
+      .value("TWRNS_TRACE", trace_type_e::TWRNS_TRACE)
+      .value("ORACLE_SIM_TWR_TRACE", trace_type_e::ORACLE_SIM_TWR_TRACE)
+      .value("ORACLE_SYS_TWR_TRACE", trace_type_e::ORACLE_SYS_TWR_TRACE)
+      .value("ORACLE_SIM_TWRNS_TRACE", trace_type_e::ORACLE_SIM_TWRNS_TRACE)
+      .value("ORACLE_SYS_TWRNS_TRACE", trace_type_e::ORACLE_SYS_TWRNS_TRACE)
+      .value("VALPIN_TRACE", trace_type_e::VALPIN_TRACE)
+      .value("UNKNOWN_TRACE", trace_type_e::UNKNOWN_TRACE)
       .export_values();
 
   // *************** structs ***************

libCacheSim-python/tests/test_process_trace.py

@@ -5,6 +5,7 @@
 
 import sys
 import os
+import pytest
 
 # Add the parent directory to the Python path for development testing
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
@@ -28,7 +29,7 @@ def create_trace_reader():
     )
     if not os.path.exists(data_file):
         return None
-    return lcs.open_trace(data_file, lcs.TraceType.ORACLE_GENERAL_TRACE.value)
+    return lcs.open_trace(data_file, lcs.TraceType.ORACLE_GENERAL_TRACE)
 
 
 def test_process_trace_native():
@@ -38,8 +39,7 @@ def test_process_trace_native():
     # Open trace
     reader = create_trace_reader()
     if reader is None:
-        print("Warning: Test trace file not found, skipping test")
-        return  # Skip test
+        pytest.skip("Test trace file not found, skipping test")
 
     # Create LRU cache
     cache = lcs.LRU(1024*1024)  # 1MB cache
@@ -61,8 +61,7 @@ def test_process_trace_python_hook():
     # Open trace
     reader = create_trace_reader()
     if reader is None:
-        print("Warning: Test trace file not found, skipping test")
-        return  # Skip test
+        pytest.skip("Test trace file not found, skipping test")
 
     # Create Python hook LRU cache
     cache = lcs.PythonHookCachePolicy(1024*1024, "TestLRU")
@@ -126,8 +125,7 @@ def test_compare_native_vs_python_hook():
     native_cache = lcs.LRU(cache_size)
     reader1 = create_trace_reader()
     if reader1 is None:
-        print("Warning: Test trace file not found, skipping test")
-        return  # Skip test
+        pytest.skip("Test trace file not found, skipping test")
 
     native_miss_ratio = native_cache.process_trace(reader1, max_req=max_requests)
 
@@ -175,8 +173,7 @@ def test_error_handling():
 
     reader = create_trace_reader()
     if reader is None:
-        print("Warning: Test trace file not found, skipping error test")
-        return  # Skip test
+        pytest.skip("Test trace file not found, skipping error test")
 
     # Try to process trace without setting hooks
     try:
@@ -199,8 +196,7 @@ def test_lru_implementation_accuracy():
     reader2 = create_trace_reader()
 
     if not reader1 or not reader2:
-        print("Warning: Cannot open trace files for LRU accuracy test")
-        return
+        pytest.skip("Cannot open trace files for LRU accuracy test")
 
     # Test native LRU
     native_cache = lcs.LRU(cache_size)

libCacheSim-python/tests/test_unified_interface.py

@@ -29,7 +29,7 @@ def create_trace_reader():
     )
     if not os.path.exists(data_file):
         return None
-    return lcs.open_trace(data_file, lcs.TraceType.ORACLE_GENERAL_TRACE.value)
+    return lcs.open_trace(data_file, lcs.TraceType.ORACLE_GENERAL_TRACE)
 
 
 def create_test_lru_hooks():