Changeset 7 for trunk/kProfiler2/prfreader.cpp.h

Timestamp:

Feb 4, 2008, 3:08:02 AM (18 years ago)

Author:

bird

Message:

kAVL: Implemented locking, root node and a direct cache.

File:

• trunk/kProfiler2/prfreader.cpp.h (modified) (7 diffs)

trunk/kProfiler2/prfreader.cpp.h

@@ -266 +266 @@
 } KPRF_TYPE(,REPORTMODSEG), *KPRF_TYPE(P,REPORTMODSEG);
 
-/* Instantiate the AVL tree code. */
-#define KAVL_CHECK_FOR_EQUAL_INSERT
-#define KAVL_MAX_STACK          32
-#define KAVL_STD_KEY_COMP
-#define mKey                    offSegment
-#define KAVLKEY                 KDBGADDR
-#define KAVLNODE                KPRF_TYPE(,REPORTMODSEG)
-#define KAVL_FN(name)           KPRF_NAME(ReportTree ## name)
-#define KAVL_TYPE(prefix,name)  KPRF_TYPE(prefix, REPORTMODESEG ## name)
-#define KAVL_INT(name)          KPRF_NAME(REPORTMODESEGINT ## name)
-#define KAVL_DECL(type)         K_DECL_INLINE(type)
-#include <k/kAvlTmpl/kAvlBase.h>
-#include <k/kAvlTmpl/kAvlDestroy.h>
-#include <k/kAvlTmpl/kAvlGet.h>
-#include <k/kAvlTmpl/kAvlUndef.h>
-
 
 /**
@@ -530 +514 @@
     /** The number of modules in the list. */
     KU32                        cMods;
-    /** The module segment tree. */
+    /** The module segment tree. (Only kAvl cares about this.) */
     KPRF_TYPE(P,REPORTMODSEG)   pModSegTree;
     /** The number of module segments in the tree. */
@@ -557 +541 @@
 
 } KPRF_TYPE(,REPORT), *KPRF_TYPE(P,REPORT), **KPRF_TYPE(PP,REPORT);
+
+
+/* Instantiate the AVL tree code. */
+#define KAVL_CHECK_FOR_EQUAL_INSERT
+#define KAVL_MAX_STACK          32
+#define KAVL_STD_KEY_COMP
+#define mKey                    offSegment
+#define KAVLKEY                 KDBGADDR
+#define KAVLNODE                KPRF_TYPE(,REPORTMODSEG)
+#define mpRoot                  pModSegTree
+#define KAVLROOT                KPRF_TYPE(,REPORT)
+#define KAVL_FN(name)           KPRF_NAME(ReportTree ## name)
+#define KAVL_TYPE(prefix,name)  KPRF_TYPE(prefix, REPORTMODESEG ## name)
+#define KAVL_INT(name)          KPRF_NAME(REPORTMODESEGINT ## name)
+#define KAVL_DECL(type)         K_DECL_INLINE(type)
+#include <k/kAvlTmpl/kAvlBase.h>
+#include <k/kAvlTmpl/kAvlDestroy.h>
+#include <k/kAvlTmpl/kAvlGet.h>
+#include <k/kAvlTmpl/kAvlUndef.h>
 
 
@@ -592 +595 @@
     pReport->pFirstMod = NULL;
     pReport->cMods = 0;
-    pReport->pModSegTree = NULL;
+    KPRF_NAME(ReportTreeInit)(pReport);
     pReport->cModSegs = 0;
     pReport->papSortedThreads = (KPRF_TYPE(P,REPORTTHREAD) *)((KU8 *)pReport + offSortedThreads);
@@ -637 +640 @@
     }
 
-    KPRF_NAME(ReportTreeDestroy)(&pReport->pModSegTree, KPRF_NAME(DeleteModSeg), NULL);
+    KPRF_NAME(ReportTreeDestroy)(pReport, KPRF_NAME(DeleteModSeg), NULL);
 
     /*
@@ -688 +691 @@
         pSeg->cFunctions = 0;
 
-        if (!KPRF_NAME(ReportTreeInsert)(&pReport->pModSegTree, pSeg))
+        if (!KPRF_NAME(ReportTreeInsert)(pReport, pSeg))
         {
             free(pSeg);
@@ -758 +761 @@
         pReport->papSortedFunctions[iFunc] = pReportFunc;
         pReportFunc->pFunc = pFunc;
-        pReportFunc->pModSeg = KPRF_NAME(ReportTreeGet)(&pReport->pModSegTree, pFunc->offModSeg);
+        pReportFunc->pModSeg = KPRF_NAME(ReportTreeGet)(pReport, pFunc->offModSeg);
         pReportFunc->pSym = NULL;
         pReportFunc->pLine = NULL;