Skip to content

Commit

Permalink
Remove DBus from project
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobkeeler committed Jul 10, 2018
1 parent 97f0ac3 commit c6fbf11
Show file tree
Hide file tree
Showing 64 changed files with 381 additions and 17,580 deletions.
12 changes: 0 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,6 @@ if (HMI_ADAPTER_OPTION)
if (${HMI_ADAPTER_OPTION} STREQUAL "MESSAGEBROKER")
message(STATUS "Jenkins integration: selected HMI adapter MESSAGEBROKER")
set (HMIADAPTER "messagebroker")
elseif (${HMI_ADAPTER_OPTION} STREQUAL "DBUS")
message(STATUS "Jenkins integration: selected HMI adapter DBUS")
set (HMIADAPTER "dbus")
endif()
endif()

Expand Down Expand Up @@ -381,15 +378,6 @@ if (HMI STREQUAL "web" AND NOT DEFINED HMIADAPTER)
set(HMIADAPTER "messagebroker")
endif()

if (HMIADAPTER STREQUAL "dbus")
set(HMI_DBUS_API ON)
add_definitions(-DDBUS_HMIADAPTER)
add_definitions(-DHMI_DBUS_API)

find_package(DBus REQUIRED)
set(DBUS_LIBS_DIRECTORY ${DBUS_LIBRARY_DIRS} PARENT_SCOPE)
message(${DBUS_INCLUDE_DIRS})
endif()
if (HMIADAPTER STREQUAL "messagebroker")
set(HMI_JSON_API ON)
add_definitions(-DMESSAGEBROKER_HMIADAPTER)
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ The dependencies for SDL Core vary based on the configuration. You can change SD
| Flag | Description | Dependencies |
|------|-------------|--------------|
|Web HMI|Use HTML5 HMI|chromium-browser|
|DBus|Use DBus HMI Adapter|dbus-1-dev|
|EXTENDED_MEDIA_MODE|Support Video and Audio Streaming|Opengl es2, gstreamer1.0*|
|Bluetooth|Enable bluetooth transport adapter|libbluetooth3, libbluetooth-dev, bluez-tools|
|USB|Enable USB transport adapter|libusb-dev|
Expand Down
5 changes: 1 addition & 4 deletions src/3rd_party/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,14 @@ if(FORCE_3RD_PARTY)
message(FATAL_ERROR "Please don't turn on both FORCE_3RD_PARTY and NO_REBUILD_3RD_PARTY at the same time.")
else()
set(FORCE_3RD_PARTY_LOGGER ON)
set(FORCE_3RD_PARTY_DBUS ON)
endif()
endif()

if(ENABLE_LOG OR HMI_DBUS_API)
if(ENABLE_LOG)
# --- libexpat
add_subdirectory(expat-2.1.0)
set(EXPAT_LIBS_DIRECTORY ${3RD_PARTY_INSTALL_PREFIX_ARCH}/lib PARENT_SCOPE)
endif()

if(ENABLE_LOG)
if(NO_REBUILD_3RD_PARTY_LOGGER)
message(STATUS "Not rebuilding logger.")
else()
Expand Down
1 change: 0 additions & 1 deletion src/appMain/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ include_directories(
${POLICY_GLOBAL_INCLUDE_PATH}/
${COMPONENTS_DIR}/rpc_base/include
${COMPONENTS_DIR}/resumption/include
${COMPONENTS_DIR}/dbus/include
${CMAKE_BINARY_DIR}/src/components
${JSONCPP_INCLUDE_DIRECTORY}
${LOG4CXX_INCLUDE_DIRECTORY}
Expand Down
43 changes: 0 additions & 43 deletions src/appMain/life_cycle.cc
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@ LifeCycle::LifeCycle(const profile::Profile& profile)
#ifdef TELEMETRY_MONITOR
, telemetry_monitor_(NULL)
#endif // TELEMETRY_MONITOR
#ifdef DBUS_HMIADAPTER
, dbus_adapter_(NULL)
, dbus_adapter_thread_(NULL)
#endif // DBUS_HMIADAPTER
#ifdef MESSAGEBROKER_HMIADAPTER
, mb_adapter_(NULL)
, mb_adapter_thread_(NULL)
Expand Down Expand Up @@ -189,30 +185,6 @@ bool LifeCycle::InitMessageSystem() {
}
#endif // MESSAGEBROKER_HMIADAPTER

#ifdef DBUS_HMIADAPTER
/**
* Initialize DBus component
* @return true if success otherwise false.
*/
bool LifeCycle::InitMessageSystem() {
dbus_adapter_ = new hmi_message_handler::DBusMessageAdapter(hmi_handler_);

hmi_handler_->AddHMIMessageAdapter(dbus_adapter_);
if (!dbus_adapter_->Init()) {
LOG4CXX_FATAL(logger_, "Cannot init DBus service!");
return false;
}

dbus_adapter_->SubscribeTo();

LOG4CXX_INFO(logger_, "Start DBusMessageAdapter thread!");
dbus_adapter_thread_ = new std::thread(
&hmi_message_handler::DBusMessageAdapter::Run, dbus_adapter_);

return true;
}
#endif // DBUS_HMIADAPTER

namespace {
void sig_handler(int sig) {
switch (sig) {
Expand Down Expand Up @@ -315,21 +287,6 @@ void LifeCycle::StopComponents() {

LOG4CXX_INFO(logger_, "Destroying HMI Message Handler and MB adapter.");

#ifdef DBUS_HMIADAPTER
if (dbus_adapter_) {
DCHECK_OR_RETURN_VOID(hmi_handler_);
hmi_handler_->RemoveHMIMessageAdapter(dbus_adapter_);
dbus_adapter_->Shutdown();
if (dbus_adapter_thread_ != NULL) {
dbus_adapter_thread_->join();
}
delete dbus_adapter_;
dbus_adapter_ = NULL;
delete dbus_adapter_thread_;
dbus_adapter_thread_ = NULL;
}
#endif // DBUS_HMIADAPTER

#ifdef MESSAGEBROKER_HMIADAPTER
if (mb_adapter_) {
DCHECK_OR_RETURN_VOID(hmi_handler_);
Expand Down
7 changes: 0 additions & 7 deletions src/appMain/life_cycle.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@

#include "config_profile/profile.h"
#include "hmi_message_handler/hmi_message_handler_impl.h"
#ifdef DBUS_HMIADAPTER
#include "hmi_message_handler/dbus_message_adapter.h"
#endif // DBUS_HMIADAPTER
#if (defined(MESSAGEBROKER_HMIADAPTER) || defined(PASA_HMI))
#include "hmi_message_handler/messagebroker_adapter.h"
#endif // #if ( defined (MESSAGEBROKER_HMIADAPTER) || defined(PASA_HMI) )
Expand Down Expand Up @@ -99,10 +96,6 @@ class LifeCycle {
#ifdef TELEMETRY_MONITOR
telemetry_monitor::TelemetryMonitor* telemetry_monitor_;
#endif // TELEMETRY_MONITOR
#ifdef DBUS_HMIADAPTER
hmi_message_handler::DBusMessageAdapter* dbus_adapter_;
std::thread* dbus_adapter_thread_;
#endif // DBUS_HMIADAPTER

#ifdef MESSAGEBROKER_HMIADAPTER
hmi_message_handler::MessageBrokerAdapter* mb_adapter_;
Expand Down
5 changes: 0 additions & 5 deletions src/components/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,3 @@ add_subdirectory(./media_manager)
if(TELEMETRY_MONITOR)
add_subdirectory(./telemetry_monitor)
endif()

# --- DBus
if(HMI_DBUS_API)
add_subdirectory(./dbus)
endif()
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ typedef std::map<std::string, mobile_apis::VehicleDataType::eType> VehicleData;
class MessageHelper {
public:
/**
* @brief Creates request for different interfaces(JSON, DBUS)
* @brief Creates request for different interfaces(JSON)
* @param correlation_id unique ID
* @param params Vector of arguments that we need in GetVehicleData request
* (e.g. gps, odometer, fuel_level)
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit c6fbf11

Please sign in to comment.