-
Notifications
You must be signed in to change notification settings - Fork 7
create a new component-init crate for guest integration #11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| [package] | ||
| name = "component-init" | ||
| version.workspace = true | ||
| edition.workspace = true | ||
|
|
||
| [dependencies] | ||
| component-init-macro.workspace = true | ||
| wit-bindgen.workspace = true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| [package] | ||
| name = "component-init-macro" | ||
| version.workspace = true | ||
| edition.workspace = true | ||
|
|
||
| [lib] | ||
| proc-macro = true | ||
|
|
||
| [dependencies] | ||
| syn = { workspace = true, features = ["full"] } | ||
| quote.workspace = true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| use proc_macro::TokenStream; | ||
| use quote::{quote, quote_spanned}; | ||
| use syn::{ItemFn, parse_macro_input, spanned::Spanned}; | ||
|
|
||
| #[proc_macro_attribute] | ||
| pub fn init(_attr: TokenStream, item: TokenStream) -> TokenStream { | ||
| let input = parse_macro_input!(item as ItemFn); | ||
| if input.sig.asyncness.is_some() { | ||
| return quote_spanned! { input.sig.fn_token.span()=> | ||
| compile_error!("fn cannot be async"); | ||
| } | ||
| .into(); | ||
| } | ||
| if !input.sig.inputs.is_empty() { | ||
| return quote_spanned! { input.sig.inputs.span()=> | ||
| compile_error!("function cannot have arguments"); | ||
| } | ||
| .into(); | ||
| } | ||
| let callee = &input.sig.ident; | ||
|
|
||
| quote! { | ||
| #input | ||
|
|
||
| mod __component_init { | ||
| component_init::__bindgen::generate!({ | ||
| inline: r" | ||
| package this:wit; | ||
| world w { | ||
| export component-init: func(); | ||
| } | ||
| ", | ||
| runtime_path: "component_init::__bindgen::rt", | ||
| }); | ||
| struct __S; | ||
| impl Guest for __S { | ||
| fn component_init() { | ||
| super::#callee() | ||
| } | ||
| } | ||
| export!(__S); | ||
| } | ||
| } | ||
| .into() | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| pub use component_init_macro::init; | ||
|
|
||
| #[doc(hidden)] | ||
| pub mod __bindgen { | ||
| pub use wit_bindgen::*; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| use std::sync::atomic::{AtomicBool, Ordering}; | ||
|
|
||
| static IS_INITIALIZED: AtomicBool = AtomicBool::new(false); | ||
|
|
||
| #[component_init::init] | ||
| fn init() { | ||
| let before = IS_INITIALIZED.swap(true, Ordering::Relaxed); | ||
| assert!(!before, "component should only be initialized once"); | ||
| } | ||
|
|
||
| fn main() { | ||
| let initialized = IS_INITIALIZED.load(Ordering::Relaxed); | ||
| assert!(initialized, "component was not initialized") | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are the
printlns here and inusing_macromeant to be permanent, or were they just meant for temporary debugging?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I figured there was no harm in leaving those in the tests, since its reasonable that anyone running the tests with
--nocapturemight want to look at the component.Also, the tests run with wasi inheriting stdio, which is noisy as well. That one isnt supressed by lack of nocapture, because thats a cargo test magic power.