Make C++ flags available in Rust.
In order to do this, we automagically grab all of C++ gflags and
add them into the Rust Clap command. We then pass through the flags
back to C++ to set them.
This requires different versions of clap to make both our implementation
and autocxx happy.
Change-Id: I36a9584de2ade55390f7109889996bad6e2cd071
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>
diff --git a/Cargo.Bazel.lock b/Cargo.Bazel.lock
index e70a4ca..173d94c 100644
--- a/Cargo.Bazel.lock
+++ b/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
{
- "checksum": "7305dfa1e83bfd0222912e22f8294905db9c35e036a34182aaaf7bafa13c28ac",
+ "checksum": "55aae3bef8d69d63ccc72c9dd575313c0c8380bbb85cf045b64e5708d8f6cf1e",
"crates": {
"addr2line 0.20.0": {
"name": "addr2line",
@@ -233,6 +233,76 @@
},
"license": "MIT"
},
+ "anstream 0.6.11": {
+ "name": "anstream",
+ "version": "0.6.11",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/anstream/0.6.11/download",
+ "sha256": "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "anstream",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "anstream",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "crate_features": {
+ "common": [
+ "auto",
+ "default",
+ "wincon"
+ ],
+ "selects": {}
+ },
+ "deps": {
+ "common": [
+ {
+ "id": "anstyle 1.0.1",
+ "target": "anstyle"
+ },
+ {
+ "id": "anstyle-parse 0.2.3",
+ "target": "anstyle_parse"
+ },
+ {
+ "id": "anstyle-query 1.0.2",
+ "target": "anstyle_query"
+ },
+ {
+ "id": "colorchoice 1.0.0",
+ "target": "colorchoice"
+ },
+ {
+ "id": "utf8parse 0.2.1",
+ "target": "utf8parse"
+ }
+ ],
+ "selects": {
+ "cfg(windows)": [
+ {
+ "id": "anstyle-wincon 3.0.2",
+ "target": "anstyle_wincon"
+ }
+ ]
+ }
+ },
+ "edition": "2021",
+ "version": "0.6.11"
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"anstyle 1.0.1": {
"name": "anstyle",
"version": "1.0.1",
@@ -270,6 +340,139 @@
},
"license": "MIT OR Apache-2.0"
},
+ "anstyle-parse 0.2.3": {
+ "name": "anstyle-parse",
+ "version": "0.2.3",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/anstyle-parse/0.2.3/download",
+ "sha256": "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "anstyle_parse",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "anstyle_parse",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "crate_features": {
+ "common": [
+ "default",
+ "utf8"
+ ],
+ "selects": {}
+ },
+ "deps": {
+ "common": [
+ {
+ "id": "utf8parse 0.2.1",
+ "target": "utf8parse"
+ }
+ ],
+ "selects": {}
+ },
+ "edition": "2021",
+ "version": "0.2.3"
+ },
+ "license": "MIT OR Apache-2.0"
+ },
+ "anstyle-query 1.0.2": {
+ "name": "anstyle-query",
+ "version": "1.0.2",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/anstyle-query/1.0.2/download",
+ "sha256": "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "anstyle_query",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "anstyle_query",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "deps": {
+ "common": [],
+ "selects": {
+ "cfg(windows)": [
+ {
+ "id": "windows-sys 0.52.0",
+ "target": "windows_sys"
+ }
+ ]
+ }
+ },
+ "edition": "2021",
+ "version": "1.0.2"
+ },
+ "license": "MIT OR Apache-2.0"
+ },
+ "anstyle-wincon 3.0.2": {
+ "name": "anstyle-wincon",
+ "version": "3.0.2",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/anstyle-wincon/3.0.2/download",
+ "sha256": "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "anstyle_wincon",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "anstyle_wincon",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "deps": {
+ "common": [
+ {
+ "id": "anstyle 1.0.1",
+ "target": "anstyle"
+ }
+ ],
+ "selects": {
+ "cfg(windows)": [
+ {
+ "id": "windows-sys 0.52.0",
+ "target": "windows_sys"
+ }
+ ]
+ }
+ },
+ "edition": "2021",
+ "version": "3.0.2"
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"anyhow 1.0.71": {
"name": "anyhow",
"version": "1.0.71",
@@ -863,7 +1066,8 @@
"common": [
{
"id": "clap 3.2.25",
- "target": "clap"
+ "target": "clap",
+ "alias": "clap3"
},
{
"id": "env_logger 0.9.3",
@@ -1981,6 +2185,188 @@
},
"license": "MIT OR Apache-2.0"
},
+ "clap 4.4.18": {
+ "name": "clap",
+ "version": "4.4.18",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/clap/4.4.18/download",
+ "sha256": "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "clap",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "clap",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "crate_features": {
+ "common": [
+ "color",
+ "default",
+ "derive",
+ "error-context",
+ "help",
+ "std",
+ "string",
+ "suggestions",
+ "usage"
+ ],
+ "selects": {}
+ },
+ "deps": {
+ "common": [
+ {
+ "id": "clap_builder 4.4.18",
+ "target": "clap_builder"
+ }
+ ],
+ "selects": {}
+ },
+ "edition": "2021",
+ "proc_macro_deps": {
+ "common": [
+ {
+ "id": "clap_derive 4.4.7",
+ "target": "clap_derive"
+ }
+ ],
+ "selects": {}
+ },
+ "version": "4.4.18"
+ },
+ "license": "MIT OR Apache-2.0"
+ },
+ "clap_builder 4.4.18": {
+ "name": "clap_builder",
+ "version": "4.4.18",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/clap_builder/4.4.18/download",
+ "sha256": "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "clap_builder",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "clap_builder",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "crate_features": {
+ "common": [
+ "color",
+ "error-context",
+ "help",
+ "std",
+ "string",
+ "suggestions",
+ "usage"
+ ],
+ "selects": {}
+ },
+ "deps": {
+ "common": [
+ {
+ "id": "anstream 0.6.11",
+ "target": "anstream"
+ },
+ {
+ "id": "anstyle 1.0.1",
+ "target": "anstyle"
+ },
+ {
+ "id": "clap_lex 0.6.0",
+ "target": "clap_lex"
+ },
+ {
+ "id": "strsim 0.10.0",
+ "target": "strsim"
+ }
+ ],
+ "selects": {}
+ },
+ "edition": "2021",
+ "version": "4.4.18"
+ },
+ "license": "MIT OR Apache-2.0"
+ },
+ "clap_derive 4.4.7": {
+ "name": "clap_derive",
+ "version": "4.4.7",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/clap_derive/4.4.7/download",
+ "sha256": "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+ }
+ },
+ "targets": [
+ {
+ "ProcMacro": {
+ "crate_name": "clap_derive",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "clap_derive",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "crate_features": {
+ "common": [
+ "default"
+ ],
+ "selects": {}
+ },
+ "deps": {
+ "common": [
+ {
+ "id": "heck 0.4.1",
+ "target": "heck"
+ },
+ {
+ "id": "proc-macro2 1.0.63",
+ "target": "proc_macro2"
+ },
+ {
+ "id": "quote 1.0.29",
+ "target": "quote"
+ },
+ {
+ "id": "syn 2.0.28",
+ "target": "syn"
+ }
+ ],
+ "selects": {}
+ },
+ "edition": "2021",
+ "version": "4.4.7"
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"clap_lex 0.2.4": {
"name": "clap_lex",
"version": "0.2.4",
@@ -2009,7 +2395,7 @@
"deps": {
"common": [
{
- "id": "os_str_bytes 6.5.1",
+ "id": "os_str_bytes 6.6.1",
"target": "os_str_bytes"
}
],
@@ -2020,6 +2406,36 @@
},
"license": "MIT OR Apache-2.0"
},
+ "clap_lex 0.6.0": {
+ "name": "clap_lex",
+ "version": "0.6.0",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/clap_lex/0.6.0/download",
+ "sha256": "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "clap_lex",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "clap_lex",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "edition": "2021",
+ "version": "0.6.0"
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"codespan-reporting 0.11.1": {
"name": "codespan-reporting",
"version": "0.11.1",
@@ -2063,6 +2479,36 @@
},
"license": "Apache-2.0"
},
+ "colorchoice 1.0.0": {
+ "name": "colorchoice",
+ "version": "1.0.0",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/colorchoice/1.0.0/download",
+ "sha256": "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "colorchoice",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "colorchoice",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "edition": "2021",
+ "version": "1.0.0"
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"compile_with_bazel 0.0.0": {
"name": "compile_with_bazel",
"version": "0.0.0",
@@ -2098,6 +2544,10 @@
"target": "bitflags"
},
{
+ "id": "clap 4.4.18",
+ "target": "clap"
+ },
+ {
"id": "cxx 1.0.97",
"target": "cxx"
},
@@ -3554,6 +4004,42 @@
},
"license": "MIT OR Apache-2.0"
},
+ "heck 0.4.1": {
+ "name": "heck",
+ "version": "0.4.1",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/heck/0.4.1/download",
+ "sha256": "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "heck",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "heck",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "crate_features": {
+ "common": [
+ "default"
+ ],
+ "selects": {}
+ },
+ "edition": "2018",
+ "version": "0.4.1"
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"hermit-abi 0.1.19": {
"name": "hermit-abi",
"version": "0.1.19",
@@ -5059,13 +5545,13 @@
},
"license": "MIT OR Apache-2.0"
},
- "os_str_bytes 6.5.1": {
+ "os_str_bytes 6.6.1": {
"name": "os_str_bytes",
- "version": "6.5.1",
+ "version": "6.6.1",
"repository": {
"Http": {
- "url": "https://crates.io/api/v1/crates/os_str_bytes/6.5.1/download",
- "sha256": "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
+ "url": "https://crates.io/api/v1/crates/os_str_bytes/6.6.1/download",
+ "sha256": "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
}
},
"targets": [
@@ -5091,7 +5577,7 @@
"selects": {}
},
"edition": "2021",
- "version": "6.5.1"
+ "version": "6.6.1"
},
"license": "MIT OR Apache-2.0"
},
@@ -7928,6 +8414,42 @@
},
"license": "MIT/Apache-2.0"
},
+ "utf8parse 0.2.1": {
+ "name": "utf8parse",
+ "version": "0.2.1",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/utf8parse/0.2.1/download",
+ "sha256": "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "utf8parse",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "utf8parse",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "crate_features": {
+ "common": [
+ "default"
+ ],
+ "selects": {}
+ },
+ "edition": "2018",
+ "version": "0.2.1"
+ },
+ "license": "Apache-2.0 OR MIT"
+ },
"uuid 1.4.0": {
"name": "uuid",
"version": "1.4.0",
@@ -8437,6 +8959,45 @@
},
"license": "MIT OR Apache-2.0"
},
+ "windows-sys 0.52.0": {
+ "name": "windows-sys",
+ "version": "0.52.0",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/windows-sys/0.52.0/download",
+ "sha256": "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "windows_sys",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "windows_sys",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "deps": {
+ "common": [
+ {
+ "id": "windows-targets 0.52.0",
+ "target": "windows_targets"
+ }
+ ],
+ "selects": {}
+ },
+ "edition": "2021",
+ "version": "0.52.0"
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"windows-targets 0.48.1": {
"name": "windows-targets",
"version": "0.48.1",
@@ -8514,6 +9075,83 @@
},
"license": "MIT OR Apache-2.0"
},
+ "windows-targets 0.52.0": {
+ "name": "windows-targets",
+ "version": "0.52.0",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/windows-targets/0.52.0/download",
+ "sha256": "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "windows_targets",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "windows_targets",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "deps": {
+ "common": [],
+ "selects": {
+ "aarch64-pc-windows-gnullvm": [
+ {
+ "id": "windows_aarch64_gnullvm 0.52.0",
+ "target": "windows_aarch64_gnullvm"
+ }
+ ],
+ "cfg(all(target_arch = \"aarch64\", target_env = \"msvc\", not(windows_raw_dylib)))": [
+ {
+ "id": "windows_aarch64_msvc 0.52.0",
+ "target": "windows_aarch64_msvc"
+ }
+ ],
+ "cfg(all(target_arch = \"x86\", target_env = \"gnu\", not(windows_raw_dylib)))": [
+ {
+ "id": "windows_i686_gnu 0.52.0",
+ "target": "windows_i686_gnu"
+ }
+ ],
+ "cfg(all(target_arch = \"x86\", target_env = \"msvc\", not(windows_raw_dylib)))": [
+ {
+ "id": "windows_i686_msvc 0.52.0",
+ "target": "windows_i686_msvc"
+ }
+ ],
+ "cfg(all(target_arch = \"x86_64\", target_env = \"gnu\", not(target_abi = \"llvm\"), not(windows_raw_dylib)))": [
+ {
+ "id": "windows_x86_64_gnu 0.52.0",
+ "target": "windows_x86_64_gnu"
+ }
+ ],
+ "cfg(all(target_arch = \"x86_64\", target_env = \"msvc\", not(windows_raw_dylib)))": [
+ {
+ "id": "windows_x86_64_msvc 0.52.0",
+ "target": "windows_x86_64_msvc"
+ }
+ ],
+ "x86_64-pc-windows-gnullvm": [
+ {
+ "id": "windows_x86_64_gnullvm 0.52.0",
+ "target": "windows_x86_64_gnullvm"
+ }
+ ]
+ }
+ },
+ "edition": "2021",
+ "version": "0.52.0"
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"windows_aarch64_gnullvm 0.48.0": {
"name": "windows_aarch64_gnullvm",
"version": "0.48.0",
@@ -8567,6 +9205,59 @@
},
"license": "MIT OR Apache-2.0"
},
+ "windows_aarch64_gnullvm 0.52.0": {
+ "name": "windows_aarch64_gnullvm",
+ "version": "0.52.0",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.52.0/download",
+ "sha256": "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "windows_aarch64_gnullvm",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ },
+ {
+ "BuildScript": {
+ "crate_name": "build_script_build",
+ "crate_root": "build.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "windows_aarch64_gnullvm",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "deps": {
+ "common": [
+ {
+ "id": "windows_aarch64_gnullvm 0.52.0",
+ "target": "build_script_build"
+ }
+ ],
+ "selects": {}
+ },
+ "edition": "2021",
+ "version": "0.52.0"
+ },
+ "build_script_attrs": {
+ "data_glob": [
+ "**"
+ ]
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"windows_aarch64_msvc 0.48.0": {
"name": "windows_aarch64_msvc",
"version": "0.48.0",
@@ -8620,6 +9311,59 @@
},
"license": "MIT OR Apache-2.0"
},
+ "windows_aarch64_msvc 0.52.0": {
+ "name": "windows_aarch64_msvc",
+ "version": "0.52.0",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/windows_aarch64_msvc/0.52.0/download",
+ "sha256": "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "windows_aarch64_msvc",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ },
+ {
+ "BuildScript": {
+ "crate_name": "build_script_build",
+ "crate_root": "build.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "windows_aarch64_msvc",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "deps": {
+ "common": [
+ {
+ "id": "windows_aarch64_msvc 0.52.0",
+ "target": "build_script_build"
+ }
+ ],
+ "selects": {}
+ },
+ "edition": "2021",
+ "version": "0.52.0"
+ },
+ "build_script_attrs": {
+ "data_glob": [
+ "**"
+ ]
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"windows_i686_gnu 0.48.0": {
"name": "windows_i686_gnu",
"version": "0.48.0",
@@ -8673,6 +9417,59 @@
},
"license": "MIT OR Apache-2.0"
},
+ "windows_i686_gnu 0.52.0": {
+ "name": "windows_i686_gnu",
+ "version": "0.52.0",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/windows_i686_gnu/0.52.0/download",
+ "sha256": "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "windows_i686_gnu",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ },
+ {
+ "BuildScript": {
+ "crate_name": "build_script_build",
+ "crate_root": "build.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "windows_i686_gnu",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "deps": {
+ "common": [
+ {
+ "id": "windows_i686_gnu 0.52.0",
+ "target": "build_script_build"
+ }
+ ],
+ "selects": {}
+ },
+ "edition": "2021",
+ "version": "0.52.0"
+ },
+ "build_script_attrs": {
+ "data_glob": [
+ "**"
+ ]
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"windows_i686_msvc 0.48.0": {
"name": "windows_i686_msvc",
"version": "0.48.0",
@@ -8726,6 +9523,59 @@
},
"license": "MIT OR Apache-2.0"
},
+ "windows_i686_msvc 0.52.0": {
+ "name": "windows_i686_msvc",
+ "version": "0.52.0",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/windows_i686_msvc/0.52.0/download",
+ "sha256": "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "windows_i686_msvc",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ },
+ {
+ "BuildScript": {
+ "crate_name": "build_script_build",
+ "crate_root": "build.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "windows_i686_msvc",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "deps": {
+ "common": [
+ {
+ "id": "windows_i686_msvc 0.52.0",
+ "target": "build_script_build"
+ }
+ ],
+ "selects": {}
+ },
+ "edition": "2021",
+ "version": "0.52.0"
+ },
+ "build_script_attrs": {
+ "data_glob": [
+ "**"
+ ]
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"windows_x86_64_gnu 0.48.0": {
"name": "windows_x86_64_gnu",
"version": "0.48.0",
@@ -8779,6 +9629,59 @@
},
"license": "MIT OR Apache-2.0"
},
+ "windows_x86_64_gnu 0.52.0": {
+ "name": "windows_x86_64_gnu",
+ "version": "0.52.0",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/windows_x86_64_gnu/0.52.0/download",
+ "sha256": "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "windows_x86_64_gnu",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ },
+ {
+ "BuildScript": {
+ "crate_name": "build_script_build",
+ "crate_root": "build.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "windows_x86_64_gnu",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "deps": {
+ "common": [
+ {
+ "id": "windows_x86_64_gnu 0.52.0",
+ "target": "build_script_build"
+ }
+ ],
+ "selects": {}
+ },
+ "edition": "2021",
+ "version": "0.52.0"
+ },
+ "build_script_attrs": {
+ "data_glob": [
+ "**"
+ ]
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"windows_x86_64_gnullvm 0.48.0": {
"name": "windows_x86_64_gnullvm",
"version": "0.48.0",
@@ -8832,6 +9735,59 @@
},
"license": "MIT OR Apache-2.0"
},
+ "windows_x86_64_gnullvm 0.52.0": {
+ "name": "windows_x86_64_gnullvm",
+ "version": "0.52.0",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.52.0/download",
+ "sha256": "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "windows_x86_64_gnullvm",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ },
+ {
+ "BuildScript": {
+ "crate_name": "build_script_build",
+ "crate_root": "build.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "windows_x86_64_gnullvm",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "deps": {
+ "common": [
+ {
+ "id": "windows_x86_64_gnullvm 0.52.0",
+ "target": "build_script_build"
+ }
+ ],
+ "selects": {}
+ },
+ "edition": "2021",
+ "version": "0.52.0"
+ },
+ "build_script_attrs": {
+ "data_glob": [
+ "**"
+ ]
+ },
+ "license": "MIT OR Apache-2.0"
+ },
"windows_x86_64_msvc 0.48.0": {
"name": "windows_x86_64_msvc",
"version": "0.48.0",
@@ -8884,6 +9840,59 @@
]
},
"license": "MIT OR Apache-2.0"
+ },
+ "windows_x86_64_msvc 0.52.0": {
+ "name": "windows_x86_64_msvc",
+ "version": "0.52.0",
+ "repository": {
+ "Http": {
+ "url": "https://crates.io/api/v1/crates/windows_x86_64_msvc/0.52.0/download",
+ "sha256": "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+ }
+ },
+ "targets": [
+ {
+ "Library": {
+ "crate_name": "windows_x86_64_msvc",
+ "crate_root": "src/lib.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ },
+ {
+ "BuildScript": {
+ "crate_name": "build_script_build",
+ "crate_root": "build.rs",
+ "srcs": [
+ "**/*.rs"
+ ]
+ }
+ }
+ ],
+ "library_target_name": "windows_x86_64_msvc",
+ "common_attrs": {
+ "compile_data_glob": [
+ "**"
+ ],
+ "deps": {
+ "common": [
+ {
+ "id": "windows_x86_64_msvc 0.52.0",
+ "target": "build_script_build"
+ }
+ ],
+ "selects": {}
+ },
+ "edition": "2021",
+ "version": "0.52.0"
+ },
+ "build_script_attrs": {
+ "data_glob": [
+ "**"
+ ]
+ },
+ "license": "MIT OR Apache-2.0"
}
},
"binary_crates": [],
diff --git a/Cargo.lock b/Cargo.lock
index 5fcc5eb..beeff6e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -47,12 +47,54 @@
]
[[package]]
+name = "anstream"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "utf8parse",
+]
+
+[[package]]
name = "anstyle"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
[[package]]
+name = "anstyle-parse"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
name = "anyhow"
version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -385,7 +427,7 @@
dependencies = [
"atty",
"bitflags 1.3.2",
- "clap_lex",
+ "clap_lex 0.2.4",
"indexmap",
"once_cell",
"strsim 0.10.0",
@@ -394,6 +436,40 @@
]
[[package]]
+name = "clap"
+version = "4.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex 0.6.0",
+ "strsim 0.10.0",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.28",
+]
+
+[[package]]
name = "clap_lex"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -403,6 +479,12 @@
]
[[package]]
+name = "clap_lex"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+
+[[package]]
name = "codespan-reporting"
version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -413,12 +495,19 @@
]
[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
name = "compile_with_bazel"
version = "0.0.0"
dependencies = [
"anyhow",
"bindgen",
"bitflags 1.3.2",
+ "clap 4.4.18",
"cxx",
"cxxbridge-macro",
"futures",
@@ -524,7 +613,7 @@
dependencies = [
"errno-dragonfly",
"libc",
- "windows-sys",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -677,6 +766,12 @@
]
[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
name = "hermit-abi"
version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -731,7 +826,7 @@
dependencies = [
"hermit-abi 0.3.2",
"libc",
- "windows-sys",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -742,7 +837,7 @@
dependencies = [
"hermit-abi 0.3.2",
"rustix 0.38.7",
- "windows-sys",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -939,9 +1034,9 @@
[[package]]
name = "os_str_bytes"
-version = "6.5.1"
+version = "6.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
+checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
[[package]]
name = "owo-colors"
@@ -1129,7 +1224,7 @@
"io-lifetimes",
"libc",
"linux-raw-sys 0.3.8",
- "windows-sys",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1142,7 +1237,7 @@
"errno",
"libc",
"linux-raw-sys 0.4.5",
- "windows-sys",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1300,7 +1395,7 @@
"fastrand",
"redox_syscall",
"rustix 0.37.23",
- "windows-sys",
+ "windows-sys 0.48.0",
]
[[package]]
@@ -1432,6 +1527,12 @@
checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
name = "uuid"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1521,7 +1622,16 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
dependencies = [
- "windows-targets",
+ "windows-targets 0.48.1",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.0",
]
[[package]]
@@ -1530,13 +1640,28 @@
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
]
[[package]]
@@ -1546,37 +1671,79 @@
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
+[[package]]
name = "windows_aarch64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
+[[package]]
name = "windows_i686_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
+[[package]]
name = "windows_i686_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
+[[package]]
name = "windows_x86_64_gnu"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
+[[package]]
name = "windows_x86_64_gnullvm"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
+[[package]]
name = "windows_x86_64_msvc"
version = "0.48.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
diff --git a/Cargo.toml b/Cargo.toml
index 8d07945..993491a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,6 +18,7 @@
]
[dependencies]
+clap = { version = "4.4", features = ["derive", "string"] }
cxx = "1.0"
cxxbridge-macro = "1.0"
uuid = "1.0"
diff --git a/aos/BUILD b/aos/BUILD
index 7c0ad3d..7724574 100644
--- a/aos/BUILD
+++ b/aos/BUILD
@@ -184,12 +184,29 @@
],
)
+cc_library(
+ name = "init_for_rust",
+ srcs = [
+ "init_for_rust.cc",
+ ],
+ hdrs = [
+ "init_for_rust.h",
+ ],
+ deps = [
+ ":for_rust",
+ ":init",
+ "//aos/logging",
+ "@com_github_gflags_gflags//:gflags",
+ "@crate_index//:cxx_cc",
+ ],
+)
+
autocxx_library(
name = "init_rs",
srcs = ["init.rs"],
crate_name = "aos_init",
libs = [
- ":init",
+ ":init_for_rust",
],
override_cc_toolchain = "@llvm_toolchain//:cc-clang-x86_64-linux",
target_compatible_with = select({
@@ -197,6 +214,19 @@
"//tools:has_msan": ["@platforms//:incompatible"],
}),
visibility = ["//visibility:public"],
+ deps = [
+ "@crate_index//:clap",
+ ],
+)
+
+rust_test(
+ name = "init_rs_test",
+ crate = ":init_rs",
+ rustc_flags = ["-Crelocation-model=static"],
+ target_compatible_with = select({
+ "//conditions:default": ["//tools/platforms/rust:has_support"],
+ "//tools:has_msan": ["@platforms//:incompatible"],
+ }),
)
autocxx_library(
diff --git a/aos/events/BUILD b/aos/events/BUILD
index 9910fc6..1a5d7b2 100644
--- a/aos/events/BUILD
+++ b/aos/events/BUILD
@@ -282,6 +282,7 @@
"//aos:flatbuffers_rs",
"//aos:init_rs",
"@com_github_google_flatbuffers//rust",
+ "@crate_index//:clap",
"@crate_index//:futures",
],
)
@@ -309,6 +310,7 @@
"//aos:flatbuffers_rs",
"//aos:init_rs",
"@com_github_google_flatbuffers//rust",
+ "@crate_index//:clap",
"@crate_index//:futures",
],
)
diff --git a/aos/events/ping.rs b/aos/events/ping.rs
index 3226461..d699d3c 100644
--- a/aos/events/ping.rs
+++ b/aos/events/ping.rs
@@ -1,6 +1,8 @@
use aos_configuration as config;
use aos_events_event_loop_runtime::{EventLoopRuntime, Sender, Watcher};
use aos_events_shm_event_loop::ShmEventLoop;
+use aos_init::WithCppFlags;
+use clap::{CommandFactory, Parser};
use core::cell::Cell;
use core::time::Duration;
use futures::never::Never;
@@ -9,12 +11,22 @@
use ping_rust_fbs::aos::examples as ping;
use pong_rust_fbs::aos::examples as pong;
+/// Ping portion of a ping/pong system.
+#[derive(Parser, Debug)]
+#[command(name = "ping")]
+struct App {
+ /// Time to sleep between pings.
+ #[arg(long, default_value_t = 10000, value_name = "MICROS")]
+ sleep: u64,
+}
+
fn main() {
+ let app = App::parse_with_cpp_flags();
aos_init::init();
let config = config::read_config_from(Path::new("pingpong_config.json")).unwrap();
let ping = PingTask::new();
ShmEventLoop::new(&config).run_with(|runtime| {
- runtime.spawn(ping.tasks(runtime));
+ runtime.spawn(ping.tasks(runtime, app.sleep));
});
}
@@ -31,15 +43,15 @@
}
/// Returns a future with all the tasks for the ping process
- pub async fn tasks(&self, event_loop: &EventLoopRuntime<'_>) -> Never {
- futures::join!(self.ping(event_loop), self.handle_pong(event_loop));
+ pub async fn tasks(&self, event_loop: &EventLoopRuntime<'_>, sleep: u64) -> Never {
+ futures::join!(self.ping(event_loop, sleep), self.handle_pong(event_loop));
unreachable!("Let's hope `never_type` gets stabilized soon :)");
}
- async fn ping(&self, event_loop: &EventLoopRuntime<'_>) -> Never {
+ async fn ping(&self, event_loop: &EventLoopRuntime<'_>, sleep: u64) -> Never {
// The sender is used to send messages back to the pong channel.
let mut ping_sender: Sender<ping::Ping> = event_loop.make_sender("/test").unwrap();
- let mut interval = event_loop.add_interval(Duration::from_secs(1));
+ let mut interval = event_loop.add_interval(Duration::from_micros(sleep));
event_loop.on_run().await;
loop {
diff --git a/aos/events/pong.rs b/aos/events/pong.rs
index d2859a8..01af56f 100644
--- a/aos/events/pong.rs
+++ b/aos/events/pong.rs
@@ -1,13 +1,21 @@
use aos_configuration as config;
use aos_events_event_loop_runtime::{EventLoopRuntime, Sender, Watcher};
use aos_events_shm_event_loop::ShmEventLoop;
+use aos_init::WithCppFlags;
+use clap::Parser;
use futures::never::Never;
use std::path::Path;
use ping_rust_fbs::aos::examples as ping;
use pong_rust_fbs::aos::examples as pong;
+/// Pong portion of a ping/pong system.
+#[derive(Parser, Debug)]
+#[command(name = "pong")]
+struct App {}
+
fn main() {
+ let _app = App::parse_with_cpp_flags();
aos_init::init();
let config = config::read_config_from(Path::new("pingpong_config.json")).unwrap();
ShmEventLoop::new(&config).run_with(|runtime| {
diff --git a/aos/init.cc b/aos/init.cc
index 3ca7314..579ad33 100644
--- a/aos/init.cc
+++ b/aos/init.cc
@@ -45,25 +45,6 @@
initialized = true;
}
-void InitFromRust(const char *argv0) {
- CHECK(!IsInitialized()) << "Only initialize once.";
-
- FLAGS_logtostderr = true;
-
- google::InitGoogleLogging(argv0);
-
- // TODO(Brian): Provide a way for Rust to configure C++ flags.
- char fake_argv0_val[] = "rust";
- char *fake_argv0 = fake_argv0_val;
- char **fake_argv = &fake_argv0;
- int fake_argc = 1;
- gflags::ParseCommandLineFlags(&fake_argc, &fake_argv, true);
-
- // TODO(Brian): Where should Rust binaries be configured to write coredumps?
-
- // TODO(Brian): Figure out what to do with allocator hooks for C++ and Rust.
-
- initialized = true;
-}
+void MarkInitialized() { initialized = true; }
} // namespace aos
diff --git a/aos/init.h b/aos/init.h
index 29480eb..b9270b3 100644
--- a/aos/init.h
+++ b/aos/init.h
@@ -10,10 +10,10 @@
// ShmEventLoop can confirm the world was initialized before running.
bool IsInitialized();
-// A special initialization function that initializes the C++ parts in a way
-// compatible with Rust. This requires careful coordination with `:init_rs`, do
-// not use it from anywhere else.
-void InitFromRust(const char *argv0);
+// Marks the system as initialized. This is only meant to be used from
+// init_for_rust. DO NOT call this from anywhere else, use InitGoogle
+// instead.
+void MarkInitialized();
} // namespace aos
diff --git a/aos/init.rs b/aos/init.rs
index 13066f1..3b4d876 100644
--- a/aos/init.rs
+++ b/aos/init.rs
@@ -1,20 +1,195 @@
-use std::{ffi::CString, sync::Once};
+use std::{
+ env,
+ ffi::{CString, OsStr, OsString},
+ os::unix::prelude::OsStrExt,
+ sync::Once,
+};
+
+use clap::{
+ error::{ContextKind, ContextValue},
+ Arg, ArgAction, Error, Parser,
+};
autocxx::include_cpp! (
-#include "aos/init.h"
+#include "aos/init_for_rust.h"
safety!(unsafe)
generate!("aos::InitFromRust")
+generate!("aos::GetCppFlags")
+generate!("aos::FlagInfo")
+generate!("aos::SetCommandLineOption")
+generate!("aos::GetCommandLineOption")
);
/// Initializes AOS.
pub fn init() {
static ONCE: Once = Once::new();
ONCE.call_once(|| {
- let argv0 = std::env::args().next().expect("must have argv[0]");
- let argv0 = CString::new(argv0).expect("argv[0] may not have NUL");
- // SAFETY: argv0 is a NUL-terminated string.
- unsafe { ffi::aos::InitFromRust(argv0.as_ptr()) };
+ let argv0 = std::env::args()
+ .map(|arg| CString::new(arg).expect("Arg may not have NUL"))
+ .next()
+ .expect("Missing argv[0]?");
+ // SAFETY: argv0 is a well-defined CString.
+ unsafe {
+ ffi::aos::InitFromRust(argv0.as_ptr());
+ }
});
}
+
+/// Trait used to append C++ gFlags to a clap CLI.
+pub trait WithCppFlags: Parser {
+ /// Parses the comannd line arguments while also setting the C++ gFlags.
+ fn parse_with_cpp_flags() -> Self {
+ Self::parse_with_cpp_flags_from(env::args_os())
+ }
+
+ /// Like [`parse_with_cpp_flags`] but read from an iterator.
+ fn parse_with_cpp_flags_from<I, T>(itr: I) -> Self
+ where
+ I: IntoIterator<Item = T>,
+ T: Into<OsString> + Clone,
+ {
+ let cxxflags = ffi::aos::GetCppFlags();
+ let cxxflags: Vec<CxxFlag> = cxxflags
+ .iter()
+ .map(|flag| CxxFlag::from(flag))
+ .filter(|flag| flag.name != "help" && flag.name != "version")
+ .collect();
+
+ let mut command = Self::command()
+ .next_help_heading("Flags from C++")
+ .args(cxxflags.iter().cloned());
+
+ let matches = command.clone().get_matches_from(itr);
+
+ for cxxflag in cxxflags {
+ let Some(mut value) = matches.get_raw(&cxxflag.name) else {
+ continue;
+ };
+ // We grab the last match as GFlags does.
+ let value = value.next_back().unwrap();
+ cxxflag.set(value).unwrap_or_else(|_| {
+ let mut error = Error::new(clap::error::ErrorKind::InvalidValue);
+
+ // Let user know how they messed up.
+ error.insert(
+ ContextKind::InvalidArg,
+ ContextValue::String(format!("--{}", cxxflag.name)),
+ );
+ error.insert(
+ ContextKind::InvalidValue,
+ ContextValue::String(
+ value
+ .to_owned()
+ .into_string()
+ .expect("Invalid UTF-8 String"),
+ ),
+ );
+ error.format(&mut command).exit()
+ })
+ }
+
+ match Self::from_arg_matches(&matches) {
+ Ok(flags) => flags,
+ Err(e) => e.format(&mut command).exit(),
+ }
+ }
+}
+
+impl<T: Parser> WithCppFlags for T {}
+
+#[derive(Clone)]
+#[allow(unused)]
+struct CxxFlag {
+ name: String,
+ ty: String,
+ description: String,
+ default_value: String,
+ filename: String,
+}
+
+struct SetFlagError;
+
+impl CxxFlag {
+ /// Sets the command gFlag to the specified value.
+ fn set(&self, value: &OsStr) -> Result<(), SetFlagError> {
+ unsafe {
+ let name = CString::new(self.name.clone()).expect("Flag name may not have NUL");
+ let value = CString::new(value.as_bytes()).expect("Arg may not have NUL");
+ if ffi::aos::SetCommandLineOption(name.as_ptr(), value.as_ptr()) {
+ Ok(())
+ } else {
+ Err(SetFlagError)
+ }
+ }
+ }
+
+ fn get_option(name: &str) -> String {
+ unsafe {
+ let name = CString::new(name).expect("Flag may not have NUL");
+ ffi::aos::GetCommandLineOption(name.as_ptr()).to_string()
+ }
+ }
+}
+
+impl From<&ffi::aos::FlagInfo> for CxxFlag {
+ fn from(value: &ffi::aos::FlagInfo) -> Self {
+ Self {
+ name: value.name().to_string(),
+ ty: value.ty().to_string(),
+ description: value.description().to_string(),
+ default_value: value.default_value().to_string(),
+ filename: value.filename().to_string(),
+ }
+ }
+}
+
+impl From<CxxFlag> for Arg {
+ fn from(value: CxxFlag) -> Self {
+ assert_ne!(&value.name, "help");
+ Arg::new(&value.name)
+ .long(&value.name)
+ .help(&value.description)
+ .default_value(&value.default_value)
+ .action(ArgAction::Set)
+ }
+}
+
+#[cfg(test)]
+mod tests {
+ use std::sync::Mutex;
+
+ use super::*;
+
+ #[derive(Parser)]
+ #[command()]
+ struct App {
+ #[arg(long)]
+ myarg: u64,
+ }
+
+ // We are sharing global state through gFlags. Use a mutex to prevent races.
+ static MUTEX: Mutex<()> = Mutex::new(());
+
+ #[test]
+ fn simple_rust() {
+ let _guard = MUTEX.lock();
+ let app = App::parse_with_cpp_flags_from(&["mytest", "--myarg", "23"]);
+ assert_eq!(app.myarg, 23);
+ }
+
+ #[test]
+ fn set_cxx_flag() {
+ let _guard = MUTEX.lock();
+ let app = App::parse_with_cpp_flags_from(&[
+ "mytest",
+ "--alsologtostderr",
+ "true",
+ "--myarg",
+ "23",
+ ]);
+ assert_eq!(app.myarg, 23);
+ assert_eq!(CxxFlag::get_option("alsologtostderr"), "true");
+ }
+}
diff --git a/aos/init_for_rust.cc b/aos/init_for_rust.cc
new file mode 100644
index 0000000..9af4d83
--- /dev/null
+++ b/aos/init_for_rust.cc
@@ -0,0 +1,49 @@
+#include "aos/init_for_rust.h"
+
+#include "gflags/gflags.h"
+#include "glog/logging.h"
+
+#include "aos/init.h"
+
+namespace aos {
+
+void InitFromRust(const char *argv0) {
+ CHECK(!IsInitialized()) << "Only initialize once.";
+
+ google::InitGoogleLogging(argv0);
+
+ // TODO(Brian): Where should Rust binaries be configured to write coredumps?
+
+ // TODO(Brian): Figure out what to do with allocator hooks for C++ and Rust.
+
+ MarkInitialized();
+}
+
+std::vector<FlagInfo> GetCppFlags() {
+ std::vector<gflags::CommandLineFlagInfo> info;
+ gflags::GetAllFlags(&info);
+ std::vector<FlagInfo> out;
+ for (const auto &flag : info) {
+ FlagInfo out_flag = {
+ .name_ = flag.name,
+ .type_ = flag.type,
+ .description_ = flag.description,
+ .default_value_ = flag.default_value,
+ .filename_ = flag.filename,
+ };
+ out.push_back(out_flag);
+ }
+ return out;
+}
+
+bool SetCommandLineOption(const char *name, const char *value) {
+ return !gflags::SetCommandLineOption(name, value).empty();
+}
+
+std::string GetCommandLineOption(const char *name) {
+ std::string out;
+ CHECK(gflags::GetCommandLineOption(name, &out)) << "Unknown flag " << name;
+ return out;
+}
+
+} // namespace aos
diff --git a/aos/init_for_rust.h b/aos/init_for_rust.h
new file mode 100644
index 0000000..86bfd66
--- /dev/null
+++ b/aos/init_for_rust.h
@@ -0,0 +1,47 @@
+#ifndef AOS_INIT_FOR_RUST_H_
+#define AOS_INIT_FOR_RUST_H_
+
+#include <string>
+#include <string_view>
+#include <vector>
+
+#include "aos/for_rust.h"
+#include "cxx.h"
+
+namespace aos {
+
+struct FlagInfo {
+ std::string name_;
+ std::string type_;
+ std::string description_;
+ std::string default_value_;
+ std::string filename_;
+
+ rust::Str name() const {
+ return StringViewToRustStr(std::string_view(name_));
+ }
+ rust::Str ty() const { return StringViewToRustStr(std::string_view(type_)); }
+ rust::Str description() const {
+ return StringViewToRustStr(std::string_view(description_));
+ }
+ rust::Str default_value() const {
+ return StringViewToRustStr(std::string_view(default_value_));
+ }
+ rust::Str filename() const {
+ return StringViewToRustStr(std::string_view(filename_));
+ }
+};
+
+// A special initialization function that initializes the C++ parts in a way
+// compatible with Rust. This requires careful coordination with `:init_rs`, do
+// not use it from anywhere else.
+void InitFromRust(const char *argv0);
+
+std::vector<FlagInfo> GetCppFlags();
+
+bool SetCommandLineOption(const char *name, const char *value);
+std::string GetCommandLineOption(const char *name);
+
+} // namespace aos
+
+#endif // AOS_INIT_FOR_RUST_H_
diff --git a/third_party/autocxx/gen/cmd/BUILD b/third_party/autocxx/gen/cmd/BUILD
index 60d011c..c05e24d 100644
--- a/third_party/autocxx/gen/cmd/BUILD
+++ b/third_party/autocxx/gen/cmd/BUILD
@@ -22,7 +22,7 @@
version = "0.16.0",
deps = [
"//third_party/autocxx/engine:autocxx_engine",
- "@crate_index//:clap",
+ "@crate_index//:clap3",
"@crate_index//:env_logger",
"@crate_index//:indexmap",
"@crate_index//:miette",
diff --git a/third_party/autocxx/gen/cmd/Cargo.toml b/third_party/autocxx/gen/cmd/Cargo.toml
index 7a78ba3..55242ff 100644
--- a/third_party/autocxx/gen/cmd/Cargo.toml
+++ b/third_party/autocxx/gen/cmd/Cargo.toml
@@ -23,7 +23,7 @@
[dependencies]
autocxx-engine = { version = "=0.26.0", path = "../../engine" }
-clap = { version = "3.1.2", features = ["cargo"] }
+clap3 = { package = "clap", version = "3.2.25", features = ["cargo"] }
proc-macro2 = "1.0"
env_logger = "0.9.0"
miette = { version = "5", features = ["fancy"] }