summaryrefslogtreecommitdiff
path: root/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc')
-rw-r--r--src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc b/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
index e509252dec..9fe79cade1 100644
--- a/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
+++ b/src/components/transport_manager/src/iap2_emulation/iap2_transport_adapter.cc
@@ -50,7 +50,7 @@ static const auto out_signals_channel = "iap_signals_out";
namespace transport_manager {
namespace transport_adapter {
-CREATE_LOGGERPTR_GLOBAL(logger_, "IAP2Emulation");
+SDL_CREATE_LOG_VARIABLE("IAP2Emulation");
IAP2BluetoothEmulationTransportAdapter::IAP2BluetoothEmulationTransportAdapter(
const uint16_t port,
@@ -60,7 +60,7 @@ IAP2BluetoothEmulationTransportAdapter::IAP2BluetoothEmulationTransportAdapter(
void IAP2BluetoothEmulationTransportAdapter::DeviceSwitched(
const DeviceUID& device_handle) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
UNUSED(device_handle);
DCHECK(!"Switching for iAP2 Bluetooth is not supported.");
}
@@ -84,7 +84,7 @@ IAP2USBEmulationTransportAdapter::IAP2USBEmulationTransportAdapter(
signal_handler_->Start();
const auto result = mkfifo(out_signals_channel, mode);
UNUSED(result);
- LOG4CXX_DEBUG(logger_, "Out signals channel creation result: " << result);
+ SDL_LOG_DEBUG("Out signals channel creation result: " << result);
}
IAP2USBEmulationTransportAdapter::~IAP2USBEmulationTransportAdapter() {
@@ -93,31 +93,31 @@ IAP2USBEmulationTransportAdapter::~IAP2USBEmulationTransportAdapter() {
signal_handler_->SetDelegate(NULL);
delete delegate;
threads::DeleteThread(signal_handler_);
- LOG4CXX_DEBUG(logger_, "Out close result: " << close(out_));
- LOG4CXX_DEBUG(logger_, "Out unlink result: " << unlink(out_signals_channel));
+ SDL_LOG_DEBUG("Out close result: " << close(out_));
+ SDL_LOG_DEBUG("Out unlink result: " << unlink(out_signals_channel));
}
void IAP2USBEmulationTransportAdapter::DeviceSwitched(
const DeviceUID& device_handle) {
- LOG4CXX_AUTO_TRACE(logger_);
+ SDL_LOG_AUTO_TRACE();
UNUSED(device_handle);
const auto switch_signal_ack = std::string("SDL_TRANSPORT_SWITCH_ACK\n");
auto out_ = open(out_signals_channel, O_WRONLY);
- LOG4CXX_DEBUG(logger_, "Out channel descriptor: " << out_);
+ SDL_LOG_DEBUG("Out channel descriptor: " << out_);
if (out_ < 0) {
- LOG4CXX_ERROR(logger_, "Failed to open out signals channel");
+ SDL_LOG_ERROR("Failed to open out signals channel");
return;
}
const auto bytes =
write(out_, switch_signal_ack.c_str(), switch_signal_ack.size());
UNUSED(bytes);
- LOG4CXX_DEBUG(logger_, "Written bytes to out: " << bytes);
+ SDL_LOG_DEBUG("Written bytes to out: " << bytes);
- LOG4CXX_DEBUG(logger_, "Switching signal ACK is sent");
- LOG4CXX_DEBUG(logger_, "iAP2 USB device is switched with iAP2 Bluetooth");
+ SDL_LOG_DEBUG("Switching signal ACK is sent");
+ SDL_LOG_DEBUG("iAP2 USB device is switched with iAP2 Bluetooth");
close(out_);
}
@@ -135,19 +135,19 @@ IAP2USBEmulationTransportAdapter::IAPSignalHandlerDelegate::
: adapter_(adapter), run_flag_(true), in_(0) {
const auto result = mkfifo(in_signals_channel, mode);
UNUSED(result);
- LOG4CXX_DEBUG(logger_, "In signals channel creation result: " << result);
+ SDL_LOG_DEBUG("In signals channel creation result: " << result);
}
void IAP2USBEmulationTransportAdapter::IAPSignalHandlerDelegate::threadMain() {
- LOG4CXX_AUTO_TRACE(logger_);
- LOG4CXX_DEBUG(logger_, "Signal handling is started");
+ SDL_LOG_AUTO_TRACE();
+ SDL_LOG_DEBUG("Signal handling is started");
const auto switch_signal = "SDL_TRANSPORT_SWITCH";
- LOG4CXX_DEBUG(logger_, "Waiting for signal: " << switch_signal);
+ SDL_LOG_DEBUG("Waiting for signal: " << switch_signal);
in_ = open(in_signals_channel, O_RDONLY);
- LOG4CXX_DEBUG(logger_, "In channel descriptor: " << in_);
+ SDL_LOG_DEBUG("In channel descriptor: " << in_);
if (in_ < 0) {
- LOG4CXX_ERROR(logger_, "Failed to open in signals channel");
+ SDL_LOG_ERROR("Failed to open in signals channel");
return;
}
@@ -159,26 +159,26 @@ void IAP2USBEmulationTransportAdapter::IAPSignalHandlerDelegate::threadMain() {
continue;
}
if (-1 == bytes) {
- LOG4CXX_DEBUG(logger_, "Error during input pipe read");
+ SDL_LOG_DEBUG("Error during input pipe read");
break;
}
- LOG4CXX_DEBUG(logger_, "Read in bytes: " << bytes);
+ SDL_LOG_DEBUG("Read in bytes: " << bytes);
buffer[bytes] = '\0';
std::string str(buffer);
if (std::string::npos != str.find(switch_signal)) {
- LOG4CXX_DEBUG(logger_, "Switch signal received.");
+ SDL_LOG_DEBUG("Switch signal received.");
adapter_.DoTransportSwitch();
}
}
- LOG4CXX_DEBUG(logger_, "In close result: " << close(in_));
- LOG4CXX_DEBUG(logger_, "In unlink result: " << unlink(in_signals_channel));
+ SDL_LOG_DEBUG("In close result: " << close(in_));
+ SDL_LOG_DEBUG("In unlink result: " << unlink(in_signals_channel));
}
void IAP2USBEmulationTransportAdapter::IAPSignalHandlerDelegate::
exitThreadMain() {
- LOG4CXX_AUTO_TRACE(logger_);
- LOG4CXX_DEBUG(logger_, "Stopping signal handling.");
+ SDL_LOG_AUTO_TRACE();
+ SDL_LOG_DEBUG("Stopping signal handling.");
run_flag_ = false;
ThreadDelegate::exitThreadMain();
}