Feature/599 provide and use c service in rust #627
There are no files selected for viewing
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
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
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,29 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| [package] | ||
| name = "celix" | ||
| version = "0.0.1" | ||
| edition = '2021' | ||
|
|
||
| [dependencies] | ||
| celix_bindings = { path = "../celix_bindings" } | ||
|
|
||
| [lib] | ||
| name = "celix" | ||
| path = "src/lib.rs" | ||
| crate-type = ["rlib"] | ||
|
Contributor
There was a problem hiding this comment. Now it's OK to have static libcelix. Considering its size, 200KB for x64 release build, it might be preferable to built as shared object. Even if we can add |
||
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,88 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| use std::sync::Arc; | ||
|
|
||
| use super::BundleContext; | ||
| use super::Error; | ||
|
|
||
| pub trait BundleActivator { | ||
| fn new(ctx: Arc<BundleContext>) -> Self; | ||
| fn start(&mut self) -> Result<(), Error> { | ||
| /* Default implementation */ | ||
| Ok(()) | ||
| } | ||
| fn stop(&mut self) -> Result<(), Error> { | ||
| /* Default implementation */ | ||
| Ok(()) | ||
| } | ||
| } | ||
|
|
||
| #[macro_export] | ||
| macro_rules! generate_bundle_activator { | ||
| ($activator:ty) => { | ||
| #[no_mangle] | ||
| pub unsafe extern "C" fn celix_bundleActivator_create( | ||
| ctx: *mut $crate::details::CBundleContext, | ||
| out: *mut *mut ::std::ffi::c_void, | ||
| ) -> $crate::details::CStatus { | ||
| let boxed_context = $crate::bundle_context_new(ctx); | ||
| let mut arc_context = Arc::from(boxed_context); | ||
| let activator = <$activator>::new(arc_context); | ||
| *out = Box::into_raw(Box::new(activator)) as *mut ::std::ffi::c_void; | ||
| $crate::CELIX_SUCCESS | ||
| } | ||
|
|
||
| #[no_mangle] | ||
| pub unsafe extern "C" fn celix_bundleActivator_start( | ||
| handle: *mut ::std::ffi::c_void, | ||
| ctx: *mut $crate::details::CBundleContext, | ||
| ) -> $crate::details::CStatus { | ||
| let activator = &mut *(handle as *mut $activator); | ||
| let result = activator.start(); | ||
| match result { | ||
| Ok(_) => $crate::CELIX_SUCCESS, | ||
| Err(e) => e.into(), | ||
| } | ||
| } | ||
|
|
||
| #[no_mangle] | ||
| pub unsafe extern "C" fn celix_bundleActivator_stop( | ||
| handle: *mut ::std::ffi::c_void, | ||
| ctx: *mut $crate::details::CBundleContext, | ||
| ) -> $crate::details::CStatus { | ||
| let activator = &mut *(handle as *mut $activator); | ||
| let result = activator.stop(); | ||
| match result { | ||
| Ok(_) => $crate::CELIX_SUCCESS, | ||
| Err(e) => e.into(), | ||
| } | ||
| } | ||
|
|
||
| #[no_mangle] | ||
| pub unsafe extern "C" fn celix_bundleActivator_destroy( | ||
| handle: *mut ::std::ffi::c_void, | ||
| _ctx: *mut $crate::details::CBundleContext, | ||
| ) -> $crate::details::CStatus { | ||
| let reclaimed_activator = Box::from_raw(handle as *mut $activator); | ||
|
Contributor
There was a problem hiding this comment. This does not feel right. In the C version, activator is dropped after IMHO, the best fix is to change the corresponding logic in From status = CELIX_DO_IF(status, bundle_getContext(bndEntry->bnd, &context));
if (status == CELIX_SUCCESS) {
if (activator->stop != NULL) {
status = CELIX_DO_IF(status, activator->stop(activator->userData, context));
if (status == CELIX_SUCCESS) {
celix_dependency_manager_t *mng = celix_bundleContext_getDependencyManager(context);
celix_dependencyManager_removeAllComponents(mng);
}
}
}
if (status == CELIX_SUCCESS) {
if (activator->destroy != NULL) {
status = CELIX_DO_IF(status, activator->destroy(activator->userData, context));
}
}
if (bndEntry->bndId >= CELIX_FRAMEWORK_BUNDLE_ID) {
//framework and "normal" bundle
celix_framework_waitUntilNoEventsForBnd(framework, bndEntry->bndId);
celix_bundleContext_cleanup(bndEntry->bnd->context);
}To status = CELIX_DO_IF(status, bundle_getContext(bndEntry->bnd, &context));
if (status == CELIX_SUCCESS) {
if (activator->stop != NULL) {
status = CELIX_DO_IF(status, activator->stop(activator->userData, context));
if (status == CELIX_SUCCESS) {
celix_dependency_manager_t *mng = celix_bundleContext_getDependencyManager(context);
celix_dependencyManager_removeAllComponents(mng);
}
}
}
if (bndEntry->bndId >= CELIX_FRAMEWORK_BUNDLE_ID) {
//framework and "normal" bundle
celix_framework_waitUntilNoEventsForBnd(framework, bndEntry->bndId);
celix_bundleContext_cleanup(bndEntry->bnd->context);
}
if (status == CELIX_SUCCESS) {
if (activator->destroy != NULL) {
status = CELIX_DO_IF(status, activator->destroy(activator->userData, context));
}
}So that we can remove |
||
| drop(reclaimed_activator); | ||
| $crate::CELIX_SUCCESS | ||
| } | ||
| }; | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.