Convert data collection

Author: ZippeyKeys12

runtime/cn-testing-rs/build.rs

@@ -17,6 +17,7 @@ fn main() {
 #ifndef BENNET_WRAPPER_H
 #define BENNET_WRAPPER_H
 
+#include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
 
@@ -60,45 +61,8 @@ void bennet_set_size_split_backtracks_allowed(uint64_t allowed);
 enum bennet_failure_type bennet_failure_get_failure_type(void);
 void bennet_rand_alloc_set_mem_size(uint64_t size);
 
-// Info collection functions
-void bennet_info_sizes_init(void);
-void bennet_info_sizes_set_function_under_test(const char* name);
-void bennet_info_sizes_log(void);
-void bennet_info_sizes_print_info(void);
-
-void bennet_info_backtracks_init(void);
-void bennet_info_backtracks_set_function_under_test(const char* name);
-void bennet_info_backtracks_begin_run(void);
-void bennet_info_backtracks_end_run(_Bool);
-void bennet_info_backtracks_print_backtrack_info(void);
-
-void bennet_info_unsatisfied_init(void);
-void bennet_info_unsatisfied_set_function_under_test(const char* name);
-void bennet_info_unsatisfied_begin_run(void);
-void bennet_info_unsatisfied_end_run(_Bool);
-void bennet_info_unsatisfied_print_info(void);
-
-void bennet_info_discards_init(void);
-void bennet_info_discards_set_function_under_test(const char* name);
-void bennet_info_discards_log(enum bennet_failure_type);
-void bennet_info_discards_print_info(void);
-
-void bennet_info_timing_init(void);
-void bennet_info_timing_set_function_under_test(const char* name);
-void bennet_info_timing_start(const char* label);
-void bennet_info_timing_end(const char* label);
-void bennet_info_timing_print_info(void);
-
-struct tyche_line_info {
-  char *test_suite;
-  char *test_name;
-  char *status;
-  char *status_reason;
-  uint64_t suite_begin_time;
-  char *representation;
-};
-
-void print_test_summary_tyche(FILE *out, struct tyche_line_info *line_info);
+// Ownership size function (for info/sizes.rs to call)
+size_t bennet_ownership_size(void);
 
 #endif
 "#;

runtime/cn-testing-rs/cbindgen.toml

@@ -1,6 +1,6 @@
 language = "C"
 # Note: Include guard is manually managed - opening in header, closing is added by dune after macros
-header = "#ifndef CN_TEST_H\n#define CN_TEST_H\n\n#include <bennet/prelude.h>"
+header = "#ifndef CN_TEST_H\n#define CN_TEST_H\n\n#include <bennet/prelude.h>\n#include <stdio.h>\ntypedef FILE cn_FILE;"
 trailer = ""
 # Don't use include_guard to avoid automatic #endif generation
 no_includes = false
@@ -16,6 +16,7 @@ exclude = ["bennet_*", "cn_smt_*", "cn_replica_*", "fulminate_*"]
 
 [export.rename]
 "bindings::bennet_sizing_strategy" = "enum bennet_sizing_strategy"
+"FILE" = "FILE"
 
 [defines]
 "target_os = windows" = "CN_PLATFORM_WINDOWS"

runtime/cn-testing-rs/src/executor.rs

@@ -6,6 +6,7 @@ use libc::{c_char, c_int};
 use std::ffi::CStr;
 use crate::bindings;
 use crate::cli::TestConfig;
+use crate::info;
 use crate::registry;
 use crate::types::{CnTestInput, CnTestReproduction, CnTestResult, CN_TEST_MAX_TEST_CASES};
 
@@ -29,23 +30,23 @@ pub unsafe extern "C" fn cn_test_main(argc: c_int, argv: *mut *mut c_char) -> c_
 
     // Initialize info collection subsystems
     if config.output_tyche || config.print_size_info {
-        bindings::bennet_info_sizes_init();
+        info::bennet_info_sizes_init();
     }
 
     if config.output_tyche || config.print_backtrack_info {
-        bindings::bennet_info_backtracks_init();
+        info::bennet_info_backtracks_init();
     }
 
     if config.print_satisfaction_info {
-        bindings::bennet_info_unsatisfied_init();
+        info::bennet_info_unsatisfied_init();
     }
 
     if config.print_discard_info {
-        bindings::bennet_info_discards_init();
+        info::bennet_info_discards_init();
     }
 
     if config.output_tyche || config.print_timing_info {
-        bindings::bennet_info_timing_init();
+        info::bennet_info_timing_init();
     }
 
     // Print initial info
@@ -103,23 +104,23 @@ pub unsafe extern "C" fn cn_test_main(argc: c_int, argv: *mut *mut c_char) -> c_
 
             // Set function under test for info collection
             if config.output_tyche || config.print_size_info {
-                bindings::bennet_info_sizes_set_function_under_test(test_case.name);
+                info::bennet_info_sizes_set_function_under_test(test_case.name);
             }
 
             if config.output_tyche || config.print_backtrack_info {
-                bindings::bennet_info_backtracks_set_function_under_test(test_case.name);
+                info::bennet_info_backtracks_set_function_under_test(test_case.name);
             }
 
             if config.print_satisfaction_info {
-                bindings::bennet_info_unsatisfied_set_function_under_test(test_case.name);
+                info::bennet_info_unsatisfied_set_function_under_test(test_case.name);
             }
 
             if config.print_discard_info {
-                bindings::bennet_info_discards_set_function_under_test(test_case.name);
+                info::bennet_info_discards_set_function_under_test(test_case.name);
             }
 
             if config.output_tyche || config.print_timing_info {
-                bindings::bennet_info_timing_set_function_under_test(test_case.name);
+                info::bennet_info_timing_set_function_under_test(test_case.name);
             }
 
             // Print initial test info
@@ -281,27 +282,27 @@ pub unsafe extern "C" fn cn_test_main(argc: c_int, argv: *mut *mut c_char) -> c_
     // Print info if requested
     if config.print_size_info {
         println!();
-        bindings::bennet_info_sizes_print_info();
+        info::bennet_info_sizes_print_info();
     }
 
     if config.print_backtrack_info {
         println!();
-        bindings::bennet_info_backtracks_print_backtrack_info();
+        info::bennet_info_backtracks_print_backtrack_info();
     }
 
     if config.print_satisfaction_info {
         println!();
-        bindings::bennet_info_unsatisfied_print_info();
+        info::bennet_info_unsatisfied_print_info();
     }
 
     if config.print_discard_info {
         println!();
-        bindings::bennet_info_discards_print_info();
+        info::bennet_info_discards_print_info();
     }
 
     if config.print_timing_info {
         println!();
-        bindings::bennet_info_timing_print_info();
+        info::bennet_info_timing_print_info();
     }
 
     // Return non-zero exit code if there were failures or errors