FCL/sf/os/osrndtools: comparison perfsrv/piprofiler/engine/src/ProfilerEngine.cpp

equal deleted inserted replaced

-:aa2539c91954
+:1c2bb2fc7c87
 *
 *	CProfiler class implementation
 *
 */
 // --------------------------------------------------------------------------------------------
-CProfiler* CProfiler::NewLC(const TDesC& aSettingsFile)
+CProfiler* CProfiler::NewLC(const TDesC& aSettingsFile, TBool aBootMode)
 {
-	CProfiler* self = new(ELeave) CProfiler(aSettingsFile);
+	CProfiler* self = new(ELeave) CProfiler(aSettingsFile ,aBootMode);
 	CleanupStack::PushL(self);
 	self->ConstructL();
+	LOGTEXT(_L("CProfiler::NewLC - done"));
 	return self;
 }
 // --------------------------------------------------------------------------------------------
-CProfiler::CProfiler(const TDesC& aSettingsFile) :
+CProfiler::CProfiler(const TDesC& aSettingsFile, TBool aBootMode) :
-iSettingsFileLocation(aSettingsFile)
+iSettingsFileLocation(aSettingsFile),
+iBootMode(aBootMode)
 	{
 	// define property for Profiler Engine status, UI may read it for control purposes
 	if ( RProperty::Define(KEngineStatusPropertyCat,
 	        EProfilerEngineStatus,
 	        RProperty::EInt,
 		iUserStream = NULL;
 		}
 	// close engine status property
 	iEngineStatus.Close();
-	if (RProperty::Delete(KEngineStatusPropertyCat, EProfilerEngineStatus) != KErrNotFound)
+	TInt ret = RProperty::Delete(KEngineStatusPropertyCat, EProfilerEngineStatus);
-	    {
+	if ( ret != KErrNone)
-	    LOGTEXT(_L("CProfiler::~CProfiler - cannot close status property"));
+	    {
+	    LOGSTRING2("CProfiler::~CProfiler - cannot close status property %d", ret);
 	    }
 // close engine update property
 iUpdateStatus.Close();
-if (RProperty::Delete(KEngineStatusPropertyCat, EProfilerErrorStatus) != KErrNotFound)
+ret = RProperty::Delete(KEngineStatusPropertyCat, EProfilerErrorStatus);
-{
+if (ret != KErrNone)
-LOGTEXT(_L("CProfiler::~CProfiler - cannot close update property"));
+{
+LOGSTRING2("CProfiler::~CProfiler - cannot close update property %d",ret);
 }
 // close server process
 if (iServer)
 {
 // --------------------------------------------------------------------------------------------
 void CProfiler::ConstructL()
 {
 	LOGTEXT(_L("CProfiler::ConstructL - Enter"));
-	TInt err(0);
+TInt err(0);
 	TLex lex;
+	if(iBootMode)
+	    {
+LOGSTRING("boot mode enabled");
+	    }
+	else
+	    {
+LOGSTRING("normal mode enabled");
+	    }
 	if ( iSettingsFileLocation.CompareF(KNullDesC) != 0 )
 	    {
 lex=(iSettingsFileLocation);
 // parse the first command line argument, the command itself
 if(lex.TokenLength() != 0)
 {
 // there is another item in the list
 TPtrC filename = lex.MarkedToken();
 LOGSTRING2("filename %S", &filename);
-lex.SkipSpace();
-lex.Mark();
+}
-lex.SkipCharacters();
+	    }
-if(lex.TokenLength() != 0)
+	else
-{
+	    {
-TPtrC boot = lex.MarkedToken();
+LOGSTRING("CProfiler::ConstructL - Enter - settingsfilelocation null");
-LOGTEXT(_L("boot mode"));
-}
-}
 	    }
 // create new sampler stream instance
 iUserStream = CProfilerSampleStream::NewL(KStreamBufferSize);
 if(!iUserStream)
 // engine status checker
 iErrorChecker = CProfilerErrorChecker::NewL();
 iErrorChecker->SetObserver(this);
-	// create and initiate plug-in controller instances
+// create and initiate plug-in controller instances
-iSamplerHandler = CSamplerController::NewL(*iUserStream);
+iSamplerHandler = CSamplerController::NewL(*iUserStream, iBootMode);
-iWriterHandler = CWriterController::NewL(*iUserStream);
+LOGSTRING("CSamplerController started from ProfilerEngine");
+iWriterHandler = CWriterController::NewL(*iUserStream, iBootMode);
+LOGSTRING("CWriterController started from ProfilerEngine");
 iWriterHandler->InitialiseWriterListL();
+LOGSTRING("WriterList initialised started from ProfilerEngine");
 // set engine as an observer to sampler controller to get the notification of plugin load has ended
 iSamplerHandler->SetObserver(this);
 // default settings from sampler plugins, maximum 20 sampler plugins
 iDefaultSamplerAttributesArray = new(ELeave) CArrayFixFlat<TSamplerAttributes>(20);
 			User::Leave(err);
 		    }
 		else break;
 	    }
+	if(err != KErrNone)
+	    {
+		User::Leave(err);
+	    }
 	// set settings file loading preferences
 	iSettingsFileLoaded = EFalse;
 	// change status property to idle since initialization successfull
 	iState = RProfiler::EIdle;
 // load default settings file
 LoadSettingsL();
 iSettingsFileLoaded = ETrue;
 }
+LOGSTRING("CProfiler::HandleSamplerControllerReadyL rendezvous");
 // notify engine's launcher(UI or PIProfilerLauncher) to continue launch
 RProcess::Rendezvous(KErrNone);
 }
 void CProfiler::NotifyRequesterForSettingsUpdate()
 // ----------------------------------------------------------------------------
 // Gets a value from settings file for certain attribute.
 // ----------------------------------------------------------------------------
 void CProfiler::DoGetValueFromSettingsArray(CDesC8ArrayFlat* aLineArray, const TDesC8& aAttribute, TDes8& aValue)
 {
-LOGTEXT(_L("CProfiler::DoGetValueFromSettingsFile()"));
+LOGTEXT(_L("CProfiler::DoGetValueFromSettingsArray()"));
 _LIT8(KSettingItemSeparator, "=");
 // read a line of given array
 for (TInt i=0; i<aLineArray->MdcaCount(); i++)
 {
 }
 }
 void CProfiler::DoGetValueFromSettingsArray(CDesC8ArrayFlat* aLineArray, const TDesC8& aAttribute, TInt& aValue)
 {
-LOGTEXT(_L("CProfiler::DoGetValueFromSettingsFile()"));
+LOGTEXT(_L("CProfiler::DoGetValueFromSettingsFile() TLex"));
 _LIT8(KSettingItemSeparator, "=");
 // read a line of given array
 for (TInt i=0; i<aLineArray->MdcaCount(); i++)
 {
 // --------------------------------------------------------------------------------------------
 void CProfiler::UpdateSavedGeneralAttributes(CDesC8ArrayFlat* aSavedAttributes)
 {
 // get saved general settings
+LOGSTRING("CProfiler::UpdateSavedGeneralAttributes");
 DoGetValueFromSettingsArray(aSavedAttributes, KGenericTraceOutput, iGeneralAttributes.iTraceOutput);
 DoGetValueFromSettingsArray(aSavedAttributes, KGenericTraceFilePrefix, iGeneralAttributes.iTraceFilePrefix);
 DoGetValueFromSettingsArray(aSavedAttributes, KGenericTraceFileSaveDrive, iGeneralAttributes.iSaveFileDrive);
 DoGetValueFromSettingsArray(aSavedAttributes, KGenericTimedProfilingPeriod, iGeneralAttributes.iTimedSamplingPeriod);
 }
 TBuf8<384> line;
 // connect to file server
 err = fs.Connect();
 if( err != KErrNone )
 {
 // failed to write settings to settings file
+RDebug::Printf("FS connect failed");
 return;
 }
 // create and set the private path
 fs.CreatePrivatePath(EDriveC);
 fs.SetSessionToPrivate(EDriveC);
 // create the new settings file
 err = settingsFile.Replace(fs, iSettingsFileLocation, EFileWrite);
 if(err != KErrNone)
-return;
+{
+RDebug::Printf("Settingsfile replace failed");
-CleanupClosePushL(settingsFile);
+fs.Close();
+return;
+}
 // write the header
 line.Copy(KPIProfilerSettingsHeader);
 line.Append(KNewLineSeparator);
 line.Append(KNewLineSeparator);
 settingsFile.Write(line);
 iSamplerHandler->GetSamplerAttributesL(iDefaultSamplerAttributesArray);
 // call CSamplerController to write all sampler settings
 iSamplerHandler->ComposeAttributesToSettingsFileFormat(settingsFile, iDefaultSamplerAttributesArray);
-CleanupStack::PopAndDestroy(); //settingsFile
+settingsFile.Close();
 // close file
 fs.Close();
 }
 TInt CProfiler::CheckOldProfilerRunning()
 	LOGTEXT(_L("CPServer::NewL - Enter"));
 	CPServer* self = new(ELeave) CPServer(aPriority, aEngine);
 	CleanupStack::PushL(self);
 	self->StartL(KProfilerName);
 	CleanupStack::Pop();
-	LOGTEXT(_L("CPSession::NewL - Exit"));
+	LOGTEXT(_L("CPServer::NewL - Exit "));
 	return self;
 }
 // --------------------------------------------------------------------------------------------
 CPServer::CPServer(TInt aPriority, MProfilerEngine& aEngine)
 * Static methods for controlling the profiler
 * through command line
 *
 */
 // --------------------------------------------------------------------------------------------
-static void RunEngineServerL(const TDesC& aSettingsFile)
+static void RunEngineServerL(const TDesC& aSettingsFile, TBool aBoot)
 {
-	RDebug::Print(_L("Profiler: RunEngineServerL() - Install active scheduler"));
+	LOGSTRING("Profiler: RunEngineServerL() - Install active scheduler");
 	CActiveScheduler* pS = new CActiveScheduler;
 	CActiveScheduler::Install(pS);
-	CProfiler* p = CProfiler::NewLC(aSettingsFile);
+	CProfiler* p = CProfiler::NewLC(aSettingsFile, aBoot);
+	LOGSTRING("Profiler: RunEngineServerL() - Starting active scheduler");
 	CActiveScheduler::Start();
 	p->Finalise();
+	LOGSTRING("Profiler: RunEngineServerL() - profiler finalised");
 	CleanupStack::PopAndDestroy(p);
 	delete pS;
+	LOGSTRING("Profiler: RunEngineServerL() - done");
 }
 // --------------------------------------------------------------------------------------------
 static TInt TestSettingsFile(const TDesC& configFile)
 {
 }
 // --------------------------------------------------------------------------------------------
 GLDEF_C TInt E32Main()
 {
+LOGSTRING("Profiler: E32Main()");
 // parse command line arguments
 TBuf<256> c;
 TInt err(KErrNone);
+_LIT(KBootMeasurement,"*boot");
+TBool myBoot(EFalse);
 // copy the full command line with arguments into a buffer
 User::CommandLine(c);
+// parse command line for boot mode. filename boot
+if (c.Match(KBootMeasurement) != KErrNotFound)
+{
+LOGTEXT(_L("ParseCommandAndExecute Found keyword boot"));
+myBoot = ETrue;
+}
+TBuf<256> temp;
+temp.Append(c);
+TLex lex(temp);
+lex.Mark();
+lex.SkipCharacters();
+TPtrC token;
 TBuf<256> fileName;
-fileName.Append(c); // only one settings param should be
-LOGSTRING3("Filename is %S, response %d 1", &fileName, err);
+if(lex.TokenLength() != 0)
-err = TestSettingsFile(fileName);
+{
-if(err != KErrNone)
+TPtrC token = lex.MarkedToken();
-{
+LOGSTRING2("E32 Main Token 1 %S",&token);
-LOGSTRING3("Filename is %S, response %d 2", &fileName, err);
+fileName.Append(token); // only one settings param should be
-// settings file does not exist, copy null desc to file name
+LOGSTRING3("Filename is #%S#, response %d 1", &fileName, err);
-fileName.Copy(KNullDesC);
+err = TestSettingsFile(fileName);
-}
+if(err != KErrNone)
+{
-LOGSTRING3("Filename is %S, response %d 3", &fileName, err);
+LOGSTRING3("Filename is #%S#, response %d 2", &fileName, err);
+// settings file does not exist, copy null desc to file name
+fileName.Copy(KNullDesC);
+}
+}
+else
+{
+LOGTEXT(_L("E32 Main Problem 1 in parsing command line"));
+}
 // if no command line arguments found just start the profiler process
 __UHEAP_MARK;
 CTrapCleanup* cleanup = CTrapCleanup::New();
 TInt ret(KErrNoMemory);
+err = KErrNoMemory;
 if( cleanup )
 {
-TRAPD( ret, RunEngineServerL(fileName) );
+TRAPD(err ,RunEngineServerL(fileName, myBoot));
-RDebug::Print(_L("Profiler: E32Main() - ret %d"), ret);
+LOGSTRING3("Profiler: E32Main() - ret %d err %d", ret,err);
-delete cleanup;
+if(err != KErrNone)
+{
+RDebug::Print(_L("if Profiler: E32Main() - ret %d err %d"), ret,err);
+ret = err;
+delete cleanup;
+}
+else
+{
+LOGSTRING3("else Profiler: E32Main() - ret %d err %d", ret,err);
+ret = err;
+delete cleanup;
+}
 }
 __UHEAP_MARKEND;
 return ret;
 }

changeset 62	1c2bb2fc7c87
parent 51	98307c651589