diff options
| -rw-r--r-- | src/adbd-client.cpp | 5 | ||||
| -rw-r--r-- | tests/utils/adbd-server.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/adbd-client.cpp b/src/adbd-client.cpp index 937215e..400c7c9 100644 --- a/src/adbd-client.cpp +++ b/src/adbd-client.cpp @@ -44,6 +44,7 @@ public: ~Impl() { // tell the worker thread to stop whatever it's doing and exit. + g_debug("%s Client::Impl dtor, cancelling m_cancellable", G_STRLOC); g_cancellable_cancel(m_cancellable); m_pkresponse_cv.notify_one(); m_sleep_cv.notify_one(); @@ -144,7 +145,9 @@ private: return m_pkresponse_ready || g_cancellable_is_cancelled(m_cancellable); }); response = m_pkresponse; - g_debug("%s got response '%d'", G_STRLOC, int(response)); + g_debug("%s got response '%d', is-cancelled %d", G_STRLOC, + int(response), + int(g_cancellable_is_cancelled(m_cancellable))); } if (!g_cancellable_is_cancelled(m_cancellable)) send_pk_response(socket, response); diff --git a/tests/utils/adbd-server.h b/tests/utils/adbd-server.h index 5e66379..b574622 100644 --- a/tests/utils/adbd-server.h +++ b/tests/utils/adbd-server.h @@ -112,7 +112,7 @@ private: continue; } const std::string response(buf, std::string::size_type(n_bytes)); - g_message("server got response: %s", response.c_str()); + g_message("server read %d bytes, got response: '%s'", int(n_bytes), response.c_str()); if (!response.empty()) { m_responses.push_back(response); requests.erase(requests.begin()); |