move allocator functionality to one module to enable easier testing

cshorler · cshorler · commit 4a71f48bc827 · 2020-07-21T16:17:03.000+01:00
diff --git a/include/express/memory.h b/include/express/memory.h
@@ -1,6 +1,6 @@
 #ifndef __MEMORY_H
 #define __MEMORY_H
 
-void MEMinit();
+void MEMORYinitialize();
 
 #endif // __MEMORY_H
diff --git a/src/express/alg.c b/src/express/alg.c
@@ -75,10 +75,6 @@ Scope ALGcreate( char type ) {
 
 /** Initialize the Algorithm module. */
 void ALGinitialize( void ) {
-    ALLOCinitialize( &FUNC_fl, sizeof( struct Function_ ),  100, 50 );
-    ALLOCinitialize( &RULE_fl, sizeof( struct Rule_ ),      100, 50 );
-    ALLOCinitialize( &PROC_fl, sizeof( struct Procedure_ ), 100, 50 );
-    ALLOCinitialize( &WHERE_fl, sizeof( struct Where_ ),    100, 50 );
 }
 
 void ALGput_full_text( Scope s, int start, int end ) {
diff --git a/src/express/caseitem.c b/src/express/caseitem.c
@@ -36,7 +36,6 @@
 /** Initialize the Case Item module. */
 void
 CASE_ITinitialize( void ) {
-    ALLOCinitialize( &CASE_IT_fl, sizeof( struct Case_Item_ ), 500, 100 );
 }
 
 /**
diff --git a/src/express/entity.c b/src/express/entity.c
@@ -298,7 +298,6 @@ Entity ENTITYcopy( Entity e ) {
 
 /** Initialize the Entity module. */
 void ENTITYinitialize() {
-    ALLOCinitialize( &ENTITY_fl, sizeof( struct Entity_ ), 500, 100 );
 }
 
 /**
diff --git a/src/express/error.c b/src/express/error.c
@@ -187,8 +187,6 @@ void ERRORcleanup( void ) {
 /** Need the LIST routines to complete ERROR initialization */
 void ERRORinitialize_after_LIST( void ) {
     ERRORwarnings = LISTcreate();
-
-    ALLOCinitialize( &ERROR_OPT_fl, sizeof( struct Error_Warning_ ), 5, 5 );
 }
 
 void ERRORcreate_warning( char * name, Error error ) {
diff --git a/src/express/expr.c b/src/express/expr.c
@@ -143,10 +143,6 @@ Expression EXPcreate_from_symbol( Type type, Symbol * symbol ) {
 
 /** Description: Initialize the Expression module. */
 void EXPinitialize( void ) {
-    ALLOCinitialize( &EXP_fl, sizeof( struct Expression_ ), 500, 200 );
-    ALLOCinitialize( &OP_fl, sizeof( struct Op_Subexpression ), 500, 100 );
-    ALLOCinitialize( &QUERY_fl, sizeof( struct Query_ ), 50, 10 );
-    ALLOCinitialize( &QUAL_ATTR_fl, sizeof( struct Query_ ), 20, 10 );
 
 #ifdef does_not_appear_to_be_necessary_or_even_make_sense
     LITERAL_EMPTY_SET = EXPcreate_simple( Type_Set );
diff --git a/src/express/express.c b/src/express/express.c
@@ -74,6 +74,7 @@
 #include <setjmp.h>
 #include <errno.h>
 
+#include "express/memory.h"
 #include "express/basic.h"
 #include "express/express.h"
 #include "express/resolve.h"
@@ -259,7 +260,7 @@ void PASSinitialize() {
 
 /** Initialize the Express package. */
 void EXPRESSinitialize( void ) {
-    _ALLOCinitialize();
+    MEMORYinitialize();
     ERRORinitialize();
 
     HASHinitialize();   /* comes first - used by just about everything else! */
diff --git a/src/express/hash.c b/src/express/hash.c
@@ -132,12 +132,6 @@ static long     HashAccesses, HashCollisions;
 
 void
 HASHinitialize() {
-    if( HASH_Table_fl.size_elt == 0 ) {
-        ALLOCinitialize( &HASH_Table_fl, sizeof( struct Hash_Table_ ), 50, 50 );
-    }
-    if( HASH_Element_fl.size_elt == 0 ) {
-        ALLOCinitialize( &HASH_Element_fl, sizeof( struct Element_ ), 500, 100 );
-    }
 }
 
 Hash_Table
diff --git a/src/express/linklist.c b/src/express/linklist.c
@@ -27,8 +27,6 @@
 Error ERROR_empty_list = ERROR_none;
 
 void LISTinitialize( void ) {
-    ALLOCinitialize( &LINK_fl, sizeof( struct Link_ ), 500, 100 );
-    ALLOCinitialize( &LIST_fl, sizeof( struct Linked_List_ ), 100, 50 );
     ERROR_empty_list = ERRORcreate( "Empty list in %s.", SEVERITY_ERROR );
 }
 
diff --git a/src/express/memory.c b/src/express/memory.c
@@ -19,6 +19,7 @@ struct freelist_head SYMBOL_fl;
 
 struct freelist_head SCOPE_fl;
 struct freelist_head SCHEMA_fl;
+struct freelist_head REN_fl;
 
 struct freelist_head TYPEHEAD_fl;
 struct freelist_head TYPEBODY_fl;
@@ -50,7 +51,7 @@ struct freelist_head PCALL_fl;
 struct freelist_head RET_fl;
 struct freelist_head INCR_fl;
 
-void MEMinit() {
+void MEMORYinitialize() {
     _ALLOCinitialize();
     
     ALLOCinitialize( &HASH_Table_fl, sizeof( struct Hash_Table_ ), 50, 50 );
@@ -78,6 +79,7 @@ void MEMinit() {
     ALLOCinitialize( &ENTITY_fl, sizeof( struct Entity_ ), 500, 100 );
     
     ALLOCinitialize( &SCHEMA_fl, sizeof( struct Schema_ ), 40, 20 );
+    ALLOCinitialize( &REN_fl, sizeof( struct Rename ), 30, 30 );
     
     ALLOCinitialize( &CASE_IT_fl, sizeof( struct Case_Item_ ), 500, 100 );
 
diff --git a/src/express/schema.c b/src/express/schema.c
@@ -51,14 +51,10 @@
 #include "express/object.h"
 #include "express/resolve.h"
 
-struct freelist_head REN_fl;
-
 int __SCOPE_search_id = 0;
 
 /** Initialize the Schema module. */
 void SCHEMAinitialize( void ) {
-    ALLOCinitialize( &REN_fl, sizeof( struct Rename ), 30, 30 );
-    ALLOCinitialize( &SCHEMA_fl, sizeof( struct Schema_ ), 40, 20 );
 }
 
 
diff --git a/src/express/scope.c b/src/express/scope.c
@@ -45,7 +45,6 @@
 #include "express/resolve.h"
 
 void SCOPEinitialize( void ) {
-    ALLOCinitialize( &SCOPE_fl, sizeof( struct Scope_ ), 100, 50 );
 }
 
 /**
diff --git a/src/express/stmt.c b/src/express/stmt.c
@@ -43,18 +43,6 @@
 #include <sc_memmgr.h>
 #include "express/stmt.h"
 
-struct freelist_head STMT_fl;
-
-struct freelist_head ALIAS_fl;
-struct freelist_head ASSIGN_fl;
-struct freelist_head CASE_fl;
-struct freelist_head COMP_STMT_fl;
-struct freelist_head COND_fl;
-struct freelist_head LOOP_fl;
-struct freelist_head PCALL_fl;
-struct freelist_head RET_fl;
-struct freelist_head INCR_fl;
-
 Statement STATEMENT_ESCAPE = STATEMENT_NULL;
 Statement STATEMENT_SKIP = STATEMENT_NULL;
 
@@ -68,18 +56,6 @@ Statement STMTcreate( int type ) {
 
 /** Initialize the Statement module. */
 void STMTinitialize( void ) {
-    ALLOCinitialize( &STMT_fl, sizeof( struct Statement_ ), 500, 100 );
-
-    ALLOCinitialize( &ALIAS_fl, sizeof( struct Alias_ ), 10, 10 );
-    ALLOCinitialize( &ASSIGN_fl, sizeof( struct Assignment_ ), 100, 30 );
-    ALLOCinitialize( &CASE_fl, sizeof( struct Case_Statement_ ), 100, 30 );
-    ALLOCinitialize( &COMP_STMT_fl, sizeof( struct Compound_Statement_ ), 100, 30 );
-    ALLOCinitialize( &COND_fl, sizeof( struct Conditional_ ), 100, 30 );
-    ALLOCinitialize( &LOOP_fl, sizeof( struct Loop_ ), 100, 30 );
-    ALLOCinitialize( &PCALL_fl, sizeof( struct Procedure_Call_ ), 100, 30 );
-    ALLOCinitialize( &RET_fl, sizeof( struct Return_Statement_ ), 100, 30 );
-    ALLOCinitialize( &INCR_fl, sizeof( struct Increment_ ), 100, 30 );
-
     STATEMENT_SKIP = STMTcreate( STMT_SKIP );
     STATEMENT_ESCAPE = STMTcreate( STMT_ESCAPE );
 }
diff --git a/src/express/symbol.c b/src/express/symbol.c
@@ -37,5 +37,4 @@
 
 /** Initialize the Symbol module */
 void SYMBOLinitialize( void ) {
-    ALLOCinitialize( &SYMBOL_fl, sizeof( struct Symbol_ ), 100, 100 );
 }
diff --git a/src/express/type.c b/src/express/type.c
@@ -258,8 +258,6 @@ return( false );
 
 /** Initialize the Type module */
 void TYPEinitialize() {
-    ALLOCinitialize( &TYPEHEAD_fl, sizeof( struct TypeHead_ ), 500, 100 );
-    ALLOCinitialize( &TYPEBODY_fl, sizeof( struct TypeBody_ ), 200, 100 );
     /* Very commonly-used read-only types */
     Type_Unknown = TYPEcreate( unknown_ );
     Type_Dont_Care = TYPEcreate( special_ );
diff --git a/src/express/variable.c b/src/express/variable.c
@@ -91,7 +91,6 @@ char * opcode_print( Op_Code o );
 
 /** Initialize the Variable module. */
 void VARinitialize() {
-    ALLOCinitialize( &VAR_fl, sizeof( struct Variable_ ), 100, 50 );
 }
 
 /** VARget_simple_name

Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,6 @@ Scope ALGcreate( char type ) {`
`75`	`75`
`76`	`76`	`/** Initialize the Algorithm module. */`
`77`	`77`	`void ALGinitialize( void ) {`
`78`		`- ALLOCinitialize( &FUNC_fl, sizeof( struct Function_ ), 100, 50 );`
`79`		`- ALLOCinitialize( &RULE_fl, sizeof( struct Rule_ ), 100, 50 );`
`80`		`- ALLOCinitialize( &PROC_fl, sizeof( struct Procedure_ ), 100, 50 );`
`81`		`- ALLOCinitialize( &WHERE_fl, sizeof( struct Where_ ), 100, 50 );`
`82`	`78`	`}`
`83`	`79`
`84`	`80`	`void ALGput_full_text( Scope s, int start, int end ) {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@`
`36`	`36`	`/** Initialize the Case Item module. */`
`37`	`37`	`void`
`38`	`38`	`CASE_ITinitialize( void ) {`
`39`		`- ALLOCinitialize( &CASE_IT_fl, sizeof( struct Case_Item_ ), 500, 100 );`
`40`	`39`	`}`
`41`	`40`
`42`	`41`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,6 @@ Entity ENTITYcopy( Entity e ) {`
`298`	`298`
`299`	`299`	`/** Initialize the Entity module. */`
`300`	`300`	`void ENTITYinitialize() {`
`301`		`- ALLOCinitialize( &ENTITY_fl, sizeof( struct Entity_ ), 500, 100 );`
`302`	`301`	`}`
`303`	`302`
`304`	`303`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,6 @@ void ERRORcleanup( void ) {`
`187`	`187`	`/** Need the LIST routines to complete ERROR initialization */`
`188`	`188`	`void ERRORinitialize_after_LIST( void ) {`
`189`	`189`	`ERRORwarnings = LISTcreate();`
`190`		`-`
`191`		`- ALLOCinitialize( &ERROR_OPT_fl, sizeof( struct Error_Warning_ ), 5, 5 );`
`192`	`190`	`}`
`193`	`191`
`194`	`192`	`void ERRORcreate_warning( char * name, Error error ) {`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,6 @@`
`27`	`27`	`Error ERROR_empty_list = ERROR_none;`
`28`	`28`
`29`	`29`	`void LISTinitialize( void ) {`
`30`		`- ALLOCinitialize( &LINK_fl, sizeof( struct Link_ ), 500, 100 );`
`31`		`- ALLOCinitialize( &LIST_fl, sizeof( struct Linked_List_ ), 100, 50 );`
`32`	`30`	`ERROR_empty_list = ERRORcreate( "Empty list in %s.", SEVERITY_ERROR );`
`33`	`31`	`}`
`34`	`32`