analyzetool/dynamicmemoryhook/src/analyzetooleventhandler.cpp
branchRCL_3
changeset 59 8ad140f3dd41
parent 49 7fdc9a71d314
equal deleted inserted replaced
49:7fdc9a71d314 59:8ad140f3dd41
    66                 ATFastLogDllLoaded( iProcessId,
    66                 ATFastLogDllLoaded( iProcessId,
    67                         iLibraryInfo.iLibraryName, 
    67                         iLibraryInfo.iLibraryName, 
    68                         iLibraryInfo.iRunAddress,
    68                         iLibraryInfo.iRunAddress,
    69                         iLibraryInfo.iRunAddress + iLibraryInfo.iSize );
    69                         iLibraryInfo.iRunAddress + iLibraryInfo.iSize );
    70                 }
    70                 }
    71             else if( iLogOption == EATLogToFile )
    71             else
    72             	{
    72                 {
    73 				iLogFile.ATFileLogDllLoaded( iLibraryInfo.iLibraryName, 
    73                 LOGSTR1( "ATMH CLibraryEventHandler::RunL() - iStorageServer.LogDllLoaded() " );
    74 						iLibraryInfo.iRunAddress,
    74                 error = iStorageServer.LogDllLoaded( 
    75 						iLibraryInfo.iRunAddress + iLibraryInfo.iSize );
    75                         iLibraryInfo.iLibraryName, 
    76             	}
    76                         iLibraryInfo.iRunAddress,
    77             
    77                         iLibraryInfo.iRunAddress + iLibraryInfo.iSize );
       
    78                 LOGSTR2( "ATMH StorageServer error: %i",  error );
       
    79                 }
    78             if ( KErrNone == error )
    80             if ( KErrNone == error )
    79                 {
    81                 {
    80                 iCodeblocks.Append( TCodeblock( iLibraryInfo.iRunAddress, 
    82                 iCodeblocks.Append( TCodeblock( iLibraryInfo.iRunAddress, 
    81                         iLibraryInfo.iSize, 
    83                         iLibraryInfo.iSize, 
    82                         iLibraryInfo.iLibraryName ) );
    84                         iLibraryInfo.iLibraryName ) );
   102                     ATFastLogDllUnloaded( iProcessId,
   104                     ATFastLogDllUnloaded( iProcessId,
   103                             libraryName,
   105                             libraryName,
   104                             iLibraryInfo.iRunAddress, 
   106                             iLibraryInfo.iRunAddress, 
   105                             iLibraryInfo.iRunAddress + iLibraryInfo.iSize );
   107                             iLibraryInfo.iRunAddress + iLibraryInfo.iSize );
   106                     }
   108                     }
   107                 else if( iLogOption == EATLogToFile )
   109                 else
   108 					{
   110                     {
   109 					iLogFile.ATFileLogDllUnloaded( iLibraryInfo.iLibraryName, 
   111                     LOGSTR1( "ATMH CLibraryEventHandler::RunL() - iStorageServer.LogDllUnloaded() " );
   110 							iLibraryInfo.iRunAddress,
   112                     #ifdef LOGGING_ENABLED
   111 							iLibraryInfo.iRunAddress + iLibraryInfo.iSize );
   113                     TInt error = iStorageServer.LogDllUnloaded( 
   112 					}
   114                             libraryName/*iLibraryInfo.iLibraryName*/, 
       
   115                             iLibraryInfo.iRunAddress, 
       
   116                             iLibraryInfo.iRunAddress + iLibraryInfo.iSize );
       
   117     
       
   118                     LOGSTR2( "ATMH StorageServer error: %i",  error );
       
   119                     #else
       
   120                     iStorageServer.LogDllUnloaded( 
       
   121                                                 libraryName/*iLibraryInfo.iLibraryName*/, 
       
   122                                                 iLibraryInfo.iRunAddress, 
       
   123                                                 iLibraryInfo.iRunAddress + iLibraryInfo.iSize );
       
   124                     #endif
       
   125                     }
   113                 iCodeblocks.Remove( i );
   126                 iCodeblocks.Remove( i );
   114                 break;
   127                 break;
   115                 }
   128                 }
   116             }
   129             }
   117         }
   130         }
   183 // C++ default constructor can NOT contain any code, that
   196 // C++ default constructor can NOT contain any code, that
   184 // might leave.
   197 // might leave.
   185 // -----------------------------------------------------------------------------
   198 // -----------------------------------------------------------------------------
   186 //
   199 //
   187 CLibraryEventHandler::CLibraryEventHandler( RAnalyzeTool& aAnalyzeTool, 
   200 CLibraryEventHandler::CLibraryEventHandler( RAnalyzeTool& aAnalyzeTool, 
   188 	RArray<TCodeblock>& aCodeblocks,
   201 	RArray<TCodeblock>& aCodeblocks, RATStorageServer& aStorageServer, 
   189 	TUint aProcessId, RMutex& aMutex, 
   202 	TUint aProcessId, RMutex& aMutex, 
   190 	MAnalyzeToolEventhandlerNotifier& aNotifier,
   203 	MAnalyzeToolEventhandlerNotifier& aNotifier,
   191 	TUint32 aLogOption,
   204 	TUint32 aLogOption ) 
   192 	RATFileLog& aFileLog ) 
       
   193  :	CActive( EPriorityNormal ),
   205  :	CActive( EPriorityNormal ),
   194     iAnalyzeTool( aAnalyzeTool ),
   206     iAnalyzeTool( aAnalyzeTool ),
   195     iCodeblocks( aCodeblocks ),
   207     iCodeblocks( aCodeblocks ),
       
   208     iStorageServer( aStorageServer ),
   196     iProcessId( aProcessId ),
   209     iProcessId( aProcessId ),
   197     iMutex( aMutex ),
   210     iMutex( aMutex ),
   198     iStarted( EFalse ),
   211     iStarted( EFalse ),
   199     iNotifier( aNotifier ),
   212     iNotifier( aNotifier ),
   200     iLogOption( aLogOption ),
   213     iLogOption( aLogOption )
   201     iLogFile( aFileLog )
       
   202     {
   214     {
   203     LOGSTR1( "ATMH CLibraryEventHandler::CLibraryEventHandler()" );
   215     LOGSTR1( "ATMH CLibraryEventHandler::CLibraryEventHandler()" );
   204     }
   216     }
   205 
   217 
   206 // -----------------------------------------------------------------------------
   218 // -----------------------------------------------------------------------------