Skip to content
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.

Sign up for GitHub

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

Jump to bottom

88 auto install embedded bundles from executable #109

Merged
merged 12 commits into from
Aug 1, 2016
Merged

88 auto install embedded bundles from executable #109

merged 12 commits into from
Aug 1, 2016

Conversation

karthikreddy09
Copy link
Member

Install all embedded bundles in the executable binary at framework startup.

@karthikreddy09
Auto-install embedded bundles from the executable
2cbad79 
Signed-off-by: The Mathworks Inc. < Roy.Lurie@mathworks.com >
Deleted usBundleUtils.h public header

Signed-off-by: The Mathworks Inc, < Roy.Lurie@mathworks.com>

Removed public header usBundleUtils.h

Signed-off-by: The Mathworks Inc. < Roy.Lurie@mathworks.com >

Fixup platform specific code in BundleUtils & test failure fixes on linux.

Signed-off-by: The Mathworks Inc. < Roy.Lurie@mathworks.com >

Fixes for Mac static builds and windows shared builds.

Signed-off-by: The Mathworks Inc. < Roy.Lurie@mathworks.com>

Auto-install initial changes (works on Mac OS X for shared libs)

Signed-off-by: The Mathworks Inc, < Roy.Lurie@mathworks.com >

Remove symbol lookup for GetBundleContext inline method

Signed-off-by: The Mathworks Inc. <Roy.Lurie@mathworks.com>
@karthikreddy09
Fix a typo
9ee8ad3 
Fixed a wrong commit. 

Signed-off-by: The Mathworks Inc. < Roy.Lurie@mathworks.com >
karthikreddy09
karthikreddy09 reviewed Jul 26, 2016
View reviewed changes
core/src/bundle/usBundleUtils.cpp
}

void* GetSymbol_impl(const std::string& bundleName, const std::string& libLocation, const char* symbol)
std::string GetExecutablePath()
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using dlsym to find "main" symbol in the handle returned by dlopen(0, RTLD_LAZY) does not work.
see http://coliru.stacked-crooked.com/a/fd8dd59f2c6c8baa

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is because the executable is not linked with -rdynamic, as mentioned in #90 (comment). See also http://coliru.stacked-crooked.com/a/e68dcb2883c24514. I am okay with the current implementation though.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I should have read your comment carefully. Clearly, I had my blinders on.

@karthikreddy09
Added a test point for auto-install embedded bundles
6ffefe2 
Signed-off-by: The Mathworks Inc. < Roy.Lurie@mathworks.com >
@karthikreddy09
Fix test failures
afcd496 
Signed-off-by: The Mathworks Inc. < Roy.Lurie@mathworks.com >
jeffdiclemente
jeffdiclemente reviewed Jul 28, 2016
View reviewed changes
core/src/bundle/usBundle.cpp
@@ -138,6 +138,11 @@ void Bundle::Stop(uint32_t options)

void Bundle::Uninstall()
{
if (!IsSharedLibrary(GetLocation()))
{
throw std::runtime_error("Bundles embedded in the executable are not uninstallable");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "not uninstallable" part sounds awkward to me. What do you think about something like

Bundles embedded in an executable cannot be uninstalled.

?

@saschazelzer
Copy link
Member

This looks good to me for merging, after the comments have been resolved.

saschazelzer and others added 2 commits July 29, 2016 09:56
@saschazelzer @karthikreddy09
Simplify bundle ctx and activator functions and use consistent naming…
7fe27d8 
… scheme.
@karthikreddy09
Fix based on review comments
307a0da 
Signed-off-by: The Mathworks Inc. < Roy.Lurie@mathworks.com >
@saschazelzer
Copy link
Member

Great work. Just to be clear: +1 for merging (the US_DEBUG conflicts could be resolved in the merge commit).

@karthikreddy09
Copy link
Member Author

Working on it … :-)
I rebased auto-install onto development and encountered test failures in static builds. Investigating the failures.

-Abhinay.

From: Sascha Zelzer notifications@github.com
Reply-To: CppMicroServices/CppMicroServices reply@reply.github.com
Date: Friday, July 29, 2016 at 1:38 PM
To: CppMicroServices/CppMicroServices CppMicroServices@noreply.github.com
Cc: Abhinay Reddyreddy karthikreddy09@icloud.com, Author author@noreply.github.com
Subject: Re: [CppMicroServices/CppMicroServices] 88 auto install embedded bundles from executable (#109)

Great work. Just to be clear: +1 for merging (the US_DEBUG conflicts could be resolved in the merge commit).

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or mute the thread.

@karthikreddy09
Merge remote-tracking branch 'refs/remotes/origin/development'
4dda1d5 
Conflicts:
	core/include/usBundleUtils.h
	core/src/bundle/usBundleUtils.cpp
	core/test/usFrameworkTest.cpp
@karthikreddy09
Fix for merge issues
5281f5a 
Signed-off-by: The Mathworks Inc < Roy.Lurie@mathworks.com >
@karthikreddy09
Use system bundle's LogSink in BundleUtils
6c80e66 
Signed-off-by: The Mathworks Inc < Roy.Lurie@mathworks.com >
jeffdiclemente
jeffdiclemente reviewed Jul 29, 2016
View reviewed changes
core/src/bundle/usBundleUtils.cpp
// Private util function to return system bundle's log sink
std::shared_ptr<LogSink> GetFrameworkLogSink()
{
auto sink = GetBundleContext().GetLogSink();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be simplified to return GetBundleContext().GetLogSink();

@karthikreddy09
Reduced LoC in Util function
b18d61c 
Signed-off-by: The Mathworks Inc. < Roy.Lurie@mathworks.com >
@karthikreddy09
Removed friend function introduced in recent commit
51a0e7d 
Signed-off-by: The Mathworks Inc < Roy.Lurie@mathworks.com >
@jeffdiclemente
Copy link
Member

This looks good to merge.
Can you please include a change to usBundleEvent.cpp line 108 from

  case BundleEvent::BUNDLE_STOPPED:         return os << "BUNDLE_STOPPED";

to

  case BundleEvent::BUNDLE_STOPPED:         return os << "STOPPED";

This is a trivial issue which was missed in a previous PR. Thanks.

@karthikreddy09
Fixed ostream output for BundleEvent::Type
4204ef5 
Signed-off-by: The Mathworks Inc. < Roy.Lurie@mathworks.com >
@karthikreddy09 karthikreddy09 merged commit 1cd2e24 into development Aug 1, 2016
@jeffdiclemente jeffdiclemente deleted the 88-auto-install-embedded-bundles-from-executable branch August 2, 2016 11:11
@jeffdiclemente jeffdiclemente mentioned this pull request Aug 2, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@karthikreddy09 @saschazelzer @jeffdiclemente