Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ebf2132 authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Gerrit Code Review
Browse files

Merge changes I3e25da4e,I750bf034 

* changes:
  Floss: Fix suspend callback path
  Floss: Move macro debugging to OUT_DIR
parents 6b76940b 5b745e62

system/gd/rust/linux/client/src/main.rs

+3 −1
Original line number Diff line number Diff line
@@ -319,6 +319,8 @@ async fn start_interactive_shell( 
                    format!("/org/chromium/bluetooth/client/{}/bluetooth_callback", adapter);

                let conn_cb_objpath: String =

                    format!("/org/chromium/bluetooth/client/{}/bluetooth_conn_callback", adapter);

                let suspend_cb_objpath: String =

                    format!("/org/chromium/bluetooth/client/{}/suspend_callback", adapter);



                let dbus_connection = context.lock().unwrap().dbus_connection.clone();

                let dbus_crossroads = context.lock().unwrap().dbus_crossroads.clone();
@@ -348,7 +350,7 @@ async fn start_interactive_shell( 
                // TODO(b/224606285): Implement suspend debug utils in btclient.

                context.lock().unwrap().suspend_dbus.as_mut().unwrap().register_callback(Box::new(

                    SuspendCallback::new(

                        cb_objpath,

                        suspend_cb_objpath,

                        dbus_connection.clone(),

                        dbus_crossroads.clone(),

                    ),

system/gd/rust/linux/stack/btif_macros/src/lib.rs

+14 −2
Original line number Diff line number Diff line
@@ -13,8 +13,20 @@ use syn::{Expr, FnArg, ItemTrait, Meta, Pat, TraitItem}; 


use crate::proc_macro::TokenStream;



const OUTPUT_DEBUG: bool = false;



fn debug_output_to_file(gen: &proc_macro2::TokenStream, filename: String) {

    let path = Path::new(filename.as_str());

    if !OUTPUT_DEBUG {

        return;

    }



    let filepath = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap())

        .join(filename)

        .to_str()

        .unwrap()

        .to_string();



    let path = Path::new(&filepath);

    let mut file = File::create(&path).unwrap();

    file.write_all(gen.to_string().as_bytes()).unwrap();

}
@@ -120,7 +132,7 @@ pub fn btif_callbacks_dispatcher(attr: TokenStream, item: TokenStream) -> TokenS 
    };



    // TODO: Have a simple framework to turn on/off macro-generated code debug.

    debug_output_to_file(&gen, format!("/tmp/out-{}.rs", fn_ident.to_string()));

    debug_output_to_file(&gen, format!("out-{}.rs", fn_ident.to_string()));



    gen.into()

}