--- a/analyzetool/dynamicmemoryhook/inc/analyzetoolmainallocator.h	Wed Sep 15 00:19:18 2010 +0300
+++ b/analyzetool/dynamicmemoryhook/inc/analyzetoolmainallocator.h	Wed Sep 15 13:53:27 2010 +0300
@@ -22,11 +22,11 @@
 // INCLUDES
 #include <u32std.h>
 #include "codeblock.h"
-#include <analyzetool/atstorageserverclnt.h>
 #include <analyzetool/analyzetool.h>
 #include <analyzetool/atcommon.h>
 #include "analyzetoolmemoryallocator.h"
 #include "analyzetooleventhandlernotifier.h"
+#include "analyzetoolfilelog.h"
 
 // FORWARD DECLARATIONS
 class CLibraryEventHandler;
@@ -47,16 +47,21 @@
         * C++ default constructor.
         * @param aNotFirst Is this first thread using this heap
         * @param aFileName The name of the log file
-        * @param aLogOption The logging option for storage server
+        * @param aLogOption The logging option
         * @param aIsDebug Determines whether a binary is UDEB or UREL
         * @param aAllocCallStackSize Max number of stored callstack items when memory allocated
         * @param aFreeCallStackSize Max number of stored callstack items when memory freed
+        * @param aAtoolVersion Version of atool
+        * @param aApiVersion Version of api
         */
         RAnalyzeToolMainAllocator( TBool aNotFirst,
-                const TFileName aFileName,
+                const TFileName& aFileName,
+                const TPath& aFilePath,
                 TUint32 aLogOption, TUint32 aIsDebug,
                 TUint32 aAllocCallStackSize,
-                TUint32 aFreeCallStackSize );
+                TUint32 aFreeCallStackSize,
+                const TDesC8& aAtoolVersion,
+                const TDesC8& aApiVersion );
 
         /**
         * Destructor.
@@ -191,13 +196,7 @@
         void ShareHeap();
 
     public: // inlines
-    
-        /**
-        * Acquires the open RATStorageServer handle
-        * @return RATStorageServer& The open RATStorageServer handle
-        */
-        inline RATStorageServer& StorageServer();
-        
+            
         /**
         * Acquires the codeblocks of the process
         * @return RArray<TCodeblock>& The process codeblocks
@@ -221,12 +220,6 @@
 		* @return RAnalyzeTool A reference to logical channel
 		*/
         inline RAnalyzeTool& AnalyzeTool();
- 
-         /**
-        * Acquires information if storage server is open
-        * @return TBool iStorageServerOpen
-        */
-        inline TBool StorageServerOpen();
                 
         /**
         * Acquires the log option type 
@@ -245,17 +238,23 @@
          * @return TUint32 iFreeMaxCallStack
          */
         inline TUint32 FreeMaxCallStack();
+        
+        /**
+         * Acquires handle to lig file
+         * @return RATFileLog iLogFile
+         */
+        inline RATFileLog& LogFile();
 
     private: // private functions
 
         /**
         * Log the process initial information
         * @param aFileName The name of the log file
-        * @param aLogOption The logging option for storage serve
+        * @param aLogOption The logging option
         * @param aIsDebug Determines whether a binary is UDEB or UREL
         */
-        void LogProcessInformation( const TFileName aFileName, TUint32 aLogOption,
-                                                                TUint32 aIsDebug );
+        void LogProcessInformation( const TFileName& aFileName,  const TPath& aFilePath,  TUint32 aLogOption,
+        		TUint32 aIsDebug, const TDesC8& aAtoolVersion, const TDesC8& aApiVersion );
 
         /**
         * Find the current thread which is using the heap
@@ -268,11 +267,14 @@
         * Installs the eventhandler, if possible
         */
         void InstallEventHandler();
+        
+        /**
+        * Logs version of ATApp, ATApi, S60 version and ROM checksum 
+        * at the startup of hooked application
+        */
+        void LogDeviceInfo();
 
     private: // member variables
-            
-        /* Handle to the RATStorageServer */
-        RATStorageServer iStorageServer;
 
         /* Handle to the RAnalyzeTool */		
         RAnalyzeTool iAnalyzeTool;           
@@ -303,9 +305,6 @@
                 
         /* Array of threads using this heap */
         RArray<TThreadStack> iThreadArray;
-
-        /* A flag for indicating that the RATStorageServer is open */
-        TBool iStorageServerOpen;
         
         /* Log option */
         TUint32 iLogOption;
@@ -319,6 +318,10 @@
         /* Max items on stored call stack when memory freed */
         TUint32 iFreeMaxCallStack;
         
+        /* Binary log file */
+        RATFileLog iLogFile;
+       
+        
     };
 
 // INLINES