Changeset 2511 for trunk/src/win32k/misc/heaptest.c

Timestamp:

Jan 24, 2000, 7:19:01 PM (26 years ago)

Author:

bird

Message:

Heapchanges: Heap is splitted into a swappable and a resident. The heaps
are dynamically growable.

File:

• trunk/src/win32k/misc/heaptest.c (modified) (19 diffs)

trunk/src/win32k/misc/heaptest.c

@@ -1 @@
-/* $Id: heaptest.c,v 1.4 2000-01-24 03:05:13 bird Exp $
+/* $Id: heaptest.c,v 1.5 2000-01-24 18:18:59 bird Exp $
  *
  * Test of resident and swappable heaps.
@@ -13 +13 @@
 *   Defined Constants
 *******************************************************************************/
-#define NUMBER_OF_POINTERS      1024
-#define RANDOMTEST_ITERATIONS   65536*2
-#define Int3()          __interrupt(3)
-
+#define NUMBER_OF_POINTERS      16384
+#define RANDOMTEST_ITERATIONS   65536
+#define EXTRA_HEAPCHECK
 
 /*******************************************************************************
@@ -25 +24 @@
 #include "smalloc.h"
 #include "macros.h"
+#include "asmutils.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <memory.h>
-#include <builtin.h>
 
 
@@ -43 +42 @@
     unsigned      crealloc;
     int           i;
-    int           fResTests = 0;
-    int           fResSimple = 0;
-    int           fResRandom = 0;
+    int           fResTests = 1;
+    int           fResSimple = 1;
+    int           fResRandom = 1;
     int           fSwpTests = 1;
-    int           fSwpSimple = 0;
+    int           fSwpSimple = 1;
     int           fSwpRandom = 1;
     enum   {malloc,realloc, free, unknown} enmLast = unknown;
@@ -98 +97 @@
                         break;
                 }
-                memset(apv[i], 0xA, MIN(acb[i],16));
+                memset(apv[i], 0xA, acb[i]);
                 cb += acb[i];
             }
@@ -113 +112 @@
                 if (cb != ((acb[i] + 3) & ~3) && (cb < ((acb[i] + 3) & ~3) || cb > 52 + ((acb[i] + 3) & ~3)) )
                     printf("size of avp[%d] (%d) != acb[%d] (%d)\n", i, cb, i, acb[i]);
+                memset(apv[i], 0xF, acb[i]);
                 rfree(apv[i]);
                 enmLast = free;
@@ -179 +179 @@
                             break;
                         }
-                        memset(apv[j], 0xA, MIN(acb[j],16));
+                        memset(apv[j], 0xA, acb[j]);
                         cAllocations++;
                         cb += acb[j];
@@ -236 +236 @@
                             apv[j] = pv;
                             acb[j] = cb;
+                            memset(apv[j], 0xB, acb[j]);
                         }
                         else
                         {   /* free */
+                            memset(apv[j], 0xF, acb[j]);
                             rfree(apv[j]);
                             enmLast = free;
@@ -247 +249 @@
                     }
                 }
+                #ifdef EXTRA_HEAPCHECK
                 _res_heap_check();
+                #endif
                 if (RANDOMTEST_ITERATIONS/2 == i)
                     _res_dump_subheaps();
@@ -277 +281 @@
     if (fSwpTests)
     {
+        printf("\nSwappable heap tests\nSwappable heap tests\n");
         if (fSwpSimple)
         {
@@ -282 +287 @@
              * Simple allocation test.
              */
+            printf("\nSimple swappable heap tests\nSimple swappable heap tests\n");
             for (i = 0; i < NUMBER_OF_POINTERS; i++)
             {
@@ -299 +305 @@
                         break;
                 }
-                memset(apv[i], 0xA, MIN(acb[i],16));
+                memset(apv[i], 0xA, acb[i]);
                 cb += acb[i];
             }
@@ -314 +320 @@
                 if (cb != ((acb[i] + 3) & ~3) && (cb < ((acb[i] + 3) & ~3) || cb > 52 + ((acb[i] + 3) & ~3)) )
                     printf("size of avp[%d] (%d) != acb[%d] (%d)\n", i, cb, i, acb[i]);
+                memset(apv[i], 0xF, acb[i]);
                 sfree(apv[i]);
                 enmLast = free;
@@ -340 +347 @@
              */
             printf("\n"
-                   "Random allocation and freeing test:\n");
+                   "Random allocation and freeing test (swappable)\n"
+                   "Random allocation and freeing test (swappable)\n"
+                   );
             for (i = 0; i < NUMBER_OF_POINTERS; i++)
                 apv[i] = NULL, acb[i] = 0;
@@ -380 +389 @@
                             break;
                         }
-                        memset(apv[j], 0xA, MIN(acb[j],16));
+                        memset(apv[j], 0xA, acb[j]);
                         cAllocations++;
                         cb += acb[j];
@@ -437 +446 @@
                             apv[j] = pv;
                             acb[j] = cb;
+                            memset(apv[j], 0xB, acb[j]);
                         }
                         else
                         {   /* free */
+                            memset(apv[j], 0xF, acb[j]);
                             sfree(apv[j]);
                             enmLast = free;
@@ -448 +459 @@
                     }
                 }
+                #ifdef EXTRA_HEAPCHECK
                 _swp_heap_check();
+                #endif
                 if (RANDOMTEST_ITERATIONS/2 == i)
+                {
                     _swp_dump_subheaps();
+                    _res_dump_subheaps();
+                }
                 if ((i % 2048) == 0)
                     printf("i=%d cAllocations=%d\n", i, cAllocations);
@@ -459 +475 @@
             printf("_swp_dump_subheaps:\n");
             _swp_dump_subheaps();
+            printf("_res_dump_subheaps:\n");
+            _res_dump_subheaps();
 
             printf("_swp_memfree - before heapmin: %d\n", _swp_memfree());
@@ -466 +484 @@
             printf("_swp_dump_subheaps:\n");
             _swp_dump_subheaps();
+            printf("_res_dump_subheaps:\n");
+            _res_dump_subheaps();
         } /* fSwpRandom */
     }