--- a/analyzetool/commandlineengine/inc/ATCommonDefines.h Wed Sep 15 13:53:27 2010 +0300
+++ b/analyzetool/commandlineengine/inc/ATCommonDefines.h Wed Oct 13 16:17:58 2010 +0300
@@ -23,51 +23,6 @@
using namespace std;
-#define MAIN_ID "<AT>"
-#define ALLOC_ID "ALLOC" // < V.1.6 allocation. // todo remove
-#define ALLOCH_ID "ALH" // Header of multi message allocation.
-#define ALLOCF_ID "ALF" // Fragment of multi message allocation.
-#define REALLOCH_ID "RAH" // Header of multi message reallocation.
-#define REALLOCF_ID "RAF" // Fragment of multi message reallocation.
-#define FREE_ID "FREE"
-#define FREEH_ID "FRH" // Header of multi message free.
-#define FREEF_ID "FRF" // Fragment of multi message free.
-#define HANDLE_LEAK_ID "HANDLE_LEAK"
-
-const string ERROR_OCCURED = "ERR"; // Error messages.
-const string INCORRECT_ATOOL_VERSION = "INCORRECT_ATOOL_VERSION";
-
-// if changed, change also in analyzetoolfilelog.h
-enum EMessageType{
- EFileVersion = 0,
- EProcessStart,
- EProcessEnd,
- EThreadStart,
- EThreadEnd,
- EDllLoad,
- EDllUnload,
- EAllocH,
- EAllocF,
- EFreeH,
- EFreeF,
- EReallocH,
- EReallocF,
- ETestStart,
- ETestEnd,
- EHandleLeak,
- EDeviceInfo,
- EError
- };
-
-/**
-* Invalid characters in trace file line content.
-* These will be filtered out before actuall parsing of line.
-10 = LF
-13 = CR
-124 = |
-*/
-const char cINVALID_TRACE_FILE_CHARS[] = { 10, 13, 124 };
-
/**
* Atool return code.
*/
@@ -126,12 +81,9 @@
// makefile dir is used in atool.cpp to check will we use sbs2 (in analyze and clear)
#define RAPTOR_MAKEFILE_DIR "atool_temp\\build"
-//part of user defined filename to be replaced by process name
-const string AT_PROCESSNAME_TAG = "%processname%";
-
// Atool version number and date
-#define ATOOL_VERSION "1.10.0" // NOTE! This version number is written also to temporary cpp file.
-#define ATOOL_DATE "2nd July 2010"
+#define ATOOL_VERSION "1.9.1" // NOTE! This version number is written also to temporary cpp file.
+#define ATOOL_DATE "29th April 2010"
// Default/min/max call stack sizes
const int AT_ALLOC_CALL_STACK_SIZE_DEFAULT = 40;
@@ -144,10 +96,10 @@
// Constant compatibility string in temporary cpp.
// Api version ; current version.
-#define ATOOL_COMPATIBILITY_STRING "1.7.6;1.10.0"
+#define ATOOL_COMPATIBILITY_STRING "1.7.5;1.9.1"
// Datafile version
-#define AT_DATA_FILE_VERSION "DATA_FILE_VERSION 12"
+#define AT_DATA_FILE_VERSION "DATA_FILE_VERSION 11"
// Latest dbghelp.dll version
const int DBGHELP_VERSION_MAJ = 6;
@@ -163,8 +115,7 @@
const string AT_BUILD_SUMMARY_TARGET = "\tTarget: ";
const string AT_BUILD_SUMMARY_FAILED = "Build failed: ";
const string AT_BUILD_SUMMARY_ERRORS = "\tErrors: ";
-const string AT_BUILD_SUMMARY_DATA_FILE_NAME = "\tLog file name: ";
-const string AT_BUILD_SUMMARY_DATA_FILE_PATH = "\tLog file path: ";
+const string AT_BUILD_SUMMARY_DATA_FILE_NAME = "\tInternal data gathering filename: ";
const string AT_BUILD_SUMMARY_NORMAL_BUILD_COMPLETE = "Normal build complete: ";
const string AT_BUILD_SUMMARY_STATIC_LIBRARY = "\tModule is static library.";
const string AT_BUILD_SUMMARY_UNSUPPORTED_TARGET_TYPE = "\tModule has unsupported target type.";
@@ -176,9 +127,9 @@
const string AT_BUILD_SUMMARY_LOGGING_MODE = "Data gathering mode: ";
const string AT_BUILD_SUMMARY_ALLOC_CALL_STACK_SIZE = "Allocation call stack size: ";
const string AT_BUILD_SUMMARY_FREE_CALL_STACK_SIZE = "Free call stack size: ";
-const string AT_BUILD_SUMMARY_FILE = "log to file";
+const string AT_BUILD_SUMMARY_FILE = "monitored internal";
const string AT_BUILD_SUMMARY_TRACE = "monitored external";
-const string AT_BUILD_SUMMARY_TRACE_FAST = "output to trace";
+const string AT_BUILD_SUMMARY_TRACE_FAST = "external";
const string AT_UNSUPPORTED_TARGET_TYPE = "\tModule has unsupported target type.";
const string AT_UNSUPPORTED_COMPILE_DEFINITION = "\tModule defined unsupported compile definition.";
@@ -353,21 +304,17 @@
// Trace file constants definitions
#define LABEL_DATA_FILE_VERSION "DATA_FILE_VERSION"
-#define LABEL_PROCESS_START "PCS"
-#define LABEL_DLL_LOAD "DLL"
-#define LABEL_DLL_UNLOAD "DLU"
+#define LABEL_PROCESS_START "PROCESS_START"
+#define LABEL_DLL_LOAD "DLL_LOAD"
+#define LABEL_DLL_UNLOAD "DLL_UNLOAD"
#define LABEL_MEM_LEAK "MEM_LEAK"
-#define LABEL_PROCESS_END "PCE"
-#define LABEL_ERROR_OCCURED "ERR"
-#define LABEL_HANDLE_LEAK "HDL"
-#define LABEL_TEST_START "TSS"
-#define LABEL_TEST_END "TSE"
-#define LABEL_THREAD_START "TDS"
-#define LABEL_THREAD_END "TDE"
-#define LABEL_DEVICE_INFO "DEVINFO"
+#define LABEL_PROCESS_END "PROCESS_END"
+#define LABEL_ERROR_OCCURED "ERROR_OCCURED"
+#define LABEL_HANDLE_LEAK "HANDLE_LEAK"
+#define LABEL_TEST_START "TEST_START"
+#define LABEL_TEST_END "TEST_END"
#define LABEL_LOGGING_CANCELLED "LOGGING_CANCELLED"
-
// AddressToLine related constants
#define LABEL_ABNORMAL "ABNORMAL"
@@ -524,10 +471,8 @@
{
bool bNoBuild; /** Only intrument project? (no build) */
bool bDataFileName; /** Is internal data gathering filename defined */
- bool bDataFilePath; /** Is internal data gathering file path defined */
bool bAbldTest; /** Is build only for test modules (abld test build.. */
string sDataFileName; /** Internal data gathering filename */
- string sDataFilePath; /** Path to internal data gathering file */
int iBuildSystem; /** 1 = sbs, 2 = raptor */
int iLoggingMode; /** Just for old parameter parsing. 1=trace, 2=file, 0=? */
int iAllocCallStackSize; /** Call stack size when memory allocated */
@@ -546,9 +491,7 @@
bNoBuild = false;
bAbldTest = false;
bDataFileName = false;
- bDataFilePath = false;
sDataFileName = "";
- sDataFilePath = "";
iBuildSystem = 0;
iLoggingMode = 0;
iAllocCallStackSize = AT_ALLOC_CALL_STACK_SIZE_DEFAULT;