Generate bindings from C++

Author: Charlie Friend

wrappers/rust/cpp-client-telemetry-sys/build.rs

@@ -1,13 +1,9 @@
 use std::env;
-use std::fs;
 use std::path::PathBuf;
-use subprocess::Exec;
 
 static PROJECT_ROOT: &str = "../../../";
 
-fn write_bindings(header_path: &PathBuf) {
-    let header_path_string = String::from(header_path.to_string_lossy());
-
+fn write_bindings() {
     // The bindgen::Builder is the main entry point
     // to bindgen, and lets you build up options for
     // the resulting bindings.
@@ -19,25 +15,14 @@ fn write_bindings(header_path: &PathBuf) {
         // .raw_line("#![allow(non_upper_case_globals)]")
         // .raw_line("#![allow(non_camel_case_types)]")
         // .raw_line("#![allow(non_snake_case)]")
-        .header(&header_path_string)
-        .allowlist_file(&header_path_string)
-        .c_naming(false)
-        .blocklist_type("struct_IMAGE_TLS_DIRECTORY")
-        .blocklist_type("struct_PIMAGE_TLS_DIRECTORY")
-        .blocklist_type("struct_IMAGE_TLS_DIRECTORY64")
-        .blocklist_type("struct_PIMAGE_TLS_DIRECTORY64")
-        .blocklist_type("struct__IMAGE_TLS_DIRECTORY64")
-        .blocklist_type("IMAGE_TLS_DIRECTORY")
-        .blocklist_type("PIMAGE_TLS_DIRECTORY")
-        .blocklist_type("IMAGE_TLS_DIRECTORY64")
-        .blocklist_type("PIMAGE_TLS_DIRECTORY64")
-        .blocklist_type("_IMAGE_TLS_DIRECTORY64")
-        .allowlist_type("evt_.*")
-        .allowlist_function("evt_.*")
-        .allowlist_var("evt_.*")
-        .allowlist_recursively(false)
-        .layout_tests(false)
-        .merge_extern_blocks(true)
+        .clang_arg(format!("-I{}", PathBuf::from(PROJECT_ROOT).join("lib/include").display()))
+        .header("./include/wrapper.hpp")
+        //.enable_cxx_namespaces()
+        .allowlist_type("Microsoft::Applications::Events::LogManagerProvider")
+        .allowlist_recursively(true)
+        // STL types must be marked as 'opaque' as bindgen can't handle the internals of these types.
+        .opaque_type("std::(.*)")
+        //.blocklist_function("std::*")
         // Tell cargo to invalidate the built crate whenever any of the
         // included header files changed.
         // .wrap_static_fns(true)
@@ -65,20 +50,20 @@ fn main() {
     println!("cargo:rustc-link-search=native={}", out_dir);
     println!("cargo:rustc-link-lib=ClientTelemetry");
 
-    // TODO use clang crate instead of invoking CLI directly
-    let header_out = Exec::cmd("clang")
-        .arg("-E")
-        .arg(mat_h_location)
-        .arg("-D")
-        .arg("HAVE_DYNAMIC_C_LIB")
-        .capture()
-        .expect("Failed to open clang process")
-        .stdout_str();
+    // // TODO use clang crate instead of invoking CLI directly
+    // let header_out = Exec::cmd("clang")
+    //     .arg("-E")
+    //     .arg(mat_h_location)
+    //     .arg("-D")
+    //     .arg("HAVE_DYNAMIC_C_LIB")
+    //     .capture()
+    //     .expect("Failed to open clang process")
+    //     .stdout_str();
 
-    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-    let mat_out_path = out_dir.join("mat.out.h");
+    // let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+    // let mat_out_path = out_dir.join("mat.out.h");
 
-    fs::write(&mat_out_path, header_out).unwrap();
+    // fs::write(&mat_out_path, header_out).unwrap();
 
-    write_bindings(&mat_out_path);
+    write_bindings();
 }

wrappers/rust/cpp-client-telemetry-sys/src/lib.rs

@@ -3,58 +3,7 @@
 #![allow(non_snake_case)]
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 
-use std::{ffi::{c_void}, os::raw};
-
-fn evt_api_call_wrapper(context_ptr: *mut evt_context_t) -> Option<evt_handle_t> {
-    let mut result = -1;
-    unsafe {
-        if let Some(cb) = evt_api_call {
-            result = cb(context_ptr);
-        }
-    }
-
-    if result == -1 {
-        return Option::None;
-    }
-
-    // Box is now responsible for destroying the context
-    let context = unsafe { Box::from_raw(context_ptr) };
-
-    Some(context.handle.clone())
-}
-
-pub fn evt_open(config: *mut c_void) -> Option<evt_handle_t> {
-    let context: Box<evt_context_t> = Box::new(evt_context_t {
-        call: evt_call_t_EVT_OP_OPEN,
-        handle: 0,
-        data: config,
-        result: 0,
-        size: 0,
-    });
-
-    evt_api_call_wrapper(Box::into_raw(context))
-}
-
-pub fn evt_close(handle: &evt_handle_t) -> evt_status_t {
-    let context: Box<evt_context_t> = Box::new(evt_context_t {
-        call: evt_call_t_EVT_OP_CLOSE,
-        handle: *handle,
-        data: std::ptr::null_mut(),
-        result: 0,
-        size: 0,
-    });
-
-    let raw_pointer = Box::into_raw(context);
-
-    let mut result: evt_status_t = -1;
-    unsafe {
-        if let Some(cb) = evt_api_call {
-            result = cb(raw_pointer);
-            let _context = Box::from_raw(raw_pointer);
-        }
-    }
-
-    result
+fn test_fn() {
 }
 
 #[cfg(test)]
@@ -79,5 +28,6 @@ mod tests {
         }"#;
 
         let result = evt_open(config.as_ptr() as *mut c_void);
+        assert_eq!(result, Some(0));
     }
 }