diff --git a/Userland/Libraries/CMakeLists.txt b/Userland/Libraries/CMakeLists.txt index cb123ae1c6..9e54e78156 100644 --- a/Userland/Libraries/CMakeLists.txt +++ b/Userland/Libraries/CMakeLists.txt @@ -26,6 +26,7 @@ add_subdirectory(LibPCIDB) add_subdirectory(LibProtocol) add_subdirectory(LibPthread) add_subdirectory(LibRegex) +add_subdirectory(LibSymbolClient) add_subdirectory(LibTar) add_subdirectory(LibTextCodec) add_subdirectory(LibThread) diff --git a/Userland/Libraries/LibSymbolClient/CMakeLists.txt b/Userland/Libraries/LibSymbolClient/CMakeLists.txt new file mode 100644 index 0000000000..89a1d56399 --- /dev/null +++ b/Userland/Libraries/LibSymbolClient/CMakeLists.txt @@ -0,0 +1,11 @@ +set(SOURCES + Client.cpp +) + +set(GENERATED_SOURCES + ../../Services/SymbolServer/SymbolClientEndpoint.h + ../../Services/SymbolServer/SymbolServerEndpoint.h +) + +serenity_lib(LibSymbolClient symbolclient) +target_link_libraries(LibSymbolClient LibIPC) diff --git a/Userland/Libraries/LibSymbolClient/Client.cpp b/Userland/Libraries/LibSymbolClient/Client.cpp new file mode 100644 index 0000000000..e860493dc8 --- /dev/null +++ b/Userland/Libraries/LibSymbolClient/Client.cpp @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2021, Andreas Kling + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include + +namespace SymbolClient { + +Client::Client() + : IPC::ServerConnection(*this, "/tmp/portal/symbol") +{ + handshake(); +} + +void Client::handshake() +{ + send_sync(); +} + +void Client::handle(const Messages::SymbolClient::Dummy&) +{ +} + +Vector Client::symbolicate(const String& path, const Vector& addresses) +{ + auto response = send_sync(path, addresses); + if (!response->success()) + return {}; + + Vector symbols; + for (auto& symbol : response->symbols()) { + Symbol s; + s.name = symbol; + symbols.append(move(s)); + } + return symbols; +} + +} diff --git a/Userland/Libraries/LibSymbolClient/Client.h b/Userland/Libraries/LibSymbolClient/Client.h new file mode 100644 index 0000000000..9faab216ca --- /dev/null +++ b/Userland/Libraries/LibSymbolClient/Client.h @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2021, Andreas Kling + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#include +#include +#include + +namespace SymbolClient { + +struct Symbol { + FlatPtr address { 0 }; + String name; + u32 offset { 0 }; + String filename; + u32 line_number { 0 }; +}; + +class Client + : public IPC::ServerConnection + , public SymbolClientEndpoint { + C_OBJECT(Client); + +public: + virtual void handshake() override; + + Vector symbolicate(const String& path, const Vector& addresses); + +private: + Client(); + + virtual void handle(const Messages::SymbolClient::Dummy&) override; +}; + +}