jyapayne/anbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert previous cycling-reference commit.

Browse source
This commit is contained in:
Jiancong 2018-04-05 22:06:43 +08:00
commit 48471b1454
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
external/process-cpp-minimal/include/core/posix/signal.h vendored
View file

@ -100,7 +100,7 @@ protected:
* @brief Traps the specified signals for the entire process. * @brief Traps the specified signals for the entire process.
*/ */
CORE_POSIX_DLL_PUBLIC CORE_POSIX_DLL_PUBLIC
SignalTrap* trap_signals_for_process( std::shared_ptr<SignalTrap> trap_signals_for_process(
std::initializer_list<core::posix::Signal> blocked_signals); std::initializer_list<core::posix::Signal> blocked_signals);
/** /**

6
external/process-cpp-minimal/src/core/posix/signal.cpp vendored
View file

@ -203,10 +203,12 @@ private:
}; };
} }
core::posix::SignalTrap* core::posix::trap_signals_for_process( std::shared_ptr<core::posix::SignalTrap> core::posix::trap_signals_for_process(
std::initializer_list<core::posix::Signal> blocked_signals) std::initializer_list<core::posix::Signal> blocked_signals)
{ {
return new impl::SignalTrap(impl::SignalTrap::Scope::process, blocked_signals); return std::make_shared<impl::SignalTrap>(
impl::SignalTrap::Scope::process,
blocked_signals);
} }
std::shared_ptr<core::posix::SignalTrap> core::posix::trap_signals_for_all_subsequent_threads( std::shared_ptr<core::posix::SignalTrap> core::posix::trap_signals_for_all_subsequent_threads(

6
src/anbox/cmds/session_manager.cpp
View file

@ -131,7 +131,7 @@ anbox::cmds::SessionManager::SessionManager()
use_system_dbus_)); use_system_dbus_));
action([this](const cli::Command::Context &) { action([this](const cli::Command::Context &) {
core::posix::SignalTrap* trap = core::posix::trap_signals_for_process( auto trap = core::posix::trap_signals_for_process(
{core::posix::Signal::sig_term, core::posix::Signal::sig_int}); {core::posix::Signal::sig_term, core::posix::Signal::sig_int});
trap->signal_raised().connect([trap](const core::posix::Signal &signal) { trap->signal_raised().connect([trap](const core::posix::Signal &signal) {
INFO("Signal %i received. Good night.", static_cast<int>(signal)); INFO("Signal %i received. Good night.", static_cast<int>(signal));
@ -139,13 +139,11 @@ anbox::cmds::SessionManager::SessionManager()
}); });
if (standalone_ && !experimental_) { if (standalone_ && !experimental_) {
delete trap;
ERROR("Experimental features selected, but --experimental flag not set"); ERROR("Experimental features selected, but --experimental flag not set");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
if (!fs::exists("/dev/binder") || !fs::exists("/dev/ashmem")) { if (!fs::exists("/dev/binder") || !fs::exists("/dev/ashmem")) {
delete trap;
ERROR("Failed to start as either binder or ashmem kernel drivers are not loaded"); ERROR("Failed to start as either binder or ashmem kernel drivers are not loaded");
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -179,7 +177,6 @@ anbox::cmds::SessionManager::SessionManager()
display_frame, display_frame,
single_window_); single_window_);
if (!platform) { if (!platform) {
delete trap;
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -287,7 +284,6 @@ anbox::cmds::SessionManager::SessionManager()
rt->stop(); rt->stop();
delete trap;
return EXIT_SUCCESS; return EXIT_SUCCESS;
}); });
} }