Change sub-buffer sizes to satisfy constraints. Warn if sizes are adjusted.

Works towards #515 (comment)

I am not sure we want to warn here in the "default" mode. Maybe if "allwarnings"?

Author: jodavies

sources/fsizes.h

@@ -126,13 +126,13 @@
 #define MAXFPATCHES 256
 #define SORTIOSIZE 200000L
 
-#define SSMALLBUFFER 500000L
-#define SSMALLOVERFLOW 800000L
+#define SSMALLBUFFER 2560016L
+#define SSMALLOVERFLOW 3840032L
 #define STERMSSMALL 10000L
-#define SLARGEBUFFER 4000000L
+#define SLARGEBUFFER 26880480L
 #define SMAXPATCHES 64
 #define SMAXFPATCHES 64
-#define SSORTIOSIZE 32768L
+#define SSORTIOSIZE 160000L
 
 #define SPECTATORSIZE 1048576L
 

sources/setfile.c

@@ -848,9 +848,17 @@ VOID WriteSetup(VOID)
 		To be used for the main allocation of the sort buffers, and
 		in a later stage for the function and subroutine sort buffers.
 */
-SORTING *AllocSort(LONG LargeSize, LONG SmallSize, LONG SmallEsize, LONG TermsInSmall,
-                   int MaxPatches, int MaxFpatches, LONG IOsize)
+SORTING *AllocSort(LONG inLargeSize, LONG inSmallSize, LONG inSmallEsize, LONG inTermsInSmall,
+                   int inMaxPatches, int inMaxFpatches, LONG inIOsize)
 {
+	LONG LargeSize = inLargeSize;
+	LONG SmallSize = inSmallSize;
+	LONG SmallEsize = inSmallEsize;
+	LONG TermsInSmall = inTermsInSmall;
+	int MaxPatches = inMaxPatches;
+	int MaxFpatches = inMaxFpatches;
+	LONG IOsize = inIOsize;
+
 #ifndef SPLITALLOC
 	LONG allocation;
 #endif
@@ -878,7 +886,6 @@ SORTING *AllocSort(LONG LargeSize, LONG SmallSize, LONG SmallEsize, LONG TermsIn
 	terms2insmall = 2*TermsInSmall;  /* Used to be just + 100 rather than *2 */
 	if ( SmallEsize < (SmallSize*3)/2 ) SmallEsize = (SmallSize*3)/2;
 	if ( LargeSize > 0 && LargeSize < 2*SmallSize ) LargeSize = 2*SmallSize;
-/*	if ( SmallEsize < 3*AM.MaxTer ) SmallEsize = 3*AM.MaxTer; */
 	SmallEsize = (SmallEsize+15) & (-16L);
 	if ( LargeSize < 0 ) LargeSize = 0;
 	sortsize = sizeof(SORTING);
@@ -902,6 +909,15 @@ SORTING *AllocSort(LONG LargeSize, LONG SmallSize, LONG SmallEsize, LONG TermsIn
 	if ( (LONG)(IObuffersize*sizeof(WORD)) < IOtry )
 		IObuffersize = (IOtry+sizeof(WORD)-1)/sizeof(WORD);
 
+	// Warn if any of the specified sizes have been adjusted:
+	if ( LargeSize != inLargeSize ) { MesPrint("Warning: LargeSize adjusted: %l -> %l", inLargeSize, LargeSize); }
+	if ( SmallSize != inSmallSize ) { MesPrint("Warning: SmallSize adjusted: %l -> %l", inSmallSize, SmallSize); }
+	if ( SmallEsize != inSmallEsize ) {MesPrint("Warning: SmallEsize adjusted: %l -> %l", inSmallEsize, SmallEsize); }
+	if ( TermsInSmall != inTermsInSmall ) { MesPrint("Warning: TermsInSmall adjusted: %l -> %l", inTermsInSmall, TermsInSmall); }
+	if ( MaxPatches != inMaxPatches ) { MesPrint("Warning: MaxPatches adjusted: %d -> %d", inMaxPatches, MaxPatches); }
+	if ( MaxFpatches != inMaxFpatches ) {MesPrint("Warning: MaxFPatches adjusted: %d -> %d", inMaxFpatches, MaxFpatches); }
+	if ( IObuffersize != inIOsize/sizeof(WORD) ) { MesPrint("Warning: IOsize adjusted: %l -> %l", inIOsize/sizeof(WORD), IObuffersize); }
+
 #ifndef SPLITALLOC
 	allocation =
 		 3*sizeof(POSITION)*(LONG)longer				/* Filepositions!! */