changeset 148:eb79d057d10d

merged dangling head
author Merten Sach <msach@mailbox.tu-berlin.de>
date Tue, 27 Sep 2011 14:42:26 +0200
parents ac41df8d08e9 f36e713e97c2
children c11b9dcf6d24
files .hgtags VMS.c VMS.h VMS__DESIGN_NOTES.txt
diffstat 3 files changed, 6 insertions(+), 11 deletions(-) [+]
line diff
     1.1 --- a/.hgtags	Wed Sep 21 16:31:19 2011 +0200
     1.2 +++ b/.hgtags	Tue Sep 27 14:42:26 2011 +0200
     1.3 @@ -1,4 +1,1 @@
     1.4  9c3107044f86c36fea3a8f72f64910b1363555be Dec27_2010_about_to_add_sched_record
     1.5 -bc31d3e070d2b7ac9f3c72b988ae261bd481c061 VO
     1.6 -fcb988543be03774b716584b39b9ae3f12a43cd6 V0
     1.7 -0000000000000000000000000000000000000000 V0
     2.1 --- a/VMS__DESIGN_NOTES.txt	Wed Sep 21 16:31:19 2011 +0200
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,2 +0,0 @@
     2.4 -
     2.5 
     2.6 -Implement VMS this way:
     2.7 
     3.1 --- a/vmalloc.c	Wed Sep 21 16:31:19 2011 +0200
     3.2 +++ b/vmalloc.c	Tue Sep 27 14:42:26 2011 +0200
     3.3 @@ -452,12 +452,12 @@
     3.4     if( firstChunk == NULL ) {printf("malloc error\n"); exit(1);}
     3.5     
     3.6     //Touch memory to avoid page faults
     3.7 -   //void *ptr,*endPtr; 
     3.8 -   //endPtr = (void*)firstChunk+MALLOC_ADDITIONAL_MEM_FROM_OS_SIZE;
     3.9 -   //for(ptr = firstChunk; ptr < endPtr; ptr+=PAGE_SIZE)
    3.10 -   //{
    3.11 -   //    *(char*)ptr = 0;
    3.12 -   //}
    3.13 +   void *ptr,*endPtr; 
    3.14 +   endPtr = (void*)firstChunk+MALLOC_ADDITIONAL_MEM_FROM_OS_SIZE;
    3.15 +   for(ptr = firstChunk; ptr < endPtr; ptr+=PAGE_SIZE)
    3.16 +   {
    3.17 +       *(char*)ptr = 0;
    3.18 +   }
    3.19  
    3.20     freeListHead->prevChunkInFreeList = NULL;
    3.21        //Use this addr to free the heap when cleanup