From 418bc484e4fc69fb418804feeaa742d9a3c1d936 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 25 Apr 2021 11:24:12 +0200 Subject: Revert "IPCCompiler: Use string hashes for IPC endpoint magic" This reverts commit 59218007a3034c7770b7fa5277ce1eae85bb1c07. --- Userland/DevTools/HackStudio/LanguageServers/LanguageClient.ipc | 2 +- Userland/DevTools/HackStudio/LanguageServers/LanguageServer.ipc | 2 +- Userland/DevTools/IPCCompiler/main.cpp | 6 +++++- Userland/Services/AudioServer/AudioClient.ipc | 2 +- Userland/Services/AudioServer/AudioServer.ipc | 2 +- Userland/Services/Clipboard/ClipboardClient.ipc | 2 +- Userland/Services/Clipboard/ClipboardServer.ipc | 2 +- Userland/Services/ImageDecoder/ImageDecoderClient.ipc | 2 +- Userland/Services/ImageDecoder/ImageDecoderServer.ipc | 2 +- Userland/Services/LaunchServer/LaunchClient.ipc | 2 +- Userland/Services/LaunchServer/LaunchServer.ipc | 2 +- Userland/Services/LookupServer/LookupClient.ipc | 2 +- Userland/Services/LookupServer/LookupServer.ipc | 2 +- Userland/Services/NotificationServer/NotificationClient.ipc | 2 +- Userland/Services/NotificationServer/NotificationServer.ipc | 2 +- Userland/Services/ProtocolServer/ProtocolClient.ipc | 2 +- Userland/Services/ProtocolServer/ProtocolServer.ipc | 2 +- Userland/Services/SymbolServer/SymbolClient.ipc | 2 +- Userland/Services/SymbolServer/SymbolServer.ipc | 2 +- Userland/Services/WebContent/WebContentClient.ipc | 2 +- Userland/Services/WebContent/WebContentServer.ipc | 2 +- Userland/Services/WindowServer/WindowClient.ipc | 2 +- Userland/Services/WindowServer/WindowManagerClient.ipc | 2 +- Userland/Services/WindowServer/WindowManagerServer.ipc | 2 +- Userland/Services/WindowServer/WindowServer.ipc | 2 +- 25 files changed, 29 insertions(+), 25 deletions(-) (limited to 'Userland') diff --git a/Userland/DevTools/HackStudio/LanguageServers/LanguageClient.ipc b/Userland/DevTools/HackStudio/LanguageServers/LanguageClient.ipc index 8a20b31fb8..889a37623e 100644 --- a/Userland/DevTools/HackStudio/LanguageServers/LanguageClient.ipc +++ b/Userland/DevTools/HackStudio/LanguageServers/LanguageClient.ipc @@ -1,4 +1,4 @@ -endpoint LanguageClient +endpoint LanguageClient = 8002 { AutoCompleteSuggestions(Vector suggestions) =| DeclarationLocation(GUI::AutocompleteProvider::ProjectLocation location) =| diff --git a/Userland/DevTools/HackStudio/LanguageServers/LanguageServer.ipc b/Userland/DevTools/HackStudio/LanguageServers/LanguageServer.ipc index 938d616be2..c8d804410a 100644 --- a/Userland/DevTools/HackStudio/LanguageServers/LanguageServer.ipc +++ b/Userland/DevTools/HackStudio/LanguageServers/LanguageServer.ipc @@ -1,4 +1,4 @@ -endpoint LanguageServer +endpoint LanguageServer = 8001 { Greet(String project_root) => () diff --git a/Userland/DevTools/IPCCompiler/main.cpp b/Userland/DevTools/IPCCompiler/main.cpp index fbd3012de1..1f5aa08a25 100644 --- a/Userland/DevTools/IPCCompiler/main.cpp +++ b/Userland/DevTools/IPCCompiler/main.cpp @@ -164,7 +164,11 @@ int main(int argc, char** argv) lexer.consume_specific("endpoint"); consume_whitespace(); endpoints.last().name = lexer.consume_while([](char ch) { return !isspace(ch); }); - endpoints.last().magic = Traits::hash(endpoints.last().name); + consume_whitespace(); + assert_specific('='); + consume_whitespace(); + auto magic_string = lexer.consume_while([](char ch) { return !isspace(ch) && ch != '{'; }); + endpoints.last().magic = magic_string.to_int().value(); consume_whitespace(); assert_specific('{'); parse_messages(); diff --git a/Userland/Services/AudioServer/AudioClient.ipc b/Userland/Services/AudioServer/AudioClient.ipc index d444c6c007..b43db52dd0 100644 --- a/Userland/Services/AudioServer/AudioClient.ipc +++ b/Userland/Services/AudioServer/AudioClient.ipc @@ -1,4 +1,4 @@ -endpoint AudioClient +endpoint AudioClient = 82 { FinishedPlayingBuffer(i32 buffer_id) =| MutedStateChanged(bool muted) =| diff --git a/Userland/Services/AudioServer/AudioServer.ipc b/Userland/Services/AudioServer/AudioServer.ipc index f268e747bd..a52a837f41 100644 --- a/Userland/Services/AudioServer/AudioServer.ipc +++ b/Userland/Services/AudioServer/AudioServer.ipc @@ -1,4 +1,4 @@ -endpoint AudioServer +endpoint AudioServer = 85 { // Basic protocol Greet() => () diff --git a/Userland/Services/Clipboard/ClipboardClient.ipc b/Userland/Services/Clipboard/ClipboardClient.ipc index d0d3a061a6..50d695e92a 100644 --- a/Userland/Services/Clipboard/ClipboardClient.ipc +++ b/Userland/Services/Clipboard/ClipboardClient.ipc @@ -1,4 +1,4 @@ -endpoint ClipboardClient +endpoint ClipboardClient = 804 { ClipboardDataChanged([UTF8] String mime_type) =| } diff --git a/Userland/Services/Clipboard/ClipboardServer.ipc b/Userland/Services/Clipboard/ClipboardServer.ipc index 9fe63e2fc0..1c6372cb4e 100644 --- a/Userland/Services/Clipboard/ClipboardServer.ipc +++ b/Userland/Services/Clipboard/ClipboardServer.ipc @@ -1,4 +1,4 @@ -endpoint ClipboardServer +endpoint ClipboardServer = 802 { Greet() => () diff --git a/Userland/Services/ImageDecoder/ImageDecoderClient.ipc b/Userland/Services/ImageDecoder/ImageDecoderClient.ipc index 4b486e38b2..49dc3862c2 100644 --- a/Userland/Services/ImageDecoder/ImageDecoderClient.ipc +++ b/Userland/Services/ImageDecoder/ImageDecoderClient.ipc @@ -1,4 +1,4 @@ -endpoint ImageDecoderClient +endpoint ImageDecoderClient = 7002 { Dummy() =| } diff --git a/Userland/Services/ImageDecoder/ImageDecoderServer.ipc b/Userland/Services/ImageDecoder/ImageDecoderServer.ipc index 41f135c4b0..c2808822df 100644 --- a/Userland/Services/ImageDecoder/ImageDecoderServer.ipc +++ b/Userland/Services/ImageDecoder/ImageDecoderServer.ipc @@ -1,4 +1,4 @@ -endpoint ImageDecoderServer +endpoint ImageDecoderServer = 7001 { Greet() => () diff --git a/Userland/Services/LaunchServer/LaunchClient.ipc b/Userland/Services/LaunchServer/LaunchClient.ipc index 2e4f324702..abd4e9ba3d 100644 --- a/Userland/Services/LaunchServer/LaunchClient.ipc +++ b/Userland/Services/LaunchServer/LaunchClient.ipc @@ -1,4 +1,4 @@ -endpoint LaunchClient +endpoint LaunchClient = 102 { Dummy() =| } diff --git a/Userland/Services/LaunchServer/LaunchServer.ipc b/Userland/Services/LaunchServer/LaunchServer.ipc index 7d160f484f..34ac5a6db3 100644 --- a/Userland/Services/LaunchServer/LaunchServer.ipc +++ b/Userland/Services/LaunchServer/LaunchServer.ipc @@ -1,4 +1,4 @@ -endpoint LaunchServer +endpoint LaunchServer = 101 { Greet() => () OpenURL(URL url, String handler_name) => (bool response) diff --git a/Userland/Services/LookupServer/LookupClient.ipc b/Userland/Services/LookupServer/LookupClient.ipc index 567b6fcb82..6455140d91 100644 --- a/Userland/Services/LookupServer/LookupClient.ipc +++ b/Userland/Services/LookupServer/LookupClient.ipc @@ -1,4 +1,4 @@ -endpoint LookupClient +endpoint LookupClient = 9002 { Dummy() =| } diff --git a/Userland/Services/LookupServer/LookupServer.ipc b/Userland/Services/LookupServer/LookupServer.ipc index 499e2290a4..e23182346a 100644 --- a/Userland/Services/LookupServer/LookupServer.ipc +++ b/Userland/Services/LookupServer/LookupServer.ipc @@ -1,4 +1,4 @@ -endpoint LookupServer +endpoint LookupServer = 9001 { LookupName(String name) => (int code, Vector addresses) LookupAddress(String address) => (int code, String name) diff --git a/Userland/Services/NotificationServer/NotificationClient.ipc b/Userland/Services/NotificationServer/NotificationClient.ipc index 9742ea513d..fc85168f76 100644 --- a/Userland/Services/NotificationServer/NotificationClient.ipc +++ b/Userland/Services/NotificationServer/NotificationClient.ipc @@ -1,4 +1,4 @@ -endpoint NotificationClient +endpoint NotificationClient = 92 { Dummy() =| } diff --git a/Userland/Services/NotificationServer/NotificationServer.ipc b/Userland/Services/NotificationServer/NotificationServer.ipc index 2a3c61932b..830e9d6312 100644 --- a/Userland/Services/NotificationServer/NotificationServer.ipc +++ b/Userland/Services/NotificationServer/NotificationServer.ipc @@ -1,4 +1,4 @@ -endpoint NotificationServer +endpoint NotificationServer = 95 { // Basic protocol Greet() => () diff --git a/Userland/Services/ProtocolServer/ProtocolClient.ipc b/Userland/Services/ProtocolServer/ProtocolClient.ipc index 37707472a6..88f4cfc96d 100644 --- a/Userland/Services/ProtocolServer/ProtocolClient.ipc +++ b/Userland/Services/ProtocolServer/ProtocolClient.ipc @@ -1,4 +1,4 @@ -endpoint ProtocolClient +endpoint ProtocolClient = 13 { // Download notifications DownloadProgress(i32 download_id, Optional total_size, u32 downloaded_size) =| diff --git a/Userland/Services/ProtocolServer/ProtocolServer.ipc b/Userland/Services/ProtocolServer/ProtocolServer.ipc index 2348e01af8..3a8ecdabad 100644 --- a/Userland/Services/ProtocolServer/ProtocolServer.ipc +++ b/Userland/Services/ProtocolServer/ProtocolServer.ipc @@ -1,4 +1,4 @@ -endpoint ProtocolServer +endpoint ProtocolServer = 9 { // Basic protocol Greet() => () diff --git a/Userland/Services/SymbolServer/SymbolClient.ipc b/Userland/Services/SymbolServer/SymbolClient.ipc index 8b4a1be029..575a17f509 100644 --- a/Userland/Services/SymbolServer/SymbolClient.ipc +++ b/Userland/Services/SymbolServer/SymbolClient.ipc @@ -1,4 +1,4 @@ -endpoint SymbolClient +endpoint SymbolClient = 4541511 { Dummy() =| } diff --git a/Userland/Services/SymbolServer/SymbolServer.ipc b/Userland/Services/SymbolServer/SymbolServer.ipc index d1eed6ac03..a578b01809 100644 --- a/Userland/Services/SymbolServer/SymbolServer.ipc +++ b/Userland/Services/SymbolServer/SymbolServer.ipc @@ -1,4 +1,4 @@ -endpoint SymbolServer +endpoint SymbolServer = 4541510 { Greet() => () diff --git a/Userland/Services/WebContent/WebContentClient.ipc b/Userland/Services/WebContent/WebContentClient.ipc index c7aad24ca0..c74abbc3af 100644 --- a/Userland/Services/WebContent/WebContentClient.ipc +++ b/Userland/Services/WebContent/WebContentClient.ipc @@ -1,4 +1,4 @@ -endpoint WebContentClient +endpoint WebContentClient = 90 { DidStartLoading(URL url) =| DidFinishLoading(URL url) =| diff --git a/Userland/Services/WebContent/WebContentServer.ipc b/Userland/Services/WebContent/WebContentServer.ipc index 1f6e30ce22..1b429c5579 100644 --- a/Userland/Services/WebContent/WebContentServer.ipc +++ b/Userland/Services/WebContent/WebContentServer.ipc @@ -1,4 +1,4 @@ -endpoint WebContentServer +endpoint WebContentServer = 89 { Greet() => () diff --git a/Userland/Services/WindowServer/WindowClient.ipc b/Userland/Services/WindowServer/WindowClient.ipc index ea8f49635d..c7ffb91a5b 100644 --- a/Userland/Services/WindowServer/WindowClient.ipc +++ b/Userland/Services/WindowServer/WindowClient.ipc @@ -1,4 +1,4 @@ -endpoint WindowClient +endpoint WindowClient = 4 { Paint(i32 window_id, Gfx::IntSize window_size, Vector rects) =| MouseMove(i32 window_id, Gfx::IntPoint mouse_position, u32 button, u32 buttons, u32 modifiers, i32 wheel_delta, bool is_drag, Vector mime_types) =| diff --git a/Userland/Services/WindowServer/WindowManagerClient.ipc b/Userland/Services/WindowServer/WindowManagerClient.ipc index facda30d8e..4c3c9c071d 100644 --- a/Userland/Services/WindowServer/WindowManagerClient.ipc +++ b/Userland/Services/WindowServer/WindowManagerClient.ipc @@ -1,4 +1,4 @@ -endpoint WindowManagerClient +endpoint WindowManagerClient = 1872 { WindowRemoved(i32 wm_id, i32 client_id, i32 window_id) =| WindowStateChanged(i32 wm_id, i32 client_id, i32 window_id, i32 parent_client_id, i32 parent_window_id, bool is_active, bool is_minimized, bool is_modal, bool is_frameless, i32 window_type, [UTF8] String title, Gfx::IntRect rect, i32 progress) =| diff --git a/Userland/Services/WindowServer/WindowManagerServer.ipc b/Userland/Services/WindowServer/WindowManagerServer.ipc index e0c12f72c9..2973d31241 100644 --- a/Userland/Services/WindowServer/WindowManagerServer.ipc +++ b/Userland/Services/WindowServer/WindowManagerServer.ipc @@ -1,4 +1,4 @@ -endpoint WindowManagerServer +endpoint WindowManagerServer = 1871 { SetEventMask(u32 event_mask) => () SetManagerWindow(i32 window_id) => () diff --git a/Userland/Services/WindowServer/WindowServer.ipc b/Userland/Services/WindowServer/WindowServer.ipc index 948e6c7bce..a0f5135d72 100644 --- a/Userland/Services/WindowServer/WindowServer.ipc +++ b/Userland/Services/WindowServer/WindowServer.ipc @@ -1,4 +1,4 @@ -endpoint WindowServer +endpoint WindowServer = 2 { Greet() => (Gfx::IntRect screen_rect, Core::AnonymousBuffer theme_buffer) -- cgit v1.2.3