Merge remote-tracking branch 'cne/master'

Author: Raltyro

hxcpp.n

@@ -106,13 +106,13 @@ static int sgCheckInternalOffsetRows = 0;
 int gInAlloc = false;
 
 // This is recalculated from the other parameters
-static size_t sWorkingMemorySize          = 10*1024*1024;
+static size_t sWorkingMemorySize = 256*1024;
 
 #ifdef HXCPP_GC_MOVING
 // Just not sure what this shold be
-static size_t sgMaximumFreeSpace  = 1024*1024*1024;
+static size_t sgMaximumFreeSpace = 512*1024*1024;
 #else
-static size_t sgMaximumFreeSpace  = 1024*1024*1024;
+static size_t sgMaximumFreeSpace = 512*1024*1024;
 #endif
 
 
@@ -720,7 +720,7 @@ struct HoleRange
 hx::QuickVec<struct BlockDataInfo *> *gBlockInfo = 0;
 static int gBlockInfoEmptySlots = 0;
 
-#define FRAG_THRESH 14
+#define FRAG_THRESH 20
 
 #define ZEROED_NOT    0
 #define ZEROED_THREAD 1
@@ -3117,11 +3117,11 @@ void VerifyStackRead(int *inBottom, int *inTop)
 
 // TODO - work out best size based on cache size?
 #ifdef HXCPP_GC_BIG_BLOCKS
-static int sMinZeroQueueSize = 4;
-static int sMaxZeroQueueSize = 16;
+static int sMinZeroQueueSize = 4*2;
+static int sMaxZeroQueueSize = 16*2;
 #else
-static int sMinZeroQueueSize = 8;
-static int sMaxZeroQueueSize = 32;
+static int sMinZeroQueueSize = 8*2;
+static int sMaxZeroQueueSize = 32*2;
 #endif
 
 #define BLOCK_OFSIZE_COUNT 12
@@ -3205,9 +3205,9 @@ class GlobalAllocator
 
    void FreeLarge(void *inLarge)
    {
-#ifdef HXCPP_TELEMETRY
+		#ifdef HXCPP_TELEMETRY
        __hxt_gc_free_large(inLarge);
-#endif
+		#endif
 
       ((unsigned char *)inLarge)[HX_ENDIAN_MARK_ID_BYTE] = 0;
       // AllocLarge will not lock this list unless it decides there is a suitable
@@ -3239,7 +3239,8 @@ class GlobalAllocator
 
       //Should we force a collect ? - the 'large' data are not considered when allocating objects
       // from the blocks, and can 'pile up' between smalll object allocations
-      if ((inSize+mLargeAllocated > mLargeAllocForceRefresh) && sgInternalEnable)
+		size_t newThreshold = mLargeAllocForceRefresh * 1.5f;
+      if ((inSize+mLargeAllocated > newThreshold) && sgInternalEnable)
       {
          #ifdef SHOW_MEM_EVENTS
          //GCLOG("Large alloc causing collection");
@@ -5184,11 +5185,11 @@ class GlobalAllocator
          }
 
 
-         bool isFragged = stats.fragScore > mAllBlocks.size()*FRAG_THRESH;
+         bool isFragged = stats.fragScore > mAllBlocks.size()*FRAG_THRESH*1.5;
          if (doRelease || isFragged || hx::gAlwaysMove)
          {
-            if (isFragged && sgTimeToNextTableUpdate>3)
-               sgTimeToNextTableUpdate = 3;
+            if (isFragged && sgTimeToNextTableUpdate>1)
+               sgTimeToNextTableUpdate = 1;
             calcMoveOrder( );
 
             // Borrow some blocks to ensuure space to defrag into
@@ -5304,7 +5305,7 @@ class GlobalAllocator
       double filled_ratio = (double)mRowsInUse/(double)(mAllBlocksCount*IMMIX_USEFUL_LINES);
       double after_gen = filled_ratio + (1.0-filled_ratio)*mGenerationalRetainEstimate;
 
-      if (after_gen<0.75)
+      if (after_gen<0.85)
       {
          sGcMode = gcmGenerational;
       }
@@ -5313,7 +5314,8 @@ class GlobalAllocator
          sGcMode = gcmFull;
          // What was I thinking here?  This breaks #851
          //gByteMarkID |= 0x30;
-      }
+			sgTimeToNextTableUpdate = 10;
+		}
 
       #ifdef SHOW_MEM_EVENTS
       GCLOG("filled=%.2f%% + estimate = %.2f%% = %.2f%% -> %s\n",