Fixed bug #7535 : High CPU usage connect to Firebird 3 database using…

… Firebird 4 Classic and SuperClassic service
FirebirdSQL · Apr 6, 2023 · 7ec5944 · 7ec5944
1 parent eeb7cd4
commit 7ec5944
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/common/file_params.h b/src/common/file_params.h
@@ -43,18 +43,19 @@ static const char* const REPL_FILE 		= "fb_repl_%s";
 static const char* const TPC_HDR_FILE	= "fb_tpc_%s";
 static const char* const TPC_BLOCK_FILE = "fb_tpc_%s_%" UQUADFORMAT;
 static const char* const SNAPSHOTS_FILE	= "fb_snap_%s";
+static const char* const PROFILER_FILE	= "fb_profiler_%s_%" UQUADFORMAT;
 
 // Global usage
 static const char* const TRACE_FILE		= "fb" COMMON_FILE_PREFIX "_trace";
 static const char* const USER_MAP_FILE	= "fb" COMMON_FILE_PREFIX "_user_mapping";
+static const char* const SHARED_EVENT	= "fb" COMMON_FILE_PREFIX "_process%u_signal%d";
 
 // Per-log file usage (for audit logging)
 static const char* const FB_TRACE_LOG_MUTEX = "fb_trace_log_mutex";
 
 // Per-trace session usage (for interactive trace)
 static const char* const FB_TRACE_FILE = "fb_trace.";
 
-static const char* const PROFILER_FILE	= "fb_profiler_%s_%" UQUADFORMAT;
 
 #ifdef UNIX
 static const char* const INIT_FILE		= "fb_init";

diff --git a/src/common/os/win32/isc_ipc.cpp b/src/common/os/win32/isc_ipc.cpp
@@ -45,6 +45,7 @@
 #include "../common/isc_proto.h"
 #include "../common/os/isc_i_proto.h"
 #include "../common/isc_s_proto.h"
+#include "../common/file_params.h"
 
 #include <windows.h>
 #include <process.h>
@@ -198,7 +199,7 @@ HANDLE ISC_make_signal(bool /*create_flag*/, bool manual_reset, int process_idL,
 		return CreateEvent(NULL, man_rst, FALSE, NULL);
 
 	TEXT event_name[BUFFER_TINY];
-	sprintf(event_name, "_firebird_process%u_signal%d", process_idL, signal_number);
+	sprintf(event_name, SHARED_EVENT, process_idL, signal_number);
 
 	if (!fb_utils::private_kernel_object_name(event_name, sizeof(event_name)))
 	{