--- a/analyzetool/dynamicmemoryhook/inc/analyzetoolallocator.h	Wed Sep 15 13:53:27 2010 +0300
+++ b/analyzetool/dynamicmemoryhook/inc/analyzetoolallocator.h	Wed Oct 13 16:17:58 2010 +0300
@@ -24,9 +24,9 @@
 #include "codeblock.h"
 #include "threadstack.h"
 #include "analyzetoolmemoryallocator.h"
+#include <analyzetool/atstorageserverclnt.h>
 #include <analyzetool/analyzetool.h>
 #include <analyzetool/atcommon.h>
-#include "analyzetoolfilelog.h"
 
 // CLASS DECLARATION
 
@@ -42,24 +42,29 @@
         /**
         * C++ default constructor.
         * @param aNotFirst Is this first thread using this heap
+        * @param aStorageServer A reference to the 
+        *                       <code>RATStorageServer</code> which is 
+        *                       used to store kernel events
         * @param aCodeblocks A reference to array of code segments
         * @param aMutex A reference to mutex for schedule access to the 
         *                   shared resources
         * @param aProcessId A reference to the observed process id
         * @param aAnalyzeTool Reference to device driver
-        * @param aLogOption The logging option
+        * @param aStorageServerOpen Variable to check if Storage server is connected
+        * @param aLogOption The logging option for storage server
         * @param aAllocCallStackSize Max number of stored callstack items when memory allocated
         * @param aFreeCallStackSize Max number of stored callstack items when memory freed
         */
         RAnalyzeToolAllocator( TBool aNotFirst,
+                               RATStorageServer& aStorageServer, 
                                RArray<TCodeblock>& aCodeblocks, 
                                RMutex& aMutex, 
                                TUint aProcessId,
                                RAnalyzeTool& aAnalyzeTool,
+                               TBool aStorageServerOpen,
                                TUint32 aLogOption,
                                TUint32 aAllocCallStackSize,
-                               TUint32 aFreeCallStackSize,
-                               RATFileLog& iLogFile );
+                               TUint32 aFreeCallStackSize );
         /**
         * Destructor.
         */                     
@@ -197,6 +202,9 @@
 
     private: 
     
+        /* Handle to the storage server*/
+        RATStorageServer& iStorageServer;
+
         /* A reference to codeblocks of the observed process */            
         RArray<TCodeblock>& iCodeblocks;
 
@@ -220,6 +228,9 @@
 
         RAnalyzeTool& iAnalyzeTool;
 
+        /* A flag for indicating that the RATStorageServer is open */
+        TBool iStorageServerOpen;
+
         /* Log option */
         TUint32 iLogOption;
         
@@ -229,9 +240,6 @@
         /* Max items on stored call stack when memory freed */
         TUint32 iFreeMaxCallStack;
         
-        /* Binary log file */
-        RATFileLog& iLogFile;
-        
     };
 
 #endif // ANALYZETOOLALLOCATOR_H