aboutsummaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
Diffstat (limited to 'libs')
-rw-r--r--libs/adbconnection/adbconnection_server.cpp6
-rw-r--r--libs/adbconnection/libadbconnection_client.map.txt8
-rw-r--r--libs/libadbd_fs/libadbd_fs.map.txt2
3 files changed, 8 insertions, 8 deletions
diff --git a/libs/adbconnection/adbconnection_server.cpp b/libs/adbconnection/adbconnection_server.cpp
index aac9615e..e3d00313 100644
--- a/libs/adbconnection/adbconnection_server.cpp
+++ b/libs/adbconnection/adbconnection_server.cpp
@@ -69,7 +69,7 @@ void adbconnection_listen(void (*callback)(int fd, ProcessInfo process)) {
events[0].events = EPOLLIN;
events[0].data.fd = -1;
if (epoll_ctl(epfd.get(), EPOLL_CTL_ADD, s.get(), &events[0]) != 0) {
- LOG(FATAL) << "failed to register event with epoll fd";
+ PLOG(FATAL) << "failed to register socket " << s.get() << " with epoll fd";
}
while (true) {
@@ -94,7 +94,7 @@ void adbconnection_listen(void (*callback)(int fd, ProcessInfo process)) {
register_event.data.fd = client.get();
if (epoll_ctl(epfd.get(), EPOLL_CTL_ADD, client.get(), &register_event) != 0) {
- PLOG(FATAL) << "failed to register JDWP client with epoll";
+ PLOG(FATAL) << "failed to register JDWP client " << client.get() << " with epoll";
}
pending_connections.emplace_back(std::move(client));
@@ -118,7 +118,7 @@ void adbconnection_listen(void (*callback)(int fd, ProcessInfo process)) {
}
if (epoll_ctl(epfd.get(), EPOLL_CTL_DEL, event.data.fd, nullptr) != 0) {
- LOG(FATAL) << "failed to delete fd from JDWP epoll fd";
+ PLOG(FATAL) << "failed to delete fd " << event.data.fd << " from JDWP epoll fd";
}
pending_connections.erase(it);
diff --git a/libs/adbconnection/libadbconnection_client.map.txt b/libs/adbconnection/libadbconnection_client.map.txt
index 153a0e41..a5e126dc 100644
--- a/libs/adbconnection/libadbconnection_client.map.txt
+++ b/libs/adbconnection/libadbconnection_client.map.txt
@@ -16,10 +16,10 @@
LIBADBCONNECTION_CLIENT_1 {
global:
- adbconnection_client_new;
- adbconnection_client_destroy;
- adbconnection_client_pollfd;
- adbconnection_client_receive_jdwp_fd;
+ adbconnection_client_new; # apex
+ adbconnection_client_destroy; # apex
+ adbconnection_client_pollfd; # apex
+ adbconnection_client_receive_jdwp_fd; # apex
local:
*;
};
diff --git a/libs/libadbd_fs/libadbd_fs.map.txt b/libs/libadbd_fs/libadbd_fs.map.txt
index 1454e963..bace3637 100644
--- a/libs/libadbd_fs/libadbd_fs.map.txt
+++ b/libs/libadbd_fs/libadbd_fs.map.txt
@@ -1,6 +1,6 @@
LIBADBD_FS {
global:
- adbd_fs_config; # apex
+ adbd_fs_config; # systemapi
local:
*;
};