Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
[Tizen] Refactor XWalkLauncher for usage of RESET event.
Browse files Browse the repository at this point in the history
After this change execute xwalk-launcher on Tizen will cause
initialization of app core and launch of g_main_loop. Application
will be actually launched after xwalk-launcher receives RESET
event from platform.

BUG=XWALK-2779
  • Loading branch information
jizydorczyk committed Dec 9, 2014
1 parent 50e7278 commit b49c571
Show file tree
Hide file tree
Showing 11 changed files with 624 additions and 361 deletions.
21 changes: 0 additions & 21 deletions application/tools/linux/dbus_connection.cc

This file was deleted.

12 changes: 0 additions & 12 deletions application/tools/linux/dbus_connection.h

This file was deleted.

206 changes: 206 additions & 0 deletions application/tools/linux/dbus_object_manager.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
// Copyright (c) 2013 Intel Corporation. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "xwalk/application/tools/linux/dbus_object_manager.h"

#include "base/message_loop/message_loop.h"

namespace {

const char kServiceName[] = "org.crosswalkproject.Runtime1";
const char kRunningManagerIface[] = "org.crosswalkproject.Running.Manager1";
const char kRunningAppIface[] = "org.crosswalkproject.Running.Application1";
const char kRunningManagerDBusPath[] = "/running1";

} // namespace

DBusObjectManager::DBusObjectManager(dbus::Bus* bus,
base::MessageLoop* main_loop)
: bus_(bus),
main_loop_(main_loop),
weak_ptr_factory_(this) {
ConnectToApplicationManager();
}

bool DBusObjectManager::Launch(
const std::string& appid_or_url, int launcher_pid, bool fullscreen,
bool remote_debugging) {
if (!running_proxy_)
return false;
dbus::MethodCall method_call(
kRunningManagerIface, "Launch");
dbus::MessageWriter writer(&method_call);
writer.AppendString(appid_or_url);
writer.AppendUint32(launcher_pid);
writer.AppendBool(fullscreen);
writer.AppendBool(remote_debugging);
scoped_ptr<dbus::Response> response(
running_proxy_->CallMethodAndBlock(&method_call,
dbus::ObjectProxy::TIMEOUT_USE_DEFAULT));
if (!response.get())
return false;
if (!response->GetErrorName().empty()) {
LOG(ERROR) << "Error during call to 'Launch': "
<< response->GetErrorName();
return false;
}

dbus::MessageReader reader(response.get());
dbus::ObjectPath running_application_path;
if (!reader.PopObjectPath(&running_application_path)) {
LOG(WARNING) << "Failed to create app proxy.";
} else {
app_proxy_ = bus_->GetObjectProxy(kServiceName, running_application_path);
if (app_proxy_)
ConnectToApplicationSignal("EPChannelCreated");
}
return true;
}

std::pair<std::string, int> DBusObjectManager::GetEPChannel() {
std::pair<std::string, int> fd;
if (!app_proxy_) {
fd.second = -1;
return fd;
}
dbus::MethodCall method_call(kRunningAppIface, "GetEPChannel");
scoped_ptr<dbus::Response> response = app_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT);
if (!response->GetErrorName().empty()) {
LOG(ERROR) << "Error during call to 'GetEPChannel': "
<< response->GetErrorName();
fd.second = -1;
return fd;
}
dbus::MessageReader reader(response.release());
dbus::FileDescriptor extension_process_fd_;
if (!reader.PopString(&fd.first) ||
!reader.PopFileDescriptor(&extension_process_fd_)) {
LOG(ERROR) << "Couldn't get EP Channel";
fd.second = -1;
return fd;
}
extension_process_fd_.CheckValidity();
fd.second = extension_process_fd_.TakeValue();
return fd;
}

bool DBusObjectManager::Suspend() {
if (!app_proxy_)
return false;
dbus::MethodCall method_call(kRunningAppIface, "Suspend");
scoped_ptr<dbus::Response> response = app_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT);
if (!response->GetErrorName().empty()) {
LOG(ERROR) << "Error during call to 'Suspend': "
<< response->GetErrorName();
return false;
}
return true;
}

bool DBusObjectManager::Resume() {
if (!app_proxy_)
return false;
dbus::MethodCall method_call(kRunningAppIface, "Resume");
scoped_ptr<dbus::Response> response = app_proxy_->CallMethodAndBlock(
&method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT);
if (!response->GetErrorName().empty()) {
LOG(ERROR) << "Error during call to 'Resume': "
<< response->GetErrorName();
return false;
}
return true;
}

void DBusObjectManager::OnOwnershipCallback(const std::string& service_name,
bool success) {
LOG(WARNING) << "Couldn't get ownership of D-Bus service name: "
<< service_name << ".";
}

void DBusObjectManager::ConnectToApplicationManager() {
running_apps_manager_ = bus_->GetObjectManager(kServiceName,
dbus::ObjectPath(kRunningManagerDBusPath));
running_apps_manager_->RegisterInterface(kRunningAppIface, this);
running_proxy_ = bus_->GetObjectProxy(kServiceName,
dbus::ObjectPath(kRunningManagerDBusPath));
}

void DBusObjectManager::ObjectAdded(const dbus::ObjectPath& object_path,
const std::string& interface_name) {
}

void DBusObjectManager::ObjectRemoved(const dbus::ObjectPath& object_path,
const std::string& interface_name) {
if (object_path != app_proxy_->object_path())
return;
LOG(INFO) << "Application '" << object_path.value().c_str()
<< "' disappeared, exiting.";
main_loop_->QuitNow();
}

dbus::PropertySet* DBusObjectManager::CreateProperties(
dbus::ObjectProxy *object_proxy,
const dbus::ObjectPath& object_path,
const std::string& interface_name) {
Properties* properties = new Properties(
object_proxy, interface_name,
base::Bind(&DBusObjectManager::OnPropertyChanged,
base::Unretained(this), object_path));
return static_cast<dbus::PropertySet*>(properties);
}

void DBusObjectManager::OnPropertyChanged(const dbus::ObjectPath& object_path,
const std::string& name) {
if (!running_apps_manager_)
ConnectToApplicationManager();
}

void DBusObjectManager::ConnectToApplicationSignal(std::string signal_name) {
if (app_proxy_)
app_proxy_->ConnectToSignal(kRunningAppIface, signal_name,
base::Bind(&DBusObjectManager::OnAppSignal,
weak_ptr_factory_.GetWeakPtr()),
base::Bind(&DBusObjectManager::OnAppSignalConnected,
weak_ptr_factory_.GetWeakPtr()));
}

bool DBusObjectManager::IsApplicationRunning(const std::string& app_id) {
std::vector<dbus::ObjectPath> objects = running_apps_manager_->GetObjects();
bool is_running = false;
for (dbus::ObjectPath obj : objects) {
DBusObjectManager::Properties* properties =
static_cast<DBusObjectManager::Properties*>(
running_apps_manager_->GetProperties(
obj, kRunningAppIface));
if (!properties)
continue;
if (properties->app_id.value() == app_id) {
is_running = true;
break;
}
}
LOG(INFO) << "Application " << app_id << " is "
<< (is_running ? "running." : "not running.");
return is_running;
}

void DBusObjectManager::OnAppSignal(dbus::Signal* signal) {
std::string signal_name = signal->GetMember();
if (signal_name == "EPChannelCreated") {
if (observer_)
observer_->OnEPChannelCreated();
} else {
LOG(INFO) << "Unknown signal received: " << signal_name;
}
}

void DBusObjectManager::OnAppSignalConnected(
const std::string& interface_name,
const std::string& signal_name,
bool success) {
if (!success)
LOG(WARNING) << "Failed to connect signal: " << signal_name;
}
90 changes: 90 additions & 0 deletions application/tools/linux/dbus_object_manager.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
// Copyright (c) 2013 Intel Corporation. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef XWALK_APPLICATION_TOOLS_LINUX_DBUS_OBJECT_MANAGER_H_
#define XWALK_APPLICATION_TOOLS_LINUX_DBUS_OBJECT_MANAGER_H_

#include <map>
#include <string>
#include <utility>
#include <vector>

#include "base/macros.h"
#include "base/threading/thread.h"
#include "base/values.h"
#include "dbus/bus.h"
#include "dbus/exported_object.h"
#include "dbus/message.h"
#include "dbus/object_manager.h"
#include "dbus/object_path.h"
#include "dbus/object_proxy.h"
#include "dbus/property.h"

class DBusObjectManager : public dbus::ObjectManager::Interface {
public:
class Observer {
public:
virtual void OnEPChannelCreated() = 0;
};

DBusObjectManager(dbus::Bus* bus, base::MessageLoop* main_loop);

bool Launch(const std::string& appid_or_url, int launcher_pid,
bool fullscreen, bool remote_debugging);
std::pair<std::string, int> GetEPChannel();
bool Suspend();
bool Resume();

bool IsApplicationRunning(const std::string& app_id);

void SetObserver(Observer* observer) { observer_ = observer; }

struct Properties : public dbus::PropertySet {
dbus::Property<std::string> app_id;

Properties(dbus::ObjectProxy* object_proxy,
const std::string& interface_name,
PropertyChangedCallback property_changed_callback)
: PropertySet(object_proxy, interface_name, property_changed_callback) {
RegisterProperty("AppID", &app_id);
}
};

private:
void OnOwnershipCallback(const std::string& service_name, bool success);
void ObjectAdded(const dbus::ObjectPath& object_path,
const std::string& interface_name) override;
void ObjectRemoved(const dbus::ObjectPath& object_path,
const std::string& interface_name) override;
dbus::PropertySet* CreateProperties(
dbus::ObjectProxy* object_proxy,
const dbus::ObjectPath& object_path,
const std::string& interface_name) override;

void OnPropertyChanged(const dbus::ObjectPath& object_path,
const std::string& name);

void ConnectToApplicationManager();
void ConnectToApplicationSignal(std::string signal_name);
void OnAppSignal(dbus::Signal* signal);
void OnAppSignalConnected(const std::string& interface_name,
const std::string& signal_name,
bool success);

scoped_refptr<dbus::Bus> bus_;
dbus::ObjectManager* running_apps_manager_;
dbus::ObjectProxy* running_proxy_;
dbus::ObjectProxy* app_proxy_;

// this is needed for exit events which come via dbus interface
base::MessageLoop* main_loop_;

base::WeakPtrFactory<DBusObjectManager> weak_ptr_factory_;

Observer* observer_;

DISALLOW_COPY_AND_ASSIGN(DBusObjectManager);
};

#endif // XWALK_APPLICATION_TOOLS_LINUX_DBUS_OBJECT_MANAGER_H_
7 changes: 5 additions & 2 deletions application/tools/linux/xwalk_application_tools.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
'../../../build/system.gyp:gio',
'../../../extensions/extensions.gyp:xwalk_extensions',
'../../../application/common/xwalk_application_common.gypi:xwalk_application_common_lib',
'../../../dbus/xwalk_dbus.gyp:xwalk_dbus'
],
'sources': [
'dbus_connection.cc',
'dbus_connection.h',
'dbus_object_manager.cc',
'dbus_object_manager.h',
'xwalk_extension_process_launcher.cc',
'xwalk_extension_process_launcher.h',
'xwalk_launcher_main.cc',
Expand All @@ -27,6 +28,8 @@
'../../../build/system.gyp:tizen_appcore_common'
],
'sources': [
'xwalk_launcher.cc',
'xwalk_launcher.h',
'xwalk_launcher_tizen.cc',
'xwalk_launcher_tizen.h',
'../tizen/xwalk_tizen_user.cc',
Expand Down
Loading

0 comments on commit b49c571

Please sign in to comment.