diff options
| -rw-r--r-- | Kernel/LocalSocket.cpp | 14 | ||||
| -rw-r--r-- | LibGUI/GEventLoop.cpp | 4 | ||||
| -rw-r--r-- | WindowServer/WSMessageLoop.cpp | 8 | ||||
| -rw-r--r-- | WindowServer/WSWindowManager.cpp | 4 |
4 files changed, 27 insertions, 3 deletions
diff --git a/Kernel/LocalSocket.cpp b/Kernel/LocalSocket.cpp index dbbd15edf6..95f98bf5b0 100644 --- a/Kernel/LocalSocket.cpp +++ b/Kernel/LocalSocket.cpp @@ -4,6 +4,8 @@ #include <Kernel/VirtualFileSystem.h> #include <LibC/errno_numbers.h> +//#define DEBUG_LOCAL_SOCKET + Retained<LocalSocket> LocalSocket::create(int type) { return adopt(*new LocalSocket(type)); @@ -12,7 +14,9 @@ Retained<LocalSocket> LocalSocket::create(int type) LocalSocket::LocalSocket(int type) : Socket(AF_LOCAL, type, 0) { +#ifdef DEBUG_LOCAL_SOCKET kprintf("%s(%u) LocalSocket{%p} created with type=%u\n", current->name().characters(), current->pid(), this, type); +#endif } LocalSocket::~LocalSocket() @@ -45,7 +49,9 @@ bool LocalSocket::bind(const sockaddr* address, socklen_t address_size, int& err char safe_address[sizeof(local_address.sun_path) + 1]; memcpy(safe_address, local_address.sun_path, sizeof(local_address.sun_path)); +#ifdef DEBUG_LOCAL_SOCKET kprintf("%s(%u) LocalSocket{%p} bind(%s)\n", current->name().characters(), current->pid(), this, safe_address); +#endif m_file = VFS::the().open(safe_address, error, O_CREAT | O_EXCL, S_IFSOCK | 0666, current->cwd_inode()); if (!m_file) { @@ -78,7 +84,9 @@ bool LocalSocket::connect(const sockaddr* address, socklen_t address_size, int& char safe_address[sizeof(local_address.sun_path) + 1]; memcpy(safe_address, local_address.sun_path, sizeof(local_address.sun_path)); +#ifdef DEBUG_LOCAL_SOCKET kprintf("%s(%u) LocalSocket{%p} connect(%s)\n", current->name().characters(), current->pid(), this, safe_address); +#endif m_file = VFS::the().open(safe_address, error, 0, 0, current->cwd_inode()); if (!m_file) { @@ -94,15 +102,21 @@ bool LocalSocket::connect(const sockaddr* address, socklen_t address_size, int& m_address = local_address; auto peer = m_file->inode()->socket(); +#ifdef DEBUG_LOCAL_SOCKET kprintf("Queueing up connection\n"); +#endif if (!peer->queue_connection_from(*this, error)) return false; +#ifdef DEBUG_LOCAL_SOCKET kprintf("Waiting for connect...\n"); +#endif if (!current->wait_for_connect(*this, error)) return false; +#ifdef DEBUG_LOCAL_SOCKET kprintf("CONNECTED!\n"); +#endif return true; } diff --git a/LibGUI/GEventLoop.cpp b/LibGUI/GEventLoop.cpp index d1353e433c..c8aa0b2bf1 100644 --- a/LibGUI/GEventLoop.cpp +++ b/LibGUI/GEventLoop.cpp @@ -46,14 +46,18 @@ GEventLoop::GEventLoop() rc = connect(m_event_fd, (const sockaddr*)&address, sizeof(address)); if (rc == 0) break; +#ifdef GEVENTLOOP_DEBUG dbgprintf("connect failed: %d, %s\n", errno, strerror(errno)); +#endif sleep(1); --retries; } if (rc < 0) { ASSERT_NOT_REACHED(); } +#ifdef GEVENTLOOP_DEBUG dbgprintf("(%u) GEventLoop constructed :)\n", getpid()); +#endif } GEventLoop::~GEventLoop() diff --git a/WindowServer/WSMessageLoop.cpp b/WindowServer/WSMessageLoop.cpp index 2ba401d92e..8e68215381 100644 --- a/WindowServer/WSMessageLoop.cpp +++ b/WindowServer/WSMessageLoop.cpp @@ -14,7 +14,7 @@ #include <LibC/stdio.h> #include <LibC/errno.h> -//#define WSEVENTLOOP_DEBUG +//#define WSMESSAGELOOP_DEBUG static WSMessageLoop* s_the; @@ -62,7 +62,7 @@ int WSMessageLoop::exec() for (auto& queued_message : messages) { auto* receiver = queued_message.receiver.ptr(); auto& message = *queued_message.message; -#ifdef WSEVENTLOOP_DEBUG +#ifdef WSMESSAGELOOP_DEBUG dbgprintf("WSMessageLoop: receiver{%p} message %u\n", receiver, (unsigned)message.type()); #endif if (receiver) @@ -73,7 +73,7 @@ int WSMessageLoop::exec() void WSMessageLoop::post_message(WSMessageReceiver& receiver, OwnPtr<WSMessage>&& message) { -#ifdef WSEVENTLOOP_DEBUG +#ifdef WSMESSAGELOOP_DEBUG dbgprintf("WSMessageLoop::post_message: {%u} << receiver=%p, message=%p (type=%u)\n", m_queued_messages.size(), receiver, message.ptr(), message->type()); #endif m_queued_messages.append({ receiver.make_weak_ptr(), move(message) }); @@ -166,7 +166,9 @@ void WSMessageLoop::wait_for_message() sockaddr_un address; socklen_t address_size = sizeof(address); int client_fd = accept(m_server_fd, (sockaddr*)&address, &address_size); +#ifdef WSMESSAGELOOP_DEBUG dbgprintf("accept() returned fd=%d, address=%s\n", client_fd, address.sun_path); +#endif ASSERT(client_fd >= 0); new WSClientConnection(client_fd); } diff --git a/WindowServer/WSWindowManager.cpp b/WindowServer/WSWindowManager.cpp index d738bf8e8c..0913c09b14 100644 --- a/WindowServer/WSWindowManager.cpp +++ b/WindowServer/WSWindowManager.cpp @@ -231,7 +231,9 @@ WSWindowManager::WSWindowManager() } return; } +#ifdef DEBUG_MENUS dbgprintf("WSMenu 1 item activated: '%s'\n", item.text().characters()); +#endif }; } @@ -340,7 +342,9 @@ void WSWindowManager::set_current_menubar(WSMenuBar* menubar) m_current_menubar = menubar->make_weak_ptr(); else m_current_menubar = nullptr; +#ifdef DEBUG_MENUS dbgprintf("[WM] Current menubar is now %p\n", menubar); +#endif Point next_menu_location { menubar_menu_margin() / 2, 0 }; for_each_active_menubar_menu([&] (WSMenu& menu) { int text_width = font().width(menu.name()); |