Changeset 3573 for trunk/kStuff/kLdr/tstkLdrHeap.c

Timestamp:

Aug 31, 2007, 6:09:23 AM (18 years ago)

Author:

bird

Message:

kHlp work...

File:

• trunk/kStuff/kLdr/tstkLdrHeap.c (modified) (17 diffs)

trunk/kStuff/kLdr/tstkLdrHeap.c

@@ -30 +30 @@
 *******************************************************************************/
 #include <k/kLdr.h>
-#include "kLdrHlp.h"
+#include <k/kHlp.h>
 
 #include <stdio.h>
@@ -44 +44 @@
 
 #define CHECK(expr) \
-    do { if (!(expr)) { printf("tstkLdrHeap(%d): ERROR - %s\n", __LINE__, #expr); cErrors++; kldrHlpBreakpoint();} \
+    do { if (!(expr)) { printf("tstkLdrHeap(%d): ERROR - %s\n", __LINE__, #expr); cErrors++; kHlpAssertBreakpoint();} \
     } while (0)
 
@@ -72 +72 @@
 
 #if 0
-# define kldrHlpAlloc(a) malloc(a)
-# define kldrHlpFree(a) free(a)
+# define kHlpAlloc(a) malloc(a)
+# define kHlpFree(a) free(a)
 #endif
 
@@ -93 +93 @@
      * Some simple init / term.
      */
-    rc = kldrHlpHeapInit();
-    CHECK_FATAL(!rc);
-    kldrHlpHeapTerm();
-
-    rc = kldrHlpHeapInit();
-    CHECK_FATAL(!rc);
-    kldrHlpHeapTerm();
+    rc = kHlpHeapInit();
+    CHECK_FATAL(!rc);
+    kHlpHeapTerm();
+
+    rc = kHlpHeapInit();
+    CHECK_FATAL(!rc);
+    kHlpHeapTerm();
 
 
@@ -105 +105 @@
      * Simple alloc all, free all in FIFO order.
      */
-    rc = kldrHlpHeapInit();
+    rc = kHlpHeapInit();
     CHECK_FATAL(!rc);
 
@@ -112 +112 @@
     {
         s_aAllocs[i].cb = RandSize();
-        s_aAllocs[i].pv = kldrHlpAlloc(s_aAllocs[i].cb);
+        s_aAllocs[i].pv = kHlpAlloc(s_aAllocs[i].cb);
         CHECK(s_aAllocs[i].pv);
     }
@@ -118 +118 @@
     /* 2. free all slots. */
     for (i = 0; i < MAX_ALLOCS; i++)
-        kldrHlpFree(s_aAllocs[i].pv);
+        kHlpFree(s_aAllocs[i].pv);
 
     /* terminate */
-    kldrHlpHeapTerm();
+    kHlpHeapTerm();
 
 
@@ -127 +127 @@
      * Simple alloc all, free all in LIFO order.
      */
-    rc = kldrHlpHeapInit();
+    rc = kHlpHeapInit();
     CHECK_FATAL(!rc);
 
@@ -134 +134 @@
     {
         s_aAllocs[i].cb = RandSize();
-        s_aAllocs[i].pv = kldrHlpAlloc(s_aAllocs[i].cb);
+        s_aAllocs[i].pv = kHlpAlloc(s_aAllocs[i].cb);
         CHECK(s_aAllocs[i].pv);
     }
@@ -141 +141 @@
     i = MAX_ALLOCS;
     while (i-- > 0)
-        kldrHlpFree(s_aAllocs[i].pv);
+        kHlpFree(s_aAllocs[i].pv);
 
     /* terminate */
-    kldrHlpHeapTerm();
+    kHlpHeapTerm();
 
 
@@ -150 +150 @@
      * Bunch of allocations, free half, allocate and free in pairs, free all.
      */
-    rc = kldrHlpHeapInit();
+    rc = kHlpHeapInit();
     CHECK_FATAL(!rc);
 
@@ -157 +157 @@
     {
         s_aAllocs[i].cb = RandSize();
-        s_aAllocs[i].pv = kldrHlpAlloc(s_aAllocs[i].cb);
+        s_aAllocs[i].pv = kHlpAlloc(s_aAllocs[i].cb);
         CHECK(s_aAllocs[i].pv);
     }
@@ -166 +166 @@
     {
         i = RandIdx(cAllocs);
-        kldrHlpFree(s_aAllocs[i].pv);
+        kHlpFree(s_aAllocs[i].pv);
         cAllocs--;
         if (i != cAllocs)
@@ -181 +181 @@
             i = cAllocs;
             s_aAllocs[i].cb = RandSize();
-            s_aAllocs[i].pv = kldrHlpAlloc(s_aAllocs[i].cb);
+            s_aAllocs[i].pv = kHlpAlloc(s_aAllocs[i].cb);
             CHECK(s_aAllocs[i].pv);
             cAllocs++;
@@ -191 +191 @@
         {
             i = RandIdx(cAllocs);
-            kldrHlpFree(s_aAllocs[i].pv);
+            kHlpFree(s_aAllocs[i].pv);
             cAllocs--;
             if (i != cAllocs)
@@ -202 +202 @@
     {
         i = RandIdx(cAllocs);
-        kldrHlpFree(s_aAllocs[i].pv);
+        kHlpFree(s_aAllocs[i].pv);
         cAllocs--;
         if (i != cAllocs)
@@ -209 +209 @@
 
     /* terminate */
-    kldrHlpHeapTerm();
+    kHlpHeapTerm();