Calculate dataSize image with permanent space

hernanmd · Apr 4, 2022 · 20ba87a · 20ba87a
1 parent 6da1a68
commit 20ba87a
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 46 deletions.
diff --git a/smalltalksrc/VMMaker/ComposedImageWriter.class.st b/smalltalksrc/VMMaker/ComposedImageWriter.class.st
@@ -38,7 +38,7 @@ ComposedImageWriter >> writeImageFile: imageFileName fromHeader: header [
 
 	<var: #imageFileName declareC: 'char *imageFileName'>
 	<var: #header type: #SpurImageHeaderStruct> "TODO: Rename this class"
-	| bytesWritten |
+	| oldSpaceBytesWritten permanentSpaceBytesWritten bytesWritten |
 
 	self logDebug: 'Writing snapshot %s' _: imageFileName.
 
@@ -48,7 +48,11 @@ ComposedImageWriter >> writeImageFile: imageFileName fromHeader: header [
 
 	self flag: #TODO. "success: header imageHeaderSize?"
 
-	bytesWritten := self writeImageSegments: imageFileName.
+	oldSpaceBytesWritten := self writeImageSegments: imageFileName.
+
+	permanentSpaceBytesWritten := 0. "self writeImagePermanentSpace: imageFileName."
+
+	bytesWritten := oldSpaceBytesWritten + permanentSpaceBytesWritten.
 
 	interpreter success: bytesWritten = header dataSize 
 ]

diff --git a/smalltalksrc/VMMaker/SpurMemoryManager.class.st b/smalltalksrc/VMMaker/SpurMemoryManager.class.st
@@ -6052,7 +6052,7 @@ SpurMemoryManager >> imageFormatVersion [
 SpurMemoryManager >> imageSizeToWrite [
 	"when asked, newSpace should be empty."
 	self assert: self newSpaceIsEmpty.
-	^segmentManager totalBytesInNonEmptySegments
+	^segmentManager totalBytesInNonEmptySegments + self totalBytesInPermanentSpace.
 ]
 
 { #category : #'header format' }
@@ -12062,6 +12062,12 @@ SpurMemoryManager >> totalByteSizeOf: oop [
 		ifFalse: [self bytesInObject: oop]
 ]
 
+{ #category : #accessing }
+SpurMemoryManager >> totalBytesInPermanentSpace [
+
+	^ permSpaceFreeStart - memoryMap permSpaceStart
+]
+
 { #category : #'free space' }
 SpurMemoryManager >> totalFreeListBytes [
 	"This method both computes the actual number of free bytes by traversing all free objects

diff --git a/smalltalksrc/VMMakerTests/VMImageHeaderWritingTest.class.st b/smalltalksrc/VMMakerTests/VMImageHeaderWritingTest.class.st
@@ -16,6 +16,20 @@ VMImageHeaderWritingTest >> setUp [
 	self saveImage.
 ]
 
+{ #category : #tests }
+VMImageHeaderWritingTest >> testWritingImageWithPermanentObjects [
+
+	| header permanentObject |
+
+	imageWriterClass ~= ComposedImageWriter ifTrue: [ ^ self skip ].
+
+	permanentObject := self newPermanentByteObjectOfSize: 14.
+
+	header := interpreter newHeader.
+
+	self assert: header dataSize equals: memory segmentManager totalBytesInNonEmptySegments + (memory bytesInObject: permanentObject).
+]
+
 { #category : #tests }
 VMImageHeaderWritingTest >> testWritingImageWritesCorrectBaseAddress [
 

diff --git a/smalltalksrc/VMMakerTests/VMImageReadingTest.class.st b/smalltalksrc/VMMakerTests/VMImageReadingTest.class.st
@@ -2,7 +2,9 @@ Class {
 	#name : #VMImageReadingTest,
 	#superclass : #VMAbstractImageFormatTest,
 	#instVars : [
-		'originalNilObjectIdentityHash'
+		'originalNilObjectIdentityHash',
+		'permanentObject',
+		'originalPermanentObjectIdentityHash'
 	],
 	#category : #'VMMakerTests-ImageFormat'
 }
@@ -37,12 +39,15 @@ VMImageReadingTest >> setUp [
 	memory classByteArray: (self newClassInOldSpaceWithSlots: 0 instSpec: (memory byteFormatForNumBytes: 0)).
 	memory ensureBehaviorHash: memory classByteArray.
 
+	permanentObject := self newPermanentByteObjectOfSize: 14.
+
 	memory garbageCollectForSnapshot.
 
 	self assert: interpreter successful.
 
 	originalNilObjectIdentityHash := memory hashBitsOf: memory nilObject.
-
+	originalPermanentObjectIdentityHash := memory hashBitsOf: permanentObject.
+
 ]
 
 { #category : #tests }
@@ -64,14 +69,24 @@ VMImageReadingTest >> testReadingSTONHeader [
 ]
 
 { #category : #tests }
-VMImageReadingTest >> testSavedImageSavesObject [
+VMImageReadingTest >> testSavedImageSavesObjectFromOldSpace [
 
 	self saveImage.	
 	self loadImage.
 
 	self assert: originalNilObjectIdentityHash equals: (memory hashBitsOf: memory nilObject).
 ]
 
+{ #category : #tests }
+VMImageReadingTest >> testSavedImageSavesObjectFromPermanentSpace [
+
+	self saveImage.	
+	self loadImage.
+
+	self assert: originalPermanentObjectIdentityHash equals: (memory hashBitsOf: permanentObject).
+
+]
+
 { #category : #tests }
 VMImageReadingTest >> testSavingImageWithThreeSegmentsIsCorrectlySqueezed [
 

diff --git a/smalltalksrc/VMMakerTests/VMPermanentSpaceMemoryTest.class.st b/smalltalksrc/VMMakerTests/VMPermanentSpaceMemoryTest.class.st
@@ -4,46 +4,6 @@ Class {
 	#category : #'VMMakerTests-PermSpace'
 }
 
-{ #category : #running }
-VMPermanentSpaceMemoryTest >> configureEnvironmentBuilder [ 
-
-	super configureEnvironmentBuilder.
-
-	environmentBuilder permSpaceSize: 10*1024*1024.
-]
-
-{ #category : #'instance creation' }
-VMPermanentSpaceMemoryTest >> newPermanentByteObjectOfSize: byteSize [
-
-	| oop numSlots instSpec |
-
-	numSlots := memory numSlotsForBytes: byteSize.
-	instSpec := memory byteFormatForNumBytes: byteSize.
-
-	oop := memory
-			allocateSlotsInPermSpace: numSlots
-			format: instSpec
-			classIndex: (memory ensureBehaviorHash: memory classByteArray).
-
-	0 to: byteSize - 1 do: [ :index | 
-		memory storeByte: index ofObject: oop withValue: 	0 ].
-
-	^ oop
-]
-
-{ #category : #running }
-VMPermanentSpaceMemoryTest >> setUp [
-
-	super setUp.
-
-	memory classByteArray: (self newClassInOldSpaceWithSlots: 0 instSpec: (memory byteFormatForNumBytes: 0)).
-
-
-
-
-
-]
-
 { #category : #'tests - allocation' }
 VMPermanentSpaceMemoryTest >> testMarkingNewSpaceDoesNotMarkPermSpace [
 

diff --git a/smalltalksrc/VMMakerTests/VMSpurInitializedOldSpaceTest.class.st b/smalltalksrc/VMMakerTests/VMSpurInitializedOldSpaceTest.class.st
@@ -19,6 +19,14 @@ VMSpurInitializedOldSpaceTest >> assertFreeListEmpty: aFreeListOop [
 	self assert: aFreeListOop equals: 0
 ]
 
+{ #category : #running }
+VMSpurInitializedOldSpaceTest >> configureEnvironmentBuilder [ 
+
+	super configureEnvironmentBuilder.
+
+	environmentBuilder permSpaceSize: 10*1024*1024.
+]
+
 { #category : #helpers }
 VMSpurInitializedOldSpaceTest >> createEphemeronClass [
 	ourEphemeronClass := self newObjectWithSlots: 3.
@@ -98,6 +106,25 @@ VMSpurInitializedOldSpaceTest >> newEphemeronObject [
 		classIndex: (memory ensureBehaviorHash: ourEphemeronClass)
 ]
 
+{ #category : #'instance creation' }
+VMSpurInitializedOldSpaceTest >> newPermanentByteObjectOfSize: byteSize [
+
+	| oop numSlots instSpec |
+
+	numSlots := memory numSlotsForBytes: byteSize.
+	instSpec := memory byteFormatForNumBytes: byteSize.
+
+	oop := memory
+			allocateSlotsInPermSpace: numSlots
+			format: instSpec
+			classIndex: (memory ensureBehaviorHash: memory classByteArray).
+
+	0 to: byteSize - 1 do: [ :index | 
+		memory storeByte: index ofObject: oop withValue: 	0 ].
+
+	^ oop
+]
+
 { #category : #helpers }
 VMSpurInitializedOldSpaceTest >> nextNodeOf: aNode [
 
@@ -129,6 +156,8 @@ VMSpurInitializedOldSpaceTest >> setUp [
 	self initializeOldSpaceForScavenger.
 	self initializeOldSpaceForFullGC.
 	memory lastHash: 1.
+	memory classByteArray: (self newClassInOldSpaceWithSlots: 0 instSpec: (memory byteFormatForNumBytes: 0)).
+
 ]
 
 { #category : #helpers }