diff options
Diffstat (limited to 'src/components/transport_manager')
24 files changed, 637 insertions, 637 deletions
diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_connection_factory.cc b/src/components/transport_manager/src/bluetooth/bluetooth_connection_factory.cc index bb27493701..eecb51625a 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_connection_factory.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_connection_factory.cc @@ -54,17 +54,17 @@ TransportAdapter::Error BluetoothConnectionFactory::Init() { TransportAdapter::Error BluetoothConnectionFactory::CreateConnection( const DeviceUID& device_uid, const ApplicationHandle& app_handle) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. device_uid: " << &device_uid << ", app_handle: " << &app_handle); BluetoothSocketConnection* connection( new BluetoothSocketConnection(device_uid, app_handle, controller_)); TransportAdapter::Error error = connection->Start(); if (TransportAdapter::OK != error) { - LOG4CXX_ERROR(logger_, "connection::Start() failed"); + LOGGER_ERROR(logger_, "connection::Start() failed"); delete connection; } - LOG4CXX_TRACE(logger_, "exit with error: " << error); + LOGGER_TRACE(logger_, "exit with error: " << error); return error; } diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_device.cc b/src/components/transport_manager/src/bluetooth/bluetooth_device.cc index 038515170d..1bb6f0c74b 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_device.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_device.cc @@ -54,11 +54,11 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager") bool BluetoothDevice::GetRfcommChannel(const ApplicationHandle app_handle, uint8_t* channel_out) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. app_handle: " << app_handle << ", channel_out: " << channel_out); if (app_handle < 0 || app_handle > std::numeric_limits<uint8_t>::max()) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with FALSE. Condition: app_handle < 0 || app_handle > " "numeric_limits::max()"); return false; @@ -67,21 +67,21 @@ bool BluetoothDevice::GetRfcommChannel(const ApplicationHandle app_handle, RfcommChannelVector::const_iterator it = std::find(rfcomm_channels_.begin(), rfcomm_channels_.end(), channel); if (it == rfcomm_channels_.end()) { - LOG4CXX_TRACE( + LOGGER_TRACE( logger_, "exit with FALSE. Condition: channel not found in RfcommChannelVector"); return false; } *channel_out = channel; - LOG4CXX_TRACE(logger_, "exit with TRUE"); + LOGGER_TRACE(logger_, "exit with TRUE"); return true; } std::string BluetoothDevice::GetUniqueDeviceId(const bdaddr_t& device_address) { - LOG4CXX_TRACE(logger_, "enter. device_adress: " << &device_address); + LOGGER_TRACE(logger_, "enter. device_adress: " << &device_address); char device_address_string[32]; ba2str(&device_address, device_address_string); - LOG4CXX_TRACE(logger_, "exit with BT-" << device_address_string); + LOGGER_TRACE(logger_, "exit with BT-" << device_address_string); return std::string("BT-") + device_address_string; } @@ -93,7 +93,7 @@ BluetoothDevice::BluetoothDevice(const bdaddr_t& device_address, , rfcomm_channels_(rfcomm_channels) {} bool BluetoothDevice::IsSameAs(const Device* other) const { - LOG4CXX_TRACE(logger_, "enter. device: " << other); + LOGGER_TRACE(logger_, "enter. device: " << other); bool result = false; const BluetoothDevice* other_bluetooth_device = @@ -107,9 +107,9 @@ bool BluetoothDevice::IsSameAs(const Device* other) const { } } if (result) { - LOG4CXX_TRACE(logger_, "exit with TRUE"); + LOGGER_TRACE(logger_, "exit with TRUE"); } else { - LOG4CXX_TRACE(logger_, "exit with FALSE"); + LOGGER_TRACE(logger_, "exit with FALSE"); } return result; } diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc index 85e6dc3f96..97f0edbd14 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_device_scanner.cc @@ -71,14 +71,14 @@ char* SplitToAddr(char* dev_list_entry) { } int FindPairedDevs(std::vector<bdaddr_t>* result) { - LOG4CXX_TRACE(logger_, "enter. result adress: " << result); + LOGGER_TRACE(logger_, "enter. result adress: " << result); DCHECK(result != NULL); const char* cmd = "bt-device -l"; FILE* pipe = popen(cmd, "r"); if (!pipe) { - LOG4CXX_TRACE(logger_, "exit -1. Condition: !pipe"); + LOGGER_TRACE(logger_, "exit -1. Condition: !pipe"); return -1; } char* buffer = new char[1028]; @@ -96,7 +96,7 @@ int FindPairedDevs(std::vector<bdaddr_t>* result) { buffer = new char[1028]; } pclose(pipe); - LOG4CXX_TRACE(logger_, "exit with 0"); + LOGGER_TRACE(logger_, "exit with 0"); delete[] buffer; return 0; } @@ -148,7 +148,7 @@ bool BluetoothDeviceScanner::IsInitialised() const { } void BluetoothDeviceScanner::UpdateTotalDeviceList() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); DeviceVector devices; devices.insert(devices.end(), paired_devices_with_sdl_.begin(), @@ -160,11 +160,11 @@ void BluetoothDeviceScanner::UpdateTotalDeviceList() { } void BluetoothDeviceScanner::DoInquiry() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); const int device_id = hci_get_route(0); if (device_id < 0) { - LOG4CXX_INFO(logger_, "HCI device is not available"); + LOGGER_INFO(logger_, "HCI device is not available"); shutdown_requested_ = true; controller_->SearchDeviceFailed(SearchDeviceError()); return; @@ -177,14 +177,14 @@ void BluetoothDeviceScanner::DoInquiry() { } if (paired_devices_.empty()) { - LOG4CXX_INFO(logger_, "Searching for paired devices."); + LOGGER_INFO(logger_, "Searching for paired devices."); if (-1 == FindPairedDevs(&paired_devices_)) { - LOG4CXX_ERROR(logger_, "Failed to retrieve list of paired devices."); + LOGGER_ERROR(logger_, "Failed to retrieve list of paired devices."); controller_->SearchDeviceFailed(SearchDeviceError()); } } - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "Check rfcomm channel on " << paired_devices_.size() << " paired devices."); @@ -193,7 +193,7 @@ void BluetoothDeviceScanner::DoInquiry() { paired_devices_, device_handle, &paired_devices_with_sdl_); UpdateTotalDeviceList(); - LOG4CXX_INFO(logger_, "Starting hci_inquiry on device " << device_id); + LOGGER_INFO(logger_, "Starting hci_inquiry on device " << device_id); const uint8_t inquiry_time = 8u; // Time unit is 1.28 seconds const size_t max_devices = 256u; inquiry_info* inquiry_info_list = new inquiry_info[max_devices]; @@ -206,7 +206,7 @@ void BluetoothDeviceScanner::DoInquiry() { IREQ_CACHE_FLUSH); if (number_of_devices >= 0) { - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "hci_inquiry: found " << number_of_devices << " devices"); std::vector<bdaddr_t> found_devices(number_of_devices); for (int i = 0; i < number_of_devices; ++i) { @@ -223,7 +223,7 @@ void BluetoothDeviceScanner::DoInquiry() { delete[] inquiry_info_list; if (number_of_devices < 0) { - LOG4CXX_DEBUG(logger_, "number_of_devices < 0"); + LOGGER_DEBUG(logger_, "number_of_devices < 0"); controller_->SearchDeviceFailed(SearchDeviceError()); } } @@ -232,7 +232,7 @@ void BluetoothDeviceScanner::CheckSDLServiceOnDevices( const std::vector<bdaddr_t>& bd_addresses, int device_handle, DeviceVector* discovered_devices) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. bd_addresses: " << &bd_addresses << ", device_handle: " << device_handle << ", discovered_devices: " << discovered_devices); @@ -254,7 +254,7 @@ void BluetoothDeviceScanner::CheckSDLServiceOnDevices( 0); if (hci_read_remote_name_ret != 0) { - LOG4CXX_ERROR_WITH_ERRNO(logger_, "hci_read_remote_name failed"); + LOGGER_ERROR_WITH_ERRNO(logger_, "hci_read_remote_name failed"); strncpy(deviceName, BluetoothDevice::GetUniqueDeviceId(bd_address).c_str(), sizeof(deviceName) / sizeof(deviceName[0])); @@ -263,19 +263,19 @@ void BluetoothDeviceScanner::CheckSDLServiceOnDevices( Device* bluetooth_device = new BluetoothDevice(bd_address, deviceName, sdl_rfcomm_channels[i]); if (bluetooth_device) { - LOG4CXX_INFO(logger_, "Bluetooth device created successfully"); + LOGGER_INFO(logger_, "Bluetooth device created successfully"); discovered_devices->push_back(bluetooth_device); } else { - LOG4CXX_WARN(logger_, "Can't create bluetooth device " << deviceName); + LOGGER_WARN(logger_, "Can't create bluetooth device " << deviceName); } } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } std::vector<BluetoothDeviceScanner::RfcommChannelVector> BluetoothDeviceScanner::DiscoverSmartDeviceLinkRFCOMMChannels( const std::vector<bdaddr_t>& device_addresses) { - LOG4CXX_TRACE(logger_, "enter device_addresses: " << &device_addresses); + LOGGER_TRACE(logger_, "enter device_addresses: " << &device_addresses); const size_t size = device_addresses.size(); std::vector<RfcommChannelVector> result(size); @@ -300,7 +300,7 @@ BluetoothDeviceScanner::DiscoverSmartDeviceLinkRFCOMMChannels( } sleep(attempt_timeout); } - LOG4CXX_TRACE( + LOGGER_TRACE( logger_, "exit with vector<RfcommChannelVector>: size = " << result.size()); return result; @@ -308,7 +308,7 @@ BluetoothDeviceScanner::DiscoverSmartDeviceLinkRFCOMMChannels( bool BluetoothDeviceScanner::DiscoverSmartDeviceLinkRFCOMMChannels( const bdaddr_t& device_address, RfcommChannelVector* channels) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. device_address: " << &device_address << ", channels: " << channels); static bdaddr_t any_address = {{0, 0, 0, 0, 0, 0}}; @@ -318,9 +318,9 @@ bool BluetoothDeviceScanner::DiscoverSmartDeviceLinkRFCOMMChannels( if (sdp_session == 0) { bool result = !(errno == 31 || errno == 16 || errno == 117 || errno == 114); if (result) { - LOG4CXX_TRACE(logger_, "exit with TRUE. Condition: sdp_session == 0"); + LOGGER_TRACE(logger_, "exit with TRUE. Condition: sdp_session == 0"); } else { - LOG4CXX_TRACE(logger_, "exit with FALSE. Condition: sdp_session == 0"); + LOGGER_TRACE(logger_, "exit with FALSE. Condition: sdp_session == 0"); } return result; } @@ -378,7 +378,7 @@ bool BluetoothDeviceScanner::DiscoverSmartDeviceLinkRFCOMMChannels( sdp_close(sdp_session); if (!channels->empty()) { - LOG4CXX_INFO(logger_, "channels not empty"); + LOGGER_INFO(logger_, "channels not empty"); std::stringstream rfcomm_channels_string; for (RfcommChannelVector::const_iterator it = channels->begin(); @@ -390,22 +390,22 @@ bool BluetoothDeviceScanner::DiscoverSmartDeviceLinkRFCOMMChannels( rfcomm_channels_string << static_cast<uint32_t>(*it); } - LOG4CXX_INFO( + LOGGER_INFO( logger_, "SmartDeviceLink service was discovered on device " << BluetoothDevice::GetUniqueDeviceId(device_address) << " at channel(s): " << rfcomm_channels_string.str().c_str()); } else { - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "SmartDeviceLink service was not discovered on device " << BluetoothDevice::GetUniqueDeviceId(device_address)); } - LOG4CXX_TRACE(logger_, "exit with TRUE"); + LOGGER_TRACE(logger_, "exit with TRUE"); return true; } void BluetoothDeviceScanner::Thread() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); ready_ = true; if (auto_repeat_search_) { while (!shutdown_requested_) { @@ -431,10 +431,10 @@ void BluetoothDeviceScanner::Thread() { } void BluetoothDeviceScanner::TimedWaitForDeviceScanRequest() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); if (auto_repeat_pause_sec_ == 0) { - LOG4CXX_TRACE(logger_, "exit. Condition: auto_repeat_pause_sec_ == 0"); + LOGGER_TRACE(logger_, "exit. Condition: auto_repeat_pause_sec_ == 0"); return; } @@ -445,7 +445,7 @@ void BluetoothDeviceScanner::TimedWaitForDeviceScanRequest() { device_scan_requested_cv_.WaitFor(auto_lock, auto_repeat_pause_sec_ * 1000); if (wait_status == sync_primitives::ConditionalVariable::kTimeout) { - LOG4CXX_INFO(logger_, "Bluetooth scanner timeout, performing scan"); + LOGGER_INFO(logger_, "Bluetooth scanner timeout, performing scan"); device_scan_requested_ = true; } } @@ -453,17 +453,17 @@ void BluetoothDeviceScanner::TimedWaitForDeviceScanRequest() { } TransportAdapter::Error BluetoothDeviceScanner::Init() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); if (!thread_->start()) { - LOG4CXX_ERROR(logger_, "Bluetooth device scanner thread start failed"); + LOGGER_ERROR(logger_, "Bluetooth device scanner thread start failed"); return TransportAdapter::FAIL; } - LOG4CXX_INFO(logger_, "Bluetooth device scanner thread started"); + LOGGER_INFO(logger_, "Bluetooth device scanner thread started"); return TransportAdapter::OK; } void BluetoothDeviceScanner::Terminate() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); shutdown_requested_ = true; if (thread_) { { @@ -471,17 +471,17 @@ void BluetoothDeviceScanner::Terminate() { device_scan_requested_ = false; device_scan_requested_cv_.NotifyOne(); } - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "Waiting for bluetooth device scanner thread termination"); thread_->stop(); - LOG4CXX_INFO(logger_, "Bluetooth device scanner thread stopped"); + LOGGER_INFO(logger_, "Bluetooth device scanner thread stopped"); } } TransportAdapter::Error BluetoothDeviceScanner::Scan() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); if ((!IsInitialised()) || shutdown_requested_) { - LOG4CXX_WARN(logger_, "BAD_STATE"); + LOGGER_WARN(logger_, "BAD_STATE"); return TransportAdapter::BAD_STATE; } if (auto_repeat_pause_sec_ == 0) { @@ -491,12 +491,12 @@ TransportAdapter::Error BluetoothDeviceScanner::Scan() { sync_primitives::AutoLock auto_lock(device_scan_requested_lock_); if (!device_scan_requested_) { - LOG4CXX_TRACE(logger_, "Requesting device Scan"); + LOGGER_TRACE(logger_, "Requesting device Scan"); device_scan_requested_ = true; device_scan_requested_cv_.NotifyOne(); } else { ret = TransportAdapter::BAD_STATE; - LOG4CXX_WARN(logger_, "BAD_STATE"); + LOGGER_WARN(logger_, "BAD_STATE"); } return ret; } @@ -506,7 +506,7 @@ BluetoothDeviceScanner::BluetoothDeviceScannerDelegate:: : scanner_(scanner) {} void BluetoothDeviceScanner::BluetoothDeviceScannerDelegate::threadMain() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); DCHECK(scanner_); scanner_->Thread(); } diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_socket_connection.cc b/src/components/transport_manager/src/bluetooth/bluetooth_socket_connection.cc index 5f1eed4c5e..5d18363f8a 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_socket_connection.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_socket_connection.cc @@ -59,8 +59,8 @@ BluetoothSocketConnection::BluetoothSocketConnection( BluetoothSocketConnection::~BluetoothSocketConnection() {} bool BluetoothSocketConnection::Establish(ConnectError** error) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "error: " << error); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "error: " << error); DeviceSptr device = controller()->FindDevice(device_handle()); BluetoothDevice* bluetooth_device = @@ -69,10 +69,10 @@ bool BluetoothSocketConnection::Establish(ConnectError** error) { uint8_t rfcomm_channel; if (!bluetooth_device->GetRfcommChannel(application_handle(), &rfcomm_channel)) { - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "Application " << application_handle() << " not found"); *error = new ConnectError(); - LOG4CXX_TRACE(logger_, "exit with FALSE"); + LOGGER_TRACE(logger_, "exit with FALSE"); return false; } @@ -87,48 +87,48 @@ bool BluetoothSocketConnection::Establish(ConnectError** error) { int attempts = 4; int connect_status = 0; - LOG4CXX_DEBUG(logger_, "start rfcomm Connect attempts"); + LOGGER_DEBUG(logger_, "start rfcomm Connect attempts"); do { rfcomm_socket = socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM); if (-1 == rfcomm_socket) { - LOG4CXX_ERROR_WITH_ERRNO(logger_, + LOGGER_ERROR_WITH_ERRNO(logger_, "Failed to create RFCOMM socket for device " << device_handle()); *error = new ConnectError(); - LOG4CXX_TRACE(logger_, "exit with FALSE"); + LOGGER_TRACE(logger_, "exit with FALSE"); return false; } connect_status = ::connect(rfcomm_socket, (struct sockaddr*)&remoteSocketAddress, sizeof(remoteSocketAddress)); if (0 == connect_status) { - LOG4CXX_DEBUG(logger_, "rfcomm Connect ok"); + LOGGER_DEBUG(logger_, "rfcomm Connect ok"); break; } if (errno != 111 && errno != 104) { - LOG4CXX_DEBUG(logger_, "rfcomm Connect errno " << errno); + LOGGER_DEBUG(logger_, "rfcomm Connect errno " << errno); break; } if (errno) { - LOG4CXX_DEBUG(logger_, "rfcomm Connect errno " << errno); + LOGGER_DEBUG(logger_, "rfcomm Connect errno " << errno); close(rfcomm_socket); } sleep(2); } while (--attempts > 0); - LOG4CXX_INFO(logger_, "rfcomm Connect attempts finished"); + LOGGER_INFO(logger_, "rfcomm Connect attempts finished"); if (0 != connect_status) { - LOG4CXX_DEBUG( + LOGGER_DEBUG( logger_, "Failed to Connect to remote device " << BluetoothDevice::GetUniqueDeviceId(remoteSocketAddress.rc_bdaddr) << " for session " << this); *error = new ConnectError(); - LOG4CXX_TRACE(logger_, "exit with FALSE"); + LOGGER_TRACE(logger_, "exit with FALSE"); return false; } set_socket(rfcomm_socket); - LOG4CXX_TRACE(logger_, "exit with TRUE"); + LOGGER_TRACE(logger_, "exit with TRUE"); return true; } diff --git a/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc b/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc index a82c40ca15..bf4806fd71 100644 --- a/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc +++ b/src/components/transport_manager/src/bluetooth/bluetooth_transport_adapter.cc @@ -69,7 +69,7 @@ DeviceType BluetoothTransportAdapter::GetDeviceType() const { } void BluetoothTransportAdapter::Store() const { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); Json::Value bluetooth_adapter_dictionary; Json::Value devices_dictionary; DeviceList device_ids = GetDeviceList(); @@ -113,11 +113,11 @@ void BluetoothTransportAdapter::Store() const { bluetooth_adapter_dictionary["devices"] = devices_dictionary; last_state().dictionary["TransportManager"]["BluetoothAdapter"] = bluetooth_adapter_dictionary; - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } bool BluetoothTransportAdapter::Restore() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); bool errors_occured = false; const Json::Value bluetooth_adapter_dictionary = last_state().dictionary["TransportManager"]["BluetoothAdapter"]; @@ -160,9 +160,9 @@ bool BluetoothTransportAdapter::Restore() { } bool result = !errors_occured; if (result) { - LOG4CXX_TRACE(logger_, "exit with TRUE"); + LOGGER_TRACE(logger_, "exit with TRUE"); } else { - LOG4CXX_TRACE(logger_, "exit with FALSE"); + LOGGER_TRACE(logger_, "exit with FALSE"); } return result; } diff --git a/src/components/transport_manager/src/tcp/tcp_client_listener.cc b/src/components/transport_manager/src/tcp/tcp_client_listener.cc index a075b1afb7..c893d102bc 100644 --- a/src/components/transport_manager/src/tcp/tcp_client_listener.cc +++ b/src/components/transport_manager/src/tcp/tcp_client_listener.cc @@ -77,12 +77,12 @@ TcpClientListener::TcpClientListener(TransportAdapterController* controller, } TransportAdapter::Error TcpClientListener::Init() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); thread_stop_requested_ = false; socket_ = socket(AF_INET, SOCK_STREAM, 0); if (-1 == socket_) { - LOG4CXX_ERROR_WITH_ERRNO(logger_, "Failed to create socket"); + LOGGER_ERROR_WITH_ERRNO(logger_, "Failed to create socket"); return TransportAdapter::FAIL; } @@ -97,29 +97,29 @@ TransportAdapter::Error TcpClientListener::Init() { if (bind(socket_, reinterpret_cast<sockaddr*>(&server_address), sizeof(server_address)) != 0) { - LOG4CXX_ERROR_WITH_ERRNO(logger_, "bind() failed"); + LOGGER_ERROR_WITH_ERRNO(logger_, "bind() failed"); return TransportAdapter::FAIL; } const int kBacklog = 128; if (0 != listen(socket_, kBacklog)) { - LOG4CXX_ERROR_WITH_ERRNO(logger_, "listen() failed"); + LOGGER_ERROR_WITH_ERRNO(logger_, "listen() failed"); return TransportAdapter::FAIL; } return TransportAdapter::OK; } void TcpClientListener::Terminate() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); if (socket_ == -1) { - LOG4CXX_WARN(logger_, "Socket has been closed"); + LOGGER_WARN(logger_, "Socket has been closed"); return; } if (shutdown(socket_, SHUT_RDWR) != 0) { - LOG4CXX_ERROR_WITH_ERRNO(logger_, "Failed to shutdown socket"); + LOGGER_ERROR_WITH_ERRNO(logger_, "Failed to shutdown socket"); } if (close(socket_) != 0) { - LOG4CXX_ERROR_WITH_ERRNO(logger_, "Failed to close socket"); + LOGGER_ERROR_WITH_ERRNO(logger_, "Failed to close socket"); } socket_ = -1; } @@ -129,7 +129,7 @@ bool TcpClientListener::IsInitialised() const { } TcpClientListener::~TcpClientListener() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); StopListening(); delete thread_->delegate(); threads::DeleteThread(thread_); @@ -137,8 +137,8 @@ TcpClientListener::~TcpClientListener() { } void SetKeepaliveOptions(const int fd) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "fd: " << fd); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "fd: " << fd); int yes = 1; int keepidle = 3; // 3 seconds to disconnection detecting int keepcnt = 5; @@ -182,25 +182,25 @@ void SetKeepaliveOptions(const int fd) { } void TcpClientListener::Loop() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); while (!thread_stop_requested_) { sockaddr_in client_address; socklen_t client_address_size = sizeof(client_address); const int connection_fd = accept( socket_, (struct sockaddr*)&client_address, &client_address_size); if (thread_stop_requested_) { - LOG4CXX_DEBUG(logger_, "thread_stop_requested_"); + LOGGER_DEBUG(logger_, "thread_stop_requested_"); close(connection_fd); break; } if (connection_fd < 0) { - LOG4CXX_ERROR_WITH_ERRNO(logger_, "accept() failed"); + LOGGER_ERROR_WITH_ERRNO(logger_, "accept() failed"); continue; } if (AF_INET != client_address.sin_family) { - LOG4CXX_DEBUG(logger_, "Address of connected client is invalid"); + LOGGER_DEBUG(logger_, "Address of connected client is invalid"); close(connection_fd); continue; } @@ -209,7 +209,7 @@ void TcpClientListener::Loop() { strncpy(device_name, inet_ntoa(client_address.sin_addr), sizeof(device_name) / sizeof(device_name[0])); - LOG4CXX_INFO(logger_, "Connected client " << device_name); + LOGGER_INFO(logger_, "Connected client " << device_name); if (enable_keepalive_) { SetKeepaliveOptions(connection_fd); @@ -233,7 +233,7 @@ void TcpClientListener::Loop() { } void TcpClientListener::StopLoop() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); thread_stop_requested_ = true; // We need to connect to the listening socket to unblock accept() call int byesocket = socket(AF_INET, SOCK_STREAM, 0); @@ -249,19 +249,19 @@ void TcpClientListener::StopLoop() { } TransportAdapter::Error TcpClientListener::StartListening() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); if (thread_->is_running()) { - LOG4CXX_WARN( + LOGGER_WARN( logger_, "TransportAdapter::BAD_STATE. Listener has already been started"); return TransportAdapter::BAD_STATE; } if (!thread_->start()) { - LOG4CXX_ERROR(logger_, "Tcp client listener thread start failed"); + LOGGER_ERROR(logger_, "Tcp client listener thread start failed"); return TransportAdapter::FAIL; } - LOG4CXX_INFO(logger_, "Tcp client listener has started successfully"); + LOGGER_INFO(logger_, "Tcp client listener has started successfully"); return TransportAdapter::OK; } @@ -278,15 +278,15 @@ TcpClientListener::ListeningThreadDelegate::ListeningThreadDelegate( : parent_(parent) {} TransportAdapter::Error TcpClientListener::StopListening() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); if (!thread_->is_running()) { - LOG4CXX_DEBUG(logger_, "TcpClientListener is not running now"); + LOGGER_DEBUG(logger_, "TcpClientListener is not running now"); return TransportAdapter::BAD_STATE; } thread_->join(); - LOG4CXX_INFO(logger_, "Tcp client listener has stopped successfully"); + LOGGER_INFO(logger_, "Tcp client listener has stopped successfully"); return TransportAdapter::OK; } diff --git a/src/components/transport_manager/src/tcp/tcp_connection_factory.cc b/src/components/transport_manager/src/tcp/tcp_connection_factory.cc index 22653e8343..46aca5f22b 100644 --- a/src/components/transport_manager/src/tcp/tcp_connection_factory.cc +++ b/src/components/transport_manager/src/tcp/tcp_connection_factory.cc @@ -50,8 +50,8 @@ TransportAdapter::Error TcpConnectionFactory::Init() { TransportAdapter::Error TcpConnectionFactory::CreateConnection( const DeviceUID& device_uid, const ApplicationHandle& app_handle) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "DeviceUID: " << &device_uid << ", ApplicationHandle: " << &app_handle); TcpServerOiginatedSocketConnection* connection( @@ -59,10 +59,10 @@ TransportAdapter::Error TcpConnectionFactory::CreateConnection( device_uid, app_handle, controller_)); controller_->ConnectionCreated(connection, device_uid, app_handle); if (connection->Start() == TransportAdapter::OK) { - LOG4CXX_DEBUG(logger_, "TCP connection initialised"); + LOGGER_DEBUG(logger_, "TCP connection initialised"); return TransportAdapter::OK; } else { - LOG4CXX_ERROR(logger_, "Could not initialise TCP connection"); + LOGGER_ERROR(logger_, "Could not initialise TCP connection"); return TransportAdapter::FAIL; } } diff --git a/src/components/transport_manager/src/tcp/tcp_device.cc b/src/components/transport_manager/src/tcp/tcp_device.cc index d3f132759a..4453c15c78 100644 --- a/src/components/transport_manager/src/tcp/tcp_device.cc +++ b/src/components/transport_manager/src/tcp/tcp_device.cc @@ -43,27 +43,27 @@ TcpDevice::TcpDevice(const in_addr_t& in_addr, const std::string& name) , applications_mutex_() , in_addr_(in_addr) , last_handle_(0) { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); } bool TcpDevice::IsSameAs(const Device* other) const { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "Device: " << other); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "Device: " << other); const TcpDevice* other_tcp_device = static_cast<const TcpDevice*>(other); if (other_tcp_device->in_addr_ == in_addr_) { - LOG4CXX_TRACE( + LOGGER_TRACE( logger_, "exit with TRUE. Condition: other_tcp_device->in_addr_ == in_addr_"); return true; } else { - LOG4CXX_TRACE(logger_, "exit with FALSE"); + LOGGER_TRACE(logger_, "exit with FALSE"); return false; } } ApplicationList TcpDevice::GetApplicationList() const { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); sync_primitives::AutoLock locker(applications_mutex_); ApplicationList app_list; for (std::map<ApplicationHandle, Application>::const_iterator it = @@ -76,8 +76,8 @@ ApplicationList TcpDevice::GetApplicationList() const { } ApplicationHandle TcpDevice::AddIncomingApplication(int socket_fd) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "Socket_fd: " << socket_fd); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "Socket_fd: " << socket_fd); Application app; app.incoming = true; app.socket = socket_fd; @@ -85,13 +85,13 @@ ApplicationHandle TcpDevice::AddIncomingApplication(int socket_fd) { sync_primitives::AutoLock locker(applications_mutex_); const ApplicationHandle app_handle = ++last_handle_; applications_[app_handle] = app; - LOG4CXX_DEBUG(logger_, "App_handle " << app_handle); + LOGGER_DEBUG(logger_, "App_handle " << app_handle); return app_handle; } ApplicationHandle TcpDevice::AddDiscoveredApplication(int port) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "Port " << port); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "Port " << port); Application app; app.incoming = false; app.socket = 0; // this line removes compiler warning @@ -99,52 +99,52 @@ ApplicationHandle TcpDevice::AddDiscoveredApplication(int port) { sync_primitives::AutoLock locker(applications_mutex_); const ApplicationHandle app_handle = ++last_handle_; applications_[app_handle] = app; - LOG4CXX_DEBUG(logger_, "App_handle " << app_handle); + LOGGER_DEBUG(logger_, "App_handle " << app_handle); return app_handle; } void TcpDevice::RemoveApplication(const ApplicationHandle app_handle) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "ApplicationHandle: " << app_handle); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "ApplicationHandle: " << app_handle); sync_primitives::AutoLock locker(applications_mutex_); applications_.erase(app_handle); } TcpDevice::~TcpDevice() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); } int TcpDevice::GetApplicationSocket(const ApplicationHandle app_handle) const { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "ApplicationHandle: " << app_handle); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "ApplicationHandle: " << app_handle); std::map<ApplicationHandle, Application>::const_iterator it = applications_.find(app_handle); if (applications_.end() == it) { - LOG4CXX_WARN(logger_, "Application was not found"); + LOGGER_WARN(logger_, "Application was not found"); return -1; } if (!it->second.incoming) { - LOG4CXX_WARN(logger_, "Application is not incoming"); + LOGGER_WARN(logger_, "Application is not incoming"); return -1; } - LOG4CXX_DEBUG(logger_, "socket " << it->second.socket); + LOGGER_DEBUG(logger_, "socket " << it->second.socket); return it->second.socket; } int TcpDevice::GetApplicationPort(const ApplicationHandle app_handle) const { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "ApplicationHandle: " << app_handle); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "ApplicationHandle: " << app_handle); std::map<ApplicationHandle, Application>::const_iterator it = applications_.find(app_handle); if (applications_.end() == it) { - LOG4CXX_WARN(logger_, "Application was not found"); + LOGGER_WARN(logger_, "Application was not found"); return -1; } if (it->second.incoming) { - LOG4CXX_DEBUG(logger_, "Application is incoming"); + LOGGER_DEBUG(logger_, "Application is incoming"); return -1; } - LOG4CXX_DEBUG(logger_, "port " << it->second.port); + LOGGER_DEBUG(logger_, "port " << it->second.port); return it->second.port; } diff --git a/src/components/transport_manager/src/tcp/tcp_socket_connection.cc b/src/components/transport_manager/src/tcp/tcp_socket_connection.cc index acab9f555f..de9cfc3e46 100644 --- a/src/components/transport_manager/src/tcp/tcp_socket_connection.cc +++ b/src/components/transport_manager/src/tcp/tcp_socket_connection.cc @@ -68,12 +68,12 @@ TcpServerOiginatedSocketConnection::TcpServerOiginatedSocketConnection( TcpServerOiginatedSocketConnection::~TcpServerOiginatedSocketConnection() {} bool TcpServerOiginatedSocketConnection::Establish(ConnectError** error) { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); DCHECK(error); - LOG4CXX_DEBUG(logger_, "error " << error); + LOGGER_DEBUG(logger_, "error " << error); DeviceSptr device = controller()->FindDevice(device_handle()); if (!device.valid()) { - LOG4CXX_ERROR(logger_, "Device " << device_handle() << " not found"); + LOGGER_ERROR(logger_, "Device " << device_handle() << " not found"); *error = new ConnectError(); return false; } @@ -81,7 +81,7 @@ bool TcpServerOiginatedSocketConnection::Establish(ConnectError** error) { const int port = tcp_device->GetApplicationPort(application_handle()); if (-1 == port) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Application port for " << application_handle() << " not found"); *error = new ConnectError(); @@ -90,7 +90,7 @@ bool TcpServerOiginatedSocketConnection::Establish(ConnectError** error) { const int socket = ::socket(AF_INET, SOCK_STREAM, 0); if (socket < 0) { - LOG4CXX_ERROR(logger_, "Failed to create socket"); + LOGGER_ERROR(logger_, "Failed to create socket"); *error = new ConnectError(); return false; } @@ -100,10 +100,10 @@ bool TcpServerOiginatedSocketConnection::Establish(ConnectError** error) { addr.sin_addr.s_addr = tcp_device->in_addr(); addr.sin_port = htons(port); - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "Connecting " << inet_ntoa(addr.sin_addr) << ":" << port); if (::connect(socket, (struct sockaddr*)&addr, sizeof(addr)) < 0) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Failed to connect for application " << application_handle() << ", error " << errno); *error = new ConnectError(); diff --git a/src/components/transport_manager/src/tcp/tcp_transport_adapter.cc b/src/components/transport_manager/src/tcp/tcp_transport_adapter.cc index a389deb517..0c7db8f294 100644 --- a/src/components/transport_manager/src/tcp/tcp_transport_adapter.cc +++ b/src/components/transport_manager/src/tcp/tcp_transport_adapter.cc @@ -68,7 +68,7 @@ DeviceType TcpTransportAdapter::GetDeviceType() const { } void TcpTransportAdapter::Store() const { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); Json::Value tcp_adapter_dictionary; Json::Value devices_dictionary; DeviceList device_ids = GetDeviceList(); @@ -115,7 +115,7 @@ void TcpTransportAdapter::Store() const { } bool TcpTransportAdapter::Restore() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); bool errors_occurred = false; const Json::Value tcp_adapter_dictionary = last_state().dictionary["TransportManager"]["TcpAdapter"]; @@ -145,7 +145,7 @@ bool TcpTransportAdapter::Restore() { } } bool result = !errors_occurred; - LOG4CXX_DEBUG(logger_, "result " << std::boolalpha << result); + LOGGER_DEBUG(logger_, "result " << std::boolalpha << result); return result; } diff --git a/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc b/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc index 65afdf4fc0..3e3b7a842c 100644 --- a/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc +++ b/src/components/transport_manager/src/transport_adapter/threaded_socket_connection.cc @@ -69,7 +69,7 @@ ThreadedSocketConnection::ThreadedSocketConnection( } ThreadedSocketConnection::~ThreadedSocketConnection() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); Disconnect(); thread_->join(); delete thread_->delegate(); @@ -84,62 +84,62 @@ ThreadedSocketConnection::~ThreadedSocketConnection() { } void ThreadedSocketConnection::Abort() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); unexpected_disconnect_ = true; terminate_flag_ = true; } TransportAdapter::Error ThreadedSocketConnection::Start() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); int fds[2]; const int pipe_ret = pipe(fds); if (0 == pipe_ret) { - LOG4CXX_DEBUG(logger_, "pipe created"); + LOGGER_DEBUG(logger_, "pipe created"); read_fd_ = fds[0]; write_fd_ = fds[1]; } else { - LOG4CXX_ERROR(logger_, "pipe creation failed"); + LOGGER_ERROR(logger_, "pipe creation failed"); return TransportAdapter::FAIL; } const int fcntl_ret = fcntl(read_fd_, F_SETFL, fcntl(read_fd_, F_GETFL) | O_NONBLOCK); if (0 != fcntl_ret) { - LOG4CXX_ERROR(logger_, "fcntl failed"); + LOGGER_ERROR(logger_, "fcntl failed"); return TransportAdapter::FAIL; } if (!thread_->start()) { - LOG4CXX_ERROR(logger_, "thread creation failed"); + LOGGER_ERROR(logger_, "thread creation failed"); return TransportAdapter::FAIL; } - LOG4CXX_INFO(logger_, "thread created"); + LOGGER_INFO(logger_, "thread created"); return TransportAdapter::OK; } void ThreadedSocketConnection::Finalize() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); if (unexpected_disconnect_) { - LOG4CXX_DEBUG(logger_, "unexpected_disconnect"); + LOGGER_DEBUG(logger_, "unexpected_disconnect"); controller_->ConnectionAborted( device_handle(), application_handle(), CommunicationError()); } else { - LOG4CXX_DEBUG(logger_, "not unexpected_disconnect"); + LOGGER_DEBUG(logger_, "not unexpected_disconnect"); controller_->ConnectionFinished(device_handle(), application_handle()); } close(socket_); } TransportAdapter::Error ThreadedSocketConnection::Notify() const { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); if (-1 == write_fd_) { - LOG4CXX_ERROR_WITH_ERRNO( + LOGGER_ERROR_WITH_ERRNO( logger_, "Failed to wake up connection thread for connection " << this); - LOG4CXX_TRACE(logger_, "exit with TransportAdapter::BAD_STATE"); + LOGGER_TRACE(logger_, "exit with TransportAdapter::BAD_STATE"); return TransportAdapter::BAD_STATE; } uint8_t c = 0; if (1 != write(write_fd_, &c, 1)) { - LOG4CXX_ERROR_WITH_ERRNO( + LOGGER_ERROR_WITH_ERRNO( logger_, "Failed to wake up connection thread for connection " << this); return TransportAdapter::FAIL; } @@ -148,36 +148,36 @@ TransportAdapter::Error ThreadedSocketConnection::Notify() const { TransportAdapter::Error ThreadedSocketConnection::SendData( ::protocol_handler::RawMessagePtr message) { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); sync_primitives::AutoLock auto_lock(frames_to_send_mutex_); frames_to_send_.push(message); return Notify(); } TransportAdapter::Error ThreadedSocketConnection::Disconnect() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); terminate_flag_ = true; return Notify(); } void ThreadedSocketConnection::threadMain() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); controller_->ConnectionCreated(this, device_uid_, app_handle_); ConnectError* connect_error = NULL; if (!Establish(&connect_error)) { - LOG4CXX_ERROR(logger_, "Connection Establish failed"); + LOGGER_ERROR(logger_, "Connection Establish failed"); delete connect_error; } - LOG4CXX_DEBUG(logger_, "Connection established"); + LOGGER_DEBUG(logger_, "Connection established"); controller_->ConnectDone(device_handle(), application_handle()); while (!terminate_flag_) { Transmit(); } - LOG4CXX_DEBUG(logger_, "Connection is to finalize"); + LOGGER_DEBUG(logger_, "Connection is to finalize"); Finalize(); sync_primitives::AutoLock auto_lock(frames_to_send_mutex_); while (!frames_to_send_.empty()) { - LOG4CXX_INFO(logger_, "removing message"); + LOGGER_INFO(logger_, "removing message"); ::protocol_handler::RawMessagePtr message = frames_to_send_.front(); frames_to_send_.pop(); controller_->DataSendFailed( @@ -192,7 +192,7 @@ bool ThreadedSocketConnection::IsFramesToSendQueueEmpty() const { } void ThreadedSocketConnection::Transmit() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); const nfds_t kPollFdsSize = 2; pollfd poll_fds[kPollFdsSize]; @@ -205,26 +205,26 @@ void ThreadedSocketConnection::Transmit() { poll_fds[1].fd = read_fd_; poll_fds[1].events = POLLIN | POLLPRI; - LOG4CXX_DEBUG(logger_, "poll " << this); + LOGGER_DEBUG(logger_, "poll " << this); if (-1 == poll(poll_fds, kPollFdsSize, -1)) { - LOG4CXX_ERROR_WITH_ERRNO(logger_, "poll failed for connection " << this); + LOGGER_ERROR_WITH_ERRNO(logger_, "poll failed for connection " << this); Abort(); return; } - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "poll is ok " << this << " revents0: " << std::hex << poll_fds[0].revents << " revents1:" << std::hex << poll_fds[1].revents); // error check if (0 != (poll_fds[1].revents & (POLLERR | POLLHUP | POLLNVAL))) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Notification pipe for connection " << this << " terminated"); Abort(); return; } if (poll_fds[0].revents & (POLLERR | POLLHUP | POLLNVAL)) { - LOG4CXX_WARN(logger_, "Connection " << this << " terminated"); + LOGGER_WARN(logger_, "Connection " << this << " terminated"); Abort(); return; } @@ -236,8 +236,8 @@ void ThreadedSocketConnection::Transmit() { bytes_read = read(read_fd_, buffer, sizeof(buffer)); } while (bytes_read > 0); if ((bytes_read < 0) && (EAGAIN != errno)) { - LOG4CXX_ERROR_WITH_ERRNO(logger_, "Failed to clear notification pipe"); - LOG4CXX_ERROR_WITH_ERRNO(logger_, "poll failed for connection " << this); + LOGGER_ERROR_WITH_ERRNO(logger_, "Failed to clear notification pipe"); + LOGGER_ERROR_WITH_ERRNO(logger_, "poll failed for connection " << this); Abort(); return; } @@ -246,12 +246,12 @@ void ThreadedSocketConnection::Transmit() { // Send data if possible if (!is_queue_empty && (poll_fds[0].revents | POLLOUT)) { - LOG4CXX_DEBUG(logger_, "frames_to_send_ not empty() "); + LOGGER_DEBUG(logger_, "frames_to_send_ not empty() "); // send data const bool send_ok = Send(); if (!send_ok) { - LOG4CXX_ERROR(logger_, "Send() failed "); + LOGGER_ERROR(logger_, "Send() failed "); Abort(); return; } @@ -261,7 +261,7 @@ void ThreadedSocketConnection::Transmit() { if (poll_fds[0].revents & (POLLIN | POLLPRI)) { const bool receive_ok = Receive(); if (!receive_ok) { - LOG4CXX_ERROR(logger_, "Receive() failed "); + LOGGER_ERROR(logger_, "Receive() failed "); Abort(); return; } @@ -269,7 +269,7 @@ void ThreadedSocketConnection::Transmit() { } bool ThreadedSocketConnection::Receive() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); uint8_t buffer[4096]; ssize_t bytes_read = -1; @@ -277,7 +277,7 @@ bool ThreadedSocketConnection::Receive() { bytes_read = recv(socket_, buffer, sizeof(buffer), MSG_DONTWAIT); if (bytes_read > 0) { - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "Received " << bytes_read << " bytes for connection " << this); ::protocol_handler::RawMessagePtr frame( @@ -286,12 +286,12 @@ bool ThreadedSocketConnection::Receive() { device_handle(), application_handle(), frame); } else if (bytes_read < 0) { if (EAGAIN != errno && EWOULDBLOCK != errno) { - LOG4CXX_ERROR_WITH_ERRNO(logger_, + LOGGER_ERROR_WITH_ERRNO(logger_, "recv() failed for connection " << this); return false; } } else { - LOG4CXX_WARN(logger_, "Connection " << this << " closed by remote peer"); + LOGGER_WARN(logger_, "Connection " << this << " closed by remote peer"); return false; } } while (bytes_read > 0); @@ -300,7 +300,7 @@ bool ThreadedSocketConnection::Receive() { } bool ThreadedSocketConnection::Send() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); FrameQueue frames_to_send_local; { @@ -310,13 +310,13 @@ bool ThreadedSocketConnection::Send() { size_t offset = 0; while (!frames_to_send_local.empty()) { - LOG4CXX_INFO(logger_, "frames_to_send is not empty"); + LOGGER_INFO(logger_, "frames_to_send is not empty"); ::protocol_handler::RawMessagePtr frame = frames_to_send_local.front(); const ssize_t bytes_sent = ::send(socket_, frame->data() + offset, frame->data_size() - offset, 0); if (bytes_sent >= 0) { - LOG4CXX_DEBUG(logger_, "bytes_sent >= 0"); + LOGGER_DEBUG(logger_, "bytes_sent >= 0"); offset += bytes_sent; if (offset == frame->data_size()) { frames_to_send_local.pop(); @@ -324,8 +324,8 @@ bool ThreadedSocketConnection::Send() { controller_->DataSendDone(device_handle(), application_handle(), frame); } } else { - LOG4CXX_DEBUG(logger_, "bytes_sent < 0"); - LOG4CXX_ERROR_WITH_ERRNO(logger_, "Send failed for connection " << this); + LOGGER_DEBUG(logger_, "bytes_sent < 0"); + LOGGER_ERROR_WITH_ERRNO(logger_, "Send failed for connection " << this); frames_to_send_local.pop(); offset = 0; controller_->DataSendFailed( @@ -341,13 +341,13 @@ ThreadedSocketConnection::SocketConnectionDelegate::SocketConnectionDelegate( : connection_(connection) {} void ThreadedSocketConnection::SocketConnectionDelegate::threadMain() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); DCHECK(connection_); connection_->threadMain(); } void ThreadedSocketConnection::SocketConnectionDelegate::exitThreadMain() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); } } // namespace transport_adapter diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc index 4da069cf8b..c12587c96b 100644 --- a/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc +++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_impl.cc @@ -82,41 +82,41 @@ TransportAdapterImpl::~TransportAdapterImpl() { Terminate(); if (device_scanner_) { - LOG4CXX_DEBUG(logger_, "Deleting device_scanner_ " << device_scanner_); + LOGGER_DEBUG(logger_, "Deleting device_scanner_ " << device_scanner_); delete device_scanner_; - LOG4CXX_DEBUG(logger_, "device_scanner_ deleted."); + LOGGER_DEBUG(logger_, "device_scanner_ deleted."); } if (server_connection_factory_) { - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "Deleting server_connection_factory " << server_connection_factory_); delete server_connection_factory_; - LOG4CXX_DEBUG(logger_, "server_connection_factory deleted."); + LOGGER_DEBUG(logger_, "server_connection_factory deleted."); } if (client_connection_listener_) { - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "Deleting client_connection_listener_ " << client_connection_listener_); delete client_connection_listener_; - LOG4CXX_DEBUG(logger_, "client_connection_listener_ deleted."); + LOGGER_DEBUG(logger_, "client_connection_listener_ deleted."); } } void TransportAdapterImpl::Terminate() { if (device_scanner_) { device_scanner_->Terminate(); - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "device_scanner_ " << device_scanner_ << " terminated."); } if (server_connection_factory_) { server_connection_factory_->Terminate(); - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "server_connection_factory " << server_connection_factory_ << " terminated."); } if (client_connection_listener_) { client_connection_listener_->Terminate(); - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "client_connection_listener_ " << client_connection_listener_ << " terminated."); } @@ -127,7 +127,7 @@ void TransportAdapterImpl::Terminate() { connections_lock_.Release(); connections.clear(); - LOG4CXX_DEBUG(logger_, "Connections deleted"); + LOGGER_DEBUG(logger_, "Connections deleted"); DeviceMap devices; devices_mutex_.Acquire(); @@ -135,11 +135,11 @@ void TransportAdapterImpl::Terminate() { devices_mutex_.Release(); devices.clear(); - LOG4CXX_DEBUG(logger_, "Devices deleted"); + LOGGER_DEBUG(logger_, "Devices deleted"); } TransportAdapter::Error TransportAdapterImpl::Init() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); Error error = OK; @@ -157,39 +157,39 @@ TransportAdapter::Error TransportAdapterImpl::Init() { if (get_settings().use_last_state()) { if (!Restore()) { - LOG4CXX_WARN(logger_, "could not restore transport adapter state"); + LOGGER_WARN(logger_, "could not restore transport adapter state"); error = FAIL; } } - LOG4CXX_TRACE(logger_, "exit with error: " << error); + LOGGER_TRACE(logger_, "exit with error: " << error); return error; } TransportAdapter::Error TransportAdapterImpl::SearchDevices() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); if (device_scanner_ == NULL) { - LOG4CXX_TRACE(logger_, "exit with NOT_SUPPORTED"); + LOGGER_TRACE(logger_, "exit with NOT_SUPPORTED"); return NOT_SUPPORTED; } else if (!device_scanner_->IsInitialised()) { - LOG4CXX_TRACE(logger_, "exit with BAD_STATE"); + LOGGER_TRACE(logger_, "exit with BAD_STATE"); return BAD_STATE; } TransportAdapter::Error er = device_scanner_->Scan(); - LOG4CXX_TRACE(logger_, "exit with error: " << er); + LOGGER_TRACE(logger_, "exit with error: " << er); return er; } TransportAdapter::Error TransportAdapterImpl::Connect( const DeviceUID& device_id, const ApplicationHandle& app_handle) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. DeviceUID " << device_id << " ApplicationHandle " << app_handle); if (server_connection_factory_ == 0) { - LOG4CXX_TRACE(logger_, "exit with NOT_SUPPORTED"); + LOGGER_TRACE(logger_, "exit with NOT_SUPPORTED"); return NOT_SUPPORTED; } if (!server_connection_factory_->IsInitialised()) { - LOG4CXX_TRACE(logger_, "exit with BAD_STATE"); + LOGGER_TRACE(logger_, "exit with BAD_STATE"); return BAD_STATE; } @@ -205,7 +205,7 @@ TransportAdapter::Error TransportAdapterImpl::Connect( } connections_lock_.Release(); if (already_exists) { - LOG4CXX_TRACE(logger_, "exit with ALREADY_EXISTS"); + LOGGER_TRACE(logger_, "exit with ALREADY_EXISTS"); return ALREADY_EXISTS; } @@ -216,49 +216,49 @@ TransportAdapter::Error TransportAdapterImpl::Connect( connections_.erase(std::make_pair(device_id, app_handle)); connections_lock_.Release(); } - LOG4CXX_TRACE(logger_, "exit with error: " << err); + LOGGER_TRACE(logger_, "exit with error: " << err); return err; } TransportAdapter::Error TransportAdapterImpl::ConnectDevice( const DeviceUID& device_handle) { - LOG4CXX_TRACE(logger_, "enter with device_handle: " << &device_handle); + LOGGER_TRACE(logger_, "enter with device_handle: " << &device_handle); DeviceSptr device = FindDevice(device_handle); if (device) { TransportAdapter::Error err = ConnectDevice(device); - LOG4CXX_TRACE(logger_, "exit with error: " << err); + LOGGER_TRACE(logger_, "exit with error: " << err); return err; } else { - LOG4CXX_TRACE(logger_, "exit with BAD_PARAM"); + LOGGER_TRACE(logger_, "exit with BAD_PARAM"); return BAD_PARAM; } } TransportAdapter::Error TransportAdapterImpl::Disconnect( const DeviceUID& device_id, const ApplicationHandle& app_handle) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. device_id: " << &device_id << ", device_id: " << &device_id); if (!initialised_) { - LOG4CXX_TRACE(logger_, "exit with BAD_STATE"); + LOGGER_TRACE(logger_, "exit with BAD_STATE"); return BAD_STATE; } ConnectionSPtr connection = FindEstablishedConnection(device_id, app_handle); if (connection) { TransportAdapter::Error err = connection->Disconnect(); - LOG4CXX_TRACE(logger_, "exit with error: " << err); + LOGGER_TRACE(logger_, "exit with error: " << err); return err; } else { - LOG4CXX_TRACE(logger_, "exit with BAD_PARAM"); + LOGGER_TRACE(logger_, "exit with BAD_PARAM"); return BAD_PARAM; } } TransportAdapter::Error TransportAdapterImpl::DisconnectDevice( const DeviceUID& device_id) { - LOG4CXX_TRACE(logger_, "enter. device_id: " << &device_id); + LOGGER_TRACE(logger_, "enter. device_id: " << &device_id); if (!initialised_) { - LOG4CXX_TRACE(logger_, "exit with BAD_STATE"); + LOGGER_TRACE(logger_, "exit with BAD_STATE"); return BAD_STATE; } @@ -283,7 +283,7 @@ TransportAdapter::Error TransportAdapterImpl::DisconnectDevice( ConnectionInfo info = *j; if (OK != info.connection->Disconnect()) { error = FAIL; - LOG4CXX_ERROR(logger_, "Error on disconnect " << error); + LOGGER_ERROR(logger_, "Error on disconnect " << error); } } @@ -294,48 +294,48 @@ TransportAdapter::Error TransportAdapterImpl::SendData( const DeviceUID& device_id, const ApplicationHandle& app_handle, const ::protocol_handler::RawMessagePtr data) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. device_id: " << &device_id << ", app_handle: " << &app_handle << ", data: " << data); if (!initialised_) { - LOG4CXX_TRACE(logger_, "exit with BAD_STATE"); + LOGGER_TRACE(logger_, "exit with BAD_STATE"); return BAD_STATE; } ConnectionSPtr connection = FindEstablishedConnection(device_id, app_handle); if (connection) { TransportAdapter::Error err = connection->SendData(data); - LOG4CXX_TRACE(logger_, "exit with error: " << err); + LOGGER_TRACE(logger_, "exit with error: " << err); return err; } else { - LOG4CXX_TRACE(logger_, "exit with BAD_PARAM"); + LOGGER_TRACE(logger_, "exit with BAD_PARAM"); return BAD_PARAM; } } TransportAdapter::Error TransportAdapterImpl::StartClientListening() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); if (client_connection_listener_ == 0) { - LOG4CXX_TRACE(logger_, "exit with NOT_SUPPORTED"); + LOGGER_TRACE(logger_, "exit with NOT_SUPPORTED"); return NOT_SUPPORTED; } if (!client_connection_listener_->IsInitialised()) { - LOG4CXX_TRACE(logger_, "exit with BAD_STATE"); + LOGGER_TRACE(logger_, "exit with BAD_STATE"); return BAD_STATE; } TransportAdapter::Error err = client_connection_listener_->StartListening(); - LOG4CXX_TRACE(logger_, "exit with error: " << err); + LOGGER_TRACE(logger_, "exit with error: " << err); return err; } TransportAdapter::Error TransportAdapterImpl::StopClientListening() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); if (client_connection_listener_ == 0) { - LOG4CXX_TRACE(logger_, "exit with NOT_SUPPORTED"); + LOGGER_TRACE(logger_, "exit with NOT_SUPPORTED"); return NOT_SUPPORTED; } if (!client_connection_listener_->IsInitialised()) { - LOG4CXX_TRACE(logger_, "exit with BAD_STATE"); + LOGGER_TRACE(logger_, "exit with BAD_STATE"); return BAD_STATE; } TransportAdapter::Error err = client_connection_listener_->StopListening(); @@ -343,25 +343,25 @@ TransportAdapter::Error TransportAdapterImpl::StopClientListening() { for (DeviceMap::iterator it = devices_.begin(); it != devices_.end(); ++it) { it->second->Stop(); } - LOG4CXX_TRACE(logger_, "exit with error: " << err); + LOGGER_TRACE(logger_, "exit with error: " << err); return err; } DeviceList TransportAdapterImpl::GetDeviceList() const { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); DeviceList devices; sync_primitives::AutoLock locker(devices_mutex_); for (DeviceMap::const_iterator it = devices_.begin(); it != devices_.end(); ++it) { devices.push_back(it->first); } - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with DeviceList. It's' size = " << devices.size()); return devices; } DeviceSptr TransportAdapterImpl::AddDevice(DeviceSptr device) { - LOG4CXX_TRACE(logger_, "enter. device: " << device); + LOGGER_TRACE(logger_, "enter. device: " << device); DeviceSptr existing_device; bool same_device_found = false; devices_mutex_.Acquire(); @@ -370,7 +370,7 @@ DeviceSptr TransportAdapterImpl::AddDevice(DeviceSptr device) { existing_device = i->second; if (device->IsSameAs(existing_device.get())) { same_device_found = true; - LOG4CXX_DEBUG(logger_, "device " << device << "already exists"); + LOGGER_DEBUG(logger_, "device " << device << "already exists"); break; } } @@ -379,7 +379,7 @@ DeviceSptr TransportAdapterImpl::AddDevice(DeviceSptr device) { } devices_mutex_.Release(); if (same_device_found) { - LOG4CXX_TRACE(logger_, "exit with TRUE. Condition: same_device_found"); + LOGGER_TRACE(logger_, "exit with TRUE. Condition: same_device_found"); return existing_device; } else { for (TransportAdapterListenerList::iterator it = listeners_.begin(); @@ -390,13 +390,13 @@ DeviceSptr TransportAdapterImpl::AddDevice(DeviceSptr device) { if (ToBeAutoConnected(device)) { ConnectDevice(device); } - LOG4CXX_TRACE(logger_, "exit with DeviceSptr " << device); + LOGGER_TRACE(logger_, "exit with DeviceSptr " << device); return device; } } void TransportAdapterImpl::SearchDeviceDone(const DeviceVector& devices) { - LOG4CXX_TRACE(logger_, "enter. devices: " << &devices); + LOGGER_TRACE(logger_, "enter. devices: " << &devices); DeviceMap new_devices; for (DeviceVector::const_iterator it = devices.begin(); it != devices.end(); ++it) { @@ -410,14 +410,14 @@ void TransportAdapterImpl::SearchDeviceDone(const DeviceVector& devices) { if (device->IsSameAs(existing_device.get())) { existing_device->set_keep_on_disconnect(true); device_found = true; - LOG4CXX_DEBUG(logger_, "device found. DeviceSptr" << it->second); + LOGGER_DEBUG(logger_, "device found. DeviceSptr" << it->second); break; } } devices_mutex_.Release(); if (!device_found) { - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "Adding new device " << device->unique_device_id() << " (\"" << device->name() << "\")"); } @@ -467,7 +467,7 @@ void TransportAdapterImpl::SearchDeviceDone(const DeviceVector& devices) { ConnectDevice(device); } } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterImpl::ApplicationListUpdated( @@ -477,40 +477,40 @@ void TransportAdapterImpl::ApplicationListUpdated( } void TransportAdapterImpl::FindNewApplicationsRequest() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); for (TransportAdapterListenerList::iterator i = listeners_.begin(); i != listeners_.end(); ++i) { TransportAdapterListener* listener = *i; listener->OnFindNewApplicationsRequest(this); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterImpl::SearchDeviceFailed(const SearchDeviceError& error) { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); for (TransportAdapterListenerList::iterator it = listeners_.begin(); it != listeners_.end(); ++it) { (*it)->OnSearchDeviceFailed(this, error); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } bool TransportAdapterImpl::IsSearchDevicesSupported() const { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); return device_scanner_ != 0; - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } bool TransportAdapterImpl::IsServerOriginatedConnectSupported() const { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); return server_connection_factory_ != 0; - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } bool TransportAdapterImpl::IsClientOriginatedConnectSupported() const { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); return client_connection_listener_ != 0; } @@ -518,7 +518,7 @@ void TransportAdapterImpl::ConnectionCreated( ConnectionSPtr connection, const DeviceUID& device_id, const ApplicationHandle& app_handle) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter connection:" << connection << ", device_id: " << &device_id << ", app_handle: " << &app_handle); @@ -534,7 +534,7 @@ void TransportAdapterImpl::ConnectionCreated( void TransportAdapterImpl::DeviceDisconnected( const DeviceUID& device_handle, const DisconnectDeviceError& error) { const DeviceUID device_uid = device_handle; - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. device_handle: " << &device_uid << ", error: " << &error); ApplicationList app_list = GetApplicationList(device_uid); @@ -568,7 +568,7 @@ void TransportAdapterImpl::DeviceDisconnected( connections_lock_.Release(); RemoveDevice(device_uid); - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } bool TransportAdapterImpl::IsSingleApplication( @@ -580,7 +580,7 @@ bool TransportAdapterImpl::IsSingleApplication( const DeviceUID& current_device_id = it->first.first; const ApplicationHandle& current_app_handle = it->first.second; if (current_device_id == device_uid && current_app_handle != app_uid) { - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "break. Condition: current_device_id == device_id && " "current_app_handle != app_handle"); @@ -594,12 +594,12 @@ void TransportAdapterImpl::DisconnectDone(const DeviceUID& device_handle, const ApplicationHandle& app_handle) { const DeviceUID device_uid = device_handle; const ApplicationHandle app_uid = app_handle; - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. device_id: " << &device_uid << ", app_handle: " << &app_uid); DeviceSptr device = FindDevice(device_handle); if (!device) { - LOG4CXX_WARN(logger_, "Device: uid " << &device_uid << " not found"); + LOGGER_WARN(logger_, "Device: uid " << &device_uid << " not found"); return; } @@ -624,14 +624,14 @@ void TransportAdapterImpl::DisconnectDone(const DeviceUID& device_handle, } Store(); - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterImpl::DataReceiveDone( const DeviceUID& device_id, const ApplicationHandle& app_handle, ::protocol_handler::RawMessagePtr message) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. device_id: " << &device_id << ", app_handle: " << &app_handle << ", message: " << message); @@ -647,33 +647,33 @@ void TransportAdapterImpl::DataReceiveDone( ++it) { (*it)->OnDataReceiveDone(this, device_id, app_handle, message); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterImpl::DataReceiveFailed( const DeviceUID& device_id, const ApplicationHandle& app_handle, const DataReceiveError& error) { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); for (TransportAdapterListenerList::iterator it = listeners_.begin(); it != listeners_.end(); ++it) { (*it)->OnDataReceiveFailed(this, device_id, app_handle, error); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterImpl::DataSendDone( const DeviceUID& device_id, const ApplicationHandle& app_handle, ::protocol_handler::RawMessagePtr message) { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); for (TransportAdapterListenerList::iterator it = listeners_.begin(); it != listeners_.end(); ++it) { (*it)->OnDataSendDone(this, device_id, app_handle, message); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterImpl::DataSendFailed( @@ -681,33 +681,33 @@ void TransportAdapterImpl::DataSendFailed( const ApplicationHandle& app_handle, ::protocol_handler::RawMessagePtr message, const DataSendError& error) { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); for (TransportAdapterListenerList::iterator it = listeners_.begin(); it != listeners_.end(); ++it) { (*it)->OnDataSendFailed(this, device_id, app_handle, message, error); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } DeviceSptr TransportAdapterImpl::FindDevice(const DeviceUID& device_id) const { - LOG4CXX_TRACE(logger_, "enter. device_id: " << &device_id); + LOGGER_TRACE(logger_, "enter. device_id: " << &device_id); DeviceSptr ret; sync_primitives::AutoLock locker(devices_mutex_); - LOG4CXX_DEBUG(logger_, "devices_.size() = " << devices_.size()); + LOGGER_DEBUG(logger_, "devices_.size() = " << devices_.size()); DeviceMap::const_iterator it = devices_.find(device_id); if (it != devices_.end()) { ret = it->second; } else { - LOG4CXX_WARN(logger_, "Device " << device_id << " not found."); + LOGGER_WARN(logger_, "Device " << device_id << " not found."); } - LOG4CXX_TRACE(logger_, "exit with DeviceSptr: " << ret); + LOGGER_TRACE(logger_, "exit with DeviceSptr: " << ret); return ret; } void TransportAdapterImpl::ConnectDone(const DeviceUID& device_id, const ApplicationHandle& app_handle) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. device_id: " << &device_id << ", app_handle: " << &app_handle); connections_lock_.AcquireForReading(); @@ -726,7 +726,7 @@ void TransportAdapterImpl::ConnectDone(const DeviceUID& device_id, } Store(); - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterImpl::ConnectFailed(const DeviceUID& device_handle, @@ -734,7 +734,7 @@ void TransportAdapterImpl::ConnectFailed(const DeviceUID& device_handle, const ConnectError& error) { const DeviceUID device_uid = device_handle; const ApplicationHandle app_uid = app_handle; - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. device_id: " << &device_uid << ", app_handle: " << &app_uid << ", error: " << &error); connections_lock_.AcquireForWriting(); @@ -745,27 +745,27 @@ void TransportAdapterImpl::ConnectFailed(const DeviceUID& device_handle, ++it) { (*it)->OnConnectFailed(this, device_uid, app_uid, error); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterImpl::AddListener(TransportAdapterListener* listener) { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); listeners_.push_back(listener); - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } ApplicationList TransportAdapterImpl::GetApplicationList( const DeviceUID& device_id) const { - LOG4CXX_TRACE(logger_, "enter. device_id: " << &device_id); + LOGGER_TRACE(logger_, "enter. device_id: " << &device_id); DeviceSptr device = FindDevice(device_id); if (device.valid()) { ApplicationList lst = device->GetApplicationList(); - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with ApplicationList. It's size = " << lst.size() << " Condition: device.valid()"); return lst; } - LOG4CXX_TRACE( + LOGGER_TRACE( logger_, "exit with empty ApplicationList. Condition: NOT device.valid()"); return ApplicationList(); @@ -773,7 +773,7 @@ ApplicationList TransportAdapterImpl::GetApplicationList( void TransportAdapterImpl::ConnectionFinished( const DeviceUID& device_id, const ApplicationHandle& app_handle) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. device_id: " << &device_id << ", app_handle: " << &app_handle); connections_lock_.AcquireForReading(); @@ -799,32 +799,32 @@ void TransportAdapterImpl::ConnectionAborted( } bool TransportAdapterImpl::IsInitialised() const { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); if (!initialised_) { - LOG4CXX_TRACE(logger_, "exit with FALSE. Condition: !initialised_"); + LOGGER_TRACE(logger_, "exit with FALSE. Condition: !initialised_"); return false; } if (device_scanner_ && !device_scanner_->IsInitialised()) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with FALSE. Condition: device_scanner_ && " "!device_scanner_->IsInitialised()"); return false; } if (server_connection_factory_ && !server_connection_factory_->IsInitialised()) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with FALSE. Condition: server_connection_factory_ && " "!server_connection_factory_->IsInitialised()"); return false; } if (client_connection_listener_ && !client_connection_listener_->IsInitialised()) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with FALSE. Condition: client_connection_listener_ && " "!client_connection_listener_->IsInitialised()"); return false; } - LOG4CXX_TRACE(logger_, "exit with TRUE"); + LOGGER_TRACE(logger_, "exit with TRUE"); return true; } @@ -869,7 +869,7 @@ bool TransportAdapterImpl::ToBeAutoDisconnected(DeviceSptr device) const { ConnectionSPtr TransportAdapterImpl::FindEstablishedConnection( const DeviceUID& device_id, const ApplicationHandle& app_handle) const { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. device_id: " << &device_id << ", app_handle: " << &app_handle); ConnectionSPtr connection; @@ -883,54 +883,54 @@ ConnectionSPtr TransportAdapterImpl::FindEstablishedConnection( } } connections_lock_.Release(); - LOG4CXX_TRACE(logger_, "exit with Connection: " << connection); + LOGGER_TRACE(logger_, "exit with Connection: " << connection); return connection; } TransportAdapter::Error TransportAdapterImpl::ConnectDevice(DeviceSptr device) { - LOG4CXX_TRACE(logger_, "enter. device: " << device); + LOGGER_TRACE(logger_, "enter. device: " << device); DeviceUID device_id = device->unique_device_id(); ApplicationList app_list = device->GetApplicationList(); - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "Device " << device->name() << " has " << app_list.size() << " applications."); bool errors_occurred = false; for (ApplicationList::iterator it = app_list.begin(); it != app_list.end(); ++it) { const ApplicationHandle app_handle = *it; - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "Attempt to connect device " << device_id << ", channel " << app_handle); const Error error = Connect(device_id, app_handle); switch (error) { case OK: - LOG4CXX_DEBUG(logger_, "error = OK"); + LOGGER_DEBUG(logger_, "error = OK"); break; case ALREADY_EXISTS: - LOG4CXX_DEBUG(logger_, "error = ALREADY_EXISTS"); + LOGGER_DEBUG(logger_, "error = ALREADY_EXISTS"); break; default: - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Connect to device " << device_id << ", channel " << app_handle << " failed with error " << error); errors_occurred = true; - LOG4CXX_DEBUG(logger_, "switch (error), default case"); + LOGGER_DEBUG(logger_, "switch (error), default case"); break; } } if (errors_occurred) { - LOG4CXX_TRACE(logger_, "exit with error:FAIL"); + LOGGER_TRACE(logger_, "exit with error:FAIL"); return FAIL; } else { - LOG4CXX_TRACE(logger_, "exit with error:OK"); + LOGGER_TRACE(logger_, "exit with error:OK"); return OK; } } void TransportAdapterImpl::RemoveDevice(const DeviceUID& device_handle) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "Device_handle: " << &device_handle); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "Device_handle: " << &device_handle); sync_primitives::AutoLock locker(devices_mutex_); DeviceMap::iterator i = devices_.find(device_handle); if (i != devices_.end()) { diff --git a/src/components/transport_manager/src/transport_adapter/transport_adapter_listener_impl.cc b/src/components/transport_manager/src/transport_adapter/transport_adapter_listener_impl.cc index 2ab19ade86..29b9567183 100644 --- a/src/components/transport_manager/src/transport_adapter/transport_adapter_listener_impl.cc +++ b/src/components/transport_manager/src/transport_adapter/transport_adapter_listener_impl.cc @@ -47,7 +47,7 @@ TransportAdapterListenerImpl::TransportAdapterListenerImpl( void TransportAdapterListenerImpl::OnSearchDeviceDone( const TransportAdapter* adapter) { - LOG4CXX_TRACE(logger_, "enter. adapter* " << adapter); + LOGGER_TRACE(logger_, "enter. adapter* " << adapter); const TransportAdapterEvent event( TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_DONE, transport_adapter_, @@ -58,14 +58,14 @@ void TransportAdapterListenerImpl::OnSearchDeviceDone( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnSearchDeviceFailed( const TransportAdapter* adapter, const SearchDeviceError& error) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. adapter: " << adapter << ", error: " << &error); SearchDeviceError* err = new SearchDeviceError(error); const TransportAdapterEvent event( @@ -78,14 +78,14 @@ void TransportAdapterListenerImpl::OnSearchDeviceFailed( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnDeviceListUpdated( const TransportAdapter* adapter) { - LOG4CXX_TRACE(logger_, "enter. adapter* " << adapter); + LOGGER_TRACE(logger_, "enter. adapter* " << adapter); const TransportAdapterEvent event( TransportAdapterListenerImpl::EventTypeEnum::ON_DEVICE_LIST_UPDATED, transport_adapter_, @@ -96,14 +96,14 @@ void TransportAdapterListenerImpl::OnDeviceListUpdated( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnFindNewApplicationsRequest( const TransportAdapter* adapter) { - LOG4CXX_TRACE(logger_, "enter. adapter* " << adapter); + LOGGER_TRACE(logger_, "enter. adapter* " << adapter); const TransportAdapterEvent event( TransportAdapterListenerImpl::ON_FIND_NEW_APPLICATIONS_REQUEST, transport_adapter_, @@ -114,16 +114,16 @@ void TransportAdapterListenerImpl::OnFindNewApplicationsRequest( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnConnectDone( const TransportAdapter* adapter, const DeviceUID& device, const ApplicationHandle& application_id) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter adapter*: " << adapter << ", device: " << &device << ", application_id: " << &application_id); const TransportAdapterEvent event( @@ -136,9 +136,9 @@ void TransportAdapterListenerImpl::OnConnectDone( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnConnectFailed( @@ -146,7 +146,7 @@ void TransportAdapterListenerImpl::OnConnectFailed( const DeviceUID& device, const ApplicationHandle& app_id, const ConnectError& error) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. adapter: " << adapter << ", device: " << &device << ", application_id: " << &app_id << ", error: " << &error); @@ -161,16 +161,16 @@ void TransportAdapterListenerImpl::OnConnectFailed( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnDisconnectDone( const TransportAdapter* adapter, const DeviceUID& device, const ApplicationHandle& app_id) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. adapter: " << adapter << ", device: " << &device << ", application_id: " << &app_id); const TransportAdapterEvent event( @@ -183,9 +183,9 @@ void TransportAdapterListenerImpl::OnDisconnectDone( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnDisconnectFailed( @@ -193,7 +193,7 @@ void TransportAdapterListenerImpl::OnDisconnectFailed( const DeviceUID& device, const ApplicationHandle& app_id, const DisconnectError& error) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. adapter: " << adapter << ", device: " << &device << ", application_id: " << &app_id << ", error: " << &error); @@ -208,9 +208,9 @@ void TransportAdapterListenerImpl::OnDisconnectFailed( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnDisconnectDeviceDone( @@ -226,7 +226,7 @@ void TransportAdapterListenerImpl::OnDataReceiveDone( const DeviceUID& device, const ApplicationHandle& app_id, const ::protocol_handler::RawMessagePtr data_container) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. adapter: " << adapter << ", device: " << &device << ", application_id: " << &app_id << ", data_container: " << data_container); @@ -240,9 +240,9 @@ void TransportAdapterListenerImpl::OnDataReceiveDone( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnDataReceiveFailed( @@ -250,7 +250,7 @@ void TransportAdapterListenerImpl::OnDataReceiveFailed( const DeviceUID& device, const ApplicationHandle& app_id, const DataReceiveError& error) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. adapter: " << adapter << ", device: " << &device << ", application_id: " << &app_id << ", error: " << &error); @@ -265,9 +265,9 @@ void TransportAdapterListenerImpl::OnDataReceiveFailed( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnDataSendDone( @@ -275,7 +275,7 @@ void TransportAdapterListenerImpl::OnDataSendDone( const DeviceUID& device, const ApplicationHandle& app_id, const ::protocol_handler::RawMessagePtr data_container) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. adapter: " << adapter << ", device: " << &device << ", application_id: " << &app_id << ", data_container: " << data_container); @@ -289,9 +289,9 @@ void TransportAdapterListenerImpl::OnDataSendDone( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnDataSendFailed( @@ -300,7 +300,7 @@ void TransportAdapterListenerImpl::OnDataSendFailed( const ApplicationHandle& app_id, const ::protocol_handler::RawMessagePtr data_container, const DataSendError& error) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. adapter: " << adapter << ", device: " << &device << ", application_id: " << &app_id << ", data_container: " << data_container @@ -316,9 +316,9 @@ void TransportAdapterListenerImpl::OnDataSendFailed( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnConnectRequested( @@ -331,7 +331,7 @@ void TransportAdapterListenerImpl::OnUnexpectedDisconnect( const DeviceUID& device, const ApplicationHandle& application, const CommunicationError& error) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. adapter: " << adapter << ", device: " << &device << ", application: " << &application << ", error: " << &error); @@ -346,16 +346,16 @@ void TransportAdapterListenerImpl::OnUnexpectedDisconnect( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportAdapterListenerImpl::OnCommunicationError( const TransportAdapter* adapter, const DeviceUID& device, const ApplicationHandle& app_id) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. adapter: " << adapter << ", device: " << &device << ", application_id: " << &app_id); const TransportAdapterEvent event( @@ -368,8 +368,8 @@ void TransportAdapterListenerImpl::OnCommunicationError( if (transport_manager_ != NULL && transport_manager::E_SUCCESS != transport_manager_->ReceiveEventFromDevice(event)) { - LOG4CXX_WARN(logger_, "Failed to receive event from device"); + LOGGER_WARN(logger_, "Failed to receive event from device"); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } } // namespace transport_manager diff --git a/src/components/transport_manager/src/transport_manager_default.cc b/src/components/transport_manager/src/transport_manager_default.cc index 31f398233b..9b6217ec01 100644 --- a/src/components/transport_manager/src/transport_manager_default.cc +++ b/src/components/transport_manager/src/transport_manager_default.cc @@ -52,9 +52,9 @@ TransportManagerDefault::TransportManagerDefault( : TransportManagerImpl(settings) {} int TransportManagerDefault::Init(resumption::LastState& last_state) { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); if (E_SUCCESS != TransportManagerImpl::Init(last_state)) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with E_TM_IS_NOT_INITIALIZED. Condition: E_SUCCESS != " "TransportManagerImpl::Init()"); return E_TM_IS_NOT_INITIALIZED; @@ -97,7 +97,7 @@ int TransportManagerDefault::Init(resumption::LastState& last_state) { ta_usb = NULL; #endif // USB_SUPPORT - LOG4CXX_TRACE(logger_, "exit with E_SUCCESS"); + LOGGER_TRACE(logger_, "exit with E_SUCCESS"); return E_SUCCESS; } diff --git a/src/components/transport_manager/src/transport_manager_impl.cc b/src/components/transport_manager/src/transport_manager_impl.cc index a33fe86a12..30b61f0fc7 100644 --- a/src/components/transport_manager/src/transport_manager_impl.cc +++ b/src/components/transport_manager/src/transport_manager_impl.cc @@ -61,12 +61,12 @@ CREATE_LOGGERPTR_GLOBAL(logger_, "TransportManager") TransportManagerImpl::Connection TransportManagerImpl::convert( const TransportManagerImpl::ConnectionInternal& p) { - LOG4CXX_TRACE(logger_, "enter. ConnectionInternal: " << &p); + LOGGER_TRACE(logger_, "enter. ConnectionInternal: " << &p); TransportManagerImpl::Connection c; c.application = p.application; c.device = p.device; c.id = p.id; - LOG4CXX_TRACE( + LOGGER_TRACE( logger_, "exit with TransportManagerImpl::Connection. It's ConnectionUID = " << c.id); @@ -83,11 +83,11 @@ TransportManagerImpl::TransportManagerImpl( , message_queue_("TM MessageQueue", this) , event_queue_("TM EventQueue", this) , settings_(settings) { - LOG4CXX_TRACE(logger_, "TransportManager has created"); + LOGGER_TRACE(logger_, "TransportManager has created"); } TransportManagerImpl::~TransportManagerImpl() { - LOG4CXX_DEBUG(logger_, "TransportManager object destroying"); + LOGGER_DEBUG(logger_, "TransportManager object destroying"); message_queue_.Shutdown(); event_queue_.Shutdown(); @@ -105,67 +105,67 @@ TransportManagerImpl::~TransportManagerImpl() { delete it->second; } - LOG4CXX_INFO(logger_, "TransportManager object destroyed"); + LOGGER_INFO(logger_, "TransportManager object destroyed"); } int TransportManagerImpl::ConnectDevice(const DeviceHandle device_handle) { - LOG4CXX_TRACE(logger_, "enter. DeviceHandle: " << &device_handle); + LOGGER_TRACE(logger_, "enter. DeviceHandle: " << &device_handle); if (!this->is_initialized_) { - LOG4CXX_ERROR(logger_, "TransportManager is not initialized."); - LOG4CXX_TRACE( + LOGGER_ERROR(logger_, "TransportManager is not initialized."); + LOGGER_TRACE( logger_, "exit with E_TM_IS_NOT_INITIALIZED. Condition: !this->is_initialized_"); return E_TM_IS_NOT_INITIALIZED; } DeviceUID device_id = converter_.HandleToUid(device_handle); - LOG4CXX_DEBUG(logger_, "Convert handle to id:" << device_id); + LOGGER_DEBUG(logger_, "Convert handle to id:" << device_id); sync_primitives::AutoReadLock lock(device_to_adapter_map_lock_); DeviceToAdapterMap::iterator it = device_to_adapter_map_.find(device_id); if (it == device_to_adapter_map_.end()) { - LOG4CXX_ERROR(logger_, "No device adapter found by id " << device_id); - LOG4CXX_TRACE(logger_, "exit with E_INVALID_HANDLE. Condition: NULL == ta"); + LOGGER_ERROR(logger_, "No device adapter found by id " << device_id); + LOGGER_TRACE(logger_, "exit with E_INVALID_HANDLE. Condition: NULL == ta"); return E_INVALID_HANDLE; } transport_adapter::TransportAdapter* ta = it->second; TransportAdapter::Error ta_error = ta->ConnectDevice(device_id); int err = (TransportAdapter::OK == ta_error) ? E_SUCCESS : E_INTERNAL_ERROR; - LOG4CXX_TRACE(logger_, "exit with error: " << err); + LOGGER_TRACE(logger_, "exit with error: " << err); return err; } int TransportManagerImpl::DisconnectDevice(const DeviceHandle device_handle) { - LOG4CXX_TRACE(logger_, "enter. DeviceHandle: " << &device_handle); + LOGGER_TRACE(logger_, "enter. DeviceHandle: " << &device_handle); if (!this->is_initialized_) { - LOG4CXX_ERROR(logger_, "TransportManager is not initialized."); - LOG4CXX_TRACE( + LOGGER_ERROR(logger_, "TransportManager is not initialized."); + LOGGER_TRACE( logger_, "exit with E_TM_IS_NOT_INITIALIZED. Condition: !this->is_initialized_"); return E_TM_IS_NOT_INITIALIZED; } DeviceUID device_id = converter_.HandleToUid(device_handle); - LOG4CXX_DEBUG(logger_, "Convert handle to id:" << device_id); + LOGGER_DEBUG(logger_, "Convert handle to id:" << device_id); sync_primitives::AutoReadLock lock(device_to_adapter_map_lock_); DeviceToAdapterMap::iterator it = device_to_adapter_map_.find(device_id); if (it == device_to_adapter_map_.end()) { - LOG4CXX_WARN(logger_, "No device adapter found by id " << device_id); - LOG4CXX_TRACE(logger_, "exit with E_INVALID_HANDLE. Condition: NULL == ta"); + LOGGER_WARN(logger_, "No device adapter found by id " << device_id); + LOGGER_TRACE(logger_, "exit with E_INVALID_HANDLE. Condition: NULL == ta"); return E_INVALID_HANDLE; } transport_adapter::TransportAdapter* ta = it->second; ta->DisconnectDevice(device_id); - LOG4CXX_TRACE(logger_, "exit with E_SUCCESS"); + LOGGER_TRACE(logger_, "exit with E_SUCCESS"); return E_SUCCESS; } int TransportManagerImpl::Disconnect(const ConnectionUID cid) { - LOG4CXX_TRACE(logger_, "enter. ConnectionUID: " << &cid); + LOGGER_TRACE(logger_, "enter. ConnectionUID: " << &cid); if (!this->is_initialized_) { - LOG4CXX_ERROR(logger_, "TransportManager is not initialized."); - LOG4CXX_TRACE( + LOGGER_ERROR(logger_, "TransportManager is not initialized."); + LOGGER_TRACE( logger_, "exit with E_TM_IS_NOT_INITIALIZED. Condition: !this->is_initialized_"); return E_TM_IS_NOT_INITIALIZED; @@ -174,10 +174,10 @@ int TransportManagerImpl::Disconnect(const ConnectionUID cid) { sync_primitives::AutoReadLock lock(connections_lock_); ConnectionInternal* connection = GetConnection(cid); if (NULL == connection) { - LOG4CXX_ERROR( + LOGGER_ERROR( logger_, "TransportManagerImpl::Disconnect: Connection does not exist."); - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with E_INVALID_HANDLE. Condition: NULL == connection"); return E_INVALID_HANDLE; } @@ -209,15 +209,15 @@ int TransportManagerImpl::Disconnect(const ConnectionUID cid) { connection->application); } */ - LOG4CXX_TRACE(logger_, "exit with E_SUCCESS"); + LOGGER_TRACE(logger_, "exit with E_SUCCESS"); return E_SUCCESS; } int TransportManagerImpl::DisconnectForce(const ConnectionUID cid) { - LOG4CXX_TRACE(logger_, "enter ConnectionUID: " << &cid); + LOGGER_TRACE(logger_, "enter ConnectionUID: " << &cid); if (false == this->is_initialized_) { - LOG4CXX_ERROR(logger_, "TransportManager is not initialized."); - LOG4CXX_TRACE(logger_, + LOGGER_ERROR(logger_, "TransportManager is not initialized."); + LOGGER_TRACE(logger_, "exit with E_TM_IS_NOT_INITIALIZED. Condition: false == " "this->is_initialized_"); return E_TM_IS_NOT_INITIALIZED; @@ -225,28 +225,28 @@ int TransportManagerImpl::DisconnectForce(const ConnectionUID cid) { sync_primitives::AutoReadLock lock(connections_lock_); const ConnectionInternal* connection = GetConnection(cid); if (NULL == connection) { - LOG4CXX_ERROR( + LOGGER_ERROR( logger_, "TransportManagerImpl::DisconnectForce: Connection does not exist."); - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with E_INVALID_HANDLE. Condition: NULL == connection"); return E_INVALID_HANDLE; } connection->transport_adapter->Disconnect(connection->device, connection->application); - LOG4CXX_TRACE(logger_, "exit with E_SUCCESS"); + LOGGER_TRACE(logger_, "exit with E_SUCCESS"); return E_SUCCESS; } int TransportManagerImpl::AddEventListener(TransportManagerListener* listener) { - LOG4CXX_TRACE(logger_, "enter. TransportManagerListener: " << listener); + LOGGER_TRACE(logger_, "enter. TransportManagerListener: " << listener); transport_manager_listener_.push_back(listener); - LOG4CXX_TRACE(logger_, "exit with E_SUCCESS"); + LOGGER_TRACE(logger_, "exit with E_SUCCESS"); return E_SUCCESS; } void TransportManagerImpl::DisconnectAllDevices() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); sync_primitives::AutoReadLock lock(device_list_lock_); for (DeviceInfoList::iterator i = device_list_.begin(); i != device_list_.end(); @@ -257,7 +257,7 @@ void TransportManagerImpl::DisconnectAllDevices() { } void TransportManagerImpl::TerminateAllAdapters() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); for (std::vector<TransportAdapter*>::iterator i = transport_adapters_.begin(); i != transport_adapters_.end(); ++i) { @@ -266,7 +266,7 @@ void TransportManagerImpl::TerminateAllAdapters() { } int TransportManagerImpl::InitAllAdapters() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); for (std::vector<TransportAdapter*>::iterator i = transport_adapters_.begin(); i != transport_adapters_.end(); ++i) { @@ -278,9 +278,9 @@ int TransportManagerImpl::InitAllAdapters() { } int TransportManagerImpl::Stop() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); if (!is_initialized_) { - LOG4CXX_WARN(logger_, "TransportManager is not initialized_"); + LOGGER_WARN(logger_, "TransportManager is not initialized_"); return E_TM_IS_NOT_INITIALIZED; } @@ -296,13 +296,13 @@ int TransportManagerImpl::Stop() { int TransportManagerImpl::SendMessageToDevice( const ::protocol_handler::RawMessagePtr message) { - LOG4CXX_TRACE(logger_, "enter. RawMessageSptr: " << message); - LOG4CXX_INFO(logger_, + LOGGER_TRACE(logger_, "enter. RawMessageSptr: " << message); + LOGGER_INFO(logger_, "Send message to device called with arguments " << message.get()); if (false == this->is_initialized_) { - LOG4CXX_ERROR(logger_, "TM is not initialized."); - LOG4CXX_TRACE(logger_, + LOGGER_ERROR(logger_, "TM is not initialized."); + LOGGER_TRACE(logger_, "exit with E_TM_IS_NOT_INITIALIZED. Condition: false == " "this->is_initialized_"); return E_TM_IS_NOT_INITIALIZED; @@ -313,19 +313,19 @@ int TransportManagerImpl::SendMessageToDevice( const ConnectionInternal* connection = GetConnection(message->connection_key()); if (NULL == connection) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Connection with id " << message->connection_key() << " does not exist."); - LOG4CXX_TRACE( + LOGGER_TRACE( logger_, "exit with E_INVALID_HANDLE. Condition: NULL == connection"); return E_INVALID_HANDLE; } if (connection->shutdown_) { - LOG4CXX_ERROR( + LOGGER_ERROR( logger_, "TransportManagerImpl::Disconnect: Connection is to shut down."); - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with E_CONNECTION_IS_TO_SHUTDOWN. Condition: " "connection->shutDown"); return E_CONNECTION_IS_TO_SHUTDOWN; @@ -337,49 +337,49 @@ int TransportManagerImpl::SendMessageToDevice( } #endif // TELEMETRY_MONITOR this->PostMessage(message); - LOG4CXX_TRACE(logger_, "exit with E_SUCCESS"); + LOGGER_TRACE(logger_, "exit with E_SUCCESS"); return E_SUCCESS; } int TransportManagerImpl::ReceiveEventFromDevice( const TransportAdapterEvent& event) { - LOG4CXX_TRACE(logger_, "enter. TransportAdapterEvent: " << &event); + LOGGER_TRACE(logger_, "enter. TransportAdapterEvent: " << &event); if (!is_initialized_) { - LOG4CXX_ERROR(logger_, "TM is not initialized."); - LOG4CXX_TRACE(logger_, + LOGGER_ERROR(logger_, "TM is not initialized."); + LOGGER_TRACE(logger_, "exit with E_TM_IS_NOT_INITIALIZED. Condition: false == " "this->is_initialized_"); return E_TM_IS_NOT_INITIALIZED; } this->PostEvent(event); - LOG4CXX_TRACE(logger_, "exit with E_SUCCESS"); + LOGGER_TRACE(logger_, "exit with E_SUCCESS"); return E_SUCCESS; } int TransportManagerImpl::RemoveDevice(const DeviceHandle device_handle) { - LOG4CXX_TRACE(logger_, "enter. DeviceHandle: " << &device_handle); + LOGGER_TRACE(logger_, "enter. DeviceHandle: " << &device_handle); DeviceUID device_id = converter_.HandleToUid(device_handle); if (false == this->is_initialized_) { - LOG4CXX_ERROR(logger_, "TM is not initialized."); - LOG4CXX_TRACE(logger_, + LOGGER_ERROR(logger_, "TM is not initialized."); + LOGGER_TRACE(logger_, "exit with E_TM_IS_NOT_INITIALIZED. Condition: false == " "this->is_initialized_"); return E_TM_IS_NOT_INITIALIZED; } sync_primitives::AutoWriteLock lock(device_to_adapter_map_lock_); device_to_adapter_map_.erase(device_id); - LOG4CXX_TRACE(logger_, "exit with E_SUCCESS"); + LOGGER_TRACE(logger_, "exit with E_SUCCESS"); return E_SUCCESS; } int TransportManagerImpl::AddTransportAdapter( transport_adapter::TransportAdapter* transport_adapter) { - LOG4CXX_TRACE(logger_, "enter. TransportAdapter: " << transport_adapter); + LOGGER_TRACE(logger_, "enter. TransportAdapter: " << transport_adapter); if (transport_adapter_listeners_.find(transport_adapter) != transport_adapter_listeners_.end()) { - LOG4CXX_ERROR(logger_, "Adapter already exists."); - LOG4CXX_TRACE(logger_, + LOGGER_ERROR(logger_, "Adapter already exists."); + LOGGER_TRACE(logger_, "exit with E_ADAPTER_EXISTS. Condition: " "transport_adapter_listeners_.find(transport_adapter) != " "transport_adapter_listeners_.end()"); @@ -394,21 +394,21 @@ int TransportManagerImpl::AddTransportAdapter( transport_adapter->Init() == TransportAdapter::OK) { transport_adapters_.push_back(transport_adapter); } - LOG4CXX_TRACE(logger_, "exit with E_SUCCESS"); + LOGGER_TRACE(logger_, "exit with E_SUCCESS"); return E_SUCCESS; } int TransportManagerImpl::SearchDevices() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); if (!this->is_initialized_) { - LOG4CXX_ERROR(logger_, "TM is not initialized"); - LOG4CXX_TRACE( + LOGGER_ERROR(logger_, "TM is not initialized"); + LOGGER_TRACE( logger_, "exit with E_TM_IS_NOT_INITIALIZED. Condition: !this->is_initialized_"); return E_TM_IS_NOT_INITIALIZED; } - LOG4CXX_INFO(logger_, "Search device called"); + LOGGER_INFO(logger_, "Search device called"); bool success_occurred = false; @@ -416,33 +416,33 @@ int TransportManagerImpl::SearchDevices() { transport_adapters_.begin(); it != transport_adapters_.end(); ++it) { - LOG4CXX_DEBUG(logger_, "Iterating over transport adapters"); + LOGGER_DEBUG(logger_, "Iterating over transport adapters"); TransportAdapter::Error scanResult = (*it)->SearchDevices(); if (transport_adapter::TransportAdapter::OK == scanResult) { success_occurred = true; } else { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Transport Adapter search failed " << *it << "[" << (*it)->GetDeviceType() << "]"); switch (scanResult) { case transport_adapter::TransportAdapter::NOT_SUPPORTED: { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Search feature is not supported " << *it << "[" << (*it)->GetDeviceType() << "]"); - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "scanResult = TransportAdapter::NOT_SUPPORTED"); break; } case transport_adapter::TransportAdapter::BAD_STATE: { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Transport Adapter has bad state " << *it << "[" << (*it)->GetDeviceType() << "]"); - LOG4CXX_DEBUG(logger_, "scanResult = TransportAdapter::BAD_STATE"); + LOGGER_DEBUG(logger_, "scanResult = TransportAdapter::BAD_STATE"); break; } default: { - LOG4CXX_ERROR(logger_, "Invalid scan result"); - LOG4CXX_DEBUG(logger_, "scanResult = default switch case"); + LOGGER_ERROR(logger_, "Invalid scan result"); + LOGGER_DEBUG(logger_, "scanResult = default switch case"); return E_ADAPTERS_FAIL; } } @@ -452,11 +452,11 @@ int TransportManagerImpl::SearchDevices() { (success_occurred || transport_adapters_.empty()) ? E_SUCCESS : E_ADAPTERS_FAIL; if (transport_adapter_search == E_SUCCESS) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with E_SUCCESS. Condition: success_occured || " "transport_adapters_.empty()"); } else { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with E_ADAPTERS_FAIL. Condition: success_occured || " "transport_adapters_.empty()"); } @@ -466,14 +466,14 @@ int TransportManagerImpl::SearchDevices() { int TransportManagerImpl::Init(resumption::LastState& last_state) { // Last state requred to initialize Transport adapters UNUSED(last_state); - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); is_initialized_ = true; - LOG4CXX_TRACE(logger_, "exit with E_SUCCESS"); + LOGGER_TRACE(logger_, "exit with E_SUCCESS"); return E_SUCCESS; } int TransportManagerImpl::Reinit() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); DisconnectAllDevices(); TerminateAllAdapters(); int ret = InitAllAdapters(); @@ -481,13 +481,13 @@ int TransportManagerImpl::Reinit() { } int TransportManagerImpl::Visibility(const bool& on_off) const { - LOG4CXX_TRACE(logger_, "enter. On_off: " << &on_off); + LOGGER_TRACE(logger_, "enter. On_off: " << &on_off); TransportAdapter::Error ret; - LOG4CXX_DEBUG(logger_, "Visibility change requested to " << on_off); + LOGGER_DEBUG(logger_, "Visibility change requested to " << on_off); if (!is_initialized_) { - LOG4CXX_ERROR(logger_, "TM is not initialized"); - LOG4CXX_TRACE(logger_, + LOGGER_ERROR(logger_, "TM is not initialized"); + LOGGER_TRACE(logger_, "exit with E_TM_IS_NOT_INITIALIZED. Condition: false == " "is_initialized_"); return E_TM_IS_NOT_INITIALIZED; @@ -503,17 +503,17 @@ int TransportManagerImpl::Visibility(const bool& on_off) const { ret = (*it)->StopClientListening(); } if (TransportAdapter::Error::NOT_SUPPORTED == ret) { - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "Visibility change is not supported for adapter " << *it << "[" << (*it)->GetDeviceType() << "]"); } } - LOG4CXX_TRACE(logger_, "exit with E_SUCCESS"); + LOGGER_TRACE(logger_, "exit with E_SUCCESS"); return E_SUCCESS; } void TransportManagerImpl::UpdateDeviceList(TransportAdapter* ta) { - LOG4CXX_TRACE(logger_, "enter. TransportAdapter: " << ta); + LOGGER_TRACE(logger_, "enter. TransportAdapter: " << ta); std::set<DeviceInfo> old_devices; std::set<DeviceInfo> new_devices; { @@ -563,19 +563,19 @@ void TransportManagerImpl::UpdateDeviceList(TransportAdapter* ta) { ++it) { RaiseEvent(&TransportManagerListener::OnDeviceRemoved, *it); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportManagerImpl::PostMessage( const ::protocol_handler::RawMessagePtr message) { - LOG4CXX_TRACE(logger_, "enter. RawMessageSptr: " << message); + LOGGER_TRACE(logger_, "enter. RawMessageSptr: " << message); message_queue_.PostMessage(message); - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportManagerImpl::PostEvent(const TransportAdapterEvent& event) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "TransportAdapterEvent: " << &event); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "TransportAdapterEvent: " << &event); event_queue_.PostMessage(event); } @@ -584,15 +584,15 @@ const TransportManagerSettings& TransportManagerImpl::get_settings() const { } void TransportManagerImpl::AddConnection(const ConnectionInternal& c) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "ConnectionInternal: " << &c); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "ConnectionInternal: " << &c); sync_primitives::AutoWriteLock lock(connections_lock_); connections_.push_back(c); } void TransportManagerImpl::RemoveConnection(uint32_t id) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "Id: " << id); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "Id: " << id); sync_primitives::AutoWriteLock lock(connections_lock_); for (std::vector<ConnectionInternal>::iterator it = connections_.begin(); it != connections_.end(); @@ -606,13 +606,13 @@ void TransportManagerImpl::RemoveConnection(uint32_t id) { TransportManagerImpl::ConnectionInternal* TransportManagerImpl::GetConnection( const ConnectionUID id) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "ConnectionUID: " << &id); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "ConnectionUID: " << &id); for (std::vector<ConnectionInternal>::iterator it = connections_.begin(); it != connections_.end(); ++it) { if (it->id == id) { - LOG4CXX_DEBUG(logger_, "ConnectionInternal. It's address: " << &*it); + LOGGER_DEBUG(logger_, "ConnectionInternal. It's address: " << &*it); return &*it; } } @@ -621,15 +621,15 @@ TransportManagerImpl::ConnectionInternal* TransportManagerImpl::GetConnection( TransportManagerImpl::ConnectionInternal* TransportManagerImpl::GetConnection( const DeviceUID& device, const ApplicationHandle& application) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "DeviceUID: " << &device << "ApplicationHandle: " << &application); for (std::vector<ConnectionInternal>::iterator it = connections_.begin(); it != connections_.end(); ++it) { if (it->device == device && it->application == application) { - LOG4CXX_DEBUG(logger_, "ConnectionInternal. It's address: " << &*it); + LOGGER_DEBUG(logger_, "ConnectionInternal. It's address: " << &*it); return &*it; } } @@ -637,9 +637,9 @@ TransportManagerImpl::ConnectionInternal* TransportManagerImpl::GetConnection( } void TransportManagerImpl::OnDeviceListUpdated(TransportAdapter* ta) { - LOG4CXX_TRACE(logger_, "enter. TransportAdapter: " << ta); + LOGGER_TRACE(logger_, "enter. TransportAdapter: " << ta); const DeviceList device_list = ta->GetDeviceList(); - LOG4CXX_DEBUG(logger_, "DEVICE_LIST_UPDATED " << device_list.size()); + LOGGER_DEBUG(logger_, "DEVICE_LIST_UPDATED " << device_list.size()); for (DeviceList::const_iterator it = device_list.begin(); it != device_list.end(); ++it) { @@ -661,32 +661,32 @@ void TransportManagerImpl::OnDeviceListUpdated(TransportAdapter* ta) { } device_list_lock_.Release(); RaiseEvent(&TransportManagerListener::OnDeviceListUpdated, device_infos); - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void TransportManagerImpl::Handle(TransportAdapterEvent event) { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); switch (event.event_type) { case TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_DONE: { RaiseEvent(&TransportManagerListener::OnScanDevicesFinished); - LOG4CXX_DEBUG(logger_, "event_type = ON_SEARCH_DONE"); + LOGGER_DEBUG(logger_, "event_type = ON_SEARCH_DONE"); break; } case TransportAdapterListenerImpl::EventTypeEnum::ON_SEARCH_FAIL: { // error happened in real search process (external error) RaiseEvent(&TransportManagerListener::OnScanDevicesFailed, *static_cast<SearchDeviceError*>(event.event_error.get())); - LOG4CXX_DEBUG(logger_, "event_type = ON_SEARCH_FAIL"); + LOGGER_DEBUG(logger_, "event_type = ON_SEARCH_FAIL"); break; } case TransportAdapterListenerImpl::EventTypeEnum::ON_DEVICE_LIST_UPDATED: { OnDeviceListUpdated(event.transport_adapter); - LOG4CXX_DEBUG(logger_, "event_type = ON_DEVICE_LIST_UPDATED"); + LOGGER_DEBUG(logger_, "event_type = ON_DEVICE_LIST_UPDATED"); break; } case TransportAdapterListenerImpl::ON_FIND_NEW_APPLICATIONS_REQUEST: { RaiseEvent(&TransportManagerListener::OnFindNewApplicationsRequest); - LOG4CXX_DEBUG(logger_, "event_type = ON_FIND_NEW_APPLICATIONS_REQUEST"); + LOGGER_DEBUG(logger_, "event_type = ON_FIND_NEW_APPLICATIONS_REQUEST"); break; } case TransportAdapterListenerImpl::EventTypeEnum::ON_CONNECT_DONE: { @@ -705,7 +705,7 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { event.transport_adapter->DeviceName(event.device_uid), event.transport_adapter->GetConnectionType()), connection_id_counter_); - LOG4CXX_DEBUG(logger_, "event_type = ON_CONNECT_DONE"); + LOGGER_DEBUG(logger_, "event_type = ON_CONNECT_DONE"); break; } case TransportAdapterListenerImpl::EventTypeEnum::ON_CONNECT_FAIL: { @@ -716,7 +716,7 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { event.transport_adapter->DeviceName(event.device_uid), event.transport_adapter->GetConnectionType()), ConnectError()); - LOG4CXX_DEBUG(logger_, "event_type = ON_CONNECT_FAIL"); + LOGGER_DEBUG(logger_, "event_type = ON_CONNECT_FAIL"); break; } case TransportAdapterListenerImpl::EventTypeEnum::ON_DISCONNECT_DONE: { @@ -724,8 +724,8 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { ConnectionInternal* connection = GetConnection(event.device_uid, event.application_id); if (NULL == connection) { - LOG4CXX_ERROR(logger_, "Connection not found"); - LOG4CXX_DEBUG(logger_, + LOGGER_ERROR(logger_, "Connection not found"); + LOGGER_DEBUG(logger_, "event_type = ON_DISCONNECT_DONE && NULL == connection"); connections_lock_.Release(); break; @@ -735,7 +735,7 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { RaiseEvent(&TransportManagerListener::OnConnectionClosed, id); RemoveConnection(id); - LOG4CXX_DEBUG(logger_, "event_type = ON_DISCONNECT_DONE"); + LOGGER_DEBUG(logger_, "event_type = ON_DISCONNECT_DONE"); break; } case TransportAdapterListenerImpl::EventTypeEnum::ON_DISCONNECT_FAIL: { @@ -744,7 +744,7 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { RaiseEvent(&TransportManagerListener::OnDisconnectFailed, device_handle, DisconnectDeviceError()); - LOG4CXX_DEBUG(logger_, "event_type = ON_DISCONNECT_FAIL"); + LOGGER_DEBUG(logger_, "event_type = ON_DISCONNECT_FAIL"); break; } case TransportAdapterListenerImpl::EventTypeEnum::ON_SEND_DONE: { @@ -757,10 +757,10 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { ConnectionInternal* connection = GetConnection(event.device_uid, event.application_id); if (connection == NULL) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Connection ('" << event.device_uid << ", " << event.application_id << ") not found"); - LOG4CXX_DEBUG( + LOGGER_DEBUG( logger_, "event_type = ON_SEND_DONE. Condition: NULL == connection"); break; @@ -771,7 +771,7 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { connection->transport_adapter->Disconnect(connection->device, connection->application); } - LOG4CXX_DEBUG(logger_, "event_type = ON_SEND_DONE"); + LOGGER_DEBUG(logger_, "event_type = ON_SEND_DONE"); break; } case TransportAdapterListenerImpl::EventTypeEnum::ON_SEND_FAIL: { @@ -785,11 +785,11 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { ConnectionInternal* connection = GetConnection(event.device_uid, event.application_id); if (connection == NULL) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Connection ('" << event.device_uid << ", " << event.application_id << ") not found"); - LOG4CXX_DEBUG( + LOGGER_DEBUG( logger_, "event_type = ON_SEND_FAIL. Condition: NULL == connection"); break; @@ -798,15 +798,15 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { // TODO(YK): start timer here to wait before notify caller // and remove unsent messages - LOG4CXX_ERROR(logger_, "Transport adapter failed to send data"); + LOGGER_ERROR(logger_, "Transport adapter failed to send data"); // TODO(YK): potential error case -> thread unsafe // update of message content if (event.event_data.valid()) { event.event_data->set_waiting(true); } else { - LOG4CXX_DEBUG(logger_, "Data is invalid"); + LOGGER_DEBUG(logger_, "Data is invalid"); } - LOG4CXX_DEBUG(logger_, "eevent_type = ON_SEND_FAIL"); + LOGGER_DEBUG(logger_, "eevent_type = ON_SEND_FAIL"); break; } case TransportAdapterListenerImpl::EventTypeEnum::ON_RECEIVED_DONE: { @@ -815,11 +815,11 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { ConnectionInternal* connection = GetConnection(event.device_uid, event.application_id); if (connection == NULL) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Connection ('" << event.device_uid << ", " << event.application_id << ") not found"); - LOG4CXX_DEBUG( + LOGGER_DEBUG( logger_, "event_type = ON_RECEIVED_DONE. Condition: NULL == connection"); break; @@ -833,16 +833,16 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { #endif // TELEMETRY_MONITOR RaiseEvent(&TransportManagerListener::OnTMMessageReceived, event.event_data); - LOG4CXX_DEBUG(logger_, "event_type = ON_RECEIVED_DONE"); + LOGGER_DEBUG(logger_, "event_type = ON_RECEIVED_DONE"); break; } case TransportAdapterListenerImpl::EventTypeEnum::ON_RECEIVED_FAIL: { - LOG4CXX_DEBUG(logger_, "Event ON_RECEIVED_FAIL"); + LOGGER_DEBUG(logger_, "Event ON_RECEIVED_FAIL"); connections_lock_.AcquireForReading(); ConnectionInternal* connection = GetConnection(event.device_uid, event.application_id); if (connection == NULL) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Connection ('" << event.device_uid << ", " << event.application_id << ") not found"); connections_lock_.Release(); @@ -852,11 +852,11 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { RaiseEvent(&TransportManagerListener::OnTMMessageReceiveFailed, *static_cast<DataReceiveError*>(event.event_error.get())); - LOG4CXX_DEBUG(logger_, "event_type = ON_RECEIVED_FAIL"); + LOGGER_DEBUG(logger_, "event_type = ON_RECEIVED_FAIL"); break; } case TransportAdapterListenerImpl::EventTypeEnum::ON_COMMUNICATION_ERROR: { - LOG4CXX_DEBUG(logger_, "event_type = ON_COMMUNICATION_ERROR"); + LOGGER_DEBUG(logger_, "event_type = ON_COMMUNICATION_ERROR"); break; } case TransportAdapterListenerImpl::EventTypeEnum:: @@ -873,15 +873,15 @@ void TransportManagerImpl::Handle(TransportAdapterEvent event) { RemoveConnection(id); } else { connections_lock_.Release(); - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Connection ('" << event.device_uid << ", " << event.application_id << ") not found"); } - LOG4CXX_DEBUG(logger_, "eevent_type = ON_UNEXPECTED_DISCONNECT"); + LOGGER_DEBUG(logger_, "eevent_type = ON_UNEXPECTED_DISCONNECT"); break; } } // switch - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } #ifdef TELEMETRY_MONITOR @@ -891,11 +891,11 @@ void TransportManagerImpl::SetTelemetryObserver(TMTelemetryObserver* observer) { #endif // TELEMETRY_MONITOR void TransportManagerImpl::Handle(::protocol_handler::RawMessagePtr msg) { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); sync_primitives::AutoReadLock lock(connections_lock_); ConnectionInternal* connection = GetConnection(msg->connection_key()); if (connection == NULL) { - LOG4CXX_WARN(logger_, + LOGGER_WARN(logger_, "Connection " << msg->connection_key() << " not found"); RaiseEvent(&TransportManagerListener::OnTMMessageSendFailed, DataSendTimeoutError(), @@ -904,14 +904,14 @@ void TransportManagerImpl::Handle(::protocol_handler::RawMessagePtr msg) { } TransportAdapter* transport_adapter = connection->transport_adapter; - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "Got adapter " << transport_adapter << "[" << transport_adapter->GetDeviceType() << "]" << " by session id " << msg->connection_key()); if (NULL == transport_adapter) { std::string error_text = "Transport adapter is not found"; - LOG4CXX_ERROR(logger_, error_text); + LOGGER_ERROR(logger_, error_text); RaiseEvent(&TransportManagerListener::OnTMMessageSendFailed, DataSendError(error_text), msg); @@ -919,15 +919,15 @@ void TransportManagerImpl::Handle(::protocol_handler::RawMessagePtr msg) { if (TransportAdapter::OK == transport_adapter->SendData( connection->device, connection->application, msg)) { - LOG4CXX_TRACE(logger_, "Data sent to adapter"); + LOGGER_TRACE(logger_, "Data sent to adapter"); } else { - LOG4CXX_ERROR(logger_, "Data sent error"); + LOGGER_ERROR(logger_, "Data sent error"); RaiseEvent(&TransportManagerListener::OnTMMessageSendFailed, DataSendError("Send failed"), msg); } } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } TransportManagerImpl::ConnectionInternal::ConnectionInternal( @@ -954,13 +954,13 @@ TransportManagerImpl::ConnectionInternal::ConnectionInternal( } void TransportManagerImpl::ConnectionInternal::DisconnectFailedRoutine() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); transport_manager->RaiseEvent(&TransportManagerListener::OnDisconnectFailed, device_handle_, DisconnectDeviceError()); shutdown_ = false; timer->Stop(); - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } } // namespace transport_manager diff --git a/src/components/transport_manager/src/usb/libusb/platform_usb_device.cc b/src/components/transport_manager/src/usb/libusb/platform_usb_device.cc index 33709cf0f6..a00d60fe90 100644 --- a/src/components/transport_manager/src/usb/libusb/platform_usb_device.cc +++ b/src/components/transport_manager/src/usb/libusb/platform_usb_device.cc @@ -56,18 +56,18 @@ PlatformUsbDevice::PlatformUsbDevice( , libusb_device_(device_libusb) {} std::string PlatformUsbDevice::GetDescString(uint8_t index) const { - LOG4CXX_TRACE(logger_, "enter. index: " << int(index)); + LOGGER_TRACE(logger_, "enter. index: " << int(index)); unsigned char buf[128]; const int libusb_ret = libusb_get_string_descriptor_ascii( libusb_device_handle_, index, buf, sizeof(buf)); if (libusb_ret < 0) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "Failed to get USB string descriptor: " << libusb_error_name(libusb_ret)); - LOG4CXX_TRACE(logger_, "exit with empty string"); + LOGGER_TRACE(logger_, "exit with empty string"); return ""; } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); return std::string(reinterpret_cast<char*>(buf)); } diff --git a/src/components/transport_manager/src/usb/libusb/usb_connection.cc b/src/components/transport_manager/src/usb/libusb/usb_connection.cc index 409209b2b2..bd81ee14ce 100644 --- a/src/components/transport_manager/src/usb/libusb/usb_connection.cc +++ b/src/components/transport_manager/src/usb/libusb/usb_connection.cc @@ -74,11 +74,11 @@ UsbConnection::UsbConnection(const DeviceUID& device_uid, , waiting_out_transfer_cancel_(false) {} UsbConnection::~UsbConnection() { - LOG4CXX_TRACE(logger_, "enter with this" << this); + LOGGER_TRACE(logger_, "enter with this" << this); Finalise(); libusb_free_transfer(in_transfer_); delete[] in_buffer_; - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } // Callback for handling income and outcome data from lib_usb @@ -91,7 +91,7 @@ void OutTransferCallback(libusb_transfer* transfer) { } bool UsbConnection::PostInTransfer() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); libusb_fill_bulk_transfer(in_transfer_, device_handle_, in_endpoint_, @@ -102,15 +102,15 @@ bool UsbConnection::PostInTransfer() { 0); const int libusb_ret = libusb_submit_transfer(in_transfer_); if (LIBUSB_SUCCESS != libusb_ret) { - LOG4CXX_ERROR( + LOGGER_ERROR( logger_, "libusb_submit_transfer failed: " << libusb_error_name(libusb_ret)); - LOG4CXX_TRACE( + LOGGER_TRACE( logger_, "exit with FALSE. Condition: LIBUSB_SUCCESS != libusb_submit_transfer"); return false; } - LOG4CXX_TRACE(logger_, "exit with TRUE"); + LOGGER_TRACE(logger_, "exit with TRUE"); return true; } @@ -125,9 +125,9 @@ std::string hex_data(const unsigned char* const buffer, } void UsbConnection::OnInTransfer(libusb_transfer* transfer) { - LOG4CXX_TRACE(logger_, "enter with Libusb_transfer*: " << transfer); + LOGGER_TRACE(logger_, "enter with Libusb_transfer*: " << transfer); if (transfer->status == LIBUSB_TRANSFER_COMPLETED) { - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "USB incoming transfer, size:" << transfer->actual_length << ", data:" << hex_data(transfer->buffer, transfer->actual_length)); @@ -135,7 +135,7 @@ void UsbConnection::OnInTransfer(libusb_transfer* transfer) { 0, 0, in_buffer_, transfer->actual_length)); controller_->DataReceiveDone(device_uid_, app_handle_, data); } else { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "USB incoming transfer failed: " << libusb_error_name(transfer->status)); controller_->DataReceiveFailed( @@ -145,17 +145,17 @@ void UsbConnection::OnInTransfer(libusb_transfer* transfer) { waiting_in_transfer_cancel_ = false; } else { if (!PostInTransfer()) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "USB incoming transfer failed with " << "LIBUSB_TRANSFER_NO_DEVICE. Abort connection."); AbortConnection(); } } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void UsbConnection::PopOutMessage() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); bytes_sent_ = 0; if (out_messages_.empty()) { current_out_message_.reset(); @@ -164,15 +164,15 @@ void UsbConnection::PopOutMessage() { out_messages_.pop_front(); PostOutTransfer(); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } bool UsbConnection::PostOutTransfer() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); out_transfer_ = libusb_alloc_transfer(0); if (0 == out_transfer_) { - LOG4CXX_ERROR(logger_, "libusb_alloc_transfer failed"); - LOG4CXX_TRACE(logger_, "exit with FALSE. Condition: 0 == out_transfer_"); + LOGGER_ERROR(logger_, "libusb_alloc_transfer failed"); + LOGGER_TRACE(logger_, "exit with FALSE. Condition: 0 == out_transfer_"); return false; } libusb_fill_bulk_transfer(out_transfer_, @@ -185,34 +185,34 @@ bool UsbConnection::PostOutTransfer() { 0); const int libusb_ret = libusb_submit_transfer(out_transfer_); if (LIBUSB_SUCCESS != libusb_ret) { - LOG4CXX_ERROR( + LOGGER_ERROR( logger_, "libusb_submit_transfer failed: " << libusb_error_name(libusb_ret) << ". Abort connection."); AbortConnection(); - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with FALSE. Condition: " << "LIBUSB_SUCCESS != libusb_fill_bulk_transfer"); return false; } - LOG4CXX_TRACE(logger_, "exit with TRUE"); + LOGGER_TRACE(logger_, "exit with TRUE"); return true; } void UsbConnection::OnOutTransfer(libusb_transfer* transfer) { - LOG4CXX_TRACE(logger_, "enter with Libusb_transfer*: " << transfer); + LOGGER_TRACE(logger_, "enter with Libusb_transfer*: " << transfer); sync_primitives::AutoLock locker(out_messages_mutex_); if (transfer->status == LIBUSB_TRANSFER_COMPLETED) { bytes_sent_ += transfer->actual_length; if (bytes_sent_ == current_out_message_->data_size()) { - LOG4CXX_DEBUG( + LOGGER_DEBUG( logger_, "USB out transfer, data sent: " << current_out_message_.get()); controller_->DataSendDone(device_uid_, app_handle_, current_out_message_); PopOutMessage(); } } else { - LOG4CXX_ERROR( + LOGGER_ERROR( logger_, "USB out transfer failed: " << libusb_error_name(transfer->status)); controller_->DataSendFailed( @@ -224,14 +224,14 @@ void UsbConnection::OnOutTransfer(libusb_transfer* transfer) { out_transfer_ = NULL; waiting_out_transfer_cancel_ = false; } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } TransportAdapter::Error UsbConnection::SendData( ::protocol_handler::RawMessagePtr message) { - LOG4CXX_TRACE(logger_, "enter with RawMessagePtr: " << message.get()); + LOGGER_TRACE(logger_, "enter with RawMessagePtr: " << message.get()); if (disconnecting_) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with TransportAdapter::BAD_STATE. Condition: " << "disconnecting_"); return TransportAdapter::BAD_STATE; @@ -244,19 +244,19 @@ TransportAdapter::Error UsbConnection::SendData( if (!PostOutTransfer()) { controller_->DataSendFailed( device_uid_, app_handle_, message, DataSendError()); - LOG4CXX_TRACE( + LOGGER_TRACE( logger_, "exit with TransportAdapter::FAIL. Condition: !PostOutTransfer()"); return TransportAdapter::FAIL; } } - LOG4CXX_TRACE(logger_, "exit with TransportAdapter::OK."); + LOGGER_TRACE(logger_, "exit with TransportAdapter::OK."); return TransportAdapter::OK; } void UsbConnection::Finalise() { - LOG4CXX_TRACE(logger_, "enter"); - LOG4CXX_DEBUG(logger_, "Finalise USB connection " << device_uid_); + LOGGER_TRACE(logger_, "enter"); + LOGGER_DEBUG(logger_, "Finalise USB connection " << device_uid_); { sync_primitives::AutoLock locker(out_messages_mutex_); disconnecting_ = true; @@ -283,15 +283,15 @@ void UsbConnection::Finalise() { while (waiting_in_transfer_cancel_ || waiting_out_transfer_cancel_) { pthread_yield(); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void UsbConnection::AbortConnection() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); controller_->ConnectionAborted( device_uid_, app_handle_, CommunicationError()); Disconnect(); - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } TransportAdapter::Error UsbConnection::Disconnect() { @@ -301,43 +301,43 @@ TransportAdapter::Error UsbConnection::Disconnect() { } bool UsbConnection::Init() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); if (!FindEndpoints()) { - LOG4CXX_ERROR(logger_, "EndPoints was not found"); - LOG4CXX_TRACE(logger_, "exit with FALSE. Condition: !FindEndpoints()"); + LOGGER_ERROR(logger_, "EndPoints was not found"); + LOGGER_TRACE(logger_, "exit with FALSE. Condition: !FindEndpoints()"); return false; } in_buffer_ = new unsigned char[in_endpoint_max_packet_size_]; in_transfer_ = libusb_alloc_transfer(0); if (NULL == in_transfer_) { - LOG4CXX_ERROR(logger_, "libusb_alloc_transfer failed"); - LOG4CXX_TRACE(logger_, "exit with FALSE. Condition: NULL == in_transfer_"); + LOGGER_ERROR(logger_, "libusb_alloc_transfer failed"); + LOGGER_TRACE(logger_, "exit with FALSE. Condition: NULL == in_transfer_"); return false; } controller_->ConnectDone(device_uid_, app_handle_); if (!PostInTransfer()) { - LOG4CXX_ERROR(logger_, "PostInTransfer failed. Call ConnectionAborted"); + LOGGER_ERROR(logger_, "PostInTransfer failed. Call ConnectionAborted"); controller_->ConnectionAborted( device_uid_, app_handle_, CommunicationError()); - LOG4CXX_TRACE(logger_, "exit with FALSE. Condition: !PostInTransfer()"); + LOGGER_TRACE(logger_, "exit with FALSE. Condition: !PostInTransfer()"); return false; } - LOG4CXX_TRACE(logger_, "exit with TRUE"); + LOGGER_TRACE(logger_, "exit with TRUE"); return true; } bool UsbConnection::FindEndpoints() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); struct libusb_config_descriptor* config; const int libusb_ret = libusb_get_active_config_descriptor(libusb_device_, &config); if (LIBUSB_SUCCESS != libusb_ret) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "libusb_get_active_config_descriptor failed: " << libusb_error_name(libusb_ret)); - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with FALSE. Condition: LIBUSB_SUCCESS != libusb_ret"); return false; } @@ -370,7 +370,7 @@ bool UsbConnection::FindEndpoints() { libusb_free_config_descriptor(config); const bool result = !(find_in_endpoint || find_out_endpoint); - LOG4CXX_TRACE(logger_, "exit with " << (result ? "TRUE" : "FALSE")); + LOGGER_TRACE(logger_, "exit with " << (result ? "TRUE" : "FALSE")); return result; } } // namespace transport_adapter diff --git a/src/components/transport_manager/src/usb/libusb/usb_handler.cc b/src/components/transport_manager/src/usb/libusb/usb_handler.cc index c62e80d1be..f4534572b9 100644 --- a/src/components/transport_manager/src/usb/libusb/usb_handler.cc +++ b/src/components/transport_manager/src/usb/libusb/usb_handler.cc @@ -96,7 +96,7 @@ UsbHandler::~UsbHandler() { libusb_hotplug_deregister_callback(libusb_context_, left_callback_handle_); } thread_->stop(); - LOG4CXX_INFO(logger_, "UsbHandler thread finished"); + LOGGER_INFO(logger_, "UsbHandler thread finished"); if (libusb_context_) { libusb_exit(libusb_context_); libusb_context_ = 0; @@ -107,34 +107,34 @@ UsbHandler::~UsbHandler() { } void UsbHandler::DeviceArrived(libusb_device* device_libusb) { - LOG4CXX_TRACE(logger_, "enter. libusb_device* " << device_libusb); + LOGGER_TRACE(logger_, "enter. libusb_device* " << device_libusb); const uint8_t bus_number = libusb_get_bus_number(device_libusb); const uint8_t device_address = libusb_get_device_address(device_libusb); libusb_device_descriptor descriptor; int libusb_ret = libusb_get_device_descriptor(device_libusb, &descriptor); if (LIBUSB_SUCCESS != libusb_ret) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "libusb_get_device_descriptor failed: " << libusb_ret); - LOG4CXX_TRACE(logger_, "exit. Condition: LIBUSB_SUCCESS != libusb_ret"); + LOGGER_TRACE(logger_, "exit. Condition: LIBUSB_SUCCESS != libusb_ret"); return; } libusb_device_handle* device_handle_libusb; libusb_ret = libusb_open(device_libusb, &device_handle_libusb); if (libusb_ret != LIBUSB_SUCCESS) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "libusb_open failed: " << libusb_error_name(libusb_ret)); - LOG4CXX_TRACE(logger_, "exit. Condition: libusb_ret != LIBUSB_SUCCESS"); + LOGGER_TRACE(logger_, "exit. Condition: libusb_ret != LIBUSB_SUCCESS"); return; } int configuration; libusb_ret = libusb_get_configuration(device_handle_libusb, &configuration); if (LIBUSB_SUCCESS != libusb_ret) { - LOG4CXX_INFO( + LOGGER_INFO( logger_, "libusb_get_configuration failed: " << libusb_error_name(libusb_ret)); - LOG4CXX_TRACE(logger_, "exit. Condition: LIBUSB_SUCCESS != libusb_ret"); + LOGGER_TRACE(logger_, "exit. Condition: LIBUSB_SUCCESS != libusb_ret"); return; } @@ -142,21 +142,21 @@ void UsbHandler::DeviceArrived(libusb_device* device_libusb) { libusb_ret = libusb_set_configuration(device_handle_libusb, kUsbConfiguration); if (LIBUSB_SUCCESS != libusb_ret) { - LOG4CXX_INFO( + LOGGER_INFO( logger_, "libusb_set_configuration failed: " << libusb_error_name(libusb_ret)); - LOG4CXX_TRACE(logger_, "exit. Condition: LIBUSB_SUCCESS != libusb_ret"); + LOGGER_TRACE(logger_, "exit. Condition: LIBUSB_SUCCESS != libusb_ret"); return; } } libusb_ret = libusb_claim_interface(device_handle_libusb, 0); if (LIBUSB_SUCCESS != libusb_ret) { - LOG4CXX_INFO( + LOGGER_INFO( logger_, "libusb_claim_interface failed: " << libusb_error_name(libusb_ret)); CloseDeviceHandle(device_handle_libusb); - LOG4CXX_TRACE(logger_, "exit. Condition: LIBUSB_SUCCESS != libusb_ret"); + LOGGER_TRACE(logger_, "exit. Condition: LIBUSB_SUCCESS != libusb_ret"); return; } @@ -173,11 +173,11 @@ void UsbHandler::DeviceArrived(libusb_device* device_libusb) { ++it) { (*it)->OnDeviceArrived(device); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void UsbHandler::DeviceLeft(libusb_device* device_libusb) { - LOG4CXX_TRACE(logger_, "enter. libusb_device* " << device_libusb); + LOGGER_TRACE(logger_, "enter. libusb_device* " << device_libusb); PlatformUsbDevice* device = NULL; for (Devices::iterator it = devices_.begin(); it != devices_.end(); ++it) { if ((*it)->GetLibusbDevice() == device_libusb) { @@ -186,7 +186,7 @@ void UsbHandler::DeviceLeft(libusb_device* device_libusb) { } } if (NULL == device) { - LOG4CXX_TRACE(logger_, "enter. Condition: NULL == device"); + LOGGER_TRACE(logger_, "enter. Condition: NULL == device"); return; } @@ -209,19 +209,19 @@ void UsbHandler::DeviceLeft(libusb_device* device_libusb) { CloseDeviceHandle(device->GetLibusbHandle()); } delete device; - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void UsbHandler::StartControlTransferSequence( UsbControlTransferSequence* sequence, PlatformUsbDevice* device) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. UsbControlTransferSequence* " << sequence << "PlatformUsbDevice* " << device); TransferSequences::iterator it = transfer_sequences_.insert( transfer_sequences_.end(), new ControlTransferSequenceState(this, sequence, device)); SubmitControlTransfer(*it); - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void UsbHandler::CloseDeviceHandle(libusb_device_handle* device_handle) { @@ -232,7 +232,7 @@ int ArrivedCallback(libusb_context* context, libusb_device* device, libusb_hotplug_event event, void* data) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. libusb device arrived (bus number " << static_cast<int>(libusb_get_bus_number(device)) << ", device address " @@ -240,7 +240,7 @@ int ArrivedCallback(libusb_context* context, << ")"); UsbHandler* usb_handler = static_cast<UsbHandler*>(data); usb_handler->DeviceArrived(device); - LOG4CXX_TRACE(logger_, "exit with 0"); + LOGGER_TRACE(logger_, "exit with 0"); return 0; } @@ -248,7 +248,7 @@ int LeftCallback(libusb_context* context, libusb_device* device, libusb_hotplug_event event, void* data) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter libusb device left (bus number " << static_cast<int>(libusb_get_bus_number(device)) << ", device address " @@ -256,25 +256,25 @@ int LeftCallback(libusb_context* context, << ")"); UsbHandler* usb_handler = static_cast<UsbHandler*>(data); usb_handler->DeviceLeft(device); - LOG4CXX_TRACE(logger_, "exit with 0"); + LOGGER_TRACE(logger_, "exit with 0"); return 0; } TransportAdapter::Error UsbHandler::Init() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); int libusb_ret = libusb_init(&libusb_context_); if (LIBUSB_SUCCESS != libusb_ret) { - LOG4CXX_ERROR(logger_, "libusb_init failed: " << libusb_ret); - LOG4CXX_TRACE(logger_, + LOGGER_ERROR(logger_, "libusb_init failed: " << libusb_ret); + LOGGER_TRACE(logger_, "exit with TransportAdapter::FAIL. Condition: LIBUSB_SUCCESS " "!= libusb_ret"); return TransportAdapter::FAIL; } if (!libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) { - LOG4CXX_ERROR(logger_, "LIBUSB_CAP_HAS_HOTPLUG not supported"); - LOG4CXX_TRACE(logger_, + LOGGER_ERROR(logger_, "LIBUSB_CAP_HAS_HOTPLUG not supported"); + LOGGER_TRACE(logger_, "exit with TransportAdapter::FAIL. Condition: " "!libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)"); return TransportAdapter::FAIL; @@ -292,9 +292,9 @@ TransportAdapter::Error UsbHandler::Init() { &arrived_callback_handle_); if (LIBUSB_SUCCESS != libusb_ret) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "libusb_hotplug_register_callback failed: " << libusb_ret); - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with TransportAdapter::FAIL. Condition: LIBUSB_SUCCESS " "!= libusb_ret"); return TransportAdapter::FAIL; @@ -312,25 +312,25 @@ TransportAdapter::Error UsbHandler::Init() { &left_callback_handle_); if (LIBUSB_SUCCESS != libusb_ret) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "libusb_hotplug_register_callback failed: " << libusb_ret); - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with TransportAdapter::FAIL. Condition: LIBUSB_SUCCESS " "!= libusb_ret"); return TransportAdapter::FAIL; } if (!thread_->start()) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "USB device scanner thread start failed, error code"); - LOG4CXX_TRACE(logger_, "exit with TransportAdapter::FAIL."); + LOGGER_TRACE(logger_, "exit with TransportAdapter::FAIL."); return TransportAdapter::FAIL; } return TransportAdapter::OK; } void UsbHandler::Thread() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); int completed = 0; while (!shutdown_requested_) { libusb_handle_events_completed(libusb_context_, &completed); @@ -353,33 +353,33 @@ void UsbHandler::Thread() { libusb_close(*it); } } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void UsbTransferSequenceCallback(libusb_transfer* transfer) { - LOG4CXX_TRACE(logger_, "enter. libusb_transfer* " << transfer); + LOGGER_TRACE(logger_, "enter. libusb_transfer* " << transfer); UsbHandler::ControlTransferSequenceState* sequence_state = static_cast<UsbHandler::ControlTransferSequenceState*>( transfer->user_data); sequence_state->usb_handler()->ControlTransferCallback(transfer); - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void UsbHandler::SubmitControlTransfer( ControlTransferSequenceState* sequence_state) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter. ControlTransferSequenceState* " << sequence_state); UsbControlTransfer* transfer = sequence_state->CurrentTransfer(); if (NULL == transfer) { - LOG4CXX_TRACE(logger_, "exit. Condition: NULL == transfer"); + LOGGER_TRACE(logger_, "exit. Condition: NULL == transfer"); return; } libusb_transfer* libusb_transfer = libusb_alloc_transfer(0); if (0 == libusb_transfer) { - LOG4CXX_ERROR(logger_, "libusb_alloc_transfer failed"); + LOGGER_ERROR(logger_, "libusb_alloc_transfer failed"); sequence_state->Finish(); - LOG4CXX_TRACE(logger_, "exit. Condition: 0 == libusb_transfer"); + LOGGER_TRACE(logger_, "exit. Condition: 0 == libusb_transfer"); return; } @@ -402,10 +402,10 @@ void UsbHandler::SubmitControlTransfer( unsigned char* buffer = static_cast<unsigned char*>(malloc(length + LIBUSB_CONTROL_SETUP_SIZE)); if (NULL == buffer) { - LOG4CXX_ERROR(logger_, "buffer allocation failed"); + LOGGER_ERROR(logger_, "buffer allocation failed"); libusb_free_transfer(libusb_transfer); sequence_state->Finish(); - LOG4CXX_TRACE(logger_, "exit. Condition: NULL == buffer"); + LOGGER_TRACE(logger_, "exit. Condition: NULL == buffer"); return; } @@ -426,21 +426,21 @@ void UsbHandler::SubmitControlTransfer( const int libusb_ret = libusb_submit_transfer(libusb_transfer); if (LIBUSB_SUCCESS != libusb_ret) { - LOG4CXX_ERROR( + LOGGER_ERROR( logger_, "libusb_submit_transfer failed: " << libusb_error_name(libusb_ret)); libusb_free_transfer(libusb_transfer); sequence_state->Finish(); } - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } void UsbHandler::ControlTransferCallback(libusb_transfer* transfer) { - LOG4CXX_TRACE(logger_, "enter. libusb_transfer* " << transfer); + LOGGER_TRACE(logger_, "enter. libusb_transfer* " << transfer); ControlTransferSequenceState* sequence_state = static_cast<ControlTransferSequenceState*>(transfer->user_data); if (transfer->status == LIBUSB_TRANSFER_COMPLETED) { - LOG4CXX_INFO(logger_, "USB control transfer completed"); + LOGGER_INFO(logger_, "USB control transfer completed"); UsbControlTransfer* current_transfer = sequence_state->CurrentTransfer(); bool submit_next = true; if (current_transfer && @@ -457,11 +457,11 @@ void UsbHandler::ControlTransferCallback(libusb_transfer* transfer) { sequence_state->Finish(); } } else { - LOG4CXX_ERROR(logger_, "USB control transfer failed: " << transfer->status); + LOGGER_ERROR(logger_, "USB control transfer failed: " << transfer->status); sequence_state->Finish(); } libusb_free_transfer(transfer); - LOG4CXX_TRACE(logger_, "exit"); + LOGGER_TRACE(logger_, "exit"); } UsbHandler::ControlTransferSequenceState::ControlTransferSequenceState( @@ -479,19 +479,19 @@ UsbHandler::ControlTransferSequenceState::~ControlTransferSequenceState() { } UsbControlTransfer* UsbHandler::ControlTransferSequenceState::Next() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); if (finished_) { - LOG4CXX_TRACE(logger_, "exit with NULL. Condition: finished_"); + LOGGER_TRACE(logger_, "exit with NULL. Condition: finished_"); return NULL; } if (++current_transfer_ == sequence_->transfers().end()) { Finish(); - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with NULL. Condition: ++current_transfer_ == " "sequence_->transfers().end()"); return NULL; } else { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with UsbControlTransfer* " << *current_transfer_ << ".Condition: ++current_transfer_ !== " @@ -513,7 +513,7 @@ UsbHandler::UsbHandlerDelegate::UsbHandlerDelegate(UsbHandler* handler) : handler_(handler) {} void UsbHandler::UsbHandlerDelegate::threadMain() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); DCHECK(handler_); handler_->Thread(); } diff --git a/src/components/transport_manager/src/usb/qnx/platform_usb_device.cc b/src/components/transport_manager/src/usb/qnx/platform_usb_device.cc index e85ab12b10..28ae779565 100644 --- a/src/components/transport_manager/src/usb/qnx/platform_usb_device.cc +++ b/src/components/transport_manager/src/usb/qnx/platform_usb_device.cc @@ -58,7 +58,7 @@ PlatformUsbDevice::PlatformUsbDevice( std::string PlatformUsbDevice::GetDescString(uint8_t index) const { char* str = usbd_string(usbd_device_, index, 0); if (NULL == str) { - LOG4CXX_INFO(logger_, "Failed to get USB string descriptor"); + LOGGER_INFO(logger_, "Failed to get USB string descriptor"); return ""; } return std::string(str); diff --git a/src/components/transport_manager/src/usb/qnx/usb_connection.cc b/src/components/transport_manager/src/usb/qnx/usb_connection.cc index 516a367ebc..e198e37ab9 100644 --- a/src/components/transport_manager/src/usb/qnx/usb_connection.cc +++ b/src/components/transport_manager/src/usb/qnx/usb_connection.cc @@ -81,13 +81,13 @@ UsbConnection::~UsbConnection() { if (in_pipe_) { const int close_pipe_rc = usbd_close_pipe(in_pipe_); if (EOK != close_pipe_rc) { - LOG4CXX_ERROR(logger_, "Failed to close pipe: " << close_pipe_rc); + LOGGER_ERROR(logger_, "Failed to close pipe: " << close_pipe_rc); } } if (out_pipe_) { const int close_pipe_rc = usbd_close_pipe(out_pipe_); if (EOK != close_pipe_rc) { - LOG4CXX_ERROR(logger_, "Failed to close pipe: " << close_pipe_rc); + LOGGER_ERROR(logger_, "Failed to close pipe: " << close_pipe_rc); } } } @@ -107,7 +107,7 @@ bool UsbConnection::PostInTransfer() { usbd_io(in_urb_, in_pipe_, InTransferCallback, this, USBD_TIME_INFINITY); if (EOK != io_rc) { pending_in_transfer_ = false; - LOG4CXX_ERROR(logger_, "Failed to post in transfer: " << io_rc); + LOGGER_ERROR(logger_, "Failed to post in transfer: " << io_rc); return false; } return true; @@ -119,10 +119,10 @@ void UsbConnection::OnInTransfer(usbd_urb* urb) { bool error = false; const int urb_status_rc = usbd_urb_status(urb, &status, &len); if (EOK != urb_status_rc && EIO != urb_status_rc) { // EIO is OK - LOG4CXX_ERROR(logger_, "Get in urb status failed: " << urb_status_rc); + LOGGER_ERROR(logger_, "Get in urb status failed: " << urb_status_rc); error = true; } - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "USB in transfer, status " << std::hex << status << ", length " << std::dec << len); @@ -139,7 +139,7 @@ void UsbConnection::OnInTransfer(usbd_urb* urb) { } if (error) { - LOG4CXX_ERROR(logger_, "USB in transfer failed"); + LOGGER_ERROR(logger_, "USB in transfer failed"); controller_->DataReceiveFailed( device_uid_, app_handle_, DataReceiveError()); } else { @@ -173,14 +173,14 @@ bool UsbConnection::PostOutTransfer() { out_buffer_ = usbd_alloc(len); memmove(out_buffer_, current_out_message_->data() + bytes_sent_, len); usbd_setup_bulk(out_urb_, URB_DIR_OUT, out_buffer_, len); - LOG4CXX_INFO(logger_, "out transfer :" << len); + LOGGER_INFO(logger_, "out transfer :" << len); pending_out_transfer_ = true; const int io_rc = usbd_io( out_urb_, out_pipe_, OutTransferCallback, this, USBD_TIME_INFINITY); if (EOK != io_rc) { pending_out_transfer_ = false; usbd_free(out_buffer_); - LOG4CXX_ERROR(logger_, "Failed to post out transfer: " << io_rc); + LOGGER_ERROR(logger_, "Failed to post out transfer: " << io_rc); return false; } return true; @@ -193,10 +193,10 @@ void UsbConnection::OnOutTransfer(usbd_urb* urb) { bool error = false; const int urb_status_rc = usbd_urb_status(urb, &status, &len); if (EOK != urb_status_rc && EIO != urb_status_rc) { // EIO is OK - LOG4CXX_ERROR(logger_, "Get out urb status failed: " << urb_status_rc); + LOGGER_ERROR(logger_, "Get out urb status failed: " << urb_status_rc); error = true; } - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "USB out transfer, status " << std::hex << status << ", length " << std::dec << len); @@ -215,14 +215,14 @@ void UsbConnection::OnOutTransfer(usbd_urb* urb) { sync_primitives::AutoLock locker(out_messages_mutex_); if (error) { - LOG4CXX_ERROR(logger_, "USB out transfer failed"); + LOGGER_ERROR(logger_, "USB out transfer failed"); controller_->DataSendFailed( device_uid_, app_handle_, current_out_message_, DataSendError()); PopOutMessage(); } else { bytes_sent_ += len; if (bytes_sent_ == current_out_message_->data_size()) { - LOG4CXX_INFO( + LOGGER_INFO( logger_, "USB out transfer, data sent: " << current_out_message_.get()); controller_->DataSendDone(device_uid_, app_handle_, current_out_message_); @@ -256,7 +256,7 @@ TransportAdapter::Error UsbConnection::SendData( } void UsbConnection::Finalise() { - LOG4CXX_INFO(logger_, "Finalising"); + LOGGER_INFO(logger_, "Finalising"); sync_primitives::AutoLock locker(out_messages_mutex_); disconnecting_ = true; usbd_abort_pipe(in_pipe_); @@ -272,7 +272,7 @@ void UsbConnection::Finalise() { } TransportAdapter::Error UsbConnection::Disconnect() { - LOG4CXX_INFO(logger_, "Disconnecting"); + LOGGER_INFO(logger_, "Disconnecting"); Finalise(); controller_->DisconnectDone(device_uid_, app_handle_); return TransportAdapter::OK; @@ -285,13 +285,13 @@ bool UsbConnection::Init() { in_urb_ = usbd_alloc_urb(NULL); out_urb_ = usbd_alloc_urb(NULL); if (NULL == in_urb_ || NULL == out_urb_) { - LOG4CXX_ERROR(logger_, "usbd_alloc_urb failed"); + LOGGER_ERROR(logger_, "usbd_alloc_urb failed"); return false; } in_buffer_ = static_cast<unsigned char*>(usbd_alloc(kInBufferSize)); if (NULL == in_buffer_) { - LOG4CXX_ERROR(logger_, "usbd_alloc failed"); + LOGGER_ERROR(logger_, "usbd_alloc failed"); return false; } @@ -314,7 +314,7 @@ bool UsbConnection::OpenEndpoints() { usbd_device_descriptor_t* device_desc = usbd_device_descriptor(usbd_device_, &device_desc_node); if (0 == device_desc) { - LOG4CXX_ERROR(logger_, "Device descriptor not found"); + LOGGER_ERROR(logger_, "Device descriptor not found"); return false; } usbd_desc_node* cfg_desc_node = NULL; @@ -331,7 +331,7 @@ bool UsbConnection::OpenEndpoints() { if (config_desc == NULL) { break; } - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "USB configuration " << static_cast<int>( config_desc->configuration.bConfigurationValue)); int iface = 0; @@ -350,7 +350,7 @@ bool UsbConnection::OpenEndpoints() { #endif const uint8_t interface_subclass = iface_desc->interface.bInterfaceSubClass; - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "USB interface number " << static_cast<int>(interface_number) << ", subclass " << std::hex << static_cast<int>(interface_subclass) @@ -370,7 +370,7 @@ bool UsbConnection::OpenEndpoints() { if ((attributes & 0x03) == USB_ATTRIB_BULK) { const uint8_t endpoint_address = endpoint_desc->endpoint.bEndpointAddress; - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "Endpoint with address " << std::hex << static_cast<int>(endpoint_address) << std::dec << " found"); @@ -396,13 +396,13 @@ bool UsbConnection::OpenEndpoints() { int open_pipe_rc = usbd_open_pipe(usbd_device_, in_endpoint_desc, &in_pipe_); if (EOK != open_pipe_rc) { - LOG4CXX_ERROR(logger_, "Cannot open input pipe, error " << open_pipe_rc); + LOGGER_ERROR(logger_, "Cannot open input pipe, error " << open_pipe_rc); return false; } open_pipe_rc = usbd_open_pipe(usbd_device_, out_endpoint_desc, &out_pipe_); if (EOK != open_pipe_rc) { - LOG4CXX_ERROR(logger_, "Cannot open output pipe, error " << open_pipe_rc); + LOGGER_ERROR(logger_, "Cannot open output pipe, error " << open_pipe_rc); return false; } diff --git a/src/components/transport_manager/src/usb/qnx/usb_handler.cc b/src/components/transport_manager/src/usb/qnx/usb_handler.cc index 2336a05f16..2457d10502 100644 --- a/src/components/transport_manager/src/usb/qnx/usb_handler.cc +++ b/src/components/transport_manager/src/usb/qnx/usb_handler.cc @@ -65,14 +65,14 @@ UsbHandler::~UsbHandler() { if (usbd_general_connection_) { const int disconnect_rc = usbd_disconnect(usbd_general_connection_); if (EOK != disconnect_rc) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "usbd_disconnect failed, error code " << disconnect_rc); } } if (usbd_aoa_connection_) { const int disconnect_rc = usbd_disconnect(usbd_aoa_connection_); if (EOK != disconnect_rc) { - LOG4CXX_ERROR(logger_, + LOGGER_ERROR(logger_, "usbd_disconnect failed, error code " << disconnect_rc); } } @@ -93,7 +93,7 @@ void UsbHandler::DeviceArrived(usbd_connection* connection, usbd_device* device_usbd = 0; const int attach_rc = usbd_attach(connection, instance, 0, &device_usbd); if (EOK != attach_rc) { - LOG4CXX_ERROR(logger_, "usbd_attach failed: " << attach_rc); + LOGGER_ERROR(logger_, "usbd_attach failed: " << attach_rc); return; } @@ -101,7 +101,7 @@ void UsbHandler::DeviceArrived(usbd_connection* connection, usbd_device_descriptor_t* descriptor = usbd_device_descriptor(device_usbd, &node); if (NULL == descriptor) { - LOG4CXX_ERROR(logger_, "usbd_device_descriptor failed"); + LOGGER_ERROR(logger_, "usbd_device_descriptor failed"); return; } @@ -139,7 +139,7 @@ void UsbHandler::DeviceLeft(usbd_device_instance_t* instance) { if ((*it)->GetDeviceInstance() == *instance) { const int detach_rc = usbd_detach((*it)->GetUsbdDevice()); if (EOK != detach_rc) - LOG4CXX_ERROR(logger_, "usbd_detach failed: " << detach_rc); + LOGGER_ERROR(logger_, "usbd_detach failed: " << detach_rc); devices_.erase(it); break; } @@ -153,14 +153,14 @@ void UsbHandler::StartControlTransferSequence( usbd_descriptors_t* descriptor = usbd_parse_descriptors( device->GetUsbdDevice(), NULL, USB_DESC_DEVICE, 0, NULL); if (NULL == descriptor) { - LOG4CXX_ERROR(logger_, "usbd_parse_descriptors failed"); + LOGGER_ERROR(logger_, "usbd_parse_descriptors failed"); } usbd_pipe* usb_pipe = 0; const int open_pipe_rc = usbd_open_pipe(device->GetUsbdDevice(), descriptor, &usb_pipe); if (EOK != open_pipe_rc) { - LOG4CXX_ERROR(logger_, "usbd_open_pipe failed, error " << open_pipe_rc); + LOGGER_ERROR(logger_, "usbd_open_pipe failed, error " << open_pipe_rc); return; } @@ -172,14 +172,14 @@ void UsbHandler::StartControlTransferSequence( usbd_urb* urb = usbd_alloc_urb(NULL); if (NULL == urb) { - LOG4CXX_ERROR(logger_, "usbd_alloc_urb failed"); + LOGGER_ERROR(logger_, "usbd_alloc_urb failed"); break; } unsigned char* buf = static_cast<unsigned char*>(usbd_alloc(transfer->Length())); if (NULL == buf) { - LOG4CXX_ERROR(logger_, "usbd_alloc failed"); + LOGGER_ERROR(logger_, "usbd_alloc failed"); break; } @@ -216,7 +216,7 @@ void UsbHandler::StartControlTransferSequence( static_cast<UsbControlInTransfer*>(transfer)->OnCompleted(buf); } } else { - LOG4CXX_ERROR(logger_, "usbd_io failed, error " << io_rc); + LOGGER_ERROR(logger_, "usbd_io failed, error " << io_rc); submit_next = false; } usbd_free(buf); @@ -233,7 +233,7 @@ void ArrivedCallback(usbd_connection* connection, usbd_device_instance_t* instance) { if (kAoaVid == instance->ident.vendor) return; - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "USB device arrived (path " << static_cast<int>(instance->path) << ", devno " << static_cast<int>(instance->devno) << ", config " @@ -246,7 +246,7 @@ void ArrivedAoaCallback(usbd_connection* connection, usbd_device_instance_t* instance) { if (kAoaVid != instance->ident.vendor) return; - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "USB AOA device arrived (path " << static_cast<int>(instance->path) << ", devno " << static_cast<int>(instance->devno) << ", config " @@ -259,7 +259,7 @@ void LeftCallback(usbd_connection* connection, usbd_device_instance_t* instance) { if (kAoaVid == instance->ident.vendor) return; - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "USB device left (path " << static_cast<int>(instance->path) << ", devno " << static_cast<int>(instance->devno) << ", config " @@ -272,7 +272,7 @@ void LeftAoaCallback(usbd_connection* connection, usbd_device_instance_t* instance) { if (kAoaVid != instance->ident.vendor) return; - LOG4CXX_INFO(logger_, + LOGGER_INFO(logger_, "USB AOA device left (path " << static_cast<int>(instance->path) << ", devno " << static_cast<int>(instance->devno) << ", config " @@ -295,7 +295,7 @@ TransportAdapter::Error UsbHandler::Init() { const int connect_rc = usbd_connect(&cparms, &usbd_general_connection_); if (EOK != connect_rc) { - LOG4CXX_ERROR(logger_, "usbd_connect failed, error code " << connect_rc); + LOGGER_ERROR(logger_, "usbd_connect failed, error code " << connect_rc); return TransportAdapter::FAIL; } } @@ -313,7 +313,7 @@ TransportAdapter::Error UsbHandler::Init() { const int connect_rc = usbd_connect(&cparms, &usbd_aoa_connection_); if (EOK != connect_rc) { - LOG4CXX_ERROR(logger_, "usbd_connect failed, error code " << connect_rc); + LOGGER_ERROR(logger_, "usbd_connect failed, error code " << connect_rc); return TransportAdapter::FAIL; } } diff --git a/src/components/transport_manager/src/usb/usb_aoa_adapter.cc b/src/components/transport_manager/src/usb/usb_aoa_adapter.cc index 3462b557ce..a74eecbdef 100644 --- a/src/components/transport_manager/src/usb/usb_aoa_adapter.cc +++ b/src/components/transport_manager/src/usb/usb_aoa_adapter.cc @@ -68,23 +68,23 @@ bool UsbAoaAdapter::IsInitialised() const { } TransportAdapter::Error UsbAoaAdapter::Init() { - LOG4CXX_TRACE(logger_, "enter"); + LOGGER_TRACE(logger_, "enter"); TransportAdapter::Error error = usb_handler_->Init(); if (error != TransportAdapter::OK) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with error " << error << ". Condition: error != TransportAdapter::OK"); return error; } error = TransportAdapterImpl::Init(); if (error != TransportAdapter::OK) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with error " << error << ". Condition: error != TransportAdapter::OK"); return error; } is_initialised_ = true; - LOG4CXX_TRACE(logger_, "exit with TransportAdapter::OK"); + LOGGER_TRACE(logger_, "exit with TransportAdapter::OK"); return TransportAdapter::OK; } diff --git a/src/components/transport_manager/src/usb/usb_connection_factory.cc b/src/components/transport_manager/src/usb/usb_connection_factory.cc index 28992d8f40..d16cff0f47 100644 --- a/src/components/transport_manager/src/usb/usb_connection_factory.cc +++ b/src/components/transport_manager/src/usb/usb_connection_factory.cc @@ -60,13 +60,13 @@ void UsbConnectionFactory::SetUsbHandler(const UsbHandlerSptr usb_handler) { TransportAdapter::Error UsbConnectionFactory::CreateConnection( const DeviceUID& device_uid, const ApplicationHandle& app_handle) { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "enter DeviceUID: " << &device_uid << ", ApplicationHandle: " << &app_handle); DeviceSptr device = controller_->FindDevice(device_uid); if (!device.valid()) { - LOG4CXX_ERROR(logger_, "device " << device_uid << " not found"); - LOG4CXX_TRACE( + LOGGER_ERROR(logger_, "device " << device_uid << " not found"); + LOGGER_TRACE( logger_, "exit with TransportAdapter::BAD_PARAM. Condition: !device.valid()"); return TransportAdapter::BAD_PARAM; @@ -82,13 +82,13 @@ TransportAdapter::Error UsbConnectionFactory::CreateConnection( controller_->ConnectionCreated(usb_connection, device_uid, app_handle); if (usb_connection->Init()) { - LOG4CXX_INFO(logger_, "USB connection initialised"); - LOG4CXX_TRACE(logger_, + LOGGER_INFO(logger_, "USB connection initialised"); + LOGGER_TRACE(logger_, "exit with TransportAdapter::OK. Condition: USB connection " "initialised"); return TransportAdapter::OK; } else { - LOG4CXX_TRACE(logger_, + LOGGER_TRACE(logger_, "exit with TransportAdapter::FAIL. Condition: USB connection " "NOT initialised"); return TransportAdapter::FAIL; diff --git a/src/components/transport_manager/src/usb/usb_device_scanner.cc b/src/components/transport_manager/src/usb/usb_device_scanner.cc index 092fd29f1a..34add3d985 100644 --- a/src/components/transport_manager/src/usb/usb_device_scanner.cc +++ b/src/components/transport_manager/src/usb/usb_device_scanner.cc @@ -56,7 +56,7 @@ class AoaInitSequence : public UsbControlTransferSequence { }; void UsbDeviceScanner::OnDeviceArrived(PlatformUsbDevice* device) { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); if (IsAppleDevice(device)) { SupportedDeviceFound(device); } else { @@ -69,8 +69,8 @@ void UsbDeviceScanner::OnDeviceArrived(PlatformUsbDevice* device) { } void UsbDeviceScanner::OnDeviceLeft(PlatformUsbDevice* device) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "PlatformUsbDevice " << device); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "PlatformUsbDevice " << device); bool list_changed = false; devices_mutex_.Acquire(); for (Devices::iterator it = devices_.begin(); it != devices_.end(); ++it) { @@ -110,7 +110,7 @@ class AoaInitSequence::AoaGetProtocolRequest : public UsbControlInTransfer { } virtual bool OnCompleted(unsigned char* data) const { const int protocol_version = data[1] << 8 | data[0]; - LOG4CXX_DEBUG(logger_, "AOA protocol version " << protocol_version); + LOGGER_DEBUG(logger_, "AOA protocol version " << protocol_version); if (protocol_version == 0) { // AOA protocol not supported return false; @@ -190,19 +190,19 @@ AoaInitSequence::AoaInitSequence() : UsbControlTransferSequence() { } void UsbDeviceScanner::TurnIntoAccessoryMode(PlatformUsbDevice* device) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_DEBUG(logger_, "PlatformUsbDevice: " << device); + LOGGER_AUTO_TRACE(logger_); + LOGGER_DEBUG(logger_, "PlatformUsbDevice: " << device); GetUsbHandler()->StartControlTransferSequence(new AoaInitSequence, device); } void UsbDeviceScanner::SupportedDeviceFound(PlatformUsbDevice* device) { - LOG4CXX_AUTO_TRACE(logger_); - LOG4CXX_TRACE(logger_, "PlatformUsbDevice: " << device); + LOGGER_AUTO_TRACE(logger_); + LOGGER_TRACE(logger_, "PlatformUsbDevice: " << device); devices_mutex_.Acquire(); devices_.push_back(device); devices_mutex_.Release(); - LOG4CXX_DEBUG(logger_, + LOGGER_DEBUG(logger_, "USB device (bus number " << static_cast<int>(device->bus_number()) << ", address " << static_cast<int>(device->address()) @@ -221,7 +221,7 @@ TransportAdapter::Error UsbDeviceScanner::Scan() { } void UsbDeviceScanner::UpdateList() { - LOG4CXX_AUTO_TRACE(logger_); + LOGGER_AUTO_TRACE(logger_); DeviceVector device_vector; devices_mutex_.Acquire(); for (Devices::const_iterator it = devices_.begin(); it != devices_.end(); @@ -237,7 +237,7 @@ void UsbDeviceScanner::UpdateList() { } devices_mutex_.Release(); - LOG4CXX_DEBUG(logger_, "USB search done " << device_vector.size()); + LOGGER_DEBUG(logger_, "USB search done " << device_vector.size()); controller_->SearchDeviceDone(device_vector); } |