summaryrefslogtreecommitdiff
path: root/rust/src/workflow.rs
diff options
context:
space:
mode:
authorMason Reed <mason@vector35.com>2024-12-22 01:21:02 -0500
committerMason Reed <mason@vector35.com>2025-01-25 00:52:29 -0500
commit6a63c17853009ce7a0071458e39c140a09440230 (patch)
treead59ab3b356b0a2c60423e55f62c996891788788 /rust/src/workflow.rs
parentbfa1d409b2d5e734804a5fdb4c68c90a93712f1f (diff)
Rust refactor
Moves a bunch of stuff out of src/types.rs that did not belong: - Confidence - Variable - Function specific stuff - Refactored InstructionInfo, see the msp430 and riscv examples. - Renamed Function::from_raw to Function::ref_from_raw and fixed places where the ref was incremented twice - Fixed FunctionRecognizer leaking functions (see above) - Fixed some apis incorrectly returning Result where Option is clearer - Started to move destructured types to the From trait for converting to an from ffi types, see Location for an example - Started to remove bad module level imports (importing std modules like mem all over the place) - Moved some wrapper handle types to named handle field (this improves readability), see CoreArchitecture for an example - Removed some unintuitive getters, this is bad practice for Rust code, just access the field directly, see DataVariable for an example - General code cleanup, purposely did not run rustfmt, that will be a single seperate commit More rust cleanup - Fixed invalid views being able to invoke UB when dealing with databases - Cleaned up some helper code in dwarf_import - Fixed inverted is_null checks causing crashes! Oops! More rust cleanup Still a WIP, I think branch info is still invalid, need to figure out the issue there. - Fixed some invalid Ref lifetimes when constructing indirectly, see Array<DataVariable> for example - Added some more comments - Removed some "magic" functions like MLIL Function::ssa_variables There are still a bunch of invalid lifetimes that aren't crashing us due to the usage of those API's not living long enough. But they ARE an issue. More rust cleanup Trying to comment more TODO's as I go along. - Renamed llil::Function to llil::LowLevelILFunction for clarity and consistency - Take base structures by ref in StructureBuilder::set_base_structures to prevent premature drops - Added more raw to wrapper conversions - Removed UB prone apis - Getting rid of more core module references, use std! - Removed improper Guard usage in array impls for wrapper types with no context - Untangling the UB of the Label api, still only half done :/ More rust cleanup - Misc formatting - Made Logger ref counted - Fixed leaking name of logger every time something was logged - Fixed the last (hopefully) of the unresolved labels - Simplified some code Fix leak in DebugInfo::AddType componentArray was never freed Add more HLIL related functions to rust More rust cleanup improve the CustomBinaryView init process Canonicalize path in `create_delete_empty` test Link core in rust When linking you must depend on the -sys crate. This is because linker arguments (what says where to find binaryninjacore) are NOT transitive. The top level application crate MUST provide it. For more information see: - https://github.com/rust-lang/cargo/issues/9554#issuecomment-857882964 - https://github.com/oxidecomputer/omicron/pull/225 Remove vendored pdb crate Use cargo to manage the git repo ref instead Fix misc rustdoc warnings Move actual plugins out of `rust/examples` and into `plugins` This is where all shipped public plugins that are not arch/view/platform/lang will be at from now on Originally they were in the rust workspace, meaning they all shared a Cargo.lock which is ill-advised. More rust cleanup - More clarification on plugin/executable requirements - Made examples actually rust examples - Add Display impl for InstructionTextToken - Renamed feature "noexports" to "no_exports" Move under_construction.png to assets directory This really did bother me Remove unneeded `extern crate bindgen` Replace nop'd log::info with println We don't register a compatible log sink so they will just get sent into the void Move inline tests into tests directory This is being done in the hopes of curbing the multi-thousand line files that will occur once we flesh out the tests Format rust code Update rust ci Still need to add support for running tests in ci More rust cleanup - Architecture id's are now typed accordingly - Fix some clippy lints - Make instruction index public in LLIL - Removed useless helper functions - LLIL expressions and instruction indexes are now typed accordingly Generate binaryninjacore-sys documentation This should show binaryninjacore-sys alongside binaryninja crate More rust cleanup - Remove lazy_static dependency - Remove hacky impl Debug for Type and just use the display impl - Add more debug impls - Reorder some top level namespace items - Add first type test Remove unneeded script helper in rust api More rust cleanup - Added main thread handler api - Register a headless main thread handler by default in initialization - Refactor QualifiedName to be properly owned - Loosened some type constraints on some apis involving QualifiedName - Fixed some apis that were crashing due to incorrect param types - Removed extern crate cruft for log crate - Simplified headless initialization using more wrapper apis - Fixed segments leaking because of no ref wrapper, see BinaryViewExt::segment_at - Added rstest to manage headless init in unit tests - Added some more unit tests - Refactored demangler api to be more ergonomic - Fixed minidump plugin not building More rust cleanup - Fixup usage of QualifiedName in plugins - Make QualifiedName more usable Implement rust TypeParser fix Platform TypeParser related functions separate User and System implementations of TypeParserResult Implement rust TypeContainer More rust cleanup - Hopefully fixed the rust.yml CI - Added TypePrinter API (this is still WIP and will crash) - Added TypeParser API - Added TypeContainer API - More work around QualifiedName apis Oh your suppose to do this Add workflow_dispatch trigger to rust.yml More rust fixes - Swapped some usage of raw 255 to MAX_CONFIDENCE, no one likes magic numbers - New InstructionTextToken API, complete with owned data, this still needs a lot of testing. - InstructionTextTokenKind describes a destructured InstructionTextToken, this should make token usage much clearer, some docs pending - Added some misc Default and Debug impls - Updated TypePrinter and architectures to use new InstructionTextToken API Misc formatting changes More rust cleanup - Fixed MANY memory leaks (most due to QualifiedName) - Made StructureBuilder more builder and less structure - Fixed CMakeLists.txt that were globbing entire api, resulting in 100 second slowdown on cmake generation - Added more Debug impl's - Added some more tests - Fixed TypeParserResult UB - Moved the From impls to blank impl for clarity, we have multiple different variants of core to rust for some structures, it should be explicit which one you are choosing. - PossibleValueSet should now be able to allocate so we can go from rust to core with those variants that require allocation - Misc doc code formatting Misc clippy lints and clippy CI Co-authored-by: Michael Krasnitski <michael.krasnitski@gmail.com> Fix typo in rust CI Misc rust formatting Fix misc typos and add typos to rust CI Add cargo workspace This will help tooling and external contributors get a map of the rust crates within binaryninja-api More rust cleanup - Format all rust plugins - Fix some tests that were out of date - Simplify WARP tests to only binaries, building object files from source is a pain - Link to core in all rust plugins - Fix some memory leaks - Update warp insta snapshots - Fix some misc clippy lints Run rust tests in CI This commit also coincides with the creation of the "testing" environment which exposes a BN_SERIAL secret for pulling a headless Binary Ninja Install missing wayland dependency in github CI Apparently its needed for linux file picker for the WARP integration Set the BINARYNINJADIR so rust can find binaryninjacore in CI The chances of this working are low Misc remove unused dependency Rust misc formatting fixes Improve initialization in rust headless scripts Provide sensible errors and validation to rust headless scripts, solves https://github.com/Vector35/binaryninja-api/issues/5796 Add BN_LICENSE environment variable to rust CI We pass the serial to download binary ninja, but we never provided the license for core initialization Fix typo More rust cleanup - Improved binary view initialization (see init_with_opts) - Allow floating license to free itself before initialization - Add initialization unit test - Add better Debug impls for some common types - Use Path api for opening binary views, this is not breaking as it uses the AsRef impl - Bump rayon dependency and constrain dependencies to x.x Update readme and include that directly in the rustdocs More rust documentation changes Add format comment to InitializationOptions::with_license Misc formatting and clippy lint allow More rust cleanup - Remove under_construction.png from the build.rs it has been removed - Use InstructionIndex in more places - Add missing PartialOrd and Ord impls for id types More rust cleanup - Make workflow cloning explicit - Add workflow tests - Add missing property string list getting for settings - Remove IntoActivityName (see https://github.com/Vector35/binaryninja-api/pull/6257) More rust cleanup This commit is half done Misc rust formatting More rust cleanup - Renamed common name conflictions (I will put my justification in the PR) - Fixed invalid instruction retrieval for LLIL - Added common aliases for llil function, instruction and expression types (see my comment in the PR) - Refactored the instruction retrieval for LLIL, MLIL and HLIL - Added instruction index types to MLIL and HLIL - Moved llil module to lowlevelil module (mlil and hlil will be moved as well) - Added preliminary LLIL unit testing Fix typos Misc clippy fixes More rust cleanup - Normalized modules - Split some code out into own files - Fixed some UB in type archive and projects - Improved API around type archives and projects substantially - Added ProgressExecutor abstraction for functions which have a progress callback - Improved background task documentation and added unit tests - Added worker thread api and unit tests - Moved some owned types to ref types, this is still not complete, but this is the path forward. - Add external location/library accessors to the binary view - Added some misc documentation - Replaced mod.rs with the module name source file Still need to normalize some paths and also update some documentation surrounding that change. Update some tests and examples Fix background task tests colliding We were creating multiple background tasks with the same progress text on multiple threads More rust cleanup - Fixed progress executor freeing itself after one iteration - Updated the last of the doc imports - Moved mainthread to main_thread - Made project creation and opening failable We could probably AsRef<ProgressExecutor> to get around the allocation and free inside the function bodies, not high priority as those functions are long running anyways. Move binary view initialization into function body for LLIL test Normalize test file names More rust cleanup - Updated README to clarify offline documentation - Refactored settings api - Added settings example to show dumping settings value and specific properties - Use the workspace to depend on binaryninja and binaryninjacore-sys - Remove binaryninjacore-sys as a workspace member (its not really required) Update workflow test to new settings api More rust cleanup - Rename Label to LowLevelILLabel - Update the functions label map automatically This fixed a major api blunder where the label map is returned as a reference and originally resulted in UB prone lifetime semantics. It was temporarily "fixed" with explicit label updates in the architecture implementation code. But that was less than ideal and was easy to mess up. Now the label map will be updated automatically as the location of labels is now tracked. Misc clippy lints More rust cleanup - Get rid of RawFunctionViewType - Add better Debug impl for Function More rust cleanup - Fixed the documentation icon using local files (thank you @mkrasnitski) - Fixed labels being updated and overwriting the label location used to update the label map More rust cleanup - Added unit tests for MLIL and HLIL - "Fixed" MLIL, LLIL, and HLIL having issues regarding Instruction vs Expression indexes - Renamed CallingConvention to CoreCallingConvention and removed architecture generic - Renamed CallingConventionBase to CallingConvention - Simplified calling convention code and fixed some bugs with implicit registers - Added impl Debug to MLIL and HLIL instructions Still need to at some point add an Expression to MLIL and HLIL. We also might want to look into having the Instruction kind just return the expression kind. Misc clippy lint More rust cleanup - Allow calling conventions to be registered for multiple architectures - Swapped a unreachable statement to an unimplemented statement More rust cleanup - Fixed the issue with PDB types, this has caused me an insane amount of grief - Fixed LLIL visit_tree missing LLIL_LOAD expressions - Added LLIL visitor test - Made all WARP file pickers use the rfd crate Use the dev branch of Binary Ninja in rust CI Misc rust fmt More rust cleanup - Refactored BinaryReader and BinaryWriter - Added some warnings to high_level_il and medium_level_il modules that they are unstable - Add BinaryReader and BinaryWriter tests - Changed BinaryView len to return u64 (that is what the core returns) - Misc formatting changes - Remove extern uses in lib.rs Add impl Debug for BinaryReader and BinaryWriter Turn off broken tests Add more info to the rust README.md More rust cleanup - Make EdgeStyle type not wrap raw - Regression tests for WARP will run on all bins in the out dir now impl rust Collaboration and Remote API Fix typo Update collaboration API Makes collaboration more in line with the refactor. Still a lot of work to do. Namely still need: - Proper errors - _with_opts functions - More ergonomic api - Better connection procedure - Updated documentation - A LOT of unit tests - An example - Typed id's for everything (i dont want BnString as the id!!!) - NEED to refactor the progress callbacks into the new progress api, but we should pull in some of the stuff the collab progress has - Elimination of apis that are dumb helpers Separate out the rust testing and use pull_request_target pull_request_target allows PR's to access the headless license, for this to be safe we need to prevent people from running the job. To prevent the job from being ran we add an environment requirement on testing that a reviewer must review the code and then manually approve it to run. More rust cleanup - Use GroupId instead of u64 - Use ProgressCallback in place of ProgressExecutor - Misc cleanup of FileMetadata - Add `save_to_path` and `save_to_accessor` to save modified binaries - Added binary_view unit tests - Added collaboration unit tests - Fixed a few issues with the collaboration apis - Renamed Command registration functions so that there is no import ambiguity - Split out RemoteUndoEntry - Collaboration apis now have a explicit `_with_progress` set of apis - Misc clippy lint fixes Fix some typos More rust cleanup - Add extra info to README.md - Refactor components api - Add components unit test Add testing and documentation to contributing section in README.md Fix misc doc comments
Diffstat (limited to 'rust/src/workflow.rs')
-rw-r--r--rust/src/workflow.rs237
1 files changed, 133 insertions, 104 deletions
diff --git a/rust/src/workflow.rs b/rust/src/workflow.rs
index 12253644..68cd3e18 100644
--- a/rust/src/workflow.rs
+++ b/rust/src/workflow.rs
@@ -3,14 +3,16 @@ use std::ffi::{c_char, c_void};
use std::ptr::NonNull;
use crate::architecture::CoreArchitecture;
-use crate::basicblock::BasicBlock;
+use crate::basic_block::BasicBlock;
+use crate::binary_view::BinaryView;
use crate::flowgraph::FlowGraph;
use crate::function::{Function, NativeBlock};
-use crate::llil::{self, FunctionForm, Mutable};
+use crate::high_level_il::HighLevelILFunction;
+use crate::low_level_il::function::{LowLevelILFunction, Mutable, NonSSA, NonSSAVariant};
+use crate::low_level_il::MutableLiftedILFunction;
+use crate::medium_level_il::MediumLevelILFunction;
use crate::rc::{Array, CoreArrayProvider, CoreArrayProviderInner, Guard, Ref, RefCountable};
use crate::string::{BnStrCompatible, BnString};
-use crate::{hlil, mlil};
-use crate::binaryview::BinaryView;
#[repr(transparent)]
/// The AnalysisContext struct is used to represent the current state of
@@ -34,78 +36,79 @@ impl AnalysisContext {
pub fn view(&self) -> Ref<BinaryView> {
let result = unsafe { BNAnalysisContextGetBinaryView(self.handle.as_ptr()) };
assert!(!result.is_null());
- unsafe { BinaryView::from_raw(result) }
+ unsafe { BinaryView::ref_from_raw(result) }
}
- /// Function for the current AnalysisContext
+ /// [`Function`] for the current AnalysisContext
pub fn function(&self) -> Ref<Function> {
let result = unsafe { BNAnalysisContextGetFunction(self.handle.as_ptr()) };
assert!(!result.is_null());
- unsafe { Function::from_raw(result) }
+ unsafe { Function::ref_from_raw(result) }
}
- /// LowLevelILFunction used to represent Low Level IL
- pub unsafe fn lifted_il_function<F: FunctionForm>(
+ /// [`LowLevelILFunction`] used to represent Low Level IL
+ pub unsafe fn lifted_il_function(
&self,
- ) -> Option<Ref<llil::Function<CoreArchitecture, Mutable, F>>> {
+ ) -> Option<Ref<MutableLiftedILFunction<CoreArchitecture>>> {
let func = self.function();
let result = unsafe { BNGetFunctionLiftedIL(func.handle) };
let arch = self.function().arch();
unsafe {
- Some(llil::Function::ref_from_raw(
+ Some(LowLevelILFunction::ref_from_raw(
arch,
NonNull::new(result)?.as_ptr(),
))
}
}
- pub fn set_lifted_il_function<F: FunctionForm>(
- &self,
- value: &llil::Function<CoreArchitecture, Mutable, F>,
- ) {
+ pub fn set_lifted_il_function(&self, value: &MutableLiftedILFunction<CoreArchitecture>) {
unsafe { BNSetLiftedILFunction(self.handle.as_ptr(), value.handle) }
}
- /// LowLevelILFunction used to represent Low Level IL
- pub unsafe fn llil_function<F: FunctionForm>(
+ // TODO: This returns LiftedNonSSA because the lifting code was written before we could patch the IL
+ // TODO: At some point we need to take the lifting code and make it available to regular IL.
+ /// [`LowLevelILFunction`] used to represent Low Level IL
+ pub unsafe fn llil_function<V: NonSSAVariant>(
&self,
- ) -> Option<Ref<llil::Function<CoreArchitecture, Mutable, F>>> {
+ ) -> Option<Ref<LowLevelILFunction<CoreArchitecture, Mutable, NonSSA<V>>>> {
let result = unsafe { BNAnalysisContextGetLowLevelILFunction(self.handle.as_ptr()) };
let arch = self.function().arch();
unsafe {
- Some(llil::Function::ref_from_raw(
+ Some(LowLevelILFunction::ref_from_raw(
arch,
NonNull::new(result)?.as_ptr(),
))
}
}
- pub fn set_llil_function<F: FunctionForm>(
+ // TODO: This returns LiftedNonSSA because the lifting code was written before we could patch the IL
+ // TODO: At some point we need to take the lifting code and make it available to regular IL.
+ pub fn set_llil_function<V: NonSSAVariant>(
&self,
- value: &llil::Function<CoreArchitecture, Mutable, F>,
+ value: &LowLevelILFunction<CoreArchitecture, Mutable, NonSSA<V>>,
) {
unsafe { BNSetLowLevelILFunction(self.handle.as_ptr(), value.handle) }
}
- /// MediumLevelILFunction used to represent Medium Level IL
- pub fn mlil_function(&self) -> Option<Ref<mlil::MediumLevelILFunction>> {
+ /// [`MediumLevelILFunction`] used to represent Medium Level IL
+ pub fn mlil_function(&self) -> Option<Ref<MediumLevelILFunction>> {
let result = unsafe { BNAnalysisContextGetMediumLevelILFunction(self.handle.as_ptr()) };
unsafe {
- Some(mlil::MediumLevelILFunction::ref_from_raw(
+ Some(MediumLevelILFunction::ref_from_raw(
NonNull::new(result)?.as_ptr(),
))
}
}
- pub fn set_mlil_function(&self, value: &mlil::MediumLevelILFunction) {
+ pub fn set_mlil_function(&self, value: &MediumLevelILFunction) {
unsafe { BNSetMediumLevelILFunction(self.handle.as_ptr(), value.handle) }
}
- /// HighLevelILFunction used to represent High Level IL
- pub fn hlil_function(&self, full_ast: bool) -> Option<Ref<hlil::HighLevelILFunction>> {
+ /// [`HighLevelILFunction`] used to represent High Level IL
+ pub fn hlil_function(&self, full_ast: bool) -> Option<Ref<HighLevelILFunction>> {
let result = unsafe { BNAnalysisContextGetHighLevelILFunction(self.handle.as_ptr()) };
unsafe {
- Some(hlil::HighLevelILFunction::ref_from_raw(
+ Some(HighLevelILFunction::ref_from_raw(
NonNull::new(result)?.as_ptr(),
full_ast,
))
@@ -126,7 +129,7 @@ impl AnalysisContext {
where
I: IntoIterator<Item = BasicBlock<NativeBlock>>,
{
- let blocks: Vec<_> = blocks.into_iter().map(|block| block).collect();
+ let blocks: Vec<_> = blocks.into_iter().collect();
let mut blocks_raw: Vec<*mut BNBasicBlock> =
blocks.iter().map(|block| block.handle).collect();
unsafe { BNSetBasicBlockList(self.handle.as_ptr(), blocks_raw.as_mut_ptr(), blocks.len()) }
@@ -192,7 +195,7 @@ impl Activity {
ctxt: *mut c_void,
analysis: *mut BNAnalysisContext,
) {
- let ctxt: &mut F = core::mem::transmute(ctxt);
+ let ctxt = &mut *(ctxt as *mut F);
if let Some(analysis) = NonNull::new(analysis) {
ctxt(&AnalysisContext::from_raw(analysis))
}
@@ -236,22 +239,6 @@ unsafe impl RefCountable for Activity {
}
}
-pub trait IntoActivityName {
- fn activity_name(self) -> BnString;
-}
-
-impl IntoActivityName for &Activity {
- fn activity_name(self) -> BnString {
- self.name()
- }
-}
-
-impl<S: BnStrCompatible> IntoActivityName for S {
- fn activity_name(self) -> BnString {
- BnString::new(self)
- }
-}
-
// TODO: We need to hide the JSON here behind a sensible/typed API.
#[repr(transparent)]
pub struct Workflow {
@@ -269,7 +256,7 @@ impl Workflow {
/// Create a new unregistered [Workflow] with no activities.
///
- /// To get a copy of an existing registered [Workflow] use [Workflow::new_from_copy].
+ /// To get a copy of an existing registered [Workflow] use [Workflow::clone].
pub fn new<S: BnStrCompatible>(name: S) -> Self {
let name = name.into_bytes_with_nul();
let result = unsafe { BNCreateWorkflow(name.as_ref().as_ptr() as *const c_char) };
@@ -280,8 +267,8 @@ impl Workflow {
///
/// * `name` - the name for the new [Workflow]
#[must_use]
- pub fn new_from_copy<S: BnStrCompatible + Clone>(name: S) -> Workflow {
- Self::new_from_copy_with_root(name, "")
+ pub fn clone<S: BnStrCompatible + Clone>(&self, name: S) -> Workflow {
+ self.clone_with_root(name, "")
}
/// Make a new unregistered [Workflow], copying all activities, within `root_activity`, and the execution strategy.
@@ -289,19 +276,17 @@ impl Workflow {
/// * `name` - the name for the new [Workflow]
/// * `root_activity` - perform the clone operation with this activity as the root
#[must_use]
- pub fn new_from_copy_with_root<S: BnStrCompatible + Clone, A: IntoActivityName>(
+ pub fn clone_with_root<S: BnStrCompatible, A: BnStrCompatible>(
+ &self,
name: S,
root_activity: A,
) -> Workflow {
- let raw_name = name.clone().into_bytes_with_nul();
- let activity = root_activity.activity_name();
- // I can't think of a single reason as to why we should let users pass a workflow handle into this.
- // To prevent warning being emitted we default to the name.
- let placeholder_workflow = Workflow::instance(name);
+ let raw_name = name.into_bytes_with_nul();
+ let activity = root_activity.into_bytes_with_nul();
unsafe {
Self::from_raw(
NonNull::new(BNWorkflowClone(
- placeholder_workflow.handle.as_ptr(),
+ self.handle.as_ptr(),
raw_name.as_ref().as_ptr() as *const c_char,
activity.as_ref().as_ptr() as *const c_char,
))
@@ -341,7 +326,12 @@ impl Workflow {
/// * `configuration` - a JSON representation of the workflow configuration
pub fn register_with_config<S: BnStrCompatible>(&self, config: S) -> Result<(), ()> {
let config = config.into_bytes_with_nul();
- if unsafe { BNRegisterWorkflow(self.handle.as_ptr(), config.as_ref().as_ptr() as *const c_char) } {
+ if unsafe {
+ BNRegisterWorkflow(
+ self.handle.as_ptr(),
+ config.as_ref().as_ptr() as *const c_char,
+ )
+ } {
Ok(())
} else {
Err(())
@@ -366,14 +356,16 @@ impl Workflow {
) -> Result<Activity, ()>
where
I: IntoIterator,
- I::Item: IntoActivityName,
+ I::Item: BnStrCompatible,
{
- let subactivities_raw: Vec<BnString> = subactivities
+ let subactivities_raw: Vec<_> = subactivities
.into_iter()
- .map(|x| x.activity_name())
+ .map(|x| x.into_bytes_with_nul())
+ .collect();
+ let mut subactivities_ptr: Vec<*const _> = subactivities_raw
+ .iter()
+ .map(|x| x.as_ref().as_ptr() as *const c_char)
.collect();
- let mut subactivities_ptr: Vec<*const _> =
- subactivities_raw.iter().map(|x| x.as_ptr()).collect();
let result = unsafe {
BNWorkflowRegisterActivity(
self.handle.as_ptr(),
@@ -387,17 +379,31 @@ impl Workflow {
}
/// Determine if an Activity exists in this [Workflow].
- pub fn contains<A: IntoActivityName>(&self, activity: A) -> bool {
- unsafe { BNWorkflowContains(self.handle.as_ptr(), activity.activity_name().as_ptr()) }
+ pub fn contains<A: BnStrCompatible>(&self, activity: A) -> bool {
+ unsafe {
+ BNWorkflowContains(
+ self.handle.as_ptr(),
+ activity.into_bytes_with_nul().as_ref().as_ptr() as *const c_char,
+ )
+ }
+ }
+
+ /// Retrieve the configuration as an adjacency list in JSON for the [Workflow].
+ pub fn configuration(&self) -> BnString {
+ self.configuration_with_activity("")
}
/// Retrieve the configuration as an adjacency list in JSON for the
- /// [Workflow], or if specified just for the given `activity`.
+ /// [Workflow], just for the given `activity`.
///
- /// `activity` - if specified, return the configuration for the `activity`
- pub fn configuration<A: IntoActivityName>(&self, activity: A) -> BnString {
- let result =
- unsafe { BNWorkflowGetConfiguration(self.handle.as_ptr(), activity.activity_name().as_ptr()) };
+ /// `activity` - return the configuration for the `activity`
+ pub fn configuration_with_activity<A: BnStrCompatible>(&self, activity: A) -> BnString {
+ let result = unsafe {
+ BNWorkflowGetConfiguration(
+ self.handle.as_ptr(),
+ activity.into_bytes_with_nul().as_ref().as_ptr() as *const c_char,
+ )
+ };
assert!(!result.is_null());
unsafe { BnString::from_raw(result) }
}
@@ -415,7 +421,10 @@ impl Workflow {
pub fn activity<A: BnStrCompatible>(&self, name: A) -> Option<Activity> {
let name = name.into_bytes_with_nul();
let result = unsafe {
- BNWorkflowGetActivity(self.handle.as_ptr(), name.as_ref().as_ptr() as *const c_char)
+ BNWorkflowGetActivity(
+ self.handle.as_ptr(),
+ name.as_ref().as_ptr() as *const c_char,
+ )
};
NonNull::new(result).map(|a| unsafe { Activity::from_raw(a) })
}
@@ -424,10 +433,14 @@ impl Workflow {
/// specified just for the given `activity`.
///
/// * `activity` - if specified, return the roots for the `activity`
- pub fn activity_roots<A: IntoActivityName>(&self, activity: A) -> Array<BnString> {
+ pub fn activity_roots<A: BnStrCompatible>(&self, activity: A) -> Array<BnString> {
let mut count = 0;
let result = unsafe {
- BNWorkflowGetActivityRoots(self.handle.as_ptr(), activity.activity_name().as_ptr(), &mut count)
+ BNWorkflowGetActivityRoots(
+ self.handle.as_ptr(),
+ activity.into_bytes_with_nul().as_ref().as_ptr() as *const c_char,
+ &mut count,
+ )
};
assert!(!result.is_null());
unsafe { Array::new(result as *mut *mut c_char, count, ()) }
@@ -437,7 +450,7 @@ impl Workflow {
///
/// * `activity` - if specified, return the direct children and optionally the descendants of the `activity` (includes `activity`)
/// * `immediate` - whether to include only direct children of `activity` or all descendants
- pub fn subactivities<A: IntoActivityName>(
+ pub fn subactivities<A: BnStrCompatible>(
&self,
activity: A,
immediate: bool,
@@ -446,7 +459,7 @@ impl Workflow {
let result = unsafe {
BNWorkflowGetSubactivities(
self.handle.as_ptr(),
- activity.activity_name().as_ptr(),
+ activity.into_bytes_with_nul().as_ref().as_ptr() as *const c_char,
immediate,
&mut count,
)
@@ -461,20 +474,23 @@ impl Workflow {
/// * `activities` - the list of Activities to assign
pub fn assign_subactivities<A, I>(&self, activity: A, activities: I) -> bool
where
- A: IntoActivityName,
+ A: BnStrCompatible,
I: IntoIterator,
- I::Item: IntoActivityName,
+ I::Item: BnStrCompatible,
{
- let mut input_list: Vec<BnString> =
- activities.into_iter().map(|a| a.activity_name()).collect();
- // SAFETY: this works because BnString and *mut ffi::c_char are
- // transmutable
- let input_list_ptr = input_list.as_mut_ptr() as *mut *const c_char;
+ let input_list: Vec<_> = activities
+ .into_iter()
+ .map(|a| a.into_bytes_with_nul())
+ .collect();
+ let mut input_list_ptr: Vec<*const _> = input_list
+ .iter()
+ .map(|x| x.as_ref().as_ptr() as *const c_char)
+ .collect();
unsafe {
BNWorkflowAssignSubactivities(
self.handle.as_ptr(),
- activity.activity_name().as_ptr(),
- input_list_ptr,
+ activity.into_bytes_with_nul().as_ref().as_ptr() as *const c_char,
+ input_list_ptr.as_mut_ptr(),
input_list.len(),
)
}
@@ -491,35 +507,43 @@ impl Workflow {
/// * `activities` - the list of Activities to insert
pub fn insert<A, I>(&self, activity: A, activities: I) -> bool
where
- A: IntoActivityName,
+ A: BnStrCompatible,
I: IntoIterator,
- I::Item: IntoActivityName,
+ I::Item: BnStrCompatible,
{
- let mut input_list: Vec<BnString> =
- activities.into_iter().map(|a| a.activity_name()).collect();
- // SAFETY: this works because BnString and *mut ffi::c_char are
- // transmutable
- let input_list_ptr = input_list.as_mut_ptr() as *mut *const c_char;
+ let input_list: Vec<_> = activities
+ .into_iter()
+ .map(|a| a.into_bytes_with_nul())
+ .collect();
+ let mut input_list_ptr: Vec<*const _> = input_list
+ .iter()
+ .map(|x| x.as_ref().as_ptr() as *const c_char)
+ .collect();
unsafe {
BNWorkflowInsert(
self.handle.as_ptr(),
- activity.activity_name().as_ptr(),
- input_list_ptr,
+ activity.into_bytes_with_nul().as_ref().as_ptr() as *const c_char,
+ input_list_ptr.as_mut_ptr(),
input_list.len(),
)
}
}
/// Remove the specified `activity`
- pub fn remove<A: IntoActivityName>(&self, activity: A) -> bool {
- unsafe { BNWorkflowRemove(self.handle.as_ptr(), activity.activity_name().as_ptr()) }
+ pub fn remove<A: BnStrCompatible>(&self, activity: A) -> bool {
+ unsafe {
+ BNWorkflowRemove(
+ self.handle.as_ptr(),
+ activity.into_bytes_with_nul().as_ref().as_ptr() as *const c_char,
+ )
+ }
}
/// Replace the specified `activity`.
///
/// * `activity` - the Activity to replace
/// * `new_activity` - the replacement Activity
- pub fn replace<A: IntoActivityName, N: IntoActivityName>(
+ pub fn replace<A: BnStrCompatible, N: BnStrCompatible>(
&self,
activity: A,
new_activity: N,
@@ -527,8 +551,8 @@ impl Workflow {
unsafe {
BNWorkflowReplace(
self.handle.as_ptr(),
- activity.activity_name().as_ptr(),
- new_activity.activity_name().as_ptr(),
+ activity.into_bytes_with_nul().as_ref().as_ptr() as *const c_char,
+ new_activity.into_bytes_with_nul().as_ref().as_ptr() as *const c_char,
)
}
}
@@ -537,15 +561,20 @@ impl Workflow {
///
/// * `activity` - if specified, generate the Flowgraph using `activity` as the root
/// * `sequential` - whether to generate a **Composite** or **Sequential** style graph
- pub fn graph<A: IntoActivityName>(
+ pub fn graph<A: BnStrCompatible>(
&self,
activity: A,
sequential: Option<bool>,
) -> Option<FlowGraph> {
let sequential = sequential.unwrap_or(false);
- let activity_name = activity.activity_name();
- let graph =
- unsafe { BNWorkflowGetGraph(self.handle.as_ptr(), activity_name.as_ptr(), sequential) };
+ let activity_name = activity.into_bytes_with_nul();
+ let graph = unsafe {
+ BNWorkflowGetGraph(
+ self.handle.as_ptr(),
+ activity_name.as_ref().as_ptr() as *const c_char,
+ sequential,
+ )
+ };
if graph.is_null() {
return None;
}
@@ -554,17 +583,17 @@ impl Workflow {
/// Not yet implemented.
pub fn show_metrics(&self) {
- unsafe { BNWorkflowShowReport(self.handle.as_ptr(), b"metrics\x00".as_ptr() as *const c_char) }
+ unsafe { BNWorkflowShowReport(self.handle.as_ptr(), c"metrics".as_ptr()) }
}
/// Show the Workflow topology in the UI.
pub fn show_topology(&self) {
- unsafe { BNWorkflowShowReport(self.handle.as_ptr(), b"topology\x00".as_ptr() as *const c_char) }
+ unsafe { BNWorkflowShowReport(self.handle.as_ptr(), c"topology".as_ptr()) }
}
/// Not yet implemented.
pub fn show_trace(&self) {
- unsafe { BNWorkflowShowReport(self.handle.as_ptr(), b"trace\x00".as_ptr() as *const c_char) }
+ unsafe { BNWorkflowShowReport(self.handle.as_ptr(), c"trace".as_ptr()) }
}
}