Vm-dev February 2015

vm-dev@lists.squeakfoundation.org

27 participants
101 discussions

VM Maker: VMMaker.oscog-eem.1050.mcz
by commits＠source.squeak.org 11 Feb '15

11 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1050.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1050 Author: eem Time: 10 February 2015, 6:37:01.618 pm UUID: ad3a825c-97ba-4d01-a0e7-637af8cbf52b Ancestors: VMMaker.oscog-eem.1049 Clean up a few more flushAtCache duplicates =============== Diff against VMMaker.oscog-eem.1049 =============== Item was changed: ----- Method: CogVMSimulator>>initialize (in category 'initialization') ----- initialize "Initialize the CogVMSimulator when running the interpreter inside Smalltalk. The primary responsibility of this method is to allocate Smalltalk Arrays for variables that will be declared as statically-allocated global arrays in the translated code." super initialize. transcript := Transcript. objectMemory ifNil: [objectMemory := self class objectMemoryClass simulatorClass new]. cogit ifNil: [cogit := self class cogitClass new setInterpreter: self]. objectMemory coInterpreter: self cogit: cogit. cogit numRegArgs > 0 ifTrue: [debugStackDepthDictionary := Dictionary new]. cogThreadManager ifNotNil: [super initialize]. "Note: we must initialize ConstMinusOne & HasBeenReturnedFromMCPC differently for simulation, due to the fact that the simulator works only with +ve 32-bit values" ConstMinusOne := objectMemory integerObjectOf: -1. HasBeenReturnedFromMCPC := objectMemory integerObjectOf: -1. cogMethodZone := cogit methodZone. "Because Slang can't remove intermediate implicit receivers (cogit methodZone foo doesn't reduce to foo())" enableCog := true. methodCache := Array new: MethodCacheSize. atCache := Array new: AtCacheTotalSize. self flushMethodCache. - self flushAtCache. cogCompiledCodeCompactionCalledFor := false. gcSemaphoreIndex := 0. externalSemaphoreSignalRequests := externalSemaphoreSignalResponses := #(). externalPrimitiveTable := CArrayAccessor on: (Array new: MaxExternalPrimitiveTableSize). externalPrimitiveTableFirstFreeIndex := 0. primitiveTable := self class primitiveTable copy. mappedPluginEntries := OrderedCollection new. objectMemory hasSpurMemoryManagerAPI ifTrue: [primitiveAccessorDepthTable := Array new: primitiveTable size. pluginList := {}. self loadNewPlugin: ''] ifFalse: [pluginList := {'' -> self }]. desiredNumStackPages := desiredEdenBytes := desiredCogCodeSize := 0. "This is initialized on loading the image, but convenient for testing stack page values..." numStackPages := self defaultNumStackPages. startMicroseconds := Time totalSeconds * 1000000. maxLiteralCountForCompile := MaxLiteralCountForCompile. minBackwardJumpCountForCompile := MinBackwardJumpCountForCompile. flagInterpretedMethods := false. "initialize InterpreterSimulator variables used for debugging" byteCount := lastPollCount := sendCount := lookupCount := 0. quitBlock := [^ self]. traceOn := true. printSends := printFrameAtEachStep := printBytecodeAtEachStep := false. myBitBlt := BitBltSimulator new setInterpreter: self. displayForm := 'Display has not yet been installed' asDisplayText form. suppressHeartbeatFlag := deferSmash := deferredSmash := false. systemAttributes := Dictionary new. primTraceLog := CArrayAccessor on: (Array new: 256 withAll: 0). primTraceLogIndex := 0. traceLog := CArrayAccessor on: (Array new: TraceBufferSize withAll: 0). traceLogIndex := 0. traceSources := TraceSources. statCodeCompactionCount := 0. statCodeCompactionUsecs := 0. extSemTabSize := 256! Item was changed: ----- Method: InterpreterPrimitives>>primitiveFlushCache (in category 'system control primitives') ----- primitiveFlushCache "Clear the method lookup cache. This must be done after every programming change." + self flushMethodCache! - self flushMethodCache. - self flushAtCache! Item was changed: ----- Method: NewspeakInterpreter>>flushExternalPrimitives (in category 'plugin primitive support') ----- flushExternalPrimitives "Flush the references to external functions from plugin primitives. This will force a reload of those primitives when accessed next. Note: We must flush the method cache here so that any failed primitives are looked up again." | oop primIdx | oop := self firstObject. [oop < endOfMemory] whileTrue: [(self isFreeObject: oop) ifFalse: [(self isCompiledMethod: oop) ifTrue: ["This is a compiled method" primIdx := self primitiveIndexOf: oop. primIdx = PrimitiveExternalCallIndex ifTrue: ["It's primitiveExternalCall" self flushExternalPrimitiveOf: oop]]]. oop := self objectAfter: oop]. self flushMethodCache. - self flushAtCache. self flushExternalPrimitiveTable! Item was changed: ----- Method: NewspeakInterpreter>>flushMethodCache (in category 'method lookup cache') ----- flushMethodCache "Flush the method cache. The method cache is flushed on every programming change and garbage collect." + 1 to: MethodCacheSize do: [ :i | methodCache at: i put: 0 ]. + 1 to: AtCacheTotalSize do: [ :i | atCache at: i put: 0 ]! - 1 to: MethodCacheSize do: [ :i | methodCache at: i put: 0 ]! Item was changed: ----- Method: NewspeakInterpreter>>initializeInterpreter: (in category 'initialization') ----- initializeInterpreter: bytesToShift "Initialize NewspeakInterpreter state before starting execution of a new image." interpreterProxy := self sqGetInterpreterProxy. self dummyReferToProxy. self initializeObjectMemory: bytesToShift. self checkAssumedCompactClasses. primFailCode := 0. self initializeExtraClassInstVarIndices. activeContext := nilObj. theHomeContext := nilObj. method := nilObj. receiver := nilObj. messageSelector := nilObj. newMethod := nilObj. lkupClass := nilObj. self flushMethodCache. - self flushAtCache. self loadInitialContext. self initialCleanup. interruptCheckCounter := 0. interruptCheckCounterFeedBackReset := 1000. interruptChecksEveryNms := 1. nextPollTick := 0. nextWakeupTick := 0. lastTick := 0. interruptKeycode := 2094. "cmd-. as used for Mac but no other OS" interruptPending := false. deferDisplayUpdates := false. pendingFinalizationSignals := 0. globalSessionID := 0. [globalSessionID = 0] whileTrue: [globalSessionID := self cCode: 'time(NULL) + ioMSecs()' inSmalltalk: [(Random new next * SmallInteger maxVal) asInteger]]! Item was changed: ----- Method: NewspeakInterpreter>>primitiveFlushCache (in category 'system control primitives') ----- primitiveFlushCache "Clear the method lookup cache. This must be done after every programming change." + self flushMethodCache! - self flushMethodCache. - self flushAtCache! Item was changed: ----- Method: StackInterpreter>>initialCleanup (in category 'initialization') ----- initialCleanup "This used to cope with issues with images written by VMs earlier than 3.6/3.7. Since we won't be loading such images (being a closure only VM) we only have to deal with external primitives. Since references to external plugins in methods are cleaned up in snapshotCleanUp only initialize the tables, not visit each method." self flushMethodCache. - self flushAtCache. self flushExternalPrimitiveTable! Item was changed: ----- Method: StackInterpreter>>initializeInterpreter: (in category 'initialization') ----- initializeInterpreter: bytesToShift "Initialize Interpreter state before starting execution of a new image." interpreterProxy := self sqGetInterpreterProxy. self dummyReferToProxy. objectMemory initializeObjectMemory: bytesToShift. self checkAssumedCompactClasses. self initializeExtraClassInstVarIndices. method := newMethod := objectMemory nilObject. self cCode: '' inSmalltalk: [breakSelectorLength ifNil: [breakSelectorLength := objectMemory minSmallInteger]]. methodDictLinearSearchLimit := 8. self flushMethodCache. - self flushAtCache. self initialCleanup. profileSemaphore := profileProcess := profileMethod := objectMemory nilObject. interruptKeycode := 2094. "cmd-. as used for Mac but no other OS" [globalSessionID = 0] whileTrue: [globalSessionID := self cCode: [(self time: #NULL) + self ioMSecs] inSmalltalk: [(Random new next * SmallInteger maxVal) asInteger]]!

1 0

VM Maker: VMMaker.oscog-eem.1049.mcz
by commits＠source.squeak.org 11 Feb '15

11 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1049.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1049 Author: eem Time: 10 February 2015, 6:20:21.812 pm UUID: aeda18a2-b9e8-4f87-8f4f-194a0155cc4a Ancestors: VMMaker.oscog-eem.1048 Spur: It's the atCache, stupid. Flush the atCache after every become. Eliminate duplicate flush in flushExternalPrimitives. Introduce lastPointerOfArray: and use it to slim down become checking. Simplify getErrorObjectFromPrimFailCode. Use lastPointerOfMethodHeader: in makeBaseFrameFor: to same effect. =============== Diff against VMMaker.oscog-eem.1048 =============== Item was changed: ----- Method: CoInterpreter>>makeBaseFrameFor: (in category 'frame access') ----- makeBaseFrameFor: aContext "<Integer>" "Marry aContext with the base frame of a new stack page. Build the base frame to reflect the context's state. Answer the new page. Override to hold the caller context in a different place, In the StackInterpreter we use the caller saved ip, but in the Cog VM caller saved ip is the ceBaseReturn: trampoline. Simply hold the caller context in the first word of the stack." <returnTypeC: #'StackPage *'> | page pointer theMethod theIP numArgs stackPtrIndex maybeClosure rcvr | <inline: false> <var: #page type: #'StackPage *'> <var: #pointer type: #'char *'> <var: #cogMethod type: #'CogMethod *'> "theIP must be typed as signed because it is assigned ceCannotResumePC and so maybe implicitly typed as unsigned." <var: #theIP type: #sqInt> self assert: (objectMemory isContext: aContext). self assert: (self isSingleContext: aContext). self assert: (objectMemory goodContextSize: aContext). theIP := objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext. self assert: HasBeenReturnedFromMCPC signedIntFromLong < 0. theIP := (objectMemory isIntegerObject: theIP) ifTrue: [objectMemory integerValueOf: theIP] ifFalse: [HasBeenReturnedFromMCPC]. theMethod := objectMemory followObjField: MethodIndex ofObject: aContext. page := self newStackPage. "first word on stack is caller context of base frame" stackPages longAt: (pointer := page baseAddress) put: (objectMemory fetchPointer: SenderIndex ofObject: aContext). "second word is the context itself; needed for cannotReturn processing; see ceBaseReturn:." stackPages longAt: (pointer := pointer - objectMemory wordSize) put: aContext. rcvr := objectMemory followField: ReceiverIndex ofObject: aContext. "If the frame is a closure activation then the closure should be on the stack in the pushed receiver position (closures receiver the value[:value:] messages). Otherwise it should be the receiver proper." maybeClosure := objectMemory fetchPointer: ClosureIndex ofObject: aContext. maybeClosure ~= objectMemory nilObject ifTrue: [numArgs := self argumentCountOfClosure: maybeClosure. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: maybeClosure] ifFalse: [| header | header := objectMemory methodHeaderOf: theMethod. numArgs := self argumentCountOfMethodHeader: header. "If this is a synthetic context its IP could be pointing at the CallPrimitive opcode. If so, skip it." (theIP signedIntFromLong > 0 and: [(self methodHeaderHasPrimitive: header) + and: [theIP = (1 + (objectMemory lastPointerOfMethodHeader: header))]]) ifTrue: - and: [theIP = (1 + (objectMemory lastPointerOf: theMethod))]]) ifTrue: [theIP := theIP + (self sizeOfCallPrimitiveBytecode: header)]. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: rcvr]. "Put the arguments on the stack" 1 to: numArgs do: [:i| stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "saved caller ip is base return trampoline" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: cogit ceBaseFrameReturnPC. "base frame's saved fp is null" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: 0. "N.B. Don't set the baseFP, which marks the page as in use, until after ensureMethodIsCogged: and/or instructionPointer:forContext:frame:. These can cause a compiled code compaction which, if marked as in use, will examine this partially initialized page and crash." page headFP: pointer. "Create either a machine code frame or an interpreter frame based on the pc. If the pc is -ve it is a machine code pc and so we produce a machine code frame. If +ve an interpreter frame. N.B. Do *not* change this to try and map from a bytecode pc to a machine code frame under any circumstances. See ensureContextIsExecutionSafeAfterAssignToStackPointer:" theIP signedIntFromLong < 0 ifTrue: [| cogMethod | "Since we would have to generate a machine-code method to be able to map the native pc anyway we should create a native method and native frame." cogMethod := self ensureMethodIsCogged: theMethod. theMethod := cogMethod asInteger. maybeClosure ~= objectMemory nilObject ifTrue: ["If the pc is the special HasBeenReturnedFromMCPC pc set the pc appropriately so that the frame stays in the cannotReturn: state." theIP = HasBeenReturnedFromMCPC signedIntFromLong ifTrue: [theMethod := (cogit findMethodForStartBcpc: (self startPCOfClosure: maybeClosure) inHomeMethod: (self cCoerceSimple: theMethod to: #'CogMethod *')) asInteger. theMethod = 0 ifTrue: [self error: 'cannot find machine code block matching closure''s startpc']. theIP := cogit ceCannotResumePC] ifFalse: [self assert: (theIP signedBitShift: -16) < -1. "See contextInstructionPointer:frame:" theMethod := theMethod - ((theIP signedBitShift: -16) * cogit blockAlignment). theIP := theMethod - theIP signedIntFromShort]. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theMethod + MFMethodFlagHasContextFlag + MFMethodFlagIsBlockFlag] ifFalse: [self assert: (theIP signedBitShift: -16) >= -1. "If the pc is the special HasBeenReturnedFromMCPC pc set the pc appropriately so that the frame stays in the cannotReturn: state." theIP := theIP = HasBeenReturnedFromMCPC signedIntFromLong ifTrue: [cogit ceCannotResumePC] ifFalse: [theMethod asInteger - theIP]. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theMethod + MFMethodFlagHasContextFlag]. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: aContext] ifFalse: [stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theMethod. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: aContext. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (self encodeFrameFieldHasContext: true isBlock: maybeClosure ~= objectMemory nilObject numArgs: numArgs). stackPages longAt: (pointer := pointer - objectMemory wordSize) put: 0. "FoxIFSavedIP" theIP := self iframeInstructionPointerForIndex: theIP method: theMethod]. page baseFP: page headFP. self assert: (self frameHasContext: page baseFP). self assert: (self frameNumArgs: page baseFP) == numArgs. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: rcvr. stackPtrIndex := self quickFetchInteger: StackPointerIndex ofObject: aContext. self assert: ReceiverIndex + stackPtrIndex < (objectMemory lengthOf: aContext). numArgs + 1 to: stackPtrIndex do: [:i| stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "top of stack is the instruction pointer" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theIP. page headSP: pointer. self assert: (self context: aContext hasValidInversePCMappingOf: theIP in: page baseFP). "Mark context as married by setting its sender to the frame pointer plus SmallInteger tags and the InstructionPointer to the saved fp (which ensures correct alignment w.r.t. the frame when we check for validity) plus SmallInteger tags." objectMemory storePointerUnchecked: SenderIndex ofObject: aContext withValue: (self withSmallIntegerTags: page baseFP). objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: aContext withValue: (self withSmallIntegerTags: 0). self assert: (objectMemory isIntegerObject: (objectMemory fetchPointer: SenderIndex ofObject: aContext)). self assert: (self frameOfMarriedContext: aContext) = page baseFP. self assert: (self validStackPageBaseFrame: page). ^page! Item was changed: ----- Method: SpurMemoryManager>>containsOnlyValidBecomeObjects: (in category 'become implementation') ----- containsOnlyValidBecomeObjects: array "Answer 0 if the array contains only unpinned non-immediates. Otherwise answer an informative error code. Can't become: immediates!! Shouldn't become pinned objects." | fieldOffset effectsFlags oop | + fieldOffset := self lastPointerOfArray: array. - fieldOffset := self lastPointerOf: array. effectsFlags := 0. "same size as array2" [fieldOffset >= self baseHeaderSize] whileTrue: [oop := self longAt: array + fieldOffset. (self isOopForwarded: oop) ifTrue: [oop := self followForwarded: oop. self longAt: array + fieldOffset put: oop]. (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. (self isPinned: oop) ifTrue: [^PrimErrObjectIsPinned]. effectsFlags := effectsFlags bitOr: (self becomeEffectFlagsFor: oop). fieldOffset := fieldOffset - self bytesPerOop]. "only set flags after checking all args." becomeEffectsFlags := effectsFlags. ^0! Item was changed: ----- Method: SpurMemoryManager>>containsOnlyValidBecomeObjects:and: (in category 'become implementation') ----- containsOnlyValidBecomeObjects: array1 and: array2 "Answer 0 if neither array contains only unpinned non-immediates. Otherwise answer an informative error code. Can't become: immediates!! Shouldn't become pinned objects." | fieldOffset effectsFlags oop size | fieldOffset := self lastPointerOf: array1. effectsFlags := size := 0. "same size as array2" [fieldOffset >= self baseHeaderSize] whileTrue: [oop := self longAt: array1 + fieldOffset. (self isOopForwarded: oop) ifTrue: [oop := self followForwarded: oop. self longAt: array1 + fieldOffset put: oop]. (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. (self isPinned: oop) ifTrue: [^PrimErrObjectIsPinned]. effectsFlags := effectsFlags bitOr: (self becomeEffectFlagsFor: oop). size := size + (self bytesInObject: oop). oop := self longAt: array2 + fieldOffset. (self isOopForwarded: oop) ifTrue: [oop := self followForwarded: oop. self longAt: array2 + fieldOffset put: oop]. (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. (self isPinned: oop) ifTrue: [^PrimErrObjectIsPinned]. effectsFlags := effectsFlags bitOr: (self becomeEffectFlagsFor: oop). size := size + (self bytesInObject: oop). fieldOffset := fieldOffset - self bytesPerOop]. - "only set flags after checking all args." - becomeEffectsFlags := effectsFlags. size >= (totalFreeOldSpace + (scavengeThreshold - freeStart)) ifTrue: [^PrimErrNoMemory]. + "only set flags after checking all args." + becomeEffectsFlags := effectsFlags. ^0! Item was added: + ----- Method: SpurMemoryManager>>lastPointerOfArray: (in category 'object enumeration') ----- + lastPointerOfArray: objOop + "Answer the byte offset of the last pointer field of the given array." + self assert: (self isArray: objOop). + ^(self numSlotsOf: objOop) - 1 * self bytesPerOop + self baseHeaderSize! Item was changed: ----- Method: StackInterpreter>>flushExternalPrimitives (in category 'plugin primitive support') ----- flushExternalPrimitives "Flush the references to external functions from plugin primitives. This will force a reload of those primitives when accessed next. Note: We must flush the method cache here also, so that any failed primitives are looked up again." objectMemory allObjectsDo: [:oop| | primIdx | (objectMemory isFreeObject: oop) ifFalse: [(objectMemory isCompiledMethod: oop) ifTrue: "This is a compiled method" [primIdx := self primitiveIndexOf: oop. primIdx = PrimitiveExternalCallIndex ifTrue: "It's primitiveExternalCall" [self flushExternalPrimitiveOf: oop]]]]. self flushMethodCache. - self flushAtCache. self flushExternalPrimitiveTable! Item was changed: ----- Method: StackInterpreter>>getErrorObjectFromPrimFailCode (in category 'message sending') ----- getErrorObjectFromPrimFailCode "Answer the errorCode object to supply to a failing primitive method that accepts one. If there is a primitive error table and the primFailCode is a valid index there-in answer the coprresponding entry in the table, otherwise simply answer the code as an integer." | table | primFailCode > 0 ifTrue: [table := objectMemory splObj: PrimErrTableIndex. + primFailCode <= (objectMemory numSlotsOf: table) ifTrue: - primFailCode <= ((objectMemory lastPointerOf: table) // objectMemory wordSize) ifTrue: [^objectMemory fetchPointer: primFailCode - 1 ofObject: table]]. ^objectMemory integerObjectOf: primFailCode! Item was changed: ----- Method: StackInterpreter>>makeBaseFrameFor: (in category 'frame access') ----- makeBaseFrameFor: aContext "<Integer>" "Marry aContext with the base frame of a new stack page. Build the base frame to reflect the context's state. Answer the new page." <returnTypeC: #'StackPage *'> | page pointer theMethod theIP numArgs stackPtrIndex maybeClosure rcvr | <inline: false> <var: #page type: #'StackPage *'> <var: #pointer type: #'char *'> self assert: (objectMemory isContext: aContext). self assert: (self isSingleContext: aContext). self assert: (objectMemory goodContextSize: aContext). page := self newStackPage. pointer := page baseAddress. theIP := objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext. theMethod := objectMemory followObjField: MethodIndex ofObject: aContext. (objectMemory isIntegerObject: theIP) ifFalse: [self error: 'context is not resumable']. theIP := objectMemory integerValueOf: theIP. rcvr := objectMemory followField: ReceiverIndex ofObject: aContext. "If the frame is a closure activation then the closure should be on the stack in the pushed receiver position (closures receiver the value[:value:] messages). Otherwise it should be the receiver proper." maybeClosure := objectMemory followField: ClosureIndex ofObject: aContext. maybeClosure ~= objectMemory nilObject ifTrue: [numArgs := self argumentCountOfClosure: maybeClosure. stackPages longAt: pointer put: maybeClosure] ifFalse: [| header | header := objectMemory methodHeaderOf: theMethod. numArgs := self argumentCountOfMethodHeader: header. "If this is a synthetic context its IP could be pointing at the CallPrimitive opcode. If so, skip it." (theIP signedIntFromLong > 0 and: [(self methodHeaderHasPrimitive: header) + and: [theIP = (1 + (objectMemory lastPointerOfMethodHeader: header))]]) ifTrue: - and: [theIP = (1 + (objectMemory lastPointerOf: theMethod))]]) ifTrue: [theIP := theIP + (self sizeOfCallPrimitiveBytecode: header)]. stackPages longAt: pointer put: rcvr]. "Put the arguments on the stack" 1 to: numArgs do: [:i| stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "saved caller ip is sender context in base frame" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory fetchPointer: SenderIndex ofObject: aContext). "base frame's saved fp is null" stackPages longAt: (pointer := pointer - objectMemory wordSize) put: 0. page baseFP: pointer; headFP: pointer. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theMethod. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (self encodeFrameFieldHasContext: true isBlock: maybeClosure ~= objectMemory nilObject numArgs: numArgs). self assert: (self frameHasContext: page baseFP). self assert: (self frameNumArgs: page baseFP) == numArgs. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: aContext. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: rcvr. stackPtrIndex := self quickFetchInteger: StackPointerIndex ofObject: aContext. self assert: ReceiverIndex + stackPtrIndex < (objectMemory lengthOf: aContext). numArgs + 1 to: stackPtrIndex do: [:i| stackPages longAt: (pointer := pointer - objectMemory wordSize) put: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]. "top of stack is the instruction pointer" theIP := self iframeInstructionPointerForIndex: theIP method: theMethod. stackPages longAt: (pointer := pointer - objectMemory wordSize) put: theIP. page headSP: pointer. self assert: (self context: aContext hasValidInversePCMappingOf: theIP in: page baseFP). "Mark context as married by setting its sender to the frame pointer plus SmallInteger tags and the InstructionPointer to the saved fp (which ensures correct alignment w.r.t. the frame when we check for validity) plus SmallInteger tags." objectMemory storePointerUnchecked: SenderIndex ofObject: aContext withValue: (self withSmallIntegerTags: page baseFP). objectMemory storePointerUnchecked: InstructionPointerIndex ofObject: aContext withValue: (self withSmallIntegerTags: 0). self assert: (objectMemory isIntegerObject: (objectMemory fetchPointer: SenderIndex ofObject: aContext)). self assert: (self frameOfMarriedContext: aContext) = page baseFP. self assert: (self validStackPageBaseFrame: page). ^page! Item was changed: ----- Method: StackInterpreter>>spurPostBecomeAction: (in category 'object memory support') ----- spurPostBecomeAction: theBecomeEffectsFlags "Insulate the stack zone from the effects of a become. All receivers must be unfollowed for two reasons: 1. inst var access is direct with no read barrier 2. super sends (always to the receiver) have no class check and so don't trap for forwarded receivers. This is an issue for primitives that assume their receiver is valid and don't validate. Super sends require an explicit check to ensure receivers in super sends are unforwarded. e.g. super doSomethingWith: (self become: other) forwards the receiver self pushed on the stack. So we could avoid following non-pointer receivers. But this is too tricky, Instead, we always follow receivers. Methods must be unfollowed since bytecode access is direct with no read barrier. But this only needs to be done if the becomeEffectsFlags indicate that a CompiledMethod was becommed. The scheduler state must be followed, but only if the becomeEffectsFlags indicate that a pointer object was becommed." <option: #SpurObjectMemory> <inline: false> "For VM profiling" self followForwardingPointersInStackZone: theBecomeEffectsFlags. + self flushAtCache. theBecomeEffectsFlags ~= 0 ifTrue: [(theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [self followForwardedMethodsInMethodCache. self followForwardedMethodsInMethodZone]. "for CoInterpreter" (theBecomeEffectsFlags anyMask: BecameActiveClassFlag) ifTrue: [self flushBecommedClassesInMethodCache. self flushBecommedClassesInMethodZone]. "for CoInterpreter" self followForwardingPointersInScheduler. self followForwardingPointersInSpecialObjectsArray. self followForwardingPointersInProfileState]!

1 0

[commit][3249] CogVM source as per VMMaker.oscog-eem.1048
by commits＠squeakvm.org 11 Feb '15

11 Feb '15

Revision: 3249 Author: eliot Date: 2015-02-10 15:19:26 -0800 (Tue, 10 Feb 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1048 Refactor leak checking code so that GCModes are flags and coincide with flags for what GC events to leak check. Hence ensure leak checking is actually run when requested. As part of this move the shrink action from postGCAction: into the memory managers and hence allow Spur to not shrink on scavenge. Fix bugs with immediate character printing. Allow printing the mark state of free chunks. Spur: Fix some dumb slips in the image segment code. Only copy-and-forward in remapObj: in the right cicumstance. Add an assert to remapObj:. Have lengthOf: answer 0 for ephemerons and something sensible for 64-bit indexable on 32-bits. Scavenging ephemerons should update the ephemeron's key with the scavenged key. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c =================================================================== --- branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2015-02-05 00:50:56 UTC (rev 3248) +++ branches/Cog/nscogsrc/plugins/LargeIntegers/LargeIntegers.c 2015-02-10 23:19:26 UTC (rev 3249) @@ -1,9 +1,9 @@ /* Automatically generated by - SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1028 uuid: 19752f44-5207-45a2-9930-ae424e662f66 + SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f from - LargeIntegersPlugin VMMaker.oscog-eem.1028 uuid: 19752f44-5207-45a2-9930-ae424e662f66 + LargeIntegersPlugin VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f */ -static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1028 uuid: 19752f44-5207-45a2-9930-ae424e662f66 " __DATE__ ; +static char __buildInfo[] = "LargeIntegersPlugin VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; @@ -173,9 +173,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "LargeIntegers v1.5 VMMaker.oscog-eem.1028 (i)" + "LargeIntegers v1.5 VMMaker.oscog-eem.1048 (i)" #else - "LargeIntegers v1.5 VMMaker.oscog-eem.1028 (e)" + "LargeIntegers v1.5 VMMaker.oscog-eem.1048 (e)" #endif ; static const int orOpIndex = 1; @@ -3310,18 +3310,13 @@ EXPORT(sqInt) primGetModuleName(void) { - sqInt i; sqInt strLen; sqInt strOop; - char *strPtr; /* missing DebugCode */; strLen = strlen(getModuleName()); strOop = instantiateClassindexableSize(classString(), strLen); - strPtr = firstIndexableField(strOop); - for (i = 0; i < strLen; i += 1) { - strPtr[i] = ((getModuleName())[i]); - } + strncpy(firstIndexableField(strOop), getModuleName(), strLen); if (failed()) { return null; } Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2015-02-05 00:50:56 UTC (rev 3248) +++ branches/Cog/nscogsrc/vm/cogit.c 2015-02-10 23:19:26 UTC (rev 3249) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 + CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f from - StackToRegisterMappingCogit VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 + StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -190,10 +190,9 @@ #define FoxMFReceiver -12 #define FoxThisContext -8 #define FPReg -1 -#define GCModeBecome 4 +#define GCModeBecome 8 #define GCModeFull 1 -#define GCModeIncr 2 -#define GCModeScavenge 3 +#define GCModeNewSpace 2 #define GPRegMax -3 #define GPRegMin -8 #define HasBytecodePC 5 @@ -598,7 +597,7 @@ void checkAssertsEnabledInCogit(void); static sqInt checkIfValidOopRefAndTargetpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) NoDbgRegParms; static sqInt checkIfValidOopRefpccogMethod(sqInt annotation, char *mcpc, sqInt cogMethod) NoDbgRegParms; -sqInt checkIntegrityOfObjectReferencesInCode(sqInt fullGCFlag); +sqInt checkIntegrityOfObjectReferencesInCode(sqInt gcModes); static sqInt checkMaybeObjRefAt(sqInt mcpc) NoDbgRegParms; static sqInt checkValidObjectReferencesInClosedPIC(CogMethod *cPIC) NoDbgRegParms; static sqInt closedPICRefersToUnmarkedObject(CogMethod *cPIC) NoDbgRegParms; @@ -9035,7 +9034,7 @@ /* Answer if all references to objects in machine-code are valid. */ sqInt -checkIntegrityOfObjectReferencesInCode(sqInt fullGCFlag) +checkIntegrityOfObjectReferencesInCode(sqInt gcModes) { CogMethod *cogMethod; sqInt count; @@ -9088,7 +9087,8 @@ if ((mapForperformUntilarg(cogMethod, checkIfValidOopRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } - if (!fullGCFlag) { + if ((hasSpurMemoryManagerAPI()) + || (gcModes & GCModeNewSpace)) { if (((isYoungObject((cogMethod->methodObject))) || (isYoung((cogMethod->selector)))) && (!((cogMethod->cmRefersToYoung)))) { @@ -9413,7 +9413,7 @@ voidYoungReferrersPostTenureAll(); } assert(allMethodsHaveCorrectHeader()); - assert((gcMode == GCModeBecome) + assert(((gcMode & (GCModeFull + GCModeNewSpace)) == 0) || (kosherYoungReferrers())); } @@ -12315,8 +12315,7 @@ { switch (gcMode) { - case GCModeScavenge: - case GCModeIncr: + case GCModeNewSpace: mapObjectReferencesInMachineCodeForYoungGC(); break; case GCModeFull: @@ -12401,7 +12400,7 @@ } pointer += BytesPerWord; } - if (leakCheckIncrementalGC()) { + if (leakCheckNewSpaceGC()) { assert(allMachineCodeObjectReferencesValid()); } if (codeModified) { Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2015-02-05 00:50:56 UTC (rev 3248) +++ branches/Cog/nscogsrc/vm/cogit.h 2015-02-10 23:19:26 UTC (rev 3249) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 + CCodeGenerator VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f */ @@ -32,7 +32,7 @@ sqInt ceCPICMissreceiver(CogMethod *cPIC, sqInt receiver); sqInt ceSICMiss(sqInt receiver); void checkAssertsEnabledInCogit(void); -sqInt checkIntegrityOfObjectReferencesInCode(sqInt fullGCFlag); +sqInt checkIntegrityOfObjectReferencesInCode(sqInt gcModes); char * codeEntryFor(char *address); char * codeEntryNameFor(char *address); sqInt cogCodeBase(void); Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2015-02-05 00:50:56 UTC (rev 3248) +++ branches/Cog/nscogsrc/vm/cointerp.c 2015-02-10 23:19:26 UTC (rev 3249) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f from - CoInterpreter VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 + CoInterpreter VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -212,9 +212,9 @@ #define FoxMFReceiver -12 #define FoxSavedFP 0 #define FoxThisContext -8 -#define GCModeBecome 4 +#define GCModeBecome 8 #define GCModeFull 1 -#define GCModeIncr 2 +#define GCModeNewSpace 2 #define GCTopMarker 3 #define HasBeenReturnedFromMCPC 0xFFFFFFFFUL #define HashBits 0x1FFE0000 @@ -421,7 +421,7 @@ void ceTraceLinkedSend(sqInt theReceiver); void ceTraceStoreOfinto(sqInt aValue, sqInt anObject); void checkAssertsEnabledInCoInterpreter(void); -static sqInt checkCodeIntegrity(sqInt fullGCFlag) NoDbgRegParms; +static sqInt checkCodeIntegrity(sqInt gcModes) NoDbgRegParms; static sqInt checkLogIntegrity(void); static sqInt checkOkayFields(sqInt oop) NoDbgRegParms; static sqInt checkStackIntegrity(void); @@ -515,7 +515,7 @@ static void printFrameMethodFor(char *theFP) NoDbgRegParms; static void printFrameThingatextraString(char *name, char *address, char *extraStringOrNil) NoDbgRegParms; static void printFrameThingatextra(char *name, char *address, sqInt extraValue) NoDbgRegParms; -void printFrameWithSP(char *theFP, char *theSP); +sqInt printFrameWithSP(char *theFP, char *theSP); static void printLogEntryAt(sqInt i) NoDbgRegParms; void printMethodCacheFor(sqInt thing); static sqInt printPrimLogEntryAt(sqInt i) NoDbgRegParms; @@ -836,7 +836,6 @@ sqInt lastPointerOf(sqInt objOop); sqInt leakCheckBecome(void); sqInt leakCheckFullGC(void); -sqInt leakCheckIncrementalGC(void); sqInt leakCheckNewSpaceGC(void); sqInt literalCountOfMethodHeader(sqInt header); static sqInt loadImageSegmentFromoutPointers(sqInt segmentWordArray, sqInt outPointerArray) NoDbgRegParms; @@ -853,7 +852,7 @@ void printReferencesTo(sqInt anOop); void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; -static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; +static void runLeakCheckerFor(sqInt gcModes) NoDbgRegParms; static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; @@ -1351,8 +1350,8 @@ _iss sqInt remapBufferCount; _iss usqInt reserveStart; _iss char * stackLimit; +_iss usqInt memoryLimit; _iss sqInt rootTableCount; -_iss usqInt memoryLimit; _iss usqInt scavengeThreshold; _iss usqInt endOfMemory; _iss unsigned char primTraceLogIndex; @@ -1370,11 +1369,11 @@ _iss sqInt profileMethod; _iss usqInt compStart; _iss sqInt extraRootCount; +_iss sqInt growHeadroom; _iss sqInt statGrowMemory; _iss sqInt tempOop2; _iss sqInt weakRootCount; _iss sqInt classNameIndex; -_iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt preemptionYields; _iss usqLong nextWakeupUsecs; @@ -1397,6 +1396,8 @@ _iss sqInt cogCodeSize; _iss usqInt compEnd; _iss sqInt externalPrimitiveTableFirstFreeIndex; +_iss sqInt shrinkThreshold; +_iss sqInt statShrinkMemory; _iss sqInt thisClassIndex; _iss sqInt edenBytes; _iss usqInt fwdTableLast; @@ -1404,7 +1405,6 @@ _iss sqInt noThreadingOfGUIThread; _iss sqInt pendingFinalizationSignals; _iss sqInt processHasThreadId; -_iss sqInt shrinkThreshold; _iss sqInt statCompMoveCount; _iss usqLong statIOProcessEvents; _iss sqInt statMkFwdCount; @@ -1417,7 +1417,6 @@ _iss usqLong statIncrGCUsecs; _iss sqInt statIncrGCs; _iss sqInt statRootTableOverflows; -_iss sqInt statShrinkMemory; _iss sqInt statSpecialMarkCount; _iss sqInt statTenures; _iss sqInt totalObjectCount; @@ -1502,10 +1501,10 @@ sqInt checkAllocFiller; sqInt breakSelectorLength = MinSmallInteger; sqInt inIOProcessEvents; -sqInt checkForLeaks; sqInt desiredEdenBytes; sqInt desiredNumStackPages; sqInt extraVMMemory; +sqInt checkForLeaks; sqInt desiredCogCodeSize; char * breakSelector; usqInt heapBase; @@ -2097,7 +2096,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1044"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1048"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -15316,9 +15315,9 @@ code are valid. Answer if all checks pass. */ static sqInt -checkCodeIntegrity(sqInt fullGCFlag) +checkCodeIntegrity(sqInt gcModes) { - return checkIntegrityOfObjectReferencesInCode(fullGCFlag); + return checkIntegrityOfObjectReferencesInCode(gcModes); } @@ -18087,7 +18086,7 @@ } -/* Shrink free memory and signal the gc semaphore */ +/* Signal the gc semaphore */ /* Attempt to shrink free memory, signal the gc semaphore and let the Cogit do its post GC thang */ @@ -18095,34 +18094,7 @@ static void postGCAction(sqInt gcModeArg) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt freeSizeNow; - sqInt limit; - assert(gcModeArg == GIV(gcMode)); - if ((gcModeArg == GCModeFull) - || (gcModeArg == GCModeIncr)) { - - /* but *not* become and *not* scavenge */ - - freeSizeNow = ((((usqInt) GIV(freeStart))) < (((usqInt) GIV(reserveStart))) - ? (((usqInt) GIV(reserveStart))) - (((usqInt) GIV(freeStart))) - : 0); - if ((freeSizeNow > GIV(shrinkThreshold)) - && (freeSizeNow > GIV(growHeadroom))) { - - /* Attempt to shrink memory after successfully reclaiming lots of memory */ - - /* begin shrinkObjectMemory: */ - GIV(statShrinkMemory) += 1; - limit = sqShrinkMemoryBy(GIV(memoryLimit), freeSizeNow - GIV(growHeadroom)); - if (!(limit == GIV(memoryLimit))) { - /* begin setMemoryLimit: */ - assert(((limit - 24) & (BytesPerWord - 1)) == 0); - GIV(memoryLimit) = limit - 24; - initializeMemoryFirstFree(GIV(freeStart)); - } - } - } signalSemaphoreWithIndex(GIV(gcSemaphoreIndex)); cogitPostGCAction(gcModeArg); GIV(lastCoggableInterpretedBlockMethod) = (GIV(lastUncoggableInterpretedBlockMethod) = null); @@ -18492,7 +18464,7 @@ printf("\n"); } -void +sqInt printFrameWithSP(char *theFP, char *theSP) { DECL_MAYBE_SQ_GLOBAL_STRUCT char *addr; @@ -18514,6 +18486,15 @@ sqInt topThing; + if (!((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) + && ((((((usqInt)theFP)) >= (((usqInt)(GIV(stackBasePlus1) - 1)))) && ((((usqInt)theFP)) <= (((usqInt)GIV(pages)))))))) { + /* begin printHexPtr: */ + printHex(oopForPointer(theFP)); + print(" is not in the stack zone?!"); + /* begin cr */ + printf("\n"); + return null; + } if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { /* begin mframeCogMethod: */ cogMethod = ((CogBlockMethod *) ((longAt(theFP + FoxMethod)) & MFMethodMask)); @@ -34943,9 +34924,7 @@ sqInt sp; usqInt start; - if ((checkForLeaks & 4) != 0) { - runLeakCheckerForFullGC(1); - } + runLeakCheckerFor(GCModeBecome); if (!(((array1 & 1) == 0) && (((((usqInt) (longAt(array1))) >> (instFormatFieldLSB())) & 15) == 2))) { return PrimErrBadReceiver; @@ -35180,9 +35159,7 @@ GIV(lastCoggableInterpretedBlockMethod) = (GIV(lastUncoggableInterpretedBlockMethod) = null); GIV(gcMode) = 0; initializeMemoryFirstFree(GIV(freeStart)); - if ((checkForLeaks & 4) != 0) { - runLeakCheckerForFullGC(1); - } + runLeakCheckerFor(GCModeBecome); return PrimNoErr; } @@ -36567,14 +36544,16 @@ void fullGC(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt freeSizeNow; sqInt limit; + sqInt limit1; sqInt sz; if (GIV(fullGCLock) > 0) { warning("aborting fullGC because fullGCLock > 0"); return; } - runLeakCheckerForFullGC(1); + runLeakCheckerFor(GCModeFull); preGCAction(GCModeFull); GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); @@ -36588,7 +36567,7 @@ GIV(youngStart) = startOfMemory(); markPhase(1); GIV(totalObjectCount) = sweepPhaseForFullGC(); - runLeakCheckerForFullGC(1); + runLeakCheckerFor(GCModeFull); /* begin fullCompaction */ assert(GIV(compStart) == (lowestFreeAfter(startOfMemory()))); if (GIV(compStart) == GIV(freeStart)) { @@ -36629,8 +36608,24 @@ /* reset the young object boundary */ GIV(youngStart) = GIV(freeStart); + /* begin attemptToShrink */ + freeSizeNow = ((((usqInt) GIV(freeStart))) < (((usqInt) GIV(reserveStart))) + ? (((usqInt) GIV(reserveStart))) - (((usqInt) GIV(freeStart))) + : 0); + if ((freeSizeNow > GIV(shrinkThreshold)) + && (freeSizeNow > GIV(growHeadroom))) { + /* begin shrinkObjectMemory: */ + GIV(statShrinkMemory) += 1; + limit1 = sqShrinkMemoryBy(GIV(memoryLimit), freeSizeNow - GIV(growHeadroom)); + if (!(limit1 == GIV(memoryLimit))) { + /* begin setMemoryLimit: */ + assert(((limit1 - 24) & (BytesPerWord - 1)) == 0); + GIV(memoryLimit) = limit1 - 24; + initializeMemoryFirstFree(GIV(freeStart)); + } + } postGCAction(GCModeFull); - runLeakCheckerForFullGC(1); + runLeakCheckerFor(GCModeFull); } @@ -36997,9 +36992,11 @@ incrementalGC(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt delta; + sqInt freeSizeNow; sqInt growth; sqInt i; sqInt limit; + sqInt limit1; sqInt survivorCount; sqInt weDidGrow; @@ -37012,8 +37009,8 @@ fullGC(); return; } - runLeakCheckerForFullGC(0); - preGCAction(GCModeIncr); + runLeakCheckerFor(GCModeNewSpace); + preGCAction(GCModeNewSpace); GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -37025,7 +37022,7 @@ finalizeReference(GIV(weakRoots)[i]); } survivorCount = sweepPhase(); - runLeakCheckerForFullGC(0); + runLeakCheckerFor(GCModeNewSpace); /* begin incrementalCompaction */ if (GIV(compStart) == GIV(freeStart)) { @@ -37084,8 +37081,24 @@ } GIV(youngStart) = GIV(freeStart); } - postGCAction(GCModeIncr); - runLeakCheckerForFullGC(0); + /* begin attemptToShrink */ + freeSizeNow = ((((usqInt) GIV(freeStart))) < (((usqInt) GIV(reserveStart))) + ? (((usqInt) GIV(reserveStart))) - (((usqInt) GIV(freeStart))) + : 0); + if ((freeSizeNow > GIV(shrinkThreshold)) + && (freeSizeNow > GIV(growHeadroom))) { + /* begin shrinkObjectMemory: */ + GIV(statShrinkMemory) += 1; + limit1 = sqShrinkMemoryBy(GIV(memoryLimit), freeSizeNow - GIV(growHeadroom)); + if (!(limit1 == GIV(memoryLimit))) { + /* begin setMemoryLimit: */ + assert(((limit1 - 24) & (BytesPerWord - 1)) == 0); + GIV(memoryLimit) = limit1 - 24; + initializeMemoryFirstFree(GIV(freeStart)); + } + } + postGCAction(GCModeNewSpace); + runLeakCheckerFor(GCModeNewSpace); if (weDidGrow) { /* begin biasToGrowCheckGCLimit */ growth = (GIV(youngStart) - (startOfMemory())) - GIV(gcBiasToGrowThreshold); @@ -37319,22 +37332,16 @@ sqInt leakCheckBecome(void) { - return (checkForLeaks & 4) != 0; + return (checkForLeaks & GCModeBecome) != 0; } sqInt leakCheckFullGC(void) { - return (checkForLeaks & 1) != 0; + return (checkForLeaks & GCModeFull) != 0; } sqInt -leakCheckIncrementalGC(void) -{ - return (checkForLeaks & 2) != 0; -} - -sqInt leakCheckNewSpaceGC(void) { return (checkForLeaks & 2) != 0; @@ -38820,12 +38827,10 @@ } static void -runLeakCheckerForFullGC(sqInt fullGCFlag) +runLeakCheckerFor(sqInt gcModes) { - if ((fullGCFlag - ? (checkForLeaks & 1) != 0 - : (checkForLeaks & 2) != 0)) { - if (fullGCFlag) { + if (gcModes & checkForLeaks) { + if (gcModes & GCModeFull) { reverseDisplayFromto(0, 7); } else { @@ -38835,7 +38840,7 @@ assert(checkHeapIntegrity()); assert(checkInterpreterIntegrity()); assert(checkStackIntegrity()); - assert(checkCodeIntegrity(fullGCFlag)); + assert(checkCodeIntegrity(gcModes)); /* begin validate */ null; } @@ -47187,7 +47192,7 @@ sqInt oop; null; - runLeakCheckerForFullGC(1); + runLeakCheckerFor(GCModeFull); /* begin fetchPointer:ofObject: */ /* begin fetchPointer:ofObject: */ oop = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << (shiftForWord())))) + BaseHeaderSize) + (ValueIndex << (shiftForWord()))); @@ -49637,12 +49642,23 @@ printFrame(char *theFP) { DECL_MAYBE_SQ_GLOBAL_STRUCT char *aFrame; + char *frameAbove; sqInt index; char *prevFrame; char *startFrame; StackPage *thePage; char *theSP; + if (!((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) + && ((((((usqInt)theFP)) >= (((usqInt)(GIV(stackBasePlus1) - 1)))) && ((((usqInt)theFP)) <= (((usqInt)GIV(pages)))))))) { + /* begin printHexPtr: */ + printHex(oopForPointer(theFP)); + print(" is not in the stack zone?!"); + /* begin cr */ + printf("\n"); + return null; + } + frameAbove = null; if (theFP == GIV(framePointer)) { theSP = GIV(stackPointer); } @@ -49666,26 +49682,14 @@ theSP = (thePage->headSP); } else { - /* begin findSPOrNilOf:on:startingFrom: */ + /* begin safeFindFrameAbove:on:startingFrom: */ startFrame = ((thePage == GIV(stackPage)) && (((GIV(framePointer) >= ((thePage->realStackLimit))) && (GIV(framePointer) <= ((thePage->baseAddress))))) ? GIV(framePointer) : (thePage->headFP)); assert(!(isFree(thePage))); if (startFrame == theFP) { - if (((thePage->headSP)) >= startFrame) { - - /* If the SP is invalid return the pointer to the receiver field. */ - - /* begin frameReceiverOffset: */ - theSP = ((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory()) - ? aFrame + FoxMFReceiver - : aFrame + FoxIFReceiver); - goto l1; - } - theSP = (thePage == GIV(stackPage) - ? (thePage->headSP) - : ((thePage->headSP)) + BytesPerWord); + frameAbove = null; goto l1; } aFrame = startFrame; @@ -49695,16 +49699,19 @@ aFrame = pointerForOop(longAt(aFrame + FoxSavedFP)); if (!(aFrame != 0)) break; if (theFP == aFrame) { - /* begin frameCallerSP: */ - assert(!(isBaseFrame(prevFrame))); - theSP = (prevFrame + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(prevFrame + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(prevFrame))->cmNumArgs) - : byteAt((prevFrame + FoxIFrameFlags) + 1))))) + BytesPerWord; + frameAbove = prevFrame; goto l1; } } - theSP = null; - l1: /* end findSPOrNilOf:on:startingFrom: */; + frameAbove = null; + l1: /* end safeFindFrameAbove:on:startingFrom: */; + theSP = (!(frameAbove == null) + ? (/* begin frameCallerSP: */ + assert(!(isBaseFrame(frameAbove))), + (frameAbove + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(frameAbove + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(frameAbove))->cmNumArgs) + : byteAt((frameAbove + FoxIFrameFlags) + 1))))) + BytesPerWord) + : 0); } } if (!(theSP)) { @@ -49717,6 +49724,9 @@ : theFP + FoxIFReceiver); } printFrameWithSP(theFP, theSP); + if (!(frameAbove == null)) { + printFrameThingat("frame pc", frameAbove + FoxCallerSavedIP); + } } @@ -49757,6 +49767,7 @@ sqInt i; sqInt methodClassAssociation; sqInt n; + sqInt n1; char *name; sqInt nameLen; sqInt obj; @@ -49803,14 +49814,14 @@ /* begin printChar: */ putchar(')'); - goto l8; + goto l7; } print("unknown immediate "); /* begin printHexnp: */ printf("0x%lx", ((unsigned long) oop2)); - goto l8; + goto l7; } if (!(((oop2 & 3) == 0) && (((((usqInt)oop2)) >= (startOfMemory())) @@ -49819,16 +49830,16 @@ print(((oop2 & (BytesPerWord - 1)) != 0 ? " is misaligned" : whereIs(oop2))); - goto l8; + goto l7; } if (((longAt(oop2)) & TypeMask) == HeaderTypeFree) { print(" is a free chunk"); - goto l8; + goto l7; } if (isinstanceOfcompactClassIndex(oop2, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << (shiftForWord()))), ClassFloatCompactIndex)) { printFloat(dbgFloatValueOf(oop2)); - goto l8; + goto l7; } classOop = (((ccIndex = (((usqInt) (longAt(oop2))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(oop2 - BaseHeaderSize)) & AllButTypeMask @@ -49839,28 +49850,28 @@ && (((((usqInt)classOop)) < GIV(freeStart)) && (((longAt(classOop)) & TypeMask) != HeaderTypeGC))))) { print("a ??"); - goto l8; + goto l7; } if ((numSlotsOf(classOop)) == GIV(metaclassNumSlots)) { printNameOfClasscount(oop2, 5); - goto l8; + goto l7; } if (oop2 == GIV(nilObj)) { print("nil"); - goto l8; + goto l7; } if (oop2 == GIV(trueObj)) { print("true"); - goto l8; + goto l7; } if (oop2 == GIV(falseObj)) { print("false"); - goto l8; + goto l7; } nameLen = lengthOfNameOfClass(classOop); if (nameLen == 0) { print("a ??"); - goto l8; + goto l7; } name = nameOfClass(classOop); if (nameLen == 10) { @@ -49874,7 +49885,7 @@ /* begin printChar: */ putchar('\''); - goto l8; + goto l7; } if ((strncmp(name, "ByteSymbol", 10)) == 0) { @@ -49883,7 +49894,7 @@ /* begin printChar: */ putchar('#'); printStringOf(oop2); - goto l8; + goto l7; } } if ((nameLen == 9) @@ -49893,7 +49904,7 @@ /* begin printChar: */ putchar(((longAt((oop2 + BaseHeaderSize) + (0 << (shiftForWord())))) >> 1)); - goto l8; + goto l7; } print("a(n) "); for (i = 0; i < nameLen; i += 1) { @@ -49911,24 +49922,24 @@ longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex1 - 1) << (shiftForWord()))))); while (1) { if (classLookupKey == GIV(nilObj)) { - goto l8; + goto l7; } if ((instanceSizeOf(classLookupKey)) == (KeyIndex + 1)) break; classLookupKey = longAt((classLookupKey + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); } if (classLookupKey == GIV(nilObj)) { - goto l5; + goto l6; } theClass1 = classOop; while (1) { if (theClass1 == classLookupKey) { - goto l6; + goto l8; } if (!(theClass1 != GIV(nilObj))) break; theClass1 = longAt((theClass1 + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); } - goto l5; - l6: ; + goto l6; + l8: ; /* begin space */ /* begin printChar: */ putchar(' '); @@ -49936,9 +49947,9 @@ print(" -> "); /* begin printHexnp: */ printf("0x%lx", ((unsigned long) (longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); - l5: ; + l6: ; } - l8: /* end printOopShortInner: */; + l7: /* end printOopShortInner: */; /* begin cr */ printf("\n"); } @@ -50089,6 +50100,7 @@ sqInt classOop; sqInt i; sqInt n; + sqInt n1; char *name; sqInt nameLen; sqInt oop1; @@ -50106,14 +50118,14 @@ /* begin printChar: */ putchar(')'); - goto l4; + goto l5; } print("unknown immediate "); /* begin printHexnp: */ printf("0x%lx", ((unsigned long) oop)); - goto l4; + goto l5; } if (!(((oop & 3) == 0) && (((((usqInt)oop)) >= (startOfMemory())) @@ -50122,16 +50134,16 @@ print(((oop & (BytesPerWord - 1)) != 0 ? " is misaligned" : whereIs(oop))); - goto l4; + goto l5; } if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { print(" is a free chunk"); - goto l4; + goto l5; } if (isinstanceOfcompactClassIndex(oop, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << (shiftForWord()))), ClassFloatCompactIndex)) { printFloat(dbgFloatValueOf(oop)); - goto l4; + goto l5; } classOop = (((ccIndex = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask @@ -50142,28 +50154,28 @@ && (((((usqInt)classOop)) < GIV(freeStart)) && (((longAt(classOop)) & TypeMask) != HeaderTypeGC))))) { print("a ??"); - goto l4; + goto l5; } if ((numSlotsOf(classOop)) == GIV(metaclassNumSlots)) { printNameOfClasscount(oop, 5); - goto l4; + goto l5; } if (oop == GIV(nilObj)) { print("nil"); - goto l4; + goto l5; } if (oop == GIV(trueObj)) { print("true"); - goto l4; + goto l5; } if (oop == GIV(falseObj)) { print("false"); - goto l4; + goto l5; } nameLen = lengthOfNameOfClass(classOop); if (nameLen == 0) { print("a ??"); - goto l4; + goto l5; } name = nameOfClass(classOop); if (nameLen == 10) { @@ -50177,7 +50189,7 @@ /* begin printChar: */ putchar('\''); - goto l4; + goto l5; } if ((strncmp(name, "ByteSymbol", 10)) == 0) { @@ -50186,7 +50198,7 @@ /* begin printChar: */ putchar('#'); printStringOf(oop); - goto l4; + goto l5; } } if ((nameLen == 9) @@ -50196,7 +50208,7 @@ /* begin printChar: */ putchar(((longAt((oop + BaseHeaderSize) + (0 << (shiftForWord())))) >> 1)); - goto l4; + goto l5; } print("a(n) "); for (i = 0; i < nameLen; i += 1) { @@ -50214,7 +50226,7 @@ longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex1 - 1) << (shiftForWord()))))); while (1) { if (classLookupKey == GIV(nilObj)) { - goto l4; + goto l5; } if ((instanceSizeOf(classLookupKey)) == (KeyIndex + 1)) break; classLookupKey = longAt((classLookupKey + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); @@ -50241,7 +50253,7 @@ printf("0x%lx", ((unsigned long) (longAt((oop + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); l1: ; } -l4: /* end printOopShortInner: */; +l5: /* end printOopShortInner: */; flush(); } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2015-02-05 00:50:56 UTC (rev 3248) +++ branches/Cog/nscogsrc/vm/cointerp.h 2015-02-10 23:19:26 UTC (rev 3249) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f */ @@ -90,7 +90,7 @@ void * primTraceLogAddress(void); usqInt primTraceLogIndexAddress(void); void printCogMethod(CogMethod *cogMethod); -void printFrameWithSP(char *theFP, char *theSP); +sqInt printFrameWithSP(char *theFP, char *theSP); void printMethodCacheFor(sqInt thing); sqInt quickPrimitiveConstantFor(sqInt aQuickPrimitiveIndex); int (*quickPrimitiveGeneratorFor(sqInt aQuickPrimitiveIndex))(void) ; @@ -136,7 +136,6 @@ sqInt lastPointerOf(sqInt objOop); sqInt leakCheckBecome(void); sqInt leakCheckFullGC(void); -sqInt leakCheckIncrementalGC(void); sqInt leakCheckNewSpaceGC(void); sqInt literalCountOfMethodHeader(sqInt header); void longPrintReferencesTo(sqInt anOop); Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-02-05 00:50:56 UTC (rev 3248) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2015-02-10 23:19:26 UTC (rev 3249) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f from - CoInterpreter VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 + CoInterpreter VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.1048 uuid: 8c759c0d-f612-4018-8a05-45ec7f6af78f " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -215,9 +215,9 @@ #define FoxMFReceiver -12 #define FoxSavedFP 0 #define FoxThisContext -8 -#define GCModeBecome 4 +#define GCModeBecome 8 #define GCModeFull 1 -#define GCModeIncr 2 +#define GCModeNewSpace 2 #define GCTopMarker 3 #define HasBeenReturnedFromMCPC 0xFFFFFFFFUL #define HashBits 0x1FFE0000 @@ -424,7 +424,7 @@ void ceTraceLinkedSend(sqInt theReceiver); void ceTraceStoreOfinto(sqInt aValue, sqInt anObject); void checkAssertsEnabledInCoInterpreter(void); -static sqInt checkCodeIntegrity(sqInt fullGCFlag) NoDbgRegParms; +static sqInt checkCodeIntegrity(sqInt gcModes) NoDbgRegParms; static sqInt checkLogIntegrity(void); static sqInt checkOkayFields(sqInt oop) NoDbgRegParms; static sqInt checkStackIntegrity(void); @@ -518,7 +518,7 @@ static void printFrameMethodFor(char *theFP) NoDbgRegParms; static void printFrameThingatextraString(char *name, char *address, char *extraStringOrNil) NoDbgRegParms; static void printFrameThingatextra(char *name, char *address, sqInt extraValue) NoDbgRegParms; -void printFrameWithSP(char *theFP, char *theSP); +sqInt printFrameWithSP(char *theFP, char *theSP); static void printLogEntryAt(sqInt i) NoDbgRegParms; void printMethodCacheFor(sqInt thing); static sqInt printPrimLogEntryAt(sqInt i) NoDbgRegParms; @@ -839,7 +839,6 @@ sqInt lastPointerOf(sqInt objOop); sqInt leakCheckBecome(void); sqInt leakCheckFullGC(void); -sqInt leakCheckIncrementalGC(void); sqInt leakCheckNewSpaceGC(void); sqInt literalCountOfMethodHeader(sqInt header); static sqInt loadImageSegmentFromoutPointers(sqInt segmentWordArray, sqInt outPointerArray) NoDbgRegParms; @@ -856,7 +855,7 @@ void printReferencesTo(sqInt anOop); void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; -static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; +static void runLeakCheckerFor(sqInt gcModes) NoDbgRegParms; static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; @@ -1354,8 +1353,8 @@ _iss sqInt remapBufferCount; _iss usqInt reserveStart; _iss char * stackLimit; +_iss usqInt memoryLimit; _iss sqInt rootTableCount; -_iss usqInt memoryLimit; _iss usqInt scavengeThreshold; _iss usqInt endOfMemory; _iss unsigned char primTraceLogIndex; @@ -1373,11 +1372,11 @@ _iss sqInt profileMethod; _iss usqInt compStart; _iss sqInt extraRootCount; +_iss sqInt growHeadroom; _iss sqInt statGrowMemory; _iss sqInt tempOop2; _iss sqInt weakRootCount; _iss sqInt classNameIndex; -_iss sqInt growHeadroom; _iss sqInt lastMethodCacheProbeWrite; _iss sqInt preemptionYields; _iss usqLong nextWakeupUsecs; @@ -1400,6 +1399,8 @@ _iss sqInt cogCodeSize; _iss usqInt compEnd; _iss sqInt externalPrimitiveTableFirstFreeIndex; +_iss sqInt shrinkThreshold; +_iss sqInt statShrinkMemory; _iss sqInt thisClassIndex; _iss sqInt edenBytes; _iss usqInt fwdTableLast; @@ -1407,7 +1408,6 @@ _iss sqInt noThreadingOfGUIThread; _iss sqInt pendingFinalizationSignals; _iss sqInt processHasThreadId; -_iss sqInt shrinkThreshold; _iss sqInt statCompMoveCount; _iss usqLong statIOProcessEvents; _iss sqInt statMkFwdCount; @@ -1420,7 +1420,6 @@ _iss usqLong statIncrGCUsecs; _iss sqInt statIncrGCs; _iss sqInt statRootTableOverflows; -_iss sqInt statShrinkMemory; _iss sqInt statSpecialMarkCount; _iss sqInt statTenures; _iss sqInt totalObjectCount; @@ -1505,10 +1504,10 @@ sqInt checkAllocFiller; sqInt breakSelectorLength = MinSmallInteger; sqInt inIOProcessEvents; -sqInt checkForLeaks; sqInt desiredEdenBytes; sqInt desiredNumStackPages; sqInt extraVMMemory; +sqInt checkForLeaks; sqInt desiredCogCodeSize; char * breakSelector; usqInt heapBase; @@ -2100,7 +2099,7 @@ /* 575 */ (void (*)(void))0, 0 }; char expensiveAsserts = 0; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1044"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.1048"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -15325,9 +15324,9 @@ code are valid. Answer if all checks pass. */ static sqInt -checkCodeIntegrity(sqInt fullGCFlag) +checkCodeIntegrity(sqInt gcModes) { - return checkIntegrityOfObjectReferencesInCode(fullGCFlag); + return checkIntegrityOfObjectReferencesInCode(gcModes); } @@ -18096,7 +18095,7 @@ } -/* Shrink free memory and signal the gc semaphore */ +/* Signal the gc semaphore */ /* Attempt to shrink free memory, signal the gc semaphore and let the Cogit do its post GC thang */ @@ -18104,34 +18103,7 @@ static void postGCAction(sqInt gcModeArg) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt freeSizeNow; - sqInt limit; - assert(gcModeArg == GIV(gcMode)); - if ((gcModeArg == GCModeFull) - || (gcModeArg == GCModeIncr)) { - - /* but *not* become and *not* scavenge */ - - freeSizeNow = ((((usqInt) GIV(freeStart))) < (((usqInt) GIV(reserveStart))) - ? (((usqInt) GIV(reserveStart))) - (((usqInt) GIV(freeStart))) - : 0); - if ((freeSizeNow > GIV(shrinkThreshold)) - && (freeSizeNow > GIV(growHeadroom))) { - - /* Attempt to shrink memory after successfully reclaiming lots of memory */ - - /* begin shrinkObjectMemory: */ - GIV(statShrinkMemory) += 1; - limit = sqShrinkMemoryBy(GIV(memoryLimit), freeSizeNow - GIV(growHeadroom)); - if (!(limit == GIV(memoryLimit))) { - /* begin setMemoryLimit: */ - assert(((limit - 24) & (BytesPerWord - 1)) == 0); - GIV(memoryLimit) = limit - 24; - initializeMemoryFirstFree(GIV(freeStart)); - } - } - } signalSemaphoreWithIndex(GIV(gcSemaphoreIndex)); cogitPostGCAction(gcModeArg); GIV(lastCoggableInterpretedBlockMethod) = (GIV(lastUncoggableInterpretedBlockMethod) = null); @@ -18501,7 +18473,7 @@ printf("\n"); } -void +sqInt printFrameWithSP(char *theFP, char *theSP) { DECL_MAYBE_SQ_GLOBAL_STRUCT char *addr; @@ -18523,6 +18495,15 @@ sqInt topThing; + if (!((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) + && ((((((usqInt)theFP)) >= (((usqInt)(GIV(stackBasePlus1) - 1)))) && ((((usqInt)theFP)) <= (((usqInt)GIV(pages)))))))) { + /* begin printHexPtr: */ + printHex(oopForPointer(theFP)); + print(" is not in the stack zone?!"); + /* begin cr */ + printf("\n"); + return null; + } if ((((usqInt)(longAt(theFP + FoxMethod)))) < (startOfMemory())) { /* begin mframeCogMethod: */ cogMethod = ((CogBlockMethod *) ((longAt(theFP + FoxMethod)) & MFMethodMask)); @@ -34952,9 +34933,7 @@ sqInt sp; usqInt start; - if ((checkForLeaks & 4) != 0) { - runLeakCheckerForFullGC(1); - } + runLeakCheckerFor(GCModeBecome); if (!(((array1 & 1) == 0) && (((((usqInt) (longAt(array1))) >> (instFormatFieldLSB())) & 15) == 2))) { return PrimErrBadReceiver; @@ -35189,9 +35168,7 @@ GIV(lastCoggableInterpretedBlockMethod) = (GIV(lastUncoggableInterpretedBlockMethod) = null); GIV(gcMode) = 0; initializeMemoryFirstFree(GIV(freeStart)); - if ((checkForLeaks & 4) != 0) { - runLeakCheckerForFullGC(1); - } + runLeakCheckerFor(GCModeBecome); return PrimNoErr; } @@ -36576,14 +36553,16 @@ void fullGC(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt freeSizeNow; sqInt limit; + sqInt limit1; sqInt sz; if (GIV(fullGCLock) > 0) { warning("aborting fullGC because fullGCLock > 0"); return; } - runLeakCheckerForFullGC(1); + runLeakCheckerFor(GCModeFull); preGCAction(GCModeFull); GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); @@ -36597,7 +36576,7 @@ GIV(youngStart) = startOfMemory(); markPhase(1); GIV(totalObjectCount) = sweepPhaseForFullGC(); - runLeakCheckerForFullGC(1); + runLeakCheckerFor(GCModeFull); /* begin fullCompaction */ assert(GIV(compStart) == (lowestFreeAfter(startOfMemory()))); if (GIV(compStart) == GIV(freeStart)) { @@ -36638,8 +36617,24 @@ /* reset the young object boundary */ GIV(youngStart) = GIV(freeStart); + /* begin attemptToShrink */ + freeSizeNow = ((((usqInt) GIV(freeStart))) < (((usqInt) GIV(reserveStart))) + ? (((usqInt) GIV(reserveStart))) - (((usqInt) GIV(freeStart))) + : 0); + if ((freeSizeNow > GIV(shrinkThreshold)) + && (freeSizeNow > GIV(growHeadroom))) { + /* begin shrinkObjectMemory: */ + GIV(statShrinkMemory) += 1; + limit1 = sqShrinkMemoryBy(GIV(memoryLimit), freeSizeNow - GIV(growHeadroom)); + if (!(limit1 == GIV(memoryLimit))) { + /* begin setMemoryLimit: */ + assert(((limit1 - 24) & (BytesPerWord - 1)) == 0); + GIV(memoryLimit) = limit1 - 24; + initializeMemoryFirstFree(GIV(freeStart)); + } + } postGCAction(GCModeFull); - runLeakCheckerForFullGC(1); + runLeakCheckerFor(GCModeFull); } @@ -37006,9 +37001,11 @@ incrementalGC(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt delta; + sqInt freeSizeNow; sqInt growth; sqInt i; sqInt limit; + sqInt limit1; sqInt survivorCount; sqInt weDidGrow; @@ -37021,8 +37018,8 @@ fullGC(); return; } - runLeakCheckerForFullGC(0); - preGCAction(GCModeIncr); + runLeakCheckerFor(GCModeNewSpace); + preGCAction(GCModeNewSpace); GIV(needGCFlag) = 0; GIV(gcStartUsecs) = ioUTCMicrosecondsNow(); GIV(statSweepCount) = (GIV(statMarkCount) = (GIV(statMkFwdCount) = (GIV(statCompMoveCount) = 0))); @@ -37034,7 +37031,7 @@ finalizeReference(GIV(weakRoots)[i]); } survivorCount = sweepPhase(); - runLeakCheckerForFullGC(0); + runLeakCheckerFor(GCModeNewSpace); /* begin incrementalCompaction */ if (GIV(compStart) == GIV(freeStart)) { @@ -37093,8 +37090,24 @@ } GIV(youngStart) = GIV(freeStart); } - postGCAction(GCModeIncr); - runLeakCheckerForFullGC(0); + /* begin attemptToShrink */ + freeSizeNow = ((((usqInt) GIV(freeStart))) < (((usqInt) GIV(reserveStart))) + ? (((usqInt) GIV(reserveStart))) - (((usqInt) GIV(freeStart))) + : 0); + if ((freeSizeNow > GIV(shrinkThreshold)) + && (freeSizeNow > GIV(growHeadroom))) { + /* begin shrinkObjectMemory: */ + GIV(statShrinkMemory) += 1; + limit1 = sqShrinkMemoryBy(GIV(memoryLimit), freeSizeNow - GIV(growHeadroom)); + if (!(limit1 == GIV(memoryLimit))) { + /* begin setMemoryLimit: */ + assert(((limit1 - 24) & (BytesPerWord - 1)) == 0); + GIV(memoryLimit) = limit1 - 24; + initializeMemoryFirstFree(GIV(freeStart)); + } + } + postGCAction(GCModeNewSpace); + runLeakCheckerFor(GCModeNewSpace); if (weDidGrow) { /* begin biasToGrowCheckGCLimit */ growth = (GIV(youngStart) - (startOfMemory())) - GIV(gcBiasToGrowThreshold); @@ -37328,22 +37341,16 @@ sqInt leakCheckBecome(void) { - return (checkForLeaks & 4) != 0; + return (checkForLeaks & GCModeBecome) != 0; } sqInt leakCheckFullGC(void) { - return (checkForLeaks & 1) != 0; + return (checkForLeaks & GCModeFull) != 0; } sqInt -leakCheckIncrementalGC(void) -{ - return (checkForLeaks & 2) != 0; -} - -sqInt leakCheckNewSpaceGC(void) { return (checkForLeaks & 2) != 0; @@ -38829,12 +38836,10 @@ } static void -runLeakCheckerForFullGC(sqInt fullGCFlag) +runLeakCheckerFor(sqInt gcModes) { - if ((fullGCFlag - ? (checkForLeaks & 1) != 0 - : (checkForLeaks & 2) != 0)) { - if (fullGCFlag) { + if (gcModes & checkForLeaks) { + if (gcModes & GCModeFull) { reverseDisplayFromto(0, 7); } else { @@ -38844,7 +38849,7 @@ assert(checkHeapIntegrity()); assert(checkInterpreterIntegrity()); assert(checkStackIntegrity()); - assert(checkCodeIntegrity(fullGCFlag)); + assert(checkCodeIntegrity(gcModes)); /* begin validate */ null; } @@ -47196,7 +47201,7 @@ sqInt oop; null; - runLeakCheckerForFullGC(1); + runLeakCheckerFor(GCModeFull); /* begin fetchPointer:ofObject: */ /* begin fetchPointer:ofObject: */ oop = longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SchedulerAssociation << (shiftForWord())))) + BaseHeaderSize) + (ValueIndex << (shiftForWord()))); @@ -49646,12 +49651,23 @@ printFrame(char *theFP) { DECL_MAYBE_SQ_GLOBAL_STRUCT char *aFrame; + char *frameAbove; sqInt index; char *prevFrame; char *startFrame; StackPage *thePage; char *theSP; + if (!((((((usqInt)theFP)) & (BytesPerWord - 1)) == 0) + && ((((((usqInt)theFP)) >= (((usqInt)(GIV(stackBasePlus1) - 1)))) && ((((usqInt)theFP)) <= (((usqInt)GIV(pages)))))))) { + /* begin printHexPtr: */ + printHex(oopForPointer(theFP)); + print(" is not in the stack zone?!"); + /* begin cr */ + printf("\n"); + return null; + } + frameAbove = null; if (theFP == GIV(framePointer)) { theSP = GIV(stackPointer); } @@ -49675,26 +49691,14 @@ theSP = (thePage->headSP); } else { - /* begin findSPOrNilOf:on:startingFrom: */ + /* begin safeFindFrameAbove:on:startingFrom: */ startFrame = ((thePage == GIV(stackPage)) && (((GIV(framePointer) >= ((thePage->realStackLimit))) && (GIV(framePointer) <= ((thePage->baseAddress))))) ? GIV(framePointer) : (thePage->headFP)); assert(!(isFree(thePage))); if (startFrame == theFP) { - if (((thePage->headSP)) >= startFrame) { - - /* If the SP is invalid return the pointer to the receiver field. */ - - /* begin frameReceiverOffset: */ - theSP = ((((usqInt)(longAt(aFrame + FoxMethod)))) < (startOfMemory()) - ? aFrame + FoxMFReceiver - : aFrame + FoxIFReceiver); - goto l1; - } - theSP = (thePage == GIV(stackPage) - ? (thePage->headSP) - : ((thePage->headSP)) + BytesPerWord); + frameAbove = null; goto l1; } aFrame = startFrame; @@ -49704,16 +49708,19 @@ aFrame = pointerForOop(longAt(aFrame + FoxSavedFP)); if (!(aFrame != 0)) break; if (theFP == aFrame) { - /* begin frameCallerSP: */ - assert(!(isBaseFrame(prevFrame))); - theSP = (prevFrame + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(prevFrame + FoxMethod)))) < (startOfMemory()) - ? ((mframeCogMethod(prevFrame))->cmNumArgs) - : byteAt((prevFrame + FoxIFrameFlags) + 1))))) + BytesPerWord; + frameAbove = prevFrame; goto l1; } } - theSP = null; - l1: /* end findSPOrNilOf:on:startingFrom: */; + frameAbove = null; + l1: /* end safeFindFrameAbove:on:startingFrom: */; + theSP = (!(frameAbove == null) + ? (/* begin frameCallerSP: */ + assert(!(isBaseFrame(frameAbove))), + (frameAbove + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(frameAbove + FoxMethod)))) < (startOfMemory()) + ? ((mframeCogMethod(frameAbove))->cmNumArgs) + : byteAt((frameAbove + FoxIFrameFlags) + 1))))) + BytesPerWord) + : 0); } } if (!(theSP)) { @@ -49726,6 +49733,9 @@ : theFP + FoxIFReceiver); } printFrameWithSP(theFP, theSP); + if (!(frameAbove == null)) { + printFrameThingat("frame pc", frameAbove + FoxCallerSavedIP); + } } @@ -49766,6 +49776,7 @@ sqInt i; sqInt methodClassAssociation; sqInt n; + sqInt n1; char *name; sqInt nameLen; sqInt obj; @@ -49812,14 +49823,14 @@ /* begin printChar: */ putchar(')'); - goto l8; + goto l7; } print("unknown immediate "); /* begin printHexnp: */ printf("0x%lx", ((unsigned long) oop2)); - goto l8; + goto l7; } if (!(((oop2 & 3) == 0) && (((((usqInt)oop2)) >= (startOfMemory())) @@ -49828,16 +49839,16 @@ print(((oop2 & (BytesPerWord - 1)) != 0 ? " is misaligned" : whereIs(oop2))); - goto l8; + goto l7; } if (((longAt(oop2)) & TypeMask) == HeaderTypeFree) { print(" is a free chunk"); - goto l8; + goto l7; } if (isinstanceOfcompactClassIndex(oop2, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << (shiftForWord()))), ClassFloatCompactIndex)) { printFloat(dbgFloatValueOf(oop2)); - goto l8; + goto l7; } classOop = (((ccIndex = (((usqInt) (longAt(oop2))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(oop2 - BaseHeaderSize)) & AllButTypeMask @@ -49848,28 +49859,28 @@ && (((((usqInt)classOop)) < GIV(freeStart)) && (((longAt(classOop)) & TypeMask) != HeaderTypeGC))))) { print("a ??"); - goto l8; + goto l7; } if ((numSlotsOf(classOop)) == GIV(metaclassNumSlots)) { printNameOfClasscount(oop2, 5); - goto l8; + goto l7; } if (oop2 == GIV(nilObj)) { print("nil"); - goto l8; + goto l7; } if (oop2 == GIV(trueObj)) { print("true"); - goto l8; + goto l7; } if (oop2 == GIV(falseObj)) { print("false"); - goto l8; + goto l7; } nameLen = lengthOfNameOfClass(classOop); if (nameLen == 0) { print("a ??"); - goto l8; + goto l7; } name = nameOfClass(classOop); if (nameLen == 10) { @@ -49883,7 +49894,7 @@ /* begin printChar: */ putchar('\''); - goto l8; + goto l7; } if ((strncmp(name, "ByteSymbol", 10)) == 0) { @@ -49892,7 +49903,7 @@ /* begin printChar: */ putchar('#'); printStringOf(oop2); - goto l8; + goto l7; } } if ((nameLen == 9) @@ -49902,7 +49913,7 @@ /* begin printChar: */ putchar(((longAt((oop2 + BaseHeaderSize) + (0 << (shiftForWord())))) >> 1)); - goto l8; + goto l7; } print("a(n) "); for (i = 0; i < nameLen; i += 1) { @@ -49920,24 +49931,24 @@ longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << (shiftForWord())))) + BaseHeaderSize) + ((ccIndex1 - 1) << (shiftForWord()))))); while (1) { if (classLookupKey == GIV(nilObj)) { - goto l8; + goto l7; } if ((instanceSizeOf(classLookupKey)) == (KeyIndex + 1)) break; classLookupKey = longAt((classLookupKey + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); } if (classLookupKey == GIV(nilObj)) { - goto l5; + goto l6; } theClass1 = classOop; while (1) { if (theClass1 == classLookupKey) { - goto l6; + goto l8; } if (!(theClass1 != GIV(nilObj))) break; theClass1 = longAt((theClass1 + BaseHeaderSize) + (SuperclassIndex << (shiftForWord()))); } - goto l5; - l6: ; + goto l6; + l8: ; /* begin space */ /* begin printChar: */ putchar(' '); @@ -49945,9 +49956,9 @@ print(" -> "); /* begin printHexnp: */ printf("0x%lx", ((unsigned long) (longAt((oop2 + BaseHeaderSize) + (ValueIndex << (shiftForWord())))))); - l5: ; + l6: ; } - l8: /* end printOopShortInner: */; + l7: /* end printOopShortInner: */; /* begin cr */ printf("\n"); } @@ -50098,6 +50109,7 @@ sqInt classOop; sqInt i; sqInt n; + sqInt n1; char *name; sqInt nameLen; sqInt oop1; @@ -50115,14 +50127,14 @@ /* begin printChar: */ putchar(')'); - goto l4; + goto l5; } print("unknown immediate "); /* begin printHexnp: */ printf("0x%lx", ((unsigned long) oop)); - goto l4; + goto l5; } if (!(((oop & 3) == 0) && (((((usqInt)oop)) >= (startOfMemory())) @@ -50131,16 +50143,16 @@ print(((oop & (BytesPerWord - 1)) != 0 ? " is misaligned" : whereIs(oop))); - goto l4; + goto l5; } if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { print(" is a free chunk"); - goto l4; + goto l5; } if (isinstanceOfcompactClassIndex(oop, longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassFloat << (shiftForWord()))), ClassFloatCompactIndex)) { printFloat(dbgFloatValueOf(oop)); - goto l4; + goto l5; } classOop = (((ccIndex = (((usqInt) (longAt(oop))) >> (compactClassFieldLSB())) & 0x1F)) == 0 ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask @@ -50151,28 +50163,28 @@ && (((((usqInt)classOop)) < GIV(freeStart)) && (((longAt(classOop)) & TypeMask) != HeaderTypeGC))))) { print("a ??"); - goto l4; + goto l5; } if ((numSlotsOf(classOop)) == GIV(metaclassNumSlots)) { printNameOfClasscount(oop, 5); - goto l4; + goto l5; } if (oop == GIV(nilObj)) { print("nil"); - goto l4; + goto l5; } if (oop == GIV(trueObj)) { print("true"); - goto l4; + goto l5; } if (oop == GIV(falseObj)) { print("false"); - goto l4; + goto l5; } nameLen = lengthOfNameOfClass(classOop); if (nameLen == 0) { print("a ??"); - goto l4; + goto l5; } name = nameOfClass(classOop); if (nameLen == 10) { @@ -50186,7 +50198,7 @@ /* begin printChar: */ putchar('\''); - goto l4; + goto l5; } @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1048.mcz
by commits＠source.squeak.org 10 Feb '15

10 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1048.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1048 Author: eem Time: 10 February 2015, 2:57:18.714 pm UUID: 8c759c0d-f612-4018-8a05-45ec7f6af78f Ancestors: VMMaker.oscog-eem.1047 Refactor leak checking code so that GCModes are flags and coincide with flags for what GC events to leak check. Hence ensure leak checking is actually run when requested. As part of this move the shrink action from postGCAction: into the memory managers and hence allow Spur to not shrink on scavenge. Fix bugs with immediate character printing. Allow printing the mark state of free chunks. Spur: Fix some dumb slips in the image segment code. Fix bogus assert in remapObj: and only copy-and-forward there-in in the right cicumstance. =============== Diff against VMMaker.oscog-eem.1047 =============== Item was changed: ----- Method: CoInterpreter>>checkCodeIntegrity: (in category 'object memory support') ----- + checkCodeIntegrity: gcModes - checkCodeIntegrity: fullGCFlag "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccessibleObjects has set a bit at each object's header. Check that all object references in machine code are valid. Answer if all checks pass." + ^cogit checkIntegrityOfObjectReferencesInCode: gcModes! - ^cogit checkIntegrityOfObjectReferencesInCode: fullGCFlag! Item was changed: ----- Method: CoInterpreter>>printFrame:WithSP: (in category 'debug printing') ----- printFrame: theFP WithSP: theSP <api> | theMethod theMethodEnd numArgs numTemps rcvrAddress topThing | <inline: false> <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <var: #addr type: #'char *'> <var: #rcvrAddress type: #'char *'> <var: #cogMethod type: #'CogBlockMethod *'> <var: #homeMethod type: #'CogMethod *'> self cCode: '' inSmalltalk: [self transcript ensureCr]. + (stackPages couldBeFramePointer: theFP) ifNil: + [self printHexPtr: theFP; print: ' is not in the stack zone?!!'; cr. + ^nil]. (self isMachineCodeFrame: theFP) ifTrue: [| cogMethod homeMethod | cogMethod := self mframeCogMethod: theFP. homeMethod := self mframeHomeMethod: theFP. theMethod := homeMethod asInteger. theMethodEnd := homeMethod asInteger + homeMethod blockSize. numArgs := cogMethod cmNumArgs. numTemps := self temporaryCountOfMethodHeader: homeMethod methodHeader] ifFalse: [theMethod := self frameMethodObject: theFP. theMethodEnd := theMethod + (objectMemory sizeBitsOfSafe: theMethod). numArgs := self iframeNumArgs: theFP. numTemps := self tempCountOf: theMethod]. (self frameIsBlockActivation: theFP) ifTrue: [| rcvrOrClosure | "No BlockLocalTempCounter in the Cogit's C code, so quick hack is to use numCopied + numArgs" rcvrOrClosure := self pushedReceiverOrClosureOfFrame: theFP. ((objectMemory isNonImmediate: rcvrOrClosure) and: [(objectMemory addressCouldBeObj: rcvrOrClosure) and: [(objectMemory fetchClassOfNonImm: rcvrOrClosure) = (objectMemory splObj: ClassBlockClosure)]]) ifTrue: [numTemps := numArgs + (self stSizeOf: rcvrOrClosure)] ifFalse: [numTemps := numArgs]]. self shortPrintFrame: theFP. (self isBaseFrame: theFP) ifTrue: [self printFrameOop: '(caller ctxt' at: theFP + (self frameStackedReceiverOffset: theFP) + (2 * objectMemory wordSize). self printFrameOop: '(saved ctxt' at: theFP + (self frameStackedReceiverOffset: theFP) + (1 * objectMemory wordSize)]. self printFrameOop: 'rcvr/clsr' at: theFP + FoxCallerSavedIP + ((numArgs + 1) * objectMemory wordSize). numArgs to: 1 by: -1 do: [:i| self printFrameOop: 'arg' index: numArgs - i at: theFP + FoxCallerSavedIP + (i * objectMemory wordSize)]. self printFrameThing: 'caller ip' at: theFP + FoxCallerSavedIP extraString: ((stackPages longAt: theFP + FoxCallerSavedIP) = cogit ceReturnToInterpreterPC ifTrue: ['ceReturnToInterpreter']). self printFrameThing: 'saved fp' at: theFP + FoxSavedFP. self printFrameMethodFor: theFP. (self isMachineCodeFrame: theFP) ifTrue: [self printFrameFlagsForFP: theFP]. self printFrameOop: 'context' at: theFP + FoxThisContext. (self isMachineCodeFrame: theFP) ifFalse: [self printFrameFlagsForFP: theFP]. (self isMachineCodeFrame: theFP) ifTrue: [rcvrAddress := theFP + FoxMFReceiver] ifFalse: [self printFrameThing: 'saved ip' at: theFP + FoxIFSavedIP extra: ((self iframeSavedIP: theFP) = 0 ifTrue: [0] ifFalse: [(self iframeSavedIP: theFP) - theMethod + 2 - objectMemory baseHeaderSize]). rcvrAddress := theFP + FoxIFReceiver]. self printFrameOop: 'receiver' at: rcvrAddress. topThing := stackPages longAt: theSP. (self oop: topThing isGreaterThanOrEqualTo: theMethod andLessThan: theMethodEnd) ifTrue: [rcvrAddress - objectMemory wordSize to: theSP + objectMemory wordSize by: objectMemory wordSize negated do: [:addr| | index | index := rcvrAddress - addr / objectMemory wordSize + numArgs. index <= numTemps ifTrue: [self printFrameOop: 'temp' index: index - 1 at: addr] ifFalse: [self printFrameOop: ((self frameIsBlockActivation: theFP) ifTrue: ['temp/stck'] ifFalse: ['stck']) at: addr]]. self printFrameThing: 'frame ip' at: theSP extra: ((self isMachineCodeFrame: theFP) ifTrue: [topThing - theMethod] ifFalse: [topThing - theMethod + 2 - objectMemory baseHeaderSize])] ifFalse: [rcvrAddress - objectMemory wordSize to: theSP by: objectMemory wordSize negated do: [:addr| | index | index := rcvrAddress - addr / objectMemory wordSize + numArgs. index <= numTemps ifTrue: [self printFrameOop: 'temp' index: index - 1 at: addr] ifFalse: [self printFrameOop: ((self frameIsBlockActivation: theFP) ifTrue: ['temp/stck'] ifFalse: ['stck']) at: addr]]]! Item was changed: ----- Method: Cogit>>checkIntegrityOfObjectReferencesInCode: (in category 'debugging') ----- + checkIntegrityOfObjectReferencesInCode: gcModes - checkIntegrityOfObjectReferencesInCode: fullGCFlag <api> "Answer if all references to objects in machine-code are valid." | cogMethod ok count | <var: #cogMethod type: #'CogMethod *'> cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. ok := true. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType ~= CMFree ifTrue: [cogMethod cmRefersToYoung ifTrue: [(count := methodZone occurrencesInYoungReferrers: cogMethod) ~= 1 ifTrue: [coInterpreter print: 'young referrer CM '; printHex: cogMethod asInteger. count = 0 ifTrue: [coInterpreter print: ' is not in youngReferrers'; cr] ifFalse: [coInterpreter print: ' is in youngReferrers '; printNum: count; print: ' times!!'; cr]. ok := false]]. (objectRepresentation checkValidOopReference: cogMethod selector) ifFalse: [coInterpreter print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' selector'; cr. ok := false]. cogMethod cmType = CMMethod ifTrue: [self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod. (objectRepresentation checkValidObjectReference: cogMethod methodObject) ifFalse: [coInterpreter print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' methodObject'; cr. ok := false]. (objectMemory isOopCompiledMethod: cogMethod methodObject) ifFalse: [coInterpreter print: 'non-method in CM '; printHex: cogMethod asInteger; print: ' methodObject'; cr. ok := false]. (self mapFor: cogMethod performUntil: #checkIfValidOopRef:pc:cogMethod: arg: cogMethod asInteger) ~= 0 ifTrue: [ok := false]. + (objectMemory hasSpurMemoryManagerAPI + or: [gcModes anyMask: GCModeNewSpace]) ifTrue: - fullGCFlag ifFalse: [(((objectMemory isYoungObject: cogMethod methodObject) or: [objectMemory isYoung: cogMethod selector]) and: [cogMethod cmRefersToYoung not]) ifTrue: [coInterpreter print: 'CM '; printHex: cogMethod asInteger; print: ' refers to young but not marked as such'; cr. ok := false]]] ifFalse: [cogMethod cmType = CMClosedPIC ifTrue: [(self checkValidObjectReferencesInClosedPIC: cogMethod) ifFalse: [ok := false]] ifFalse: [cogMethod cmType = CMOpenPIC ifTrue: [(self mapFor: cogMethod performUntil: #checkIfValidOopRef:pc:cogMethod: arg: cogMethod asInteger) ~= 0 ifTrue: [ok := false]]]]]. cogMethod := methodZone methodAfter: cogMethod]. ^ok! Item was changed: ----- Method: Cogit>>cogitPostGCAction: (in category 'jit - api') ----- cogitPostGCAction: gcMode <api> (gcMode = GCModeFull and: [objectRepresentation allYoungObjectsAgeInFullGC]) ifTrue: [methodZone voidYoungReferrersPostTenureAll]. "Post-GC update every full method's objectHeader to whatever it needs to be" self assert: self allMethodsHaveCorrectHeader. "The youngReferrers should be correct after a GC since that is the point at which it is pruned. But at other times false positives or free methods on the list are acceptable." + self assert: ((gcMode noMask: GCModeFull+GCModeNewSpace) or: [methodZone kosherYoungReferrers])! - self assert: (gcMode = GCModeBecome or: [methodZone kosherYoungReferrers])! Item was changed: ----- Method: Cogit>>mapObjectReferencesInMachineCode: (in category 'jit - api') ----- mapObjectReferencesInMachineCode: gcMode <api> "Update all references to objects in machine code." gcMode caseOf: { + [GCModeNewSpace] -> [self mapObjectReferencesInMachineCodeForYoungGC]. - [GCModeScavenge] -> [self mapObjectReferencesInMachineCodeForYoungGC]. - [GCModeIncr] -> [self mapObjectReferencesInMachineCodeForYoungGC]. [GCModeFull] -> [self mapObjectReferencesInMachineCodeForFullGC]. [GCModeBecome] -> [self mapObjectReferencesInMachineCodeForBecome] }. (self asserta: methodZone freeStart <= methodZone youngReferrers) ifFalse: [self error: 'youngReferrers list overflowed']! Item was changed: ----- Method: Cogit>>markAndTraceMachineCodeForNewSpaceGC (in category 'jit - api') ----- markAndTraceMachineCodeForNewSpaceGC "Free any methods that refer to unmarked objects, unlinking sends to freed methods." | pointer cogMethod | <var: #cogMethod type: #'CogMethod *'> objectMemory leakCheckNewSpaceGC ifTrue: [self assert: self allMachineCodeObjectReferencesValid]. codeModified := false. pointer := methodZone youngReferrers. [pointer < methodZone zoneEnd] whileTrue: [cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: pointer) to: #'CogMethod *'. cogMethod cmRefersToYoung ifTrue: [self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0. self assert: (cogMethod cmType = CMMethod or: [cogMethod cmType = CMOpenPIC]). (objectMemory isYoung: cogMethod selector) ifTrue: [objectMemory markAndTrace: cogMethod selector]. cogMethod cmType = CMMethod ifTrue: [(objectMemory isYoung: cogMethod methodObject) ifTrue: [objectMemory markAndTrace: cogMethod methodObject]. self markYoungObjectsIn: cogMethod]]. pointer := pointer + objectMemory wordSize]. + objectMemory leakCheckNewSpaceGC ifTrue: - objectMemory leakCheckIncrementalGC ifTrue: [self assert: self allMachineCodeObjectReferencesValid]. codeModified ifTrue: "After updating oops in inline caches we need to flush the icache." [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]! Item was changed: ----- Method: NewCoObjectMemorySimulator>>incrementalGC (in category 'gc -- mark and sweep') ----- incrementalGC "If we're /not/ a clone, clone the VM and push it over the cliff. If it survives, destroy the clone and continue. We should be OK until next time." + (self leakCheckNewSpaceGC - (self leakCheckIncrementalGC and: [parent isNil]) ifTrue: [coInterpreter cr; print: 'Incremental GC number '; print: statIncrGCs; tab; flush. coInterpreter cloneSimulation objectMemory incrementalGC. Smalltalk garbageCollect]. ^super incrementalGC! Item was changed: ----- Method: NewObjectMemory>>become:with:twoWay:copyHash: (in category 'become') ----- become: array1 with: array2 twoWay: twoWayFlag copyHash: copyHashFlag "All references to each object in array1 are swapped with all references to the corresponding object in array2. That is, all pointers to one object are replaced with with pointers to the other. The arguments must be arrays of the same length. Returns PrimNoErr if the primitive succeeds." "Implementation: Uses forwarding blocks to update references as done in compaction." | start | + self runLeakCheckerFor: GCModeBecome. - self leakCheckBecome ifTrue: - [self runLeakCheckerForFullGC: true]. (self isArray: array1) ifFalse: [^PrimErrBadReceiver]. ((self isArray: array2) and: [(self lastPointerOf: array1) = (self lastPointerOf: array2)]) ifFalse: [^PrimErrBadArgument]. (twoWayFlag or: [copyHashFlag]) ifTrue: [(self containOnlyOops: array1 and: array2) ifFalse: [^PrimErrInappropriate]] ifFalse: [(self containOnlyOops: array1) ifFalse: [^PrimErrInappropriate]]. (self prepareForwardingTableForBecoming: array1 with: array2 twoWay: twoWayFlag) ifFalse: [^PrimErrNoMemory]. "fail; not enough space for forwarding table" (self allYoung: array1 and: array2) ifTrue: [start := youngStart"sweep only the young objects plus the roots"] ifFalse: [start := self startOfMemory"sweep all objects"]. coInterpreter preBecomeAction. self mapPointersInObjectsFrom: start to: freeStart. twoWayFlag ifTrue: [self restoreHeadersAfterBecoming: array1 with: array2] ifFalse: [self restoreHeadersAfterForwardBecome: copyHashFlag]. coInterpreter postBecomeAction: 0. self initializeMemoryFirstFree: freeStart. "re-initialize memory used for forwarding table" + self runLeakCheckerFor: GCModeBecome. - self leakCheckBecome ifTrue: - [self runLeakCheckerForFullGC: true]. ^PrimNoErr "success"! Item was changed: ----- Method: NewObjectMemory>>fullGC (in category 'garbage collection') ----- fullGC "Do a mark/sweep garbage collection of the entire object memory. Free inaccessible objects but do not move them." <inline: false> fullGCLock > 0 ifTrue: [self warning: 'aborting fullGC because fullGCLock > 0'. ^self]. + self runLeakCheckerFor: GCModeFull. - self runLeakCheckerForFullGC: true. self preGCAction: GCModeFull. needGCFlag := false. gcStartUsecs := self ioUTCMicrosecondsNow. statSweepCount := statMarkCount := statMkFwdCount := statCompMoveCount := 0. self clearRootsTable. self initWeakTableForIncrementalGC: false. youngStart := self startOfMemory. "process all of memory" self markPhase: true. "Sweep phase returns the number of survivors. Use the up-to-date version instead the one from startup." totalObjectCount := self sweepPhaseForFullGC. + self runLeakCheckerFor: GCModeFull. - self runLeakCheckerForFullGC: true. self fullCompaction. statFullGCs := statFullGCs + 1. statGCEndUsecs := self ioUTCMicrosecondsNow. statFullGCUsecs := statFullGCUsecs + (statGCEndUsecs - gcStartUsecs). self capturePendingFinalizationSignals. youngStart := freeStart. "reset the young object boundary" + self attemptToShrink. self postGCAction: GCModeFull. + self runLeakCheckerFor: GCModeFull! - self runLeakCheckerForFullGC: true! Item was changed: ----- Method: NewObjectMemory>>incrementalGC (in category 'garbage collection') ----- incrementalGC "Do a mark/sweep garbage collection of just the young object area of object memory (i.e., objects above youngStart), using the root table to identify objects containing pointers to young objects from the old object area." | survivorCount weDidGrow | <inline: false> rootTableOverflowed ifTrue: ["root table overflow; cannot do an incremental GC because some roots are missing. (this should be very rare)" statRootTableOverflows := statRootTableOverflows + 1. ^self fullGC]. + self runLeakCheckerFor: GCModeNewSpace. + coInterpreter preGCAction: GCModeNewSpace. - self runLeakCheckerForFullGC: false. - coInterpreter preGCAction: GCModeIncr. needGCFlag := false. gcStartUsecs := self ioUTCMicrosecondsNow. statSweepCount := statMarkCount := statMkFwdCount := statCompMoveCount := 0. self initWeakTableForIncrementalGC: true. "implicitly process memory from youngStart to freeStart" self markPhase: false. self assert: weakRootCount <= WeakRootTableSize. 1 to: weakRootCount do: [:i| self finalizeReference: (weakRoots at: i)]. survivorCount := self sweepPhase. + self runLeakCheckerFor: GCModeNewSpace. - self runLeakCheckerForFullGC: false. self incrementalCompaction. statIncrGCs := statIncrGCs + 1. statGCEndUsecs := self ioUTCMicrosecondsNow. statIGCDeltaUsecs := statGCEndUsecs - gcStartUsecs. statIncrGCUsecs := statIncrGCUsecs + statIGCDeltaUsecs. self capturePendingFinalizationSignals. statRootTableCount := rootTableCount. statSurvivorCount := survivorCount. weDidGrow := false. (((survivorCount > tenuringThreshold) or: [rootTableCount >= RootTableRedZone]) or: [forceTenureFlag == true]) ifTrue: ["move up the young space boundary if * there are too many survivors: this limits the number of objects that must be processed on future incremental GC's * we're about to overflow the roots table: this limits the number of full GCs that may be caused by root table overflows in the near future" forceTenureFlag := false. statTenures := statTenures + 1. self clearRootsTable. ((self freeSize < growHeadroom) and: [gcBiasToGrow > 0]) ifTrue: [self biasToGrow. weDidGrow := true]. youngStart := freeStart]. + self attemptToShrink. + coInterpreter postGCAction: GCModeNewSpace. - coInterpreter postGCAction: GCModeIncr. + self runLeakCheckerFor: GCModeNewSpace. - self runLeakCheckerForFullGC: false. weDidGrow ifTrue: [self biasToGrowCheckGCLimit]! Item was changed: ----- Method: NewObjectMemory>>leakCheckBecome (in category 'debug support') ----- leakCheckBecome <api> + ^(checkForLeaks bitAnd: GCModeBecome) ~= 0! - ^(checkForLeaks bitAnd: 4) ~= 0! Item was changed: ----- Method: NewObjectMemory>>leakCheckFullGC (in category 'debug support') ----- leakCheckFullGC <api> + ^(checkForLeaks bitAnd: GCModeFull) ~= 0! - ^(checkForLeaks bitAnd: 1) ~= 0! Item was removed: - ----- Method: NewObjectMemory>>leakCheckIncrementalGC (in category 'debug support') ----- - leakCheckIncrementalGC - <api> - ^(checkForLeaks bitAnd: 2) ~= 0! Item was added: + ----- Method: NewObjectMemory>>runLeakCheckerFor: (in category 'debug support') ----- + runLeakCheckerFor: gcModes + <inline: false> + (gcModes anyMask: checkForLeaks) ifTrue: + [(gcModes anyMask: GCModeFull) + ifTrue: [coInterpreter reverseDisplayFrom: 0 to: 7] + ifFalse: [coInterpreter reverseDisplayFrom: 8 to: 15]. + self clearLeakMapAndMapAccessibleObjects. + self assert: self checkHeapIntegrity. + self assert: coInterpreter checkInterpreterIntegrity. + self assert: coInterpreter checkStackIntegrity. + self assert: (coInterpreter checkCodeIntegrity: gcModes). + self validate "simulation only"]! Item was removed: - ----- Method: NewObjectMemory>>runLeakCheckerForFullGC: (in category 'debug support') ----- - runLeakCheckerForFullGC: fullGCFlag - <inline: false> - (fullGCFlag - ifTrue: [self leakCheckFullGC] - ifFalse: [self leakCheckNewSpaceGC]) ifTrue: - [fullGCFlag - ifTrue: [coInterpreter reverseDisplayFrom: 0 to: 7] - ifFalse: [coInterpreter reverseDisplayFrom: 8 to: 15]. - self clearLeakMapAndMapAccessibleObjects. - self assert: self checkHeapIntegrity. - self assert: coInterpreter checkInterpreterIntegrity. - self assert: coInterpreter checkStackIntegrity. - self assert: (coInterpreter checkCodeIntegrity: fullGCFlag). - self validate "simulation only"]! Item was changed: ----- Method: NewObjectMemory>>setCheckForLeaks: (in category 'debug support') ----- + setCheckForLeaks: integerFlags - setCheckForLeaks: anInteger "0 = do nothing. 1 = check for leaks on fullGC. 2 = check for leaks on incrementalGC. + 8 = check for leaks on become" + checkForLeaks := integerFlags! - 4 = check for leaks on become - 7 = check for leaks on all three." - checkForLeaks := anInteger! Item was changed: ----- Method: NewObjectMemorySimulator>>incrementalGC (in category 'gc -- mark and sweep') ----- incrementalGC "If we're /not/ a clone, clone the VM and push it over the cliff. If it survives, destroy the clone and continue. We should be OK until next time." + (self leakCheckNewSpaceGC - (self leakCheckIncrementalGC and: [parent isNil]) ifTrue: [coInterpreter cr; print: 'Incremental GC number '; print: statIncrGCs; tab; flush. coInterpreter cloneSimulation objectMemory incrementalGC. Smalltalk garbageCollect]. ^super incrementalGC! Item was added: + ----- Method: ObjectMemory>>attemptToShrink (in category 'allocation') ----- + attemptToShrink + "Attempt to shrink memory after successfully reclaiming lots of memory." + | freeSizeNow | + freeSizeNow := self freeSize. + (freeSizeNow > shrinkThreshold + and: [freeSizeNow > growHeadroom]) ifTrue: + [self shrinkObjectMemory: freeSizeNow - growHeadroom]! Item was changed: ----- Method: ObjectMemory>>fullGC (in category 'garbage collection') ----- fullGC "Do a mark/sweep garbage collection of the entire object memory. Free inaccessible objects but do not move them." <inline: false> DoAssertionChecks ifTrue: [self reverseDisplayFrom: 0 to: 7. self clearLeakMapAndMapAccessibleObjects. self checkHeapIntegrity]. self preGCAction: GCModeFull. gcStartUsecs := self ioUTCMicrosecondsNow. statSweepCount := statMarkCount := statMkFwdCount := statCompMoveCount := 0. self clearRootsTable. self initWeakTableForIncrementalGC: false. youngStart := self startOfMemory. "process all of memory" self markPhase. "Sweep phase returns the number of survivors. Use the up-to-date version instead the one from startup." totalObjectCount := self sweepPhase. self fullCompaction. allocationCount := 0. statFullGCs := statFullGCs + 1. statGCEndTime := self ioMicroMSecs. statFullGCUsecs := statFullGCUsecs + (self ioUTCMicrosecondsNow - gcStartUsecs). self capturePendingFinalizationSignals. youngStart := freeBlock. "reset the young object boundary" + self attemptToShrink. self postGCAction: GCModeFull. DoAssertionChecks ifTrue: [self clearLeakMapAndMapAccessibleObjects. self checkHeapIntegrity. self reverseDisplayFrom: 0 to: 7]! Item was changed: ----- Method: ObjectMemory>>incrementalGC (in category 'garbage collection') ----- incrementalGC "Do a mark/sweep garbage collection of just the young object area of object memory (i.e., objects above youngStart), using the root table to identify objects containing pointers to young objects from the old object area." | survivorCount weDidGrow | <inline: false> rootTableOverflowed ifTrue: ["root table overflow; cannot do an incremental GC because some roots are missing. (this should be very rare)" statRootTableOverflows := statRootTableOverflows + 1. ^self fullGC]. DoAssertionChecks ifTrue: [self reverseDisplayFrom: 8 to: 15. self checkHeapIntegrity. self checkInterpreterIntegrity. self validate]. + self preGCAction: GCModeNewSpace. - self preGCAction: GCModeIncr. "incremental GC and compaction" gcStartUsecs := self ioUTCMicrosecondsNow. statSweepCount := statMarkCount := statMkFwdCount := statCompMoveCount := 0. self initWeakTableForIncrementalGC: true. self markPhase. self assert: weakRootCount <= WeakRootTableSize. 1 to: weakRootCount do:[:i| self finalizeReference: (weakRoots at: i)]. survivorCount := self sweepPhase. self incrementalCompaction. statAllocationCount := allocationCount. allocationCount := 0. statIncrGCs := statIncrGCs + 1. statGCEndTime := self ioMicroMSecs. statIGCDeltaUsecs := self ioUTCMicrosecondsNow - gcStartUsecs. statIncrGCUsecs := statIncrGCUsecs + statIGCDeltaUsecs. self capturePendingFinalizationSignals. self forceInterruptCheck. "Force an an interrupt check ASAP.We could choose to be clever here and only do this under certain time conditions. Keep it simple for now" statRootTableCount := rootTableCount. statSurvivorCount := survivorCount. weDidGrow := false. (((survivorCount > tenuringThreshold) or: [rootTableCount >= RootTableRedZone]) or: [forceTenureFlag == true]) ifTrue: ["move up the young space boundary if * there are too many survivors: this limits the number of objects that must be processed on future incremental GC's * we're about to overflow the roots table this limits the number of full GCs that may be caused by root table overflows in the near future" forceTenureFlag := false. statTenures := statTenures + 1. self clearRootsTable. (((self sizeOfFree: freeBlock) < growHeadroom) and: [gcBiasToGrow > 0]) ifTrue: [self biasToGrow. weDidGrow := true]. youngStart := freeBlock]. + self attemptToShrink. + self postGCAction: GCModeNewSpace. - self postGCAction: GCModeIncr. DoAssertionChecks ifTrue: [self validate. self checkHeapIntegrity. self checkInterpreterIntegrity. self reverseDisplayFrom: 8 to: 15]. weDidGrow ifTrue: [self biasToGrowCheckGCLimit]! Item was removed: - ----- Method: ObjectMemory>>unsignedIntegerSuffix (in category 'as yet unclassified') ----- - unsignedIntegerSuffix - "Answer the suffix that should be appended to unsigned integer literals in generated code." - - ^self wordSize = 4 ifTrue: ['UL'] ifFalse: ['ULL']! Item was added: + ----- Method: Spur32BitMMLECoSimulator>>runLeakCheckerFor:excludeUnmarkedNewSpaceObjs:classIndicesShouldBeValid: (in category 'debug support') ----- + runLeakCheckerFor: gcModes excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid + (coInterpreter displayView isNil + and: [gcModes anyMask: checkForLeaks]) ifTrue: + [coInterpreter transcript nextPutAll: 'leak-checking...'; flush]. + ^super + runLeakCheckerFor: gcModes + excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs + classIndicesShouldBeValid: classIndicesShouldBeValid! Item was removed: - ----- Method: Spur32BitMMLECoSimulator>>runLeakCheckerForFullGC:excludeUnmarkedNewSpaceObjs:classIndicesShouldBeValid: (in category 'debug support') ----- - runLeakCheckerForFullGC: fullGCFlag excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid - (coInterpreter displayView isNil - and: [fullGCFlag - ifTrue: [self leakCheckFullGC] - ifFalse: [self leakCheckNewSpaceGC]]) ifTrue: - [coInterpreter transcript nextPutAll: 'leak-checking...'; flush]. - ^super - runLeakCheckerForFullGC: fullGCFlag - excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs - classIndicesShouldBeValid: classIndicesShouldBeValid! Item was added: + ----- Method: Spur32BitMMLESimulator>>runLeakCheckerFor:excludeUnmarkedNewSpaceObjs:classIndicesShouldBeValid: (in category 'debug support') ----- + runLeakCheckerFor: gcModes excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid + (coInterpreter displayView isNil + and: [gcModes anyMask: checkForLeaks]) ifTrue: + [coInterpreter transcript nextPutAll: 'leak-checking...'; flush]. + ^super + runLeakCheckerFor: gcModes + excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs + classIndicesShouldBeValid: classIndicesShouldBeValid! Item was removed: - ----- Method: Spur32BitMMLESimulator>>runLeakCheckerForFullGC:excludeUnmarkedNewSpaceObjs:classIndicesShouldBeValid: (in category 'debug support') ----- - runLeakCheckerForFullGC: fullGCFlag excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid - (coInterpreter displayView isNil - and: [fullGCFlag - ifTrue: [self leakCheckFullGC] - ifFalse: [self leakCheckNewSpaceGC]]) ifTrue: - [coInterpreter transcript nextPutAll: 'leak-checking...'; flush]. - ^super - runLeakCheckerForFullGC: fullGCFlag - excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs - classIndicesShouldBeValid: classIndicesShouldBeValid! Item was added: + ----- Method: Spur64BitMMLESimulator>>runLeakCheckerFor:excludeUnmarkedNewSpaceObjs:classIndicesShouldBeValid: (in category 'debug support') ----- + runLeakCheckerFor: gcModes excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid + (coInterpreter displayView isNil + and: [gcModes anyMask: checkForLeaks]) ifTrue: + [coInterpreter transcript nextPutAll: 'leak-checking...'; flush]. + ^super + runLeakCheckerFor: gcModes + excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs + classIndicesShouldBeValid: classIndicesShouldBeValid! Item was removed: - ----- Method: Spur64BitMMLESimulator>>runLeakCheckerForFullGC:excludeUnmarkedNewSpaceObjs:classIndicesShouldBeValid: (in category 'debug support') ----- - runLeakCheckerForFullGC: fullGCFlag excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid - (coInterpreter displayView isNil - and: [fullGCFlag - ifTrue: [self leakCheckFullGC] - ifFalse: [self leakCheckNewSpaceGC]]) ifTrue: - [coInterpreter transcript nextPutAll: 'leak-checking...'; flush]. - ^super - runLeakCheckerForFullGC: fullGCFlag - excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs - classIndicesShouldBeValid: classIndicesShouldBeValid! Item was changed: ----- Method: SpurMemoryManager>>allInstancesOf: (in category 'primitive support') ----- allInstancesOf: aClass "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of instances as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | classIndex freeChunk ptr start limit count bytes | classIndex := self rawHashBitsOf: aClass. classIndex = 0 ifTrue: [freeChunk := self allocateSlots: 0 format: self arrayFormat classIndex: ClassArrayCompactIndex. ^freeChunk]. MarkObjectsForEnumerationPrimitives ifTrue: [self markObjects: true]. "may not want to revive objects unnecessarily; but marking is sloooow." freeChunk := self allocateLargestFreeChunk. start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. (self isClassAtUniqueIndex: aClass) ifTrue: [self uniqueIndex: classIndex allInstancesInto: start limit: limit resultsInto: [:c :p| count := c. ptr := p]] ifFalse: [self ambiguousClass: aClass allInstancesInto: start limit: limit resultsInto: [:c :p| count := c. ptr := p]]. self assert: (self isEmptyObjStack: markStack). MarkObjectsForEnumerationPrimitives ifTrue: [self assert: self allObjectsUnmarked. self emptyObjStack: weaklingStack] ifFalse: [self assert: (self isEmptyObjStack: weaklingStack)]. (count > (ptr - start / self bytesPerOop) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeObject: freeChunk. ^self integerObjectOf: count]. count < self numSlotsMask ifTrue: [| smallObj | smallObj := self allocateSlots: count format: self arrayFormat classIndex: ClassArrayCompactIndex. 0 to: count - 1 do: [:i| self storePointerUnchecked: i ofObject: smallObj withValue: (self fetchPointer: i ofFreeChunk: freeChunk)]. self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self beRootIfOld: smallObj. self checkFreeSpace. ^smallObj]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. self rawOverflowSlotsOf: freeChunk put: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace. + self runLeakCheckerFor: GCModeFull. - self runLeakCheckerForFullGC: false. ^freeChunk ! Item was changed: ----- Method: SpurMemoryManager>>allObjects (in category 'primitive support') ----- allObjects "Attempt to answer an array of all objects, excluding those that may be garbage collected as a side effect of allocating the result array. If no memory is available answer the number of objects as a SmallInteger. Since objects are at least 16 bytes big, and the largest SmallInteger covers 1/4 of the address space, the count can never overflow." | freeChunk ptr start limit count bytes | MarkObjectsForEnumerationPrimitives ifTrue: [self markObjects: true]. "may not want to revive objects unnecessarily; but marking is sloooow." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. self allHeapEntitiesDo: [:obj| "continue enumerating even if no room so as to unmark all objects." (MarkObjectsForEnumerationPrimitives ifTrue: [self isMarked: obj] ifFalse: [true]) ifTrue: [(self isNormalObject: obj) ifTrue: [MarkObjectsForEnumerationPrimitives ifTrue: [self setIsMarkedOf: obj to: false]. count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: obj. ptr := ptr + self bytesPerOop]] ifFalse: [MarkObjectsForEnumerationPrimitives ifTrue: [(self isSegmentBridge: obj) ifFalse: [self setIsMarkedOf: obj to: false]]]]]. self assert: (self isEmptyObjStack: markStack). MarkObjectsForEnumerationPrimitives ifTrue: [self assert: self allObjectsUnmarked. self emptyObjStack: weaklingStack] ifFalse: [self assert: (self isEmptyObjStack: weaklingStack)]. self assert: count >= self numSlotsMask. (count > (ptr - start / self bytesPerOop) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self checkFreeSpace. ^self integerObjectOf: count]. bytes := self largeObjectBytesForSlots: count. start := self startOfObject: freeChunk. self freeChunkWithBytes: limit - start - bytes at: start + bytes. totalFreeOldSpace := totalFreeOldSpace - bytes. self rawOverflowSlotsOf: freeChunk put: count. self set: freeChunk classIndexTo: ClassArrayCompactIndex formatTo: self arrayFormat. self possibleRootStoreInto: freeChunk. self checkFreeSpace. + self runLeakCheckerFor: GCModeFull. - self runLeakCheckerForFullGC: false. ^freeChunk ! Item was changed: ----- Method: SpurMemoryManager>>assignClassIndicesAndPinFrom:to:outPointers: (in category 'image segment in/out') ----- assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray "This is part of loadImageSegmentFrom:outPointers:. Make a final pass, assigning the real class indices and/or pinning pinned objects." | objOop topHashBit | + topHashBit := 1 << (self identityHashFieldWidth - 1). - topHashBit := 1 << self identityHashFieldWidth - 1. objOop := self objectStartingAt: segmentStart. [objOop < segmentLimit] whileTrue: [| classRef classOop classIndex | "In the segment, class indices are offset indexes into the segment data, or into outPointers. See mapOopsFrom:to:outPointers:outHashes:." classRef := (self classIndexOf: objOop) - self firstClassIndexPun. classOop := (classRef anyMask: topHashBit) ifTrue: [self fetchPointer: classRef - topHashBit ofObject: outPointerArray] ifFalse: [classRef * self allocationUnit + segmentStart]. classIndex := self rawHashBitsOf: classOop. self assert: (classIndex > self lastClassIndexPun and: [(self classOrNilAtIndex: classIndex) = classOop]). self setClassIndexOf: objOop to: classIndex. ((self isInNewSpace: objOop) and: [self isPinned: objOop]) ifTrue: [| oldClone | oldClone := self cloneInOldSpaceForPinning: objOop. oldClone ~= 0 ifTrue: [self setIsPinnedOf: oldClone to: true. self forward: objOop to: oldClone]]. objOop := self objectAfter: objOop limit: segmentLimit]. ! Item was added: + ----- Method: SpurMemoryManager>>attemptToShrink (in category 'growing/shrinking memory') ----- + attemptToShrink + "Attempt to shrink memory after successfully reclaiming lots of memory." + (totalFreeOldSpace > shrinkThreshold + and: [totalFreeOldSpace > growHeadroom]) ifTrue: + [segmentManager shrinkObjectMemory: totalFreeOldSpace - growHeadroom]! Item was changed: ----- Method: SpurMemoryManager>>become:with:twoWay:copyHash: (in category 'become api') ----- become: array1 with: array2 twoWay: twoWayFlag copyHash: copyHashFlag "All references to each object in array1 are swapped with all references to the corresponding object in array2. That is, all pointers to one object are replaced with with pointers to the other. The arguments must be arrays of the same length. Answers PrimNoErr if the primitive succeeds, otherwise a relevant error code." "Implementation: Uses lazy forwarding to defer updating references until message send." | ec | self assert: becomeEffectsFlags = 0. + self runLeakCheckerFor: GCModeBecome. - self leakCheckBecome ifTrue: - [self runLeakCheckerForFullGC: true]. (self isArray: array1) ifFalse: [^PrimErrBadReceiver]. ((self isArray: array2) and: [(self numSlotsOf: array1) = (self numSlotsOf: array2)]) ifFalse: [^PrimErrBadArgument]. (twoWayFlag or: [copyHashFlag]) ifTrue: [ec := self containsOnlyValidBecomeObjects: array1 and: array2] ifFalse: [self followForwardedObjectFields: array2 toDepth: 0. ec := self containsOnlyValidBecomeObjects: array1]. ec ~= 0 ifTrue: [becomeEffectsFlags := 0. ^ec]. coInterpreter preBecomeAction. twoWayFlag ifTrue: [self innerBecomeObjectsIn: array1 and: array2 copyHash: copyHashFlag] ifFalse: [self innerBecomeObjectsIn: array1 to: array2 copyHash: copyHashFlag]. self followSpecialObjectsOop. "N.B. perform coInterpreter's postBecomeAction: *before* postBecomeScanClassTable: to allow the coInterpreter to void method cache entries by spotting classIndices that refer to forwarded objects. postBecomeScanClassTable: follows forwarders in the table." coInterpreter postBecomeAction: becomeEffectsFlags. self postBecomeScanClassTable: becomeEffectsFlags. becomeEffectsFlags := 0. self assert: self validClassTableHashes. + self runLeakCheckerFor: GCModeBecome. - self leakCheckBecome ifTrue: - [self runLeakCheckerForFullGC: true]. ^PrimNoErr "success"! Item was changed: ----- Method: SpurMemoryManager>>checkHeapIntegrity:classIndicesShouldBeValid: (in category 'debug support') ----- checkHeapIntegrity: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid "Perform an integrity/leak check using the heapMap. Assume clearLeakMapAndMapAccessibleObjects has set a bit at each object's header. Scan all objects in the heap checking that every pointer points to a header. Scan the rememberedSet, remapBuffer and extraRootTable checking that every entry is a pointer to a header. Check that the number of roots is correct and that all rememberedSet entries have their isRemembered: flag set. Answer if all checks pass." | ok numRememberedObjectsInHeap | <inline: false> ok := true. numRememberedObjectsInHeap := 0. "Excuse the duplication but performance is at a premium and we avoid some tests by splitting the newSpace and oldSpace enumerations." self allNewSpaceEntitiesDo: [:obj| | fieldOop classIndex classOop | ((self isFreeObject: obj) or: [(self isMarked: obj) not and: [excludeUnmarkedNewSpaceObjs]]) ifFalse: [(self isRemembered: obj) ifTrue: [coInterpreter print: 'young object '; printHex: obj; print: ' is remembered'; cr. self eek. ok := false]]. (self isForwarded: obj) ifTrue: [fieldOop := self fetchPointer: 0 ofMaybeForwardedObject: obj. (heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in forwarder '; printHex: obj; print: ' to unmapped '; printHex: fieldOop; cr. self eek. ok := false]] ifFalse: [classOop := self classOrNilAtIndex: (classIndex := self classIndexOf: obj). (classIndicesShouldBeValid and: [classOop = nilObj and: [(self isHiddenObj: obj) not]]) ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; print: (classOop ifNil: ['nil'] ifNotNil: ['nilObj']); cr. self eek. ok := false]. 0 to: (self numPointerSlotsOf: obj) - 1 do: [:fi| fieldOop := self fetchPointer: fi ofObject: obj. (self isNonImmediate: fieldOop) ifTrue: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr. self eek. ok := false]]]]]. self allOldSpaceEntitiesDo: [:obj| | containsYoung fieldOop classIndex classOop | (self isFreeObject: obj) ifFalse: [containsYoung := false. (self isRemembered: obj) ifTrue: [numRememberedObjectsInHeap := numRememberedObjectsInHeap + 1. (scavenger isInRememberedSet: obj) ifFalse: [coInterpreter print: 'remembered object '; printHex: obj; print: ' is not in remembered table'; cr. self eek. ok := false]]. (self isForwarded: obj) ifTrue: [fieldOop := self fetchPointer: 0 ofMaybeForwardedObject: obj. (heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in forwarder '; printHex: obj; print: ' to unmapped '; printHex: fieldOop; cr. self eek. ok := false]. (self isReallyYoung: fieldOop) ifTrue: [containsYoung := true]] ifFalse: [classOop := self classOrNilAtIndex: (classIndex := self classIndexOf: obj). (classIndicesShouldBeValid and: [classOop = nilObj and: [classIndex > self lastClassIndexPun]]) ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' invalid class index '; printHex: classIndex; print: ' -> '; print: (classOop ifNil: ['nil'] ifNotNil: ['nilObj']); cr. self eek. ok := false]. 0 to: (self numPointerSlotsOf: obj) - 1 do: [:fi| fieldOop := self fetchPointer: fi ofObject: obj. (self isNonImmediate: fieldOop) ifTrue: [(heapMap heapMapAtWord: (self pointerForOop: fieldOop)) = 0 ifTrue: [coInterpreter print: 'object leak in '; printHex: obj; print: ' @ '; printNum: fi; print: ' = '; printHex: fieldOop; cr. self eek. ok := false]. "don't be misled by CogMethods; they appear to be young, but they're not" (self isReallyYoung: fieldOop) ifTrue: [containsYoung := true]]]]. + containsYoung ifTrue: + [(self isRemembered: obj) ifFalse: + [coInterpreter print: 'unremembered object '; printHex: obj; print: ' contains young oop(s)'; cr. + self eek. + ok := false]]]]. - containsYoung ifTrue: - [(self isRemembered: obj) ifFalse: - [coInterpreter print: 'unremembered object '; printHex: obj; print: ' contains young oop(s)'; cr. - self eek. - ok := false]]]]. numRememberedObjectsInHeap ~= scavenger rememberedSetSize ifTrue: [coInterpreter print: 'root count mismatch. #heap roots '; printNum: numRememberedObjectsInHeap; print: '; #roots '; printNum: scavenger rememberedSetSize; cr. self eek. "But the system copes with overflow..." self flag: 'no support for remembered set overflow yet'. "ok := rootTableOverflowed and: [needGCFlag]"]. scavenger rememberedSetWithIndexDo: [:obj :i| (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned oop in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(self isYoung: obj) ifTrue: [coInterpreter print: 'non-root in remembered set @ '; printNum: i; print: ' = '; printHex: obj; cr. self eek. ok := false]]]]. 1 to: remapBufferCount do: [:ri| | obj | obj := remapBuffer at: ri. (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned remapRoot @ '; printNum: ri; print: ' = '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in remapRoots @ '; printNum: ri; print: ' = '; printHex: obj; cr. self eek. ok := false]]]. 1 to: extraRootCount do: [:ri| | obj | obj := (extraRoots at: ri) at: 0. (obj bitAnd: self wordSize - 1) ~= 0 ifTrue: [coInterpreter print: 'misaligned extraRoot @ '; printNum: ri; print: ' => '; printHex: obj; cr. self eek. ok := false] ifFalse: [(heapMap heapMapAtWord: (self pointerForOop: obj)) = 0 ifTrue: [coInterpreter print: 'object leak in extraRoots @ '; printNum: ri; print: ' => '; printHex: obj; cr. self eek. ok := false]]]. ^ok! Item was changed: ----- Method: SpurMemoryManager>>fullGC (in category 'gc - global') ----- fullGC "Perform a full lazy compacting GC. Answer the size of the largest free chunk." <returnTypeC: #usqLong> <inline: #never> "for profiling" needGCFlag := false. gcStartUsecs := self ioUTCMicrosecondsNow. statMarkCount := 0. coInterpreter preGCAction: GCModeFull. self globalGarbageCollect. + self attemptToShrink. coInterpreter postGCAction: GCModeFull. statFullGCs := statFullGCs + 1. statGCEndUsecs := self ioUTCMicrosecondsNow. statFullGCUsecs := statFullGCUsecs + (statGCEndUsecs - gcStartUsecs). ^(freeLists at: 0) ~= 0 ifTrue: [self bytesInObject: self findLargestFreeChunk] ifFalse: [0]! Item was changed: ----- Method: SpurMemoryManager>>globalGarbageCollect (in category 'gc - global') ----- globalGarbageCollect <inline: true> "inline into fullGC" self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self markObjects: true. self freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact. "Mid-way the leak check must be more lenient. Unmarked classes will have been expunged from the table, but unmarked instances will not yet have been reclaimed." + self runLeakCheckerFor: GCModeFull - self runLeakCheckerForFullGC: true excludeUnmarkedNewSpaceObjs: true classIndicesShouldBeValid: true. self compact. self setHeapSizeAtPreviousGC. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self assert: self allObjectsUnmarked. + self runLeakCheckerFor: GCModeFull! - self runLeakCheckerForFullGC: true! Item was added: + ----- Method: SpurMemoryManager>>inLineRunLeakCheckerFor:excludeUnmarkedNewSpaceObjs:classIndicesShouldBeValid: (in category 'debug support') ----- + inLineRunLeakCheckerFor: gcModes excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid + <inline: true> + (gcModes anyMask: checkForLeaks) ifTrue: + [(gcModes anyMask: GCModeFull) + ifTrue: [coInterpreter reverseDisplayFrom: 0 to: 7] + ifFalse: [coInterpreter reverseDisplayFrom: 8 to: 15]. + self clearLeakMapAndMapAccessibleObjects. + self assert: (self checkHeapIntegrity: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid). + self assert: coInterpreter checkInterpreterIntegrity. + self assert: coInterpreter checkStackIntegrity. + self assert: (coInterpreter checkCodeIntegrity: gcModes)]! Item was changed: ----- Method: SpurMemoryManager>>leakCheckBecome (in category 'debug support') ----- leakCheckBecome <api> + ^(checkForLeaks bitAnd: GCModeBecome) ~= 0! - ^(checkForLeaks bitAnd: 4) ~= 0! Item was changed: ----- Method: SpurMemoryManager>>leakCheckFullGC (in category 'debug support') ----- leakCheckFullGC <api> + ^(checkForLeaks bitAnd: GCModeFull) ~= 0! - ^(checkForLeaks bitAnd: 1) ~= 0! Item was changed: ----- Method: SpurMemoryManager>>leakCheckImageSegments (in category 'debug support') ----- leakCheckImageSegments + ^(checkForLeaks bitAnd: GCModeImageSegment) ~= 0! - <api> - ^(checkForLeaks bitAnd: 16) ~= 0! Item was added: + ----- Method: SpurMemoryManager>>leakCheckIncremental (in category 'debug support') ----- + leakCheckIncremental + <api> + ^(checkForLeaks bitAnd: GCModeIncremental) ~= 0! Item was removed: - ----- Method: SpurMemoryManager>>leakCheckIncrementalGC (in category 'debug support') ----- - leakCheckIncrementalGC - <api> - ^(checkForLeaks bitAnd: 8) ~= 0! Item was changed: ----- Method: SpurMemoryManager>>leakCheckNewSpaceGC (in category 'debug support') ----- leakCheckNewSpaceGC <api> + ^(checkForLeaks bitAnd: GCModeNewSpace) ~= 0! - ^(checkForLeaks bitAnd: 2) ~= 0! Item was changed: ----- Method: SpurMemoryManager>>loadImageSegmentFrom:outPointers: (in category 'image segment in/out') ----- loadImageSegmentFrom: segmentWordArray outPointers: outPointerArray "This primitive is called from Squeak as... <imageSegment> loadSegmentFrom: aWordArray outPointers: anArray." "This primitive will load a binary image segment created by primitiveStoreImageSegment. It expects the outPointer array to be of the proper size, and the wordArray to be well formed. It will return as its value the original array of roots, and the erstwhile segmentWordArray will have been truncated to a size of one word, i.e. retaining the version stamp. If this primitive should fail, the segmentWordArray will, sadly, have been reduced to an unrecognizable and unusable jumble. But what more could you have done with it anyway?" <inline: false> | segmentLimit segmentStart segVersion errorCode | segmentLimit := self numSlotsOf: segmentWordArray. (self objectBytesForSlots: segmentLimit) < (self allocationUnit "version info" + self baseHeaderSize "one object header") ifTrue: [^PrimErrBadArgument]. "Verify format. If the format is wrong, word-swap (since ImageSegment data are 32-bit longs). If it is still wrong, undo the damage and fail." segVersion := self longAt: segmentWordArray + self baseHeaderSize. (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFFFF "low 3 bytes")) ifFalse: [self reverseBytesIn32BitWordsFrom: segmentWordArray + self baseHeaderSize to: (self addressAfter: segmentWordArray). segVersion := self longAt: segmentWordArray + self baseHeaderSize. (coInterpreter readableFormat: (segVersion bitAnd: 16rFFFFFF "low 3 bytes")) ifFalse: [self reverseBytesIn32BitWordsFrom: segmentWordArray + self baseHeaderSize to: (self addressAfter: segmentWordArray). ^PrimErrBadArgument]]. segmentStart := segmentWordArray + self baseHeaderSize + self allocationUnit. segmentLimit := segmentLimit * self bytesPerOop + segmentWordArray + self baseHeaderSize. "Notionally reverse the Byte type objects if the data is from opposite endian machine. Test top byte. $d on the Mac or $s on the PC. Rest of word is equal. If Spur is ever ported to big-endian machines then the segment may have to be byte/word swapped, but so far it only runs on little-endian machines, so for now just fail if endinanness is wrong." self flag: #endianness. (segVersion >> 24 bitAnd: 16rFF) ~= (self imageSegmentVersion >> 24 bitAnd: 16rFF) ifTrue: "Reverse the byte-type objects once" [true ifTrue: [^PrimErrBadArgument] ifFalse: [self byteSwapByteObjectsFrom: (self objectStartingAt: segmentStart) to: segmentLimit flipFloatsIf: false]]. "scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects until a second pass." errorCode := self mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray. errorCode ~= 0 ifTrue: [^errorCode]. "Scan for classes contained in the segment, entering them into the class table. Classes are at the front, after the root array and have the remembered bit set." errorCode := self enterClassesIntoClassTableFrom: segmentStart to: segmentLimit. errorCode ~= 0 ifTrue: [^errorCode]. "Make a final pass, assigning class indices and/or pinning pinned objects" self assignClassIndicesAndPinFrom: segmentStart to: segmentLimit outPointers: outPointerArray. "Finally evaporate the container, leaving the newly loaded objects in place." (self hasOverflowHeader: segmentWordArray) ifTrue: [self rawOverflowSlotsOf: segmentWordArray put: self allocationUnit / self bytesPerOop] ifFalse: [self rawNumSlotsOf: segmentWordArray put: self allocationUnit / self bytesPerOop]. + self runLeakCheckerFor: GCModeImageSegment. - self leakCheckImageSegments ifTrue: - [self runLeakCheckerForFullGC: true]. ^self objectStartingAt: segmentStart! Item was changed: ----- Method: SpurMemoryManager>>mapOopsAndValidateClassRefsFrom:to:outPointers: (in category 'image segment in/out') ----- mapOopsAndValidateClassRefsFrom: segmentStart to: segmentLimit outPointers: outPointerArray "This is part of loadImageSegmentFrom:outPointers:. Scan through mapping oops and validating class references. Defer entering any class objects into the class table and/or pinning objects until the second pass in assignClassIndicesAndPinFrom:to:outPointers:." | numOutPointers objOop topHashBit topOopBit | numOutPointers := self numSlotsOf: outPointerArray. + topHashBit := 1 << (self identityHashFieldWidth - 1). - topHashBit := 1 << self identityHashFieldWidth - 1. topOopBit := 1 << self bytesPerOop * 8 - 1. objOop := self objectStartingAt: segmentStart. [objOop < segmentLimit] whileTrue: [| classIndex hash oop mappedOop | (self isMarked: objOop) ifTrue: [^PrimErrInappropriate]. classIndex := (self classIndexOf: objOop) - self firstClassIndexPun. "validate the class ref, but don't update it until any internal classes have been added to the class table." (classIndex anyMask: topHashBit) ifTrue: [classIndex - topHashBit >= numOutPointers ifTrue: [^PrimErrBadIndex]. mappedOop := self fetchPointer: classIndex - topHashBit ofObject: outPointerArray. hash := self rawHashBitsOf: mappedOop. (hash > self lastClassIndexPun and: [(self classOrNilAtIndex: hash) = mappedOop]) ifFalse: [^PrimErrInappropriate]] ifFalse: "The class is contained within the segment." [(oop := classIndex * self allocationUnit + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex]. (self rawHashBitsOf: oop) ~= 0 ifTrue: [^PrimErrInappropriate]]. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. (self isNonImmediate: oop) ifTrue: [(oop anyMask: topOopBit) ifTrue: [(oop := oop - topOopBit / self bytesPerOop) >= numOutPointers ifTrue: [^PrimErrBadIndex]. mappedOop := self fetchPointer: oop ofObject: outPointerArray] ifFalse: [(oop bitAnd: self allocationUnit - 1) ~= 0 ifTrue: [^PrimErrInappropriate]. (mappedOop := oop + segmentStart) >= segmentLimit ifTrue: [^PrimErrBadIndex]]. self storePointerUnchecked: i ofObject: objOop withValue: mappedOop]]. objOop := self objectAfter: objOop limit: segmentLimit]. ^0! Item was changed: ----- Method: SpurMemoryManager>>mapOopsFrom:to:outPointers:outHashes: (in category 'image segment in/out') ----- mapOopsFrom: segStart to: segAddr outPointers: outPointerArray outHashes: savedOutHashes "This is part of storeImageSegmentInto:outPointers:roots:. Now scan, adding out pointers to the outPointersArray; all objects in arrayOfObjects have had their hashes set to point to their copies in segmentWordArray. Answer the outIndex if the scan succeded. Fail if outPointers is too small and answer -1." | objOop outIndex topHashBit topOopBit | outIndex := 0. self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. + topHashBit := 1 << (self identityHashFieldWidth - 1). - topHashBit := 1 << self identityHashFieldWidth - 1. topOopBit := 1 << self bytesPerOop * 8 - 1. objOop := self objectStartingAt: segStart. [objOop < segAddr] whileTrue: [| oop segIndex | oop := self fetchClassOfNonImm: objOop. (self isMarked: oop) ifFalse: "oop is a new outPointer; allocate its oop" [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit. outIndex = 0 ifTrue:"no room in outPointers; fail" [^-1]]. "Set the clone's class index to an offset index into segmentWordArray. Use an offset so that code cannot confuse a clone with e.g. a forwarder." segIndex := self rawHashBitsOf: oop. self setClassIndexOf: objOop to: segIndex + self firstClassIndexPun. 0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. (self isNonImmediate: oop) ifTrue: [(self isMarked: oop) ifFalse: "oop is a new outPointer; allocate its oop" [outIndex := self newOutPointer: oop at: outIndex in: outPointerArray hashes: savedOutHashes topHashBit: topHashBit. outIndex = 0 ifTrue: "no room in outPointers; fail" [^-1]]. oop := self mappedOopOf: oop topHashBit: topHashBit topOopBit: topOopBit.. self storePointerUnchecked: i ofObject: objOop withValue: oop]]. objOop := self objectAfter: objOop limit: segAddr]. ^outIndex! Item was changed: ----- Method: SpurMemoryManager>>markObjects: (in category 'gc - global') ----- markObjects: objectsShouldBeUnmarkedAndUnmarkedClassesShouldBeExpunged <inline: #never> "for profiling" "Mark all accessible objects. objectsShouldBeUnmarkedAndUnmarkedClassesShouldBeExpunged is true if all objects are unmarked and/or if unmarked classes shoud be removed from the class table." "If the incremental collector is running mark bits may be set; stop it and clear them if necessary." self cCode: '' inSmalltalk: [coInterpreter transcript nextPutAll: 'marking...'; flush]. + self runLeakCheckerFor: GCModeFull. - self runLeakCheckerForFullGC: true. self shutDownIncrementalGC: objectsShouldBeUnmarkedAndUnmarkedClassesShouldBeExpunged. self initializeUnscannedEphemerons. self initializeMarkStack. self initializeWeaklingStack. self markAccessibleObjectsAndFireEphemerons. self expungeDuplicateAndUnmarkedClasses: objectsShouldBeUnmarkedAndUnmarkedClassesShouldBeExpunged. self nilUnmarkedWeaklingSlots! Item was changed: ----- Method: SpurMemoryManager>>objectsReachableFromRoots: (in category 'image segment in/out') ----- objectsReachableFromRoots: arrayOfRoots "Answer an Array of all the objects only reachable from the argument, an Array of root objects, starting with arrayOfRoots. If there is no space, answer a SmallInteger whose value is the number of slots required. This is used to collect the objects to include in an image segment on Spur, separate from creating the segment, hence simplifying the implementation. Thanks to Igor Stasenko for this idea." | freeChunk ptr start limit count oop objOop | self assert: (self isArray: arrayOfRoots). "Mark all objects except those only reachable from the arrayOfRoots by marking each object in arrayOfRoots and then marking all reachable objects (from the system roots). This leaves unmarked only objects reachable from the arrayOfRoots. N.B. A side-effect of the marking is that all forwarders in arrayOfRoots will be followed." self assert: self allObjectsUnmarked. self markObjectsIn: arrayOfRoots. self markObjects: false. "After the mark phase all unreachable weak slots will have been nilled and all active ephemerons fired." self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self assert: self noUnscannedEphemerons. "Use the largest free chunk to answer the result." freeChunk := self allocateLargestFreeChunk. ptr := start := freeChunk + self baseHeaderSize. limit := self addressAfter: freeChunk. count := 0. "First put the arrayOfRoots; order is important." count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: arrayOfRoots. ptr := ptr + self bytesPerOop]. 0 to: (self numSlotsOf: arrayOfRoots) - 1 do: [:i| oop := self fetchPointer: i ofObject: arrayOfRoots. (self isNonImmediate: oop) ifTrue: [self push: oop onObjStack: markStack]]. "Now collect the unmarked objects reachable from the roots." [self isEmptyObjStack: markStack] whileFalse: [objOop := self popObjStack: markStack. count := count + 1. ptr < limit ifTrue: [self longAt: ptr put: objOop. ptr := ptr + self bytesPerOop]. oop := self fetchClassOfNonImm: objOop. (self isMarked: oop) ifFalse: [self setIsMarkedOf: objOop to: true. self push: oop onObjStack: markStack]. ((self isContextNonImm: objOop) and: [coInterpreter isStillMarriedContext: objOop]) "widow now, before the loop" ifTrue: [0 to: (coInterpreter numSlotsOfMarriedContext: objOop) - 1 do: [:i| oop := coInterpreter fetchPointer: i ofMarriedContext: objOop. ((self isImmediate: oop) or: [self isMarked: oop]) ifFalse: [self setIsMarkedOf: objOop to: true. self push: oop onObjStack: markStack]]] ifFalse: [0 to: (self numPointerSlotsOf: objOop) - 1 do: [:i| oop := self fetchPointer: i ofObject: objOop. ((self isImmediate: oop) or: [self isMarked: oop]) ifFalse: [self setIsMarkedOf: objOop to: true. self push: oop onObjStack: markStack]]]]. self unmarkAllObjects. totalFreeOldSpace := totalFreeOldSpace - (self bytesInObject: freeChunk). "Now try and allocate the result" (count > (ptr - start / self bytesPerOop) "not enough room" or: [limit ~= ptr and: [limit - ptr <= self allocationUnit]]) ifTrue: "can't split a single word" [self freeChunkWithBytes: (self bytesInObject: freeChunk) at: (self startOfObject: freeChunk). self checkFreeSpace. ^self integerObjectOf: count]. "There's room; set the format, & classIndex and shorten." self setFormatOf: freeChunk to: self arrayFormat. self setClassIndexOf: freeChunk to: ClassArrayCompactIndex. self shorten: freeChunk toIndexableSize: count. self possibleRootStoreInto: freeChunk. self checkFreeSpace. + self runLeakCheckerFor: GCModeImageSegment. - self runLeakCheckerForFullGC: false. ^freeChunk! Item was changed: ----- Method: SpurMemoryManager>>printHeaderTypeOf: (in category 'debug printing') ----- printHeaderTypeOf: objOop coInterpreter + print: ((self numSlotsOfAny: objOop) >= self numSlotsMask - print: ((self numSlotsOf: objOop) >= self numSlotsMask ifTrue: [' hdr16 '] ifFalse: [' hdr8 ']); printChar: ((self isImmutable: objOop) ifTrue: [$i] ifFalse: [$.]); printChar: ((self isRemembered: objOop) ifTrue: [$r] ifFalse: [$.]); printChar: ((self isPinned: objOop) ifTrue: [$p] ifFalse: [$.]); printChar: ((self isMarked: objOop) ifTrue: [$m] ifFalse: [$.]); printChar: ((self isGrey: objOop) ifTrue: [$g] ifFalse: [$.])! Item was changed: ----- Method: SpurMemoryManager>>remapObj: (in category 'gc - scavenging') ----- remapObj: objOop "Scavenge or simply follow objOop. Answer the new location of objOop. The send should have been guarded by a send of shouldRemapOop:. The method is called remapObj: for compatibility with ObjectMemory." <api> <inline: false> | resolvedObj | self assert: (self shouldRemapOop: objOop). (self isForwarded: objOop) ifTrue: + [resolvedObj := self followForwarded: objOop] - [resolvedObj := self followForwarded: objOop. - (self isInFutureSpace: resolvedObj) ifTrue: "already scavenged" - [^resolvedObj]] ifFalse: + [self deny: (self isInFutureSpace: objOop). - [self deny: (self isInFutureSpace: resolvedObj). resolvedObj := objOop]. (scavengeInProgress + and: [(self isReallyYoung: resolvedObj) "don't scavenge immediate, old, or CogMethod objects." + and: [(self isInFutureSpace: resolvedObj) not]]) ifTrue: - and: [self isReallyYoung: resolvedObj]) ifTrue: "a becommed or compacted object whose target is in old space, or a CogMethod." [^scavenger copyAndForward: resolvedObj]. ^resolvedObj! Item was changed: ----- Method: SpurMemoryManager>>return:restoringObjectsIn:savedHashes:and:savedHashes: (in category 'image segment in/out') ----- return: errCode restoringObjectsIn: firstArray savedHashes: firstSavedHashes and: secondArray savedHashes: secondSavedHashes self restoreObjectsIn: firstArray savedHashes: firstSavedHashes. self restoreObjectsIn: secondArray savedHashes: secondSavedHashes. + self runLeakCheckerFor: GCModeImageSegment. - self leakCheckImageSegments ifTrue: - [self runLeakCheckerForFullGC: true]. self assert: self allObjectsUnmarked. ^errCode! Item was added: + ----- Method: SpurMemoryManager>>runLeakCheckerFor: (in category 'debug support') ----- + runLeakCheckerFor: gcModes + <inline: false> + ^self + inLineRunLeakCheckerFor: gcModes + excludeUnmarkedNewSpaceObjs: false + classIndicesShouldBeValid: true! Item was added: + ----- Method: SpurMemoryManager>>runLeakCheckerFor:excludeUnmarkedNewSpaceObjs:classIndicesShouldBeValid: (in category 'debug support') ----- + runLeakCheckerFor: gcModes excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid + <inline: false> + self inLineRunLeakCheckerFor: gcModes + excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs + classIndicesShouldBeValid: classIndicesShouldBeValid! Item was added: + ----- Method: SpurMemoryManager>>runLeakCheckerForFullGC (in category 'debug support') ----- + runLeakCheckerForFullGC + <doNotGenerate> + "Support for the Spur bootstrap" + self runLeakCheckerFor: GCModeFull! Item was removed: - ----- Method: SpurMemoryManager>>runLeakCheckerForFullGC: (in category 'debug support') ----- - runLeakCheckerForFullGC: fullGCFlag - ^self runLeakCheckerForFullGC: fullGCFlag excludeUnmarkedNewSpaceObjs: false classIndicesShouldBeValid: true! Item was removed: - ----- Method: SpurMemoryManager>>runLeakCheckerForFullGC:excludeUnmarkedNewSpaceObjs:classIndicesShouldBeValid: (in category 'debug support') ----- - runLeakCheckerForFullGC: fullGCFlag excludeUnmarkedNewSpaceObjs: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid - <inline: false> - (fullGCFlag - ifTrue: [self leakCheckFullGC or: [self leakCheckImageSegments]] - ifFalse: [self leakCheckNewSpaceGC]) ifTrue: - [fullGCFlag - ifTrue: [coInterpreter reverseDisplayFrom: 0 to: 7] - ifFalse: [coInterpreter reverseDisplayFrom: 8 to: 15]. - self clearLeakMapAndMapAccessibleObjects. - self assert: (self checkHeapIntegrity: excludeUnmarkedNewSpaceObjs classIndicesShouldBeValid: classIndicesShouldBeValid). - self assert: coInterpreter checkInterpreterIntegrity. - self assert: coInterpreter checkStackIntegrity. - self assert: (coInterpreter checkCodeIntegrity: fullGCFlag)]! Item was changed: ----- Method: SpurMemoryManager>>scavengingGCTenuringIf: (in category 'gc - scavenging') ----- scavengingGCTenuringIf: tenuringCriterion "Run the scavenger." <inline: false> self assert: remapBufferCount = 0. (self asserta: scavenger eden limit - freeStart > coInterpreter interpreterAllocationReserveBytes) ifFalse: [coInterpreter tab; printNum: scavenger eden limit - freeStart; space; printNum: coInterpreter interpreterAllocationReserveBytes; space; printNum: coInterpreter interpreterAllocationReserveBytes - (scavenger eden limit - freeStart); cr]. self checkMemoryMap. self checkFreeSpace. + self runLeakCheckerFor: GCModeNewSpace. - self runLeakCheckerForFullGC: false. coInterpreter + preGCAction: GCModeNewSpace; - preGCAction: GCModeScavenge; "would prefer this to be in mapInterpreterOops, but compatibility with ObjectMemory dictates it goes here." flushMethodCacheFrom: newSpaceStart to: newSpaceLimit. needGCFlag := false. gcStartUsecs := coInterpreter ioUTCMicrosecondsNow. self doScavenge: tenuringCriterion. statScavenges := statScavenges + 1. statGCEndUsecs := coInterpreter ioUTCMicrosecondsNow. statSGCDeltaUsecs := statGCEndUsecs - gcStartUsecs. statScavengeGCUsecs := statScavengeGCUsecs + statSGCDeltaUsecs. statRootTableCount := scavenger rememberedSetSize. + coInterpreter postGCAction: GCModeNewSpace. - coInterpreter postGCAction: GCModeScavenge. + self runLeakCheckerFor: GCModeNewSpace. - self runLeakCheckerForFullGC: false. self checkFreeSpace! Item was changed: ----- Method: SpurMemoryManager>>setCheckForLeaks: (in category 'spur bootstrap') ----- + setCheckForLeaks: integerFlags - setCheckForLeaks: anInteger " 0 = do nothing. + 1 = check for leaks on fullGC (GCModeFull). + 2 = check for leaks on scavenger (GCModeNewSpace). + 4 = check for leaks on incremental (GCModeIncremental) + 8 = check for leaks on become + 16 = check for leaks on image segments" + checkForLeaks := integerFlags! - 1 = check for leaks on fullGC. - 2 = check for leaks on scavenger. - 4 = check for leaks on become - 8 = check for leaks on truly incremental. - 15 = check for leaks on all four." - checkForLeaks := anInteger! Item was removed: - ----- Method: SpurMemoryManager>>shrinkObjectMemory: (in category 'growing/shrinking memory') ----- - shrinkObjectMemory: delta - "Attempt to shrink the object memory by the given delta amount." - <doNotGenerate> - segmentManager shrinkObjectMemory: delta! Item was changed: ----- Method: SpurMemoryManager>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots "This primitive is called from Squeak as... <imageSegment> storeSegmentFor: arrayOfRoots into: aWordArray outPointers: anArray. This primitive will store a binary image segment (in the same format as objercts in the heap) of the set of objects in arrayOfObjects. All pointers from within the set to objects outside the set will be copied into the array of outPointers. In their place in the image segment will be an oop equal to the offset in the outPointer array (the first would be 4). but with the high bit set. Since Spur has a class table the load primitive must insert classes that have instances in the class table. This primitive marks such classes using the isRemembered bit, which isn't meaningful as a remembered bit in the segment. The primitive expects the segmentWordArray and outPointerArray to be more than adequately long. In this case it returns normally, and truncates the two arrays to exactly the right size. The primitive can fail for the following reasons with the specified failure codes: PrimErrWritePastObject: the segmentWordArray is too small PrimErrBadIndex: the outPointerArray is too small PrimErrNoMemory: additional allocations failed PrimErrLimitExceeded: there is no room in the hash field to store object oops." <inline: false> | arrayOfObjects savedInHashes savedOutHashes fillValue segStart segAddr endSeg outIndex | + self runLeakCheckerFor: GCModeImageSegment. - self leakCheckImageSegments ifTrue: - [self runLeakCheckerForFullGC: true]. "First compute the transitive closure, collecting the sequence of objects to be stored in the arrayOfObjects array." arrayOfObjects := self objectsReachableFromRoots: arrayOfRoots. arrayOfObjects ifNil: [^PrimErrNoMemory]. self assert: self allObjectsUnmarked. "work to be done when the incremental GC is written" "The scheme is to copy the objects into segmentWordArray, and then map the oops in sementWordArray. Therefore the primitive needs to both map efficiently originals to copies in segmentWordArray and be able to undo any side-effects if the primitive fails because either sementWordArray or outPointerArray is too small. The mapping is done by having the originals (either the objects in arrayOfObjects or the objects in outPointerArray) refer to their mapped locations through their identityHash, and saving their identityHashes in two ByteArrays, one that mirrors arrayOfObjects, and one that mirrors outPointerArray. Since arrayOfObjects and its saved hashes, and outPointerArray and its saved hashes, can be enumerated side-by-side, the hashes can be restored to the originals. So the hash of an object in arrayOfObjects is set to its offset in segmentWordArray / self allocationUnit, and the hash of an object in outPointerArray is set to its index in outPointerArray plus the top hash bit. Oops in segmentWordArray are therefore mapped by accessing the original oop's identityHash, testing the bottom bit to distinguish between internal and external oops. The saved hash arrays are initialized with an out-of-range hash value so that the first unused entry can be identified." savedInHashes := self allocateSlots: (self numSlotsForBytes: (self numSlotsOf: arrayOfObjects) * 4) format: self firstLongFormat classIndex: self thirtyTwoBitLongsClassIndexPun. savedOutHashes := self allocateSlots: (self numSlotsForBytes: (self numSlotsOf: outPointerArray) * 4) format: self firstLongFormat classIndex: self thirtyTwoBitLongsClassIndexPun. (savedInHashes isNil or: [savedOutHashes isNil]) ifTrue: [self freeObject: arrayOfObjects. ^PrimErrNoMemory]. fillValue := self wordSize = 4 ifTrue: [self maxIdentityHash + 1] ifFalse: [self maxIdentityHash + 1 << 32 + (self maxIdentityHash + 1)]. self fillObj: savedInHashes numSlots: (self numSlotsOf: savedInHashes) with: fillValue. self fillObj: savedOutHashes numSlots: (self numSlotsOf: savedOutHashes) with: fillValue. "Both to expand the max size of segment and to reduce the length of the load-time pass that adds classes to the class table, move classes to the front of arrayOfObjects, leaving the root array as the first element." self moveClassesForwardsIn: arrayOfObjects. segAddr := segmentWordArray + self baseHeaderSize. endSeg := self addressAfter: segmentWordArray. "Write a version number for byte order and version check." segAddr >= endSeg ifTrue: [^PrimErrGenericFailure]. self long32At: segAddr put: self imageSegmentVersion. self long32At: segAddr + 4 put: self imageSegmentVersion. segStart := segAddr := segAddr + self allocationUnit. "Copy all reachable objects to the segment." 0 to: (self numSlotsOf: arrayOfObjects) - 1 do: [:i| | newSegAddrOrError objOop | objOop := self fetchPointer: i ofObject: arrayOfObjects. self deny: ((self isImmediate: objOop) or: [self isForwarded: objOop]). self storeLong32: i ofObject: savedInHashes withValue: (self rawHashBitsOf: objOop). newSegAddrOrError := self copyObj: objOop toAddr: segAddr startAt: segStart stopAt: endSeg. newSegAddrOrError < segStart ifTrue: [^self return: newSegAddrOrError restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes and: outPointerArray savedHashes: savedOutHashes]. segAddr := newSegAddrOrError]. "Check that it can be safely shortened." (endSeg ~= segAddr and: [endSeg - segAddr < (self baseHeaderSize + self bytesPerOop)]) ifTrue: [^self return: PrimErrWritePastObject restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes and: outPointerArray savedHashes: savedOutHashes]. "Now scan, adding out pointers to the outPointersArray; all objects in arrayOfObjects have their hashes set to point to their copies in segmentWordArray." (outIndex := self mapOopsFrom: segStart to: segAddr outPointers: outPointerArray outHashes: savedOutHashes) < 0 ifTrue: "no room in outPointers; fail" [^self return: PrimErrBadIndex restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes and: outPointerArray savedHashes: savedOutHashes]. "We're done. Shorten the results, restore hashes and return." self shorten: segmentWordArray toIndexableSize: segAddr - (segmentWordArray + self baseHeaderSize) / 4. self shorten: outPointerArray toIndexableSize: outIndex. ^self return: PrimNoErr restoringObjectsIn: arrayOfObjects savedHashes: savedInHashes and: outPointerArray savedHashes: savedOutHashes! Item was changed: ----- Method: StackInterpreter class>>initializeMiscConstants (in category 'initialization') ----- initializeMiscConstants super initializeMiscConstants. STACKVM := true. + "These flags function to identify a GC operation, or + to specify what operations the leak checker should be run for." + GCModeFull := 1. "stop-the-world global GC" + GCModeNewSpace := 2. "Spur's scavenge, or V3's incremental" + GCModeIncremental := 4. "incremental global gc (Dijkstra tri-colour marking); as yet unimplemented" + GCModeBecome := 8. "v3 post-become sweeping" + GCModeImageSegment := 16. "just a flag for leak checking image segments" - GCModeFull := 1. - GCModeIncr := 2. - GCModeScavenge := 3. - GCModeBecome := 4. StackPageTraceInvalid := -1. StackPageUnreached := 0. StackPageReachedButUntraced := 1. StackPageTraced := 2. DumpStackOnLowSpace := 0. PrimitiveExternalCallIndex := 117. "Primitive index for #primitiveExternalCall" MillisecondClockMask := 16r1FFFFFFF. "Note: The external primitive table should actually be dynamically sized but for the sake of inferior platforms (e.g., Mac :-) who cannot allocate memory in any reasonable way, we keep it static (and cross our fingers...)" MaxExternalPrimitiveTableSize := 4096. "entries" MaxJumpBuf := 32. "max. callback depth" FailImbalancedPrimitives := true! Item was changed: ----- Method: StackInterpreter>>loadInitialContext (in category 'initialization') ----- loadInitialContext <inline: false> | activeProc activeContext | self cCode: [] inSmalltalk: [self initExtensions]. + objectMemory runLeakCheckerFor: GCModeFull. - objectMemory runLeakCheckerForFullGC: true. activeProc := self activeProcess. activeContext := objectMemory fetchPointer: SuspendedContextIndex ofObject: activeProc. self marryContextInNewStackPageAndInitializeInterpreterRegisters: activeContext! Item was changed: ----- Method: StackInterpreter>>postGCAction: (in category 'object memory support') ----- postGCAction: gcModeArg + "Signal the gc semaphore" - "Shrink free memory and signal the gc semaphore" - (gcModeArg = GCModeFull or: [gcModeArg = GCModeIncr]) ifTrue:"but *not* become and *not* scavenge" - [| freeSizeNow | - freeSizeNow := objectMemory freeSize. - (freeSizeNow > objectMemory shrinkThreshold - and: [freeSizeNow > objectMemory growHeadroom]) ifTrue: - ["Attempt to shrink memory after successfully reclaiming lots of memory" - objectMemory shrinkObjectMemory: freeSizeNow - objectMemory growHeadroom]]. - self signalSemaphoreWithIndex: gcSemaphoreIndex! Item was changed: ----- Method: StackInterpreter>>printFrame: (in category 'debug printing') ----- printFrame: theFP + | thePage frameAbove theSP | - | thePage theSP | <inline: false> <var: #theFP type: #'char *'> - <var: #thePage type: #'StackPage *'> <var: #theSP type: #'char *'> + <var: #frameAbove type: #'char *'> + <var: #thePage type: #'StackPage *'> + (stackPages couldBeFramePointer: theFP) ifFalse: + [self printHexPtr: theFP; print: ' is not in the stack zone?!!'; cr. + ^nil]. + frameAbove := nil. theFP = framePointer ifTrue: [theSP := stackPointer] ifFalse: [thePage := stackPages stackPageFor: theFP. (stackPages isFree: thePage) ifTrue: [self printHexPtr: theFP; print: ' is on a free page?!!'; cr. ^nil]. (thePage ~= stackPage and: [theFP = thePage headFP]) ifTrue: [theSP := thePage headSP] ifFalse: + [frameAbove := self safeFindFrameAbove: theFP + on: thePage + startingFrom: ((thePage = stackPage + and: [framePointer + between: thePage realStackLimit + and: thePage baseAddress]) + ifTrue: [framePointer] + ifFalse: [thePage headFP]). + theSP := frameAbove ifNotNil: + [self frameCallerSP: frameAbove]]]. - [theSP := self findSPOrNilOf: theFP - on: thePage - startingFrom: ((thePage = stackPage - and: [framePointer - between: thePage realStackLimit - and: thePage baseAddress]) - ifTrue: [framePointer] - ifFalse: [thePage headFP])]]. theSP ifNil: [self print: 'could not find sp; using bogus value'; cr. theSP := self frameReceiverOffset: theFP]. + self printFrame: theFP WithSP: theSP. + frameAbove ifNotNil: + [self printFrameThing: 'frame pc' at: frameAbove + FoxCallerSavedIP]! - self printFrame: theFP WithSP: theSP! Item was changed: ----- Method: StackInterpreter>>printFrame:WithSP: (in category 'debug printing') ----- printFrame: theFP WithSP: theSP <api> | theMethod numArgs topThing | <inline: false> <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <var: #addr type: #'char *'> self cCode: '' inSmalltalk: [self transcript ensureCr]. + (stackPages couldBeFramePointer: theFP) ifFalse: + [self printHexPtr: theFP; print: ' is not in the stack zone?!!'; cr. + ^nil]. theMethod := self frameMethod: theFP. numArgs := self frameNumArgs: theFP. self shortPrintFrame: theFP. self printFrameOop: 'rcvr/clsr' at: theFP + FoxCallerSavedIP + ((numArgs + 1) * objectMemory wordSize). numArgs to: 1 by: -1 do: [:i| self printFrameOop: 'arg' at: theFP + FoxCallerSavedIP + (i * objectMemory wordSize)]. self printFrameThing: 'cllr ip/ctxt' at: theFP + FoxCallerSavedIP. self printFrameThing: 'saved fp' at: theFP + FoxSavedFP. self printFrameOop: 'method' at: theFP + FoxMethod. self printFrameFlagsForFP: theFP. self printFrameThing: 'context' at: theFP + FoxThisContext. self printFrameOop: 'receiver' at: theFP + FoxReceiver. topThing := stackPages longAt: theSP. (topThing >= theMethod and: [topThing <= (theMethod + (objectMemory sizeBitsOfSafe: theMethod))]) ifTrue: [theFP + FoxReceiver - objectMemory wordSize to: theSP + objectMemory wordSize by: objectMemory wordSize negated do: [:addr| self printFrameOop: 'temp/stck' at: addr]. self printFrameThing: 'frame ip' at: theSP] ifFalse: [theFP + FoxReceiver - objectMemory wordSize to: theSP by: objectMemory wordSize negated do: [:addr| self printFrameOop: 'temp/stck' at: addr]]! Item was changed: ----- Method: StackInterpreter>>printOop: (in category 'debug printing') ----- printOop: oop | cls fmt lastIndex startIP bytecodesPerLine column | <inline: false> (objectMemory isImmediate: oop) ifTrue: [^self shortPrintOop: oop]. self printHex: oop. (objectMemory addressCouldBeObj: oop) ifFalse: [^self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [self whereIs: oop]); cr]. (objectMemory isFreeObject: oop) ifTrue: [self print: ' is a free chunk of size '; printNum: (objectMemory sizeOfFree: oop). objectMemory hasSpurMemoryManagerAPI ifTrue: + [self print: ' 0th: '; printHex: (objectMemory fetchPointer: 0 ofFreeChunk: oop). + objectMemory printHeaderTypeOf: oop]. - [self print: ' 0th: '; printHex: (objectMemory fetchPointer: 0 ofFreeChunk: oop)]. ^self cr]. (objectMemory isForwarded: oop) ifTrue: + [self - [^self print: ' is a forwarded object to '; printHex: (objectMemory followForwarded: oop); + print: ' of slot size '; printNum: (objectMemory numSlotsOfAny: oop). + objectMemory printHeaderTypeOf: oop. + ^self cr]. - print: ' of slot size '; printNum: (objectMemory numSlotsOfAny: oop); cr]. self print: ': a(n) '. self printNameOfClass: (cls := objectMemory fetchClassOfNonImm: oop) count: 5. cls = (objectMemory splObj: ClassFloat) ifTrue: [^self cr; printFloat: (objectMemory dbgFloatValueOf: oop); cr]. fmt := objectMemory formatOf: oop. fmt > objectMemory lastPointerFormat ifTrue: [self print: ' nbytes '; printNum: (objectMemory numBytesOf: oop)]. self cr. (fmt between: objectMemory firstLongFormat and: objectMemory firstCompiledMethodFormat - 1) ifTrue: ["This will answer false if splObj: ClassAlien is nilObject" (self is: oop KindOfClass: (objectMemory splObj: ClassAlien)) ifTrue: [self print: ' datasize '; printNum: (self sizeOfAlienData: oop). self print: ((self isIndirectAlien: oop) ifTrue: [' indirect @ '] ifFalse: [(self isPointerAlien: oop) ifTrue: [' pointer @ '] ifFalse: [' direct @ ']]). ^self printHex: (self startOfAlienData: oop) asUnsignedInteger; cr]. (objectMemory isWords: oop) ifTrue: [lastIndex := 64 min: ((objectMemory numBytesOf: oop) / objectMemory wordSize). lastIndex > 0 ifTrue: [1 to: lastIndex do: [:index| self space; printHex: (objectMemory fetchLong32: index - 1 ofObject: oop). (index \\ self elementsPerPrintOopLine) = 0 ifTrue: [self cr]]. (lastIndex \\ self elementsPerPrintOopLine) = 0 ifFalse: [self cr]]. ^self]. ^self printStringOf: oop; cr]. "this is nonsense. apologies." startIP := (objectMemory lastPointerOf: oop) + objectMemory bytesPerOop - objectMemory baseHeaderSize / objectMemory bytesPerOop. lastIndex := 256 min: startIP. lastIndex > 0 ifTrue: [1 to: lastIndex do: [:index| self cCode: [self printHex: (objectMemory fetchPointer: index - 1 ofObject: oop); space] inSmalltalk: [self space; printHex: (objectMemory fetchPointer: index - 1 ofObject: oop); space. self print: (self shortPrint: (objectMemory fetchPointer: index - 1 ofObject: oop))]. (index \\ self elementsPerPrintOopLine) = 0 ifTrue: [self cr]]. (lastIndex \\ self elementsPerPrintOopLine) = 0 ifFalse: [self cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > 64 ifTrue: [self print: '...'; cr]] ifTrue: [startIP := startIP * objectMemory wordSize + 1. lastIndex := objectMemory lengthOf: oop. lastIndex - startIP > 100 ifTrue: [lastIndex := startIP + 100]. bytecodesPerLine := 8. column := 1. startIP to: lastIndex do: [:index| | byte | column = 1 ifTrue: [self cCode: 'printf("0x%08x: ", oop+BaseHeaderSize+index-1)' inSmalltalk: [self print: (oop+objectMemory baseHeaderSize+index-1) hex; print: ': ']]. byte := objectMemory fetchByte: index - 1 ofObject: oop. self cCode: 'printf(" %02x/%-3d", byte,byte)' inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. column := column + 1. column > bytecodesPerLine ifTrue: [column := 1. self cr]]. column = 1 ifFalse: [self cr]]! Item was changed: ----- Method: StackInterpreter>>printOopShortInner: (in category 'debug printing') ----- printOopShortInner: oop | classOop name nameLen | <var: #name type: #'char *'> <inline: true> (objectMemory isImmediate: oop) ifTrue: [(objectMemory isImmediateCharacter: oop) ifTrue: [^self printChar: $$; printChar: (objectMemory characterValueOf: oop); printChar: $(; + printHexnp: (objectMemory characterValueOf: oop); - printHexnp: (objectMemory integerValueOf: oop); printChar: $)]. (objectMemory isIntegerObject: oop) ifTrue: [^self printNum: (objectMemory integerValueOf: oop); printChar: $(; printHexnp: (objectMemory integerValueOf: oop); printChar: $)]. (objectMemory isImmediateFloat: oop) ifTrue: [^self printFloat: (objectMemory dbgFloatValueOf: oop); printChar: $(; printHexnp: oop; printChar: $)]. ^self print: 'unknown immediate '; printHexnp: oop]. (objectMemory addressCouldBeObj: oop) ifFalse: [^self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [self whereIs: oop])]. (objectMemory isFreeObject: oop) ifTrue: [^self print: ' is a free chunk']. (objectMemory isForwarded: oop) ifTrue: [^self print: ' is a forwarder to '; printHexnp: (objectMemory followForwarded: oop)]. (self isFloatObject: oop) ifTrue: [^self printFloat: (objectMemory dbgFloatValueOf: oop)]. classOop := objectMemory fetchClassOfNonImm: oop. (objectMemory addressCouldBeObj: classOop) ifFalse: [^self print: 'a ??']. (objectMemory numSlotsOf: classOop) = metaclassNumSlots ifTrue: [^self printNameOfClass: oop count: 5]. oop = objectMemory nilObject ifTrue: [^self print: 'nil']. oop = objectMemory trueObject ifTrue: [^self print: 'true']. oop = objectMemory falseObject ifTrue: [^self print: 'false']. nameLen := self lengthOfNameOfClass: classOop. nameLen = 0 ifTrue: [^self print: 'a ??']. name := self nameOfClass: classOop. nameLen = 10 ifTrue: [(self str: name n: 'ByteString' cmp: 10) = 0 "strncmp is weird" ifTrue: [^self printChar: $'; printStringOf: oop; printChar: $']. (self str: name n: 'ByteSymbol' cmp: 10) = 0 "strncmp is weird" ifTrue: [self printChar: $#; printStringOf: oop. ^self]]. (nameLen = 9 and: [(self str: name n: 'Character' cmp: 9) = 0]) ifTrue: [^self printChar: $$; printChar: (objectMemory integerValueOf: (objectMemory fetchPointer: 0 ofObject: oop))]. self print: 'a(n) '. self cCode: [0 to: nameLen - 1 do: [:i| self printChar: (name at: i)]] inSmalltalk: [name isString ifTrue: [self print: name] ifFalse: [0 to: nameLen - 1 do: [:i| self printChar: (name at: i)]]]. "Try to spot association-like things; they're all subclasses of LookupKey" ((objectMemory isPointersNonImm: oop) and: [(objectMemory instanceSizeOf: classOop) = (ValueIndex + 1) and: [(objectMemory isBytes: (objectMemory fetchPointer: KeyIndex ofObject: oop))]]) ifTrue: [| classLookupKey | classLookupKey := objectMemory fetchClassOfNonImm: (objectMemory splObj: SchedulerAssociation). [classLookupKey = objectMemory nilObject ifTrue: [^self]. (objectMemory instanceSizeOf: classLookupKey) = (KeyIndex + 1)] whileFalse: [classLookupKey := self superclassOf: classLookupKey]. (self includesBehavior: classOop ThatOf: classLookupKey) ifTrue: [self space; printOopShort: (objectMemory fetchPointer: KeyIndex ofObject: oop); print: ' -> '; printHexnp: (objectMemory fetchPointer: ValueIndex ofObject: oop)]]! Item was added: + ----- Method: StackInterpreter>>safeFindFrameAbove:on:startingFrom: (in category 'frame access') ----- + safeFindFrameAbove: theFP on: thePage startingFrom: startFrame + "Search for the previous frame to theFP (the frame that theFP calls). + DO NOT CALL THIS WITH theFP == localFP OR theFP == framePointer!!" + <var: #theFP type: #'char *'> + <var: #thePage type: #'StackPage *'> + <var: #startFrame type: #'char *'> + <returnTypeC: #'char *'> + | aFrame prevFrame | + <inline: true> + <var: #aFrame type: #'char *'> + <var: #prevFrame type: #'char *'> + self assert: (stackPages isFree: thePage) not. + startFrame = theFP ifTrue: + [^nil]. + aFrame := startFrame. + [prevFrame := aFrame. + aFrame := self frameCallerFP: aFrame. + aFrame ~= 0] whileTrue: + [theFP = aFrame ifTrue: + [^prevFrame]]. + ^nil! Item was removed: - ----- Method: StackInterpreterSimulator>>preGCAction: (in category 'debugging traps') ----- - preGCAction: gcMode - "self halt." - ^super preGCAction: gcMode! Item was changed: SharedPool subclass: #VMBasicConstants instanceVariableNames: '' + classVariableNames: 'BaseHeaderSize Byte0Mask Byte0Shift Byte1Mask Byte1Shift Byte1ShiftNegated Byte2Mask Byte2Shift Byte3Mask Byte3Shift Byte3ShiftNegated Byte4Mask Byte4Shift Byte4ShiftNegated Byte5Mask Byte5Shift Byte5ShiftNegated Byte6Mask Byte6Shift Byte7Mask Byte7Shift Byte7ShiftNegated Bytes3to0Mask Bytes7to4Mask BytesPerOop BytesPerWord COGMTVM COGVM DisownVMLockOutFullGC DoAssertionChecks DoExpensiveAssertionChecks GCModeBecome GCModeFull GCModeImageSegment GCModeIncremental GCModeNewSpace IMMUTABILITY MULTIPLEBYTECODESETS NewspeakVM PrimErrBadArgument PrimErrBadIndex PrimErrBadMethod PrimErrBadNumArgs PrimErrBadReceiver PrimErrGenericFailure PrimErrInappropriate PrimErrLimitExceeded PrimErrNamedInternal PrimErrNoCMemory PrimErrNoMemory PrimErrNoModification PrimErrNotFound PrimErrObjectIsPinned PrimErrObjectMayMove PrimErrUnsupported PrimErrWritePastObject PrimNoErr STACKVM SistaVM VMBIGENDIAN' - classVariableNames: 'BaseHeaderSize Byte0Mask Byte0Shift Byte1Mask Byte1Shift Byte1ShiftNegated Byte2Mask Byte2Shift Byte3Mask Byte3Shift Byte3ShiftNegated Byte4Mask Byte4Shift Byte4ShiftNegated Byte5Mask Byte5Shift Byte5ShiftNegated Byte6Mask Byte6Shift Byte7Mask Byte7Shift Byte7ShiftNegated Bytes3to0Mask Bytes7to4Mask BytesPerOop BytesPerWord COGMTVM COGVM DisownVMLockOutFullGC DoAssertionChecks DoExpensiveAssertionChecks GCModeBecome GCModeFull GCModeIncr GCModeScavenge IMMUTABILITY MULTIPLEBYTECODESETS NewspeakVM PrimErrBadArgument PrimErrBadIndex PrimErrBadMethod PrimErrBadNumArgs PrimErrBadReceiver PrimErrGenericFailure PrimErrInappropriate PrimErrLimitExceeded PrimErrNamedInternal PrimErrNoCMemory PrimErrNoMemory PrimErrNoModification PrimErrNotFound PrimErrObjectIsPinned PrimErrObjectMayMove PrimErrUnsupported PrimErrWritePastObject PrimNoErr STACKVM SistaVM VMBIGENDIAN' poolDictionaries: '' category: 'VMMaker-Interpreter'! !VMBasicConstants commentStamp: '<historical>' prior: 0! I am a shared pool for basic constants upon which the VM as a whole depends. self ensureClassPool. self classPool declare: #BytesPerWord from: VMSqueakV3ObjectRepresentationConstants classPool. self classPool declare: #BaseHeaderSize from: VMSqueakV3ObjectRepresentationConstants classPool (ObjectMemory classPool keys select: [:k| k beginsWith: 'Byte']) do: [:k| self classPool declare: k from: ObjectMemory classPool]!

1 0

Re: [Pharo-dev] Reducing the activity of the image
by John McIntosh 10 Feb '15

10 Feb '15

It's a bit more complicated and what platform you are on does matter. Just hunt in the squeak mailing list 10 years back for getNextWakeupTick Possibly the mac vm still calls getNextWakeupTick() which returns the next time the VM has to wake up to service a delay pop. Normally that is less than 1/50 of a second out due to the Morphic polling cycle, say 16 - 20 milliseconds. The idea I had was to sleep until the VM needs to wakeup since when the ioRelinquishProcessorForMicroseconds is made we know we can sleep and the VM knows exactly when the next time to wake up is. Unfortunately we have to deal with user interrupts (i/o sockets ui) Some platforms might use nanosleep() (#if defined(HAVE_NANOSLEEP)) which might wake when a socket interrupt arrives, but I've never confirmed that. Anyway off then to call aioPoll() where the bulk of the cpu is consumed. I note that obviously avoiding calling aioPoll() will affect socket performance of course. http://www.squeakvm.org/svn/squeak/branches/Cog/platforms/unix/vm/aio.c I note you can't properly calculate next wakeup tick in smalltalk code due to the rather brittle code base in the Delay logic. Attempts I made a decade back always resulted in a deadlock situation, which is why that calculation is done in the VM. I had last taken a serious look at this back in 2010 and found very strange oddities such as calling ioRelinquishProcessorForMicroseconds yet a wakeup time is now, or in the past.. Obviously one needed to explore the stack traces to understand why no process was runnable, yet a process was scheduled to be woken... Anyway compare ioRelinquishProcessorForMicroseconds http://www.squeakvm.org/svn/squeak/branches/Cog/platforms/iOS/vm/Common/Cla… Against whatever is being compiled for your target platform VM and what exactly HAVE_NANOSLEEP is when the VM is compiled. Also check idle CPU usage for say a OS X Squeak 4.2.5 VM against I'm assume a unix vm flavor as you can run both on the same os-x machine for comparison using the same image/etc. On Tue, Feb 10, 2015 at 3:03 AM, Norbert Hartl <norbert(a)hartl.name> wrote: > > Am 10.02.2015 um 11:23 schrieb Sven Van Caekenberghe <sven(a)stfx.eu>: > > > On 10 Feb 2015, at 11:19, Norbert Hartl <norbert(a)hartl.name> wrote: > > Sven, > > Am 10.02.2015 um 10:36 schrieb Sven Van Caekenberghe <sven(a)stfx.eu>: > > > On 10 Feb 2015, at 09:51, Norbert Hartl <norbert(a)hartl.name> wrote: > > > Am 10.02.2015 um 09:23 schrieb Clément Bera <bera.clement(a)gmail.com>: > > Hello, > > About the Morphic rendering loop, the delay between rendering is handled > in WorldState>>#interCyclePause:. The best solution to reduce the cost of > the Morphic rendering loop is to put it in server mode by executing in > Pharo: WorldState serverMode: true. In squeak you have to set that in the > Preferences. > > I'll play with it and see what can be gained. > > > I tried the following on an otherwise idle DigitalOcean VM running Ubuntu > 13.10 > > $ mkdir pharo4 > $ curl get.pharo.org/40+vm | bash > $ ./pharo Pharo.image save Server > > First patch (slower event handling, extra delay of 50ms): > > $ ./pharo Server.image eval --save 'WorldState serverMode: true' > > Second patch (give time back to OS while idle for 10ms instead of for 1ms): > > $ cat ProcessorScheduler-class-idleProcess.st > 'From Pharo4.0 of 18 March 2013 [Latest update: #40484] on 10 February > 2015 at 9:49:15.412839 am!ProcessorScheduler class methodsFor: 'background > process' stamp: 'SvenVanCaekenberghe 2/10/2015idleProc[true] w[self > relinquishProcessorForMicroseconds: 10000]! ! > > $ ./pharo Server.image eval "'ProcessorScheduler-class-idleProcess.st' > asFileReference fileIn" > $ ./pharo Server.image eval '(ProcessorScheduler class>>#idleProcess) > sourceCode' > 'idleProcess > "A default background process which is invisible." > > [true] whileTrue: > [self relinquishProcessorForMicroseconds: 10000]' > > Run an image with a basic Zn HTTP server in background: > > $ ./pharo Server.image eval --no-quit 'ZnServer startDefaultOn: 1701' & > $ curl http://localhost:1701 > > Overall load is 0.01% but this is virtual/shared hardware, so who knows. > > CPU load of the pharo process hovers around a couple of %, I am not seeing > much difference, maybe it is a bit lower, but that might be wishful > thinking. > > my findings are similar. I have a CPU usage of 6%. WorldState serverMode > adds a Delay for 50ms. Setting a higher number in the idle process does not > seem to have any effect until the number is too high, then the image does > not start anymore. > I tuned all of these things and it is not faster sometimes it appears to > take more CPU which probably is not true. > > > I am afraid that we as a community do not fully understand what is > happening or how we can control it. > > On the other hand, on a machine with many images running, things are still > totally fine, so we should not worry too much. It is only in specific case > like yours where it becomes a concern. > > I can say that > > pharo-vm-nox --noevents --nohandlers --notimer --headless -vm-sound-null > /opt/nted/image/NTed.image --no-quit eval "RFBServer stop; reset. ZnServer > managedServers do: #stop. UIManager default uiProcess suspend. WorldState > serverMode: true. ProcessorScheduler class compile: 'idleProcess',String > cr,'[true] whileTrue: [self relinquishProcessorForMicroseconds: 10000]'. > ProcessorScheduler startUp" > > does not make a difference at all. My assumption here is to switch > everything off, don't use sockets, try to sleep as much as possible. > But....nothing. > > Norbert > > > But as it was discussed, the cpu consumption most probably does not come > from Morphic but comes from the idle loop, which can be solved by doing an > event-driven VM. > > I am particularly willing to have an event-driven VM because it then means > that the VM performance would then be directly proportional to the cpu > consumption. For example, theoretically, with an event-driven VM, having > the VM twice faster with Spur would also mean that the VM consumes twice > less energy. Go Green IT :-) > > That is exactly my point. While consumed energy is turned into heat the > act of saving energy is the same as having a cool device (pun intended). > > So I would like to take my consortium hat to state my upvote on this. > > Norbert > > 2015-02-10 8:00 GMT+01:00 Eliot Miranda <eliot.miranda(a)gmail.com>: > > > > On Feb 9, 2015, at 10:41 PM, Sven Van Caekenberghe <sven(a)stfx.eu> wrote: > > > On 10 Feb 2015, at 01:55, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: > > Hi Sven, > > On Mon, Feb 9, 2015 at 1:43 PM, Sven Van Caekenberghe <sven(a)stfx.eu> > wrote: > There is some timer thread between the image and the vm that ticks every > millisecond, that is the cause. I don't know what it does but it is > apparently needed. > > Anyway, that is how I understood it from Igor and Eliot, long ago. > > So basically, the VM is always slightly busy. > > Yet the VM is always slightly busy with the heartbeat thread, but this is > very cheap. The actual idle cost comes form the idle loop in the > background process that sends relinquishProcessorForMicroseconds:, which is > a primitive that eventually calls the select system call. This is the > source of the cost. > > > Can we change something about that ? > Maybe just as an experiment to prove your point ? > > > What do you think halving or doubling the argument to > relinquishProcessorForMicroseconds: should do if this is the major source > of overhead? Processor usage at idle should be closely inversely > proportional right? > > > On 09 Feb 2015, at 21:11, Norbert Hartl <norbert(a)hartl.name> wrote: > > I have an installation where a pharo powered hardware is used in a closed > case. Over time that collects quite some heat. One reason for this is that > the pharo vm is taking approx. 6% CPU all the time. The only thing that > happens is network/sockets. I suspended the ui thread in the image but on > this platform it doesn't help. > Are there any tweaks to lower the polling and the activity of the image/vm > even more? > > thanks, > > Norbert > > -- > best, > Eliot > > > -- =========================================================================== John M. McIntosh <johnmci(a)smalltalkconsulting.com> https://www.linkedin.com/in/smalltalk ===========================================================================

1 0

Spur 3248 or 3236?
by Chris Muller 09 Feb '15

09 Feb '15

Hi Eliot, should I prefer 3248 over 3236? Thanks.

2 1

NoDbgRegParms another possible fix in the Cog svn tree
by gettimothy 08 Feb '15

08 Feb '15

Hi all. I have been awol due to un-employment freakout for the past month or so; things are somewhat stable and I can devote some time on the CMake project. I think I have the solution to autoconf not expanding the NoDbgRegParms on my version of the autotools in build.linux32x86/squeak.cog.v3 SHORT VERSION: in Cog/platforms/unix/config/config.h.in add the line #define NoDbgRegParms in the header files Cog/src/vm/config/ cogit.h cointerp.h cointerpmt.h remove the following construct #if !defined(NoDbgRegParms) # define NoDbgRegParms /*empty*/ #endif Reasoning: In the configure template we define the darn thing as an empty sting by default and only set it to something when we intend to use it for debugging. LONG VERSION: Tools versions are: autoconf (GNU Autoconf) 2.69 gcc (GCC) 4.8.2 in Cog/platforms/unix/config/config.h.in add the line #define NoDbgRegParms in Cog/src/vm/config/ cogit.h cointerp.h cointerpmt.h remove the following construct #if !defined(NoDbgRegParms) # define NoDbgRegParms /*empty*/ #endif The following 2 changes are specific to my machine, but should have no bearing on the above. I note them only for completeness: 1.In each mvm file, I added the following configure variables that are required by my machine: --without-vm-display-fbdev --without-gl --x-libraries=/usr/lib 2. In each plugins.ext I remove the BochsIA32Plugin as I don't have it installed on my machine. the ./mvm for each build type in Cog/build.linux32x86/squeak.cog.v3 worked with these changes (prior, the NoDebugRegParms error kicks in) in all the subdirectories: build build.assert.itimerheartbeat build.debug.itimerheartbeat build.multithreaded build.multithreaded.debug build.assert build.debug build.itimerheartbeat build.multithreaded.assert After each build, ../../../products/XYZ/squeak -version was run and the vm correctly put out the info i.e. bash-4.2$ ../../../products/cogmtlinuxht/squeak -version 4.0-3248 #1 Sun Feb 8 12:43:20 EST 2015 gcc 4.8.2 [Production VM] CoInterpreterMT VMMaker.oscog-eem.1044 uuid: e04ad0a1-2b15-4561-a3ed-1a4d4d6d58c8 Feb 8 2015 StackToRegisterMappingCogit VMMaker.oscog-eem.1039 uuid: 931d69b1-7be3-42dd-8833-1ba325d2b5f2 Feb 8 2015 VM: r3248 http://www.squeakvm.org/svn/squeak/branches/Cog Date: 2015-02-04 19:50:56 -0500 Plugins: r3243 http://squeakvm.org/svn/squeak/trunk/platforms/Cross/plugins Linux flipper 3.10.17 #2 SMP Wed Oct 23 16:34:38 CDT 2013 x86_64 AMD Phenom(tm) II X4 965 Processor AuthenticAMD GNU/Linux My reasoning is as follows. The error looks like this: /home/tty/usr/src/smalltalk/CMake.oscog/Cog/src/vm/gcc3x-cointerp.c:1316:14: warning: 'oopisLessThan' used but never defined [enabled by default] static sqInt oopisLessThan(sqInt anOop, sqInt otherOop) NoDbgRegParms; The problem is that NoDbgRegParms must be replaced per the following logic in the cogit.h,cointerp.h and cointerpmt.h files #if !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms) # define NoDbgRegParms __attribute__ ((regparm (0))) #endif #if !defined(NoDbgRegParms) # define NoDbgRegParms /*empty*/ #endif i.e. either it is removed or replaced with __attribute__ ((regparm (0))) For "some reason" it is not and I have been trying to figure out why. I was rereading the autotools tutorial I have and got to the part about *.in files that configure uses as templates, one of which is config.h.in On a hunch, I decided to initialize the NoDbgRegParms to empty and ditch the "toggle attempt" in the config files; it seems to have worked. Summary. Let me know if a. the fix is unnacceptable (I will keep digging) b. more testing is needed. c. etc. Cordially, tty.

1 0

Squeak Oversight Board 2015 Elections
by Ron Teitelbaum 08 Feb '15

08 Feb '15

Hi All, It's that time again. Time to raise your voices and elect your leaders! It's a time for you to stand up, help your community and volunteer to serve! Squeak wants you! Every year we elect the SOB (Squeak Oversight Board) consisting of seven members from our community. The current board members are: 1. Bert Freudenberg 2. Eliot Miranda 3. Tim Rowledge 4. Frank Shearar 5. Craig Latta 6. Chris Muller 7. David T. Lewis For more info on the board please see: https://squeakboard.wordpress.com/our-mission/ Everything about the election, including schedule and more, can be tracked here: http://wiki.squeak.org/squeak/6200 Now until Monday 16th of February 3PM (20.00 UTC): Nominations of SOB members and campaigning! Candidates should nominate themselves and start their campaign on the squeak-dev mailing list. Or if you nominate someone else, make sure that person really wants to run. :) I will not put anyone on the candidate list until that person makes it known on squeak-dev that he/she intends to run. During this period, the candidates should ideally present themselves on squeak-dev, unless they have already done so, and the community can ask questions. I encourage you to reach out to potential candidates, people that are active in the community and represent your views, and ask them to run. Some people will not run without encouragement. Also I know that some people wait to the last minute to run for the board to see if others will run but please consider getting this year off to a faster start and just jump right in! *** Now until Monday 16th of February 3PM (20.00 UTC): Nominations of SOB members and campaigning! *** Monday 16th of February 2015 3PM (20.00 UTC): Candidate list is finalized. *** Monday 16th of February 2015 4PM (21.00 UTC): Online election starts. *** Tuesday 24th of February 2015 6PM (23.00 UTC): Online election ends. *** Results will be announced immediately when the election ends. The voting period is one week long and ballots are sent out via email. And how do you end up on the voter list? See below. :) IMPORTANT: New voters will NOT be added once the election is started. You MUST try to get on the voter list before the 16th of February 2014 or you will NOT be able to vote. If your Email has changed please make sure it is changed on the list of voters before the election starts. -------------------------- If you were invited to vote last year you are already on the voter list, no worries! If you are a new Squeaker and wish to vote do ONE of the following: * Get a "known" Squeaker to vouch for you. If a known Squeaker sends an email to voters (at) squeak.org giving me name and email for you, then I will add you. * Send an email to voters at squeak.org yourself (and CC to squeak-dev if you like) with information/arguments showing me that you are indeed serious about voting and that you are indeed a Squeaker. When the voting period starts all voters will receive an email with instructions and a link to the voting website. If there are any further questions, just reply *in this thread* and I will closely track it - or send email to voters (at) squeak.org which points to me. ...so let's get on with it! All the best, Ron Teitelbaum

4 4

CFP - IWST 2015
by jannik laval 06 Feb '15

06 Feb '15

[Please accept our apologies if you receive multiple copies of this call] [Please send to interested colleagues / mailing-lists] ************************************************************************************************************ CALL FOR PAPERS IWST15 — International Workshop on Smalltalk Technologies Brescia, Italy; July 15, 2015 http://www.esug.org/wiki/pier/Conferences/2015/International-Workshop-IWST_… ************************************************************************************************************ ------------------- Goals and scopes ------------------- The goals of the workshop is to create a forum around advances or experience in Smalltalk and to trigger discussions and exchanges of ideas. The topics of your paper can be on all aspect of Smalltalk, theoretical as well as practical. Participants are invited to submit research articles or industrial papers. This year we want to open two different tracks: one research track and one industrial track with less scientific constraints. We expect papers of three kinds: Short position papers describing emerging ideas Long research papers with deeper description of experiments and of research results. Industrial papers with presentation of real and innovative Smalltalk applications; this kind of paper should enlighten why Smalltalk is really appropriate for your application. We will not enforce any length restriction. -------------------- Important Dates -------------------- Submission deadline: April 10th, 2015 Notification deadline: May 20th, 2015 Workshop : July 15th, 2015 All accepted papers will be published in ACM DL (To be confirmed) ------------------- Topics ------------------- We welcome contributions on all aspects, theoretical as well as practical, of Smalltalk related topics such as: -Aspect-oriented programming, -Design patterns, -Experience reports, -Frameworks, -Implementation, new dialects or languages implemented in Smalltalk, -Interaction with other languages, -Meta-programming and Meta-modeling, -Tools ------------------- Best Paper Award ------------------- To encourage the submission of high-quality papers, the IWST organizing committee is very proud to announce a Best Paper Award for this edition of IWST. We thank the Lam Research Corporation for its financial contribution which makes it possible for prizes for the three best papers: 1000 USD for first place, 600 USD for second place and 400 USD for third place. The ranking will be decided by the program committee during the review process. The awards will be given during the ESUG conference social event. The Best Paper Award will take place only with a minimum of six submissions. Notice also that to be illegible, a paper must be presented at the workshop by one of the author and that the presenting author must be registered at the ESUG conference. ------------------- Publication ------------------- Both submissions and final papers must be prepared using the ACM SIGPLAN 10 point format. Templates for Word and LaTeX are available at http://www.acm.org/sigs/sigplan/authorInformation.htm. This site also contains links to useful informations on how to write effective submissions. ------------------- Submission ------------------- All submissions must be sent via easychair: https://easychair.org/conferences/?conf=iwst2015 ------------------- Program chairs ------------------- Anne Etien (Université de Lille 1, France) Jannik Laval (Ecole des Mines de Douai, France) -- ~~Jannik Laval~~ École des Mines de Douai Enseignant-chercheur http://www.jannik-laval.eu http://www.phratch.com http://www.approchealpes.info http://car.mines-douai.fr/

1 0

VM Maker: VMMaker.oscog-eem.1047.mcz
by commits＠source.squeak.org 06 Feb '15

06 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1047.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1047 Author: eem Time: 6 February 2015, 11:19:56.126 am UUID: 602b03c8-5b48-4e59-b0f3-e58c72344c7e Ancestors: VMMaker.oscog-eem.1046 Spur: Have lengthOf: answer 0 for ephemerons and something sensible for 64-bit indexable on 32-bits. =============== Diff against VMMaker.oscog-eem.1046 =============== Item was added: + ----- Method: Spur32BitMemoryManager>>lengthOf:format: (in category 'object access') ----- + lengthOf: objOop format: fmt + "Answer the number of indexable units in the given object. + For a CompiledMethod, the size of the method header (in bytes) + should be subtracted from the result of this method." + | numSlots | + <inline: true> + numSlots := self numSlotsOfAny: objOop. "don't let forwarders freak us out..." + fmt <= self ephemeronFormat ifTrue: + [^numSlots]. + fmt >= self firstByteFormat ifTrue: "bytes, including CompiledMethod" + [^numSlots << self shiftForWord - (fmt bitAnd: 7)]. + fmt >= self firstShortFormat ifTrue: + [^numSlots << (self shiftForWord - 1) - (fmt bitAnd: 3)]. + fmt >= self firstLongFormat ifTrue: + [^numSlots << (self shiftForWord - 2) - (fmt bitAnd: 1)]. + fmt = self sixtyFourBitIndexableFormat ifTrue: + [^numSlots >> 1]. + "fmt = self forwardedFormat" + ^0! Item was added: + ----- Method: Spur64BitMemoryManager>>lengthOf:format: (in category 'object access') ----- + lengthOf: objOop format: fmt + "Answer the number of indexable units in the given object. + For a CompiledMethod, the size of the method header (in bytes) + should be subtracted from the result of this method." + | numSlots | + <inline: true> + numSlots := self numSlotsOfAny: objOop. "don't let forwarders freak us out..." + fmt <= self ephemeronFormat ifTrue: + [^numSlots]. + fmt >= self firstByteFormat ifTrue: "bytes, including CompiledMethod" + [^numSlots << self shiftForWord - (fmt bitAnd: 7)]. + fmt >= self firstShortFormat ifTrue: + [^numSlots << (self shiftForWord - 1) - (fmt bitAnd: 3)]. + fmt >= self firstLongFormat ifTrue: + [^numSlots << (self shiftForWord - 2) - (fmt bitAnd: 1)]. + fmt = self sixtyFourBitIndexableFormat ifTrue: + [^numSlots]. + "fmt = self forwardedFormat" + ^0! Item was changed: ----- Method: SpurMemoryManager>>lengthOf:format: (in category 'object access') ----- lengthOf: objOop format: fmt "Answer the number of indexable units in the given object. For a CompiledMethod, the size of the method header (in bytes) should be subtracted from the result of this method." + ^self subclassResponsibility! - | numSlots | - <inline: true> - numSlots := self numSlotsOfAny: objOop. "don't let forwarders freak us out..." - fmt <= self sixtyFourBitIndexableFormat ifTrue: - [^numSlots]. - fmt >= self firstByteFormat ifTrue: "bytes, including CompiledMethod" - [^numSlots << self shiftForWord - (fmt bitAnd: 7)]. - fmt >= self firstShortFormat ifTrue: - [^numSlots << (self shiftForWord - 1) - (fmt bitAnd: 3)]. - "fmt >= self firstLongFormat" - ^numSlots << (self shiftForWord - 2) - (fmt bitAnd: 1)!

1 0

← Newer
1
...
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2015