Frontported PR #8186 : Fixed a few issues with IPC used by remote profiler

Author: hvlad

src/common/isc_s_proto.h

@@ -73,7 +73,7 @@ struct mtx
 struct event_t
 {
 	SLONG event_count;
-	int pid;
+	int event_pid;
 	pthread_mutex_t event_mutex[1];
 	pthread_cond_t event_cond[1];
 };

src/common/isc_sync.cpp

@@ -611,7 +611,7 @@ int SharedMemoryBase::eventInit(event_t* event)
 #else // pthread-based event
 
 	event->event_count = 0;
-	event->pid = getpid();
+	event->event_pid = getpid();
 
 	// Prepare an Inter-Process event block
 	pthread_mutexattr_t mattr;
@@ -662,7 +662,7 @@ void SharedMemoryBase::eventFini(event_t* event)
 
 #else // pthread-based event
 
-	if (event->pid == getpid())
+	if (event->event_pid == getpid())
 	{
 		LOG_PTHREAD_ERROR(pthread_mutex_destroy(event->event_mutex));
 		LOG_PTHREAD_ERROR(pthread_cond_destroy(event->event_cond));
@@ -691,6 +691,8 @@ SLONG SharedMemoryBase::eventClear(event_t* event)
  *
  **************************************/
 
+	fb_assert(event->event_pid == getpid());
+
 #if defined(WIN_NT)
 
 	ResetEvent(event->event_handle);
@@ -722,6 +724,8 @@ int SharedMemoryBase::eventWait(event_t* event, const SLONG value, const SLONG m
  *
  **************************************/
 
+	fb_assert(event->event_pid == getpid());
+
 	// If we're not blocked, the rest is a gross waste of time
 
 	if (!event_blocked(event, value)) {
@@ -831,7 +835,7 @@ int SharedMemoryBase::eventPost(event_t* event)
 	++event->event_count;
 
 	if (event->event_pid != process_id)
-		return ISC_kill(event->event_pid, event->event_id, event->event_handle);
+		return ISC_kill(event->event_pid, event->event_id, event->event_handle) == 0 ? FB_SUCCESS : FB_FAILURE;
 
 	return SetEvent(event->event_handle) ? FB_SUCCESS : FB_FAILURE;
 

src/jrd/Attachment.cpp

@@ -1207,7 +1207,16 @@ bool Attachment::isProfilerActive()
 	return att_profiler_manager && att_profiler_manager->isActive();
 }
 
-void Attachment::releaseProfilerManager()
+void Attachment::releaseProfilerManager(thread_db* tdbb)
 {
-	att_profiler_manager.reset();
+	if (!att_profiler_manager)
+		return;
+
+	if (att_profiler_manager->haveListener())
+	{
+		EngineCheckout cout(tdbb, FB_FUNCTION);
+		att_profiler_manager.reset();
+	}
+	else
+		att_profiler_manager.reset();
 }

src/jrd/Attachment.h

@@ -847,7 +847,7 @@ class Attachment : public pool_alloc<type_att>
 	ProfilerManager* getProfilerManager(thread_db* tdbb);
 	ProfilerManager* getActiveProfilerManagerForNonInternalStatement(thread_db* tdbb);
 	bool isProfilerActive();
-	void releaseProfilerManager();
+	void releaseProfilerManager(thread_db* tdbb);
 
 	JProvider* getProvider()
 	{