Implement improvements CORE-2773 : Let "Start trace session" service …

…report ID of newly created trace session and CORE-2774 : Let "Start trace session" service report if there was no trace plugin's loaded by the engine
FirebirdSQL · Nov 30, 2009 · 78fb021 · 78fb021
1 parent 6751d05
commit 78fb021
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/jrd/trace/TraceManager.h b/src/jrd/trace/TraceManager.h
@@ -59,6 +59,9 @@ class TraceManager
 	static ConfigStorage* getStorage()
 	{ return storageInstance.getStorage(); }
 
+	static size_t pluginsCount()
+	{ return modules->getCount(); }
+
 	void event_attach(TraceConnection* connection, bool create_db,
 		ntrace_result_t att_result);
 

diff --git a/src/jrd/trace/TraceService.cpp b/src/jrd/trace/TraceService.cpp
@@ -83,6 +83,12 @@ void TraceSvcJrd::setAttachInfo(const string& /*service_name*/, const string& us
 
 void TraceSvcJrd::startSession(TraceSession& session, bool interactive)
 {
+	if (!TraceManager::pluginsCount())
+	{
+		m_svc.printf("Can not start trace session. There is no trace plugins loaded\n");
+		return;
+	}
+
 	ConfigStorage* storage = TraceManager::getStorage();
 
 	{	// scope
@@ -111,6 +117,7 @@ void TraceSvcJrd::startSession(TraceSession& session, bool interactive)
 	}
 
 	m_svc.started();
+	m_svc.printf("Trace session ID %ld started\n", session.ses_id);
 
 	if (interactive)
 	{
@@ -120,9 +127,6 @@ void TraceSvcJrd::startSession(TraceSession& session, bool interactive)
 			storage->removeSession(session.ses_id);
 		}
 	}
-	else {
-		m_svc.printf("Trace session ID %ld started\n", session.ses_id);
-	}
 }
 
 void TraceSvcJrd::stopSession(ULONG id)