More GC tweaks; removed bbinit files.

modules/monkey/monkey.monkey2

@@ -11,7 +11,6 @@ Namespace monkey
 #Import "gc.monkey2"
 
 #Import "native/bbtypes.cpp"
-#Import "native/bbinit.cpp"
 #Import "native/bbassert.cpp"
 #Import "native/bbmemory.cpp"
 #Import "native/bbstring.cpp"

modules/monkey/native/bbgc.cpp

@@ -12,8 +12,8 @@ namespace bbGC{
 
 	size_t trigger=4*1024*1024;
 
-	int suspended;
-
+	int suspended=1;
+	
 	int markedBit;
 	int unmarkedBit;
 
@@ -46,6 +46,7 @@ namespace bbGC{
 	bool inited;
 	
 	void init(){
+
 		if( inited ) return;
 		inited=true;
 
@@ -62,6 +63,8 @@ namespace bbGC{
 		fibers=new bbGCFiber;
 		
 		currentFiber=fibers;
+		
+		suspended=0;
 	}
 	
 	void setTrigger( size_t size ){
@@ -194,9 +197,6 @@ namespace bbGC{
 	}
 
 	void sweep(){
-	
-//		puts( "bbGC::sweep()" );fflush( stdout );
-	
 		markRetained();
 		
 		markFibers();
@@ -214,16 +214,16 @@ namespace bbGC{
 			//clear unmarked
 			unmarkedList->succ=unmarkedList->pred=unmarkedList;
 		}
-		
+
+		//swap mark/unmarked lists		
 		std::swap( markedList,unmarkedList );
 		std::swap( markedBit,unmarkedBit );
-		
 		unmarkedBytes=markedBytes;
-
 		markedBytes=0;
-		
+
+		//start new sweep phase
 		allocedBytes=0;
-		
+
 		markRoots();
 	}
 	
@@ -255,8 +255,6 @@ namespace bbGC{
 	
 	void *malloc( size_t size ){
 	
-//		if( !inited ){ printf( "GC not inited!\n" );fflush( stdout ); }
-	
 		size=(size+sizeof(size_t)+7)&~7;
 		
 		if( size<256 && pools[size>>3] ){
@@ -269,7 +267,7 @@ namespace bbGC{
 		}
 		
 		if( !suspended ){
-			
+
 			if( allocedBytes+size>=trigger ){
 				
 				sweep();
@@ -340,4 +338,14 @@ namespace bbGC{
 		
 		return p;
 	}
+	
+	void collect(){
+	
+		if( !inited ) return;
+	
+		sweep();
+		
+		reclaim();
+	}
 }
+

modules/monkey/native/bbinit.cpp

@@ -1,12 +0,0 @@
-
-#include "bbinit.h"
-
-#include <stdio.h>
-
-bbInit *bbInit::first;
-
-bbInit::bbInit( const char *ident,void(*init)() ):info( info ),init( init ){
-//	printf( "Registering initializer '%s'\n",info );fflush( stdout );
-	succ=first;
-	first=this;
-}

modules/monkey/native/bbinit.h

@@ -1,17 +0,0 @@
-
-#ifndef BB_INIT_H
-#define BB_INIT_H
-
-//Simple list of stuff to get inited before main is run
-
-struct bbInit{
-	bbInit *succ;
-	const char *info;
-	void (*init)();
-	
-	static bbInit *first;
-	
-	bbInit( const char *info,void(*init)() );
-};
-
-#endif

modules/monkey/native/bbmonkey.cpp

@@ -51,23 +51,14 @@ int main( int argc,char **argv ){
 
 #endif
 
+	bbGC::init();
+	bbDB::init();
+
 	bb_argc=argc;
 	bb_argv=argv;
 	
 	try{
 	
-		bbGC::init();
-		
-		bbDB::init();
-
-		{		
-			bbDBFrame( "_void()","" );
-			
-			for( bbInit *init=bbInit::first;init;init=init->succ ){
-				init->init();
-			}
-		}
-		
 		bbMain();
 	
 	}catch( bbThrowable *t ){

modules/monkey/native/bbmonkey.h

@@ -3,7 +3,6 @@
 #define BB_MONKEY_H
 
 #include "bbstd.h"
-#include "bbinit.h"
 #include "bbtypes.h"
 #include "bbassert.h"
 #include "bbmemory.h"

modules/monkey/native/bbstring.cpp

@@ -114,7 +114,7 @@ namespace{
 
 bbString::Rep *bbString::Rep::alloc( int length ){
 	if( !length ) return &_nullRep;
-	Rep *rep=(Rep*)bbMalloc( sizeof(Rep)+length*sizeof(bbChar) );
+	Rep *rep=(Rep*)bbGC::malloc( sizeof(Rep)+length*sizeof(bbChar) );
 	rep->refs=1;
 	rep->length=length;
 	return rep;
@@ -273,8 +273,8 @@ const char *bbString::c_str()const{
 	
 	int sz=utf8Length()+1;
 	if( sz>_sz ){
-		free( _tmp );
-		_tmp=(char*)malloc( _sz=sz );
+		::free( _tmp );
+		_tmp=(char*)::malloc( _sz=sz );
 	}
 	toCString( _tmp,sz );
 	return _tmp;
@@ -571,12 +571,12 @@ bbString::operator double()const{
 
 bbCString::bbCString( const bbString &str ){
 	int size=str.utf8Length()+1;
-	_data=(char*)bbMalloc( size );
+	_data=(char*)bbGC::malloc( size );
 	str.toCString( _data,size );
 }
 
 bbCString::~bbCString(){
-	bbFree( _data );
+	bbGC::free( _data );
 }
 
 bbCString::operator char*()const{
@@ -595,12 +595,12 @@ bbCString::operator unsigned char*()const{
 
 bbWString::bbWString( const bbString &str ){
 	int size=(str.length()+1)*sizeof(wchar_t);
-	_data=(wchar_t*)bbMalloc( size );
+	_data=(wchar_t*)bbGC::malloc( size );
 	str.toWString( _data,size );
 }
 
 bbWString::~bbWString(){
-	bbFree( _data );
+	bbGC::free( _data );
 }
 
 bbWString::operator wchar_t*()const{

modules/monkey/native/bbstring.h

@@ -20,15 +20,7 @@ class bbString{
 		int length;
 		bbChar data[0];
 		
-//		Rep():refs( $80000000 ),length( 0 ){
-//		}
-		
-//		Rep( int length ):refs( 1 ),length( length ){
-//		}
-		
 		static Rep *alloc( int length );
-//			return new( bbGC::malloc( sizeof( Rep )+length*sizeof( bbChar ) ) ) Rep( length );
-//		}
 		
 		template<class C> static Rep *create( const C *p,int length ){
 			Rep *rep=alloc( length );
@@ -53,7 +45,7 @@ class bbString{
 	}
 	
 	void release(){
-		if( !--_rep->refs && _rep!=&_nullRep ) bbFree( _rep );
+		if( !--_rep->refs && _rep!=&_nullRep ) bbGC::free( _rep );
 	}
 	
 	bbString( Rep *rep ):_rep( rep ){