December 2010 - Pharo-dev - lists.pharo.org

[Pharo-project] Issue 3346 in pharo: Socket bug fixes
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: FixedWaitingToBePharoed Owner: stephane.ducasse Labels: Milestone-1.3 New issue 3346 by stephane.ducasse: Socket bug fixes http://code.google.com/p/pharo/issues/detail?id=3346 Andreas Raab uploaded a new version of Network to project The Trunk: http://source.squeak.org/trunk/Network-ar.98.mcz ==================== Summary ==================== Name: Network-ar.98 Author: ar Time: 23 November 2010, 12:12:58.498 am UUID: 5f0637f3-9b53-ab42-a6fa-55077db31f63 Ancestors: Network-ul.97 Fixes for SocketStream: 1) SocketStream>>receiveData: and SocketStream>>upToEnd: had incorrect conditions used to determine when to stop (#isConnected is wrong since there can be data pending on an unconnected socket which is why using #atEnd is the correct test). 2) The former was done to deal with non-signaling SocketStreams in cases where ConnectionClose was used to deal with end conditions (#upToEnd, #next:into:startingAt:, #readInto:startingAt:count:). This was fixed by making these places (temporarily) signaling so that the exception can be caught and handled properly. 3) SocketStream>>isDataAvailable should not attempt to shortcut prematurely; using 'socket dataAvailable' is bad for subclasses such as SecureSocketStream and unnecessary to boot (and has no performance impact). =============== Diff against Network-ul.97 =============== Item was added: + ----- Method: SocketStream>>beSignalingWhile: (in category 'private') ----- + beSignalingWhile: aBlock + "Temporarily turn a non-signaling SocketStream into a signaling one. + Required for some of operations that will catch ConnectionClosed in + order to find out that an operation completed" + + | signaling | + signaling := shouldSignal. + shouldSignal := true. + ^aBlock ensure:[shouldSignal := signaling] + ! Item was changed: ----- Method: SocketStream>>isDataAvailable (in category 'testing') ----- isDataAvailable + "Answer if more data can be read. It the inbuffer is empty, we read more data. - "Answer if more data can be read. It the inbuffer is empty, we check the socket for data. If it claims to have data available to read, we try to read some once and recursively call this method again. If something really was available it is now in the inBuffer. This is because there has been spurious dataAvailable when there really is no data to get. + Note: It is important not to rely on 'socket dataAvailable' here since this will + not work for subclasses such as SecureSocketStream (which can contain + undecrypted contents that has been read from the socket)." - Note: Some subclasses (such as SecureSocketStream) rely on the behavior here since even though data may be available in the underlying socket, it may not result in any output (yet)." self isInBufferEmpty ifFalse: [^true]. + ^self receiveAvailableData < inNextToWrite + ! - ^socket dataAvailable - ifFalse: [false] - ifTrue: [self receiveAvailableData; isDataAvailable]! Item was changed: ----- Method: SocketStream>>next:into:startingAt: (in category 'stream in') ----- next: anInteger into: aCollection startingAt: startIndex "Read n objects into the given collection. Return aCollection or a partial copy if less than n elements have been read." "Implementation note: This method DOES signal timeout if not enough elements are received. It does NOT signal ConnectionClosed as closing the connection is the only way by which partial data can be read." | start amount | + [self beSignalingWhile:[self receiveData: anInteger]] + on: ConnectionClosed do:[:ex| ex return]. - [self receiveData: anInteger] on: ConnectionClosed do:[:ex| ex return]. "Inlined version of nextInBuffer: to avoid copying the contents" amount := anInteger min: (inNextToWrite - lastRead - 1). start := lastRead + 1. lastRead := lastRead + amount. aCollection replaceFrom: startIndex to: startIndex + amount-1 with: inBuffer startingAt: start. ^amount < anInteger ifTrue:[aCollection copyFrom: 1 to: startIndex + amount-1] ifFalse:[aCollection]! Item was changed: ----- Method: SocketStream>>readInto:startingAt:count: (in category 'stream in') ----- readInto: aCollection startingAt: startIndex count: anInteger "Read n objects into the given collection starting at startIndex. Return number of elements that have been read." "Implementation note: This method DOES signal timeout if not enough elements are received. It does NOT signal ConnectionClosed as closing the connection is the only way by which partial data can be read." | start amount | + [self beSignalingWhile:[self receiveData: anInteger]] + on: ConnectionClosed do:[:ex| ex return]. - [self receiveData: anInteger] on: ConnectionClosed do:[:ex| ex return]. "Inlined version of nextInBuffer: to avoid copying the contents" amount := anInteger min: (inNextToWrite - lastRead - 1). start := lastRead + 1. lastRead := lastRead + amount. aCollection replaceFrom: startIndex to: startIndex + amount-1 with: inBuffer startingAt: start. ^amount! Item was changed: ----- Method: SocketStream>>receiveData: (in category 'control') ----- receiveData: nBytes "Keep reading the socket until we have nBytes in the inBuffer or we reach the end. This method does not return data, but can be used to make sure data has been read into the buffer from the Socket before actually reading it from the FastSocketStream. Mainly used internally. We could also adjust the buffer to the expected amount of data and avoiding several incremental grow operations. NOTE: This method doesn't honor timeouts if shouldSignal is false!! And frankly, I am not sure how to handle that case or if I care - I think we should always signal." + [self atEnd not and: [nBytes > self inBufferSize]] - [self isConnected and: [nBytes > self inBufferSize]] whileTrue: [self receiveData]! Item was changed: ----- Method: SocketStream>>upToEnd (in category 'stream in') ----- upToEnd "Answer all data coming in on the socket until the socket is closed by the other end, or we get a timeout. + This means this method catches ConnectionClosed by itself." - This means this method catches ConnectionClosed by itself. - - NOTE: Does not honour timeouts if shouldSignal is false!!" + [[self atEnd] whileFalse: [self beSignalingWhile:[self receiveData]]] - [[self isConnected] whileTrue: [self receiveData]] on: ConnectionClosed do: [:ex | "swallow it"]. ^self nextAllInBuffer!

1 1

[Pharo-project] Issue 3348 in pharo: use #shouldBePrintedAsLiteral instead of #isLiteral when printing or storing characters and arrays
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: FixedWaitingToBePharoed Owner: stephane.ducasse Labels: Milestone-1.3 Difficulty-Easy New issue 3348 by stephane.ducasse: use #shouldBePrintedAsLiteral instead of #isLiteral when printing or storing characters and arrays http://code.google.com/p/pharo/issues/detail?id=3348 A new version of Collections was added to project The Inbox: http://source.squeak.org/inbox/Collections-ul.411.mcz ==================== Summary ==================== Name: Collections-ul.411 Author: ul Time: 23 November 2010, 1:56:22.424 pm UUID: 42a0b87a-f525-6345-bd2c-e55186e17c9d Ancestors: Collections-ul.410 - use #shouldBePrintedAsLiteral instead of #isLiteral when printing or storing characters and arrays =============== Diff against Collections-ul.410 =============== Item was changed: ----- Method: Array>>printOn: (in category 'printing') ----- printOn: aStream + self shouldBePrintedAsLiteral ifTrue: [^self printAsLiteralFormOn: aStream]. - self isLiteral ifTrue: [^self printAsLiteralFormOn: aStream]. self class = Array ifTrue: [^self printAsBraceFormOn: aStream]. ^super printOn: aStream! Item was added: + ----- Method: Array>>shouldBePrintedAsLiteral (in category 'testing') ----- + shouldBePrintedAsLiteral + + ^self class == Array and: [ self allSatisfy: [ :each | each shouldBePrintedAsLiteral ] ]! Item was changed: ----- Method: Array>>storeOn: (in category 'printing') ----- storeOn: aStream "Use the literal form if possible." + self shouldBePrintedAsLiteral - self isLiteral ifTrue: [aStream nextPut: $#; nextPut: $(. self do: [:element | element storeOn: aStream. aStream space]. aStream nextPut: $)] ifFalse: [super storeOn: aStream]! Item was changed: ----- Method: Array>>storeOnStream: (in category 'filter streaming') ----- storeOnStream:aStream + + self shouldBePrintedAsLiteral + ifTrue: [ super storeOnStream:aStream ] + ifFalse:[ aStream writeCollection:self ] - self isLiteral ifTrue: [super storeOnStream:aStream] ifFalse:[aStream writeCollection:self]. ! Item was changed: + ----- Method: Character>>isLiteral (in category 'testing') ----- - ----- Method: Character>>isLiteral (in category 'printing') ----- isLiteral ^true! Item was added: + ----- Method: Character>>shouldBePrintedAsLiteral (in category 'testing') ----- + shouldBePrintedAsLiteral + + ^value between: 33 and: 255! Item was changed: ----- Method: Character>>storeOn: (in category 'printing') ----- storeOn: aStream "Common character literals are preceded by '$', however special need to be encoded differently: for some this might be done by using one of the shortcut constructor methods for the rest we have to create them by ascii-value." | name | + self shouldBePrintedAsLiteral - (value between: 33 and: 255) ifTrue: [ aStream nextPut: $$; nextPut: self ] ifFalse: [ name := self class constantNameFor: self. name notNil ifTrue: [ aStream nextPutAll: self class name; space; nextPutAll: name ] ifFalse: [ aStream nextPut: $(; nextPutAll: self class name; nextPutAll: ' value: '; print: value; nextPut: $) ] ].!

1 2

[Pharo-project] Issue 3436 in pharo: #copyFrom: is broken
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: New Owner: ---- New issue 3436 by sebastianconcept: #copyFrom: is broken http://code.google.com/p/pharo/issues/detail?id=3436 1.2 Unstable version 12272 Steps to reproduce: 1. 2. 3. Just do cmd-p on this: ('some shit' copyFrom: 5) = 'some shit' ifTrue:['WTF?!']

5 30

[Pharo-project] Issue 3349 in pharo: Some network fixes
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: FixedWaitingToBePharoed Owner: stephane.ducasse Labels: Milestone-1.3 Type-Squeak New issue 3349 by stephane.ducasse: Some network fixes http://code.google.com/p/pharo/issues/detail?id=3349 Levente Uzonyi uploaded a new version of Network to project The Trunk: http://source.squeak.org/trunk/Network-ul.99.mcz ==================== Summary ==================== Name: Network-ul.99 Author: ul Time: 25 November 2010, 11:25:58.723 pm UUID: 26c053e2-d198-0144-a3c9-c8181481e3da Ancestors: Network-ar.98 - fixed clock rollover issues (http://bugs.squeak.org/view.php?id=7343 http://bugs.squeak.org/view.php?id=6857 ) - replaced #waitForConnectionUntil: sends to #waitForConnectionFor: sends in SocksSocket - simplified a few methods (some are from Pharo) =============== Diff against Network-ar.98 =============== Item was changed: ----- Method: ConnectionQueue>>listenLoop (in category 'private') ----- listenLoop "Private!! This loop is run in a separate process. It will establish up to maxQueueLength connections on the given port." "Details: When out of sockets or queue is full, retry more frequently, since a socket may become available, space may open in the queue, or a previously queued connection may be aborted by the client, making it available for a fresh connection." "Note: If the machine is disconnected from the network while the server is running, the currently waiting socket will go from 'isWaitingForConnection' to 'unconnected', and attempts to create new sockets will fail. When this happens, delete the broken socket and keep trying to create a socket in case the network connection is re-established. Connecting and disconnecting was tested under PPP on Mac system 8.1. It is not if this will work on other platforms." | newConnection | socket := Socket newTCP. "We'll accept four simultanous connections at the same time" socket listenOn: portNumber backlogSize: 4. "If the listener is not valid then the we cannot use the BSD style accept() mechanism." socket isValid ifFalse: [^self oldStyleListenLoop]. [true] whileTrue: [ socket isValid ifFalse: [ "socket has stopped listening for some reason" socket destroy. (Delay forMilliseconds: 10) wait. ^self listenLoop ]. + newConnection := socket + waitForAcceptFor: 10 + ifTimedOut: [ nil ]. - newConnection := [socket waitForAcceptFor: 10] - on: ConnectionTimedOut - do: [nil]. (newConnection notNil and: [newConnection isConnected]) ifTrue: [ accessSema critical: [connections addLast: newConnection.]. newConnection := nil. self changed]. self pruneStaleConnections]. ! Item was changed: ----- Method: ConnectionQueue>>oldStyleListenLoop (in category 'private') ----- oldStyleListenLoop "Private!! This loop is run in a separate process. It will establish up to maxQueueLength connections on the given port." "Details: When out of sockets or queue is full, retry more frequently, since a socket may become available, space may open in the queue, or a previously queued connection may be aborted by the client, making it available for a fresh connection." "Note: If the machine is disconnected from the network while the server is running, the currently waiting socket will go from 'isWaitingForConnection' to 'unconnected', and attempts to create new sockets will fail. When this happens, delete the broken socket and keep trying to create a socket in case the network connection is re-established. Connecting and disconnecting was tested under PPP on Mac system 8.1. It is not if this will work on other platforms." [true] whileTrue: [ ((socket == nil) and: [connections size < maxQueueLength]) ifTrue: [ "try to create a new socket for listening" socket := Socket createIfFail: [nil]]. socket == nil ifTrue: [(Delay forMilliseconds: 100) wait] ifFalse: [ socket isUnconnected ifTrue: [socket listenOn: portNumber]. + socket + waitForConnectionFor: 10 + ifTimedOut: [ - [socket waitForConnectionFor: 10] - on: ConnectionTimedOut - do: [:ex | socket isConnected ifTrue: [ "connection established" accessSema critical: [connections addLast: socket]. socket := nil] ifFalse: [ socket isWaitingForConnection ifFalse: [socket destroy. socket := nil]]]]. "broken socket; start over" self pruneStaleConnections]. ! Item was changed: ----- Method: Socket class>>deadlineSecs: (in category 'utilities') ----- deadlineSecs: secs "Return a deadline time the given number of seconds from now." + self deprecated: 'Using this method may result in clock rollover related bug. Don''t use it.'. ^ Time millisecondClockValue + (secs * 1000) truncated ! Item was changed: ----- Method: Socket class>>ping: (in category 'utilities') ----- ping: hostName "Ping the given host. Useful for checking network connectivity. The host must be running a TCP echo server." "Socket ping: 'squeak.cs.uiuc.edu'" | tcpPort sock serverAddr startTime echoTime | tcpPort := 7. "7 = echo port, 13 = time port, 19 = character generator port" serverAddr := NetNameResolver addressForName: hostName timeout: 10. + serverAddr ifNil: [ ^self inform: 'Could not find an address for ', hostName ]. - serverAddr = nil ifTrue: [ - ^ self inform: 'Could not find an address for ', hostName]. sock := Socket new. sock connectNonBlockingTo: serverAddr port: tcpPort. [sock waitForConnectionFor: 10] on: ConnectionTimedOut do: [:ex | (self confirm: 'Continue to wait for connection to ', hostName, '?') ifTrue: [ex retry] ifFalse: [ sock destroy. ^ self]]. sock sendData: 'echo!!'. startTime := Time millisecondClockValue. [sock waitForDataFor: 15] on: ConnectionTimedOut do: [:ex | (self confirm: 'Packet sent but no echo yet; keep waiting?') ifTrue: [ex retry]]. echoTime := Time millisecondClockValue - startTime. sock destroy. self inform: hostName, ' responded in ', echoTime printString, ' milliseconds'. ! Item was changed: ----- Method: Socket class>>pingPorts:on:timeOutSecs: (in category 'utilities') ----- pingPorts: portList on: hostName timeOutSecs: timeOutSecs "Attempt to connect to each of the given sockets on the given host. Wait at most timeOutSecs for the connections to be established. Answer an array of strings indicating the available ports." - "Socket pingPorts: #(7 13 19 21 23 25 80 110 119) on: 'squeak.cs.uiuc.edu' timeOutSecs: 15" + "Socket pingPorts: #(7 13 19 21 23 25 80 110 119) on: 'squeak.org' timeOutSecs: 15" - | serverAddr sockets deadline done result unconnectedCount connectedCount waitingCount | - serverAddr := NetNameResolver addressForName: hostName timeout: 10. - serverAddr = nil ifTrue: [ - self inform: 'Could not find an address for ', hostName. - ^ #()]. + | serverAddr sockets startTime timeoutMsecs done result unconnectedCount connectedCount waitingCount | + serverAddr := NetNameResolver addressForName: hostName timeout: 10. + serverAddr ifNil: [ + self inform: 'Could not find an address for ' , hostName. + ^ #() ]. + sockets := portList + collect: [ :portNum | + | sock | + sock := Socket new. + [ sock connectTo: serverAddr port: portNum ] + on: ConnectionTimedOut + do: [ ]. + sock ]. + startTime := Time millisecondClockValue. + timeoutMsecs := (1000 * timeOutSecs) truncated. - sockets := portList collect: [:portNum | | sock | - sock := Socket new. - sock connectTo: serverAddr port: portNum]. - - deadline := self deadlineSecs: timeOutSecs. done := false. + [ done ] + whileFalse: [ + unconnectedCount := 0. + connectedCount := 0. + waitingCount := 0. + sockets + do: [ :s | + s isUnconnectedOrInvalid + ifTrue: [ unconnectedCount := unconnectedCount + 1 ] + ifFalse: [ + s isConnected + ifTrue: [ connectedCount := connectedCount + 1 ]. + s isWaitingForConnection + ifTrue: [ waitingCount := waitingCount + 1 ] ] ]. + waitingCount = 0 + ifTrue: [ done := true ]. + connectedCount = sockets size + ifTrue: [ done := true ]. + (Time millisecondsSince: startTime) >= timeoutMsecs + ifTrue: [ done := true ] ]. + result := (sockets select: [ :s | s isConnected ]) collect: [ :s | self nameForWellKnownTCPPort: s remotePort ]. + sockets do: [ :s | s destroy ]. + ^ result! - [done] whileFalse: [ - unconnectedCount := 0. - connectedCount := 0. - waitingCount := 0. - sockets do: [:s | - s isUnconnectedOrInvalid - ifTrue: [unconnectedCount := unconnectedCount + 1] - ifFalse: [ - s isConnected ifTrue: [connectedCount := connectedCount + 1]. - s isWaitingForConnection ifTrue: [waitingCount := waitingCount + 1]]]. - waitingCount = 0 ifTrue: [done := true]. - connectedCount = sockets size ifTrue: [done := true]. - Time millisecondClockValue > deadline ifTrue: [done := true]]. - - result := (sockets select: [:s | s isConnected]) - collect: [:s | self nameForWellKnownTCPPort: s remotePort]. - sockets do: [:s | s destroy]. - ^ result - ! Item was changed: ----- Method: Socket>>acceptFrom: (in category 'initialize-destroy') ----- acceptFrom: aSocket "Initialize a new socket handle from an accept call" | semaIndex readSemaIndex writeSemaIndex | primitiveOnlySupportsOneSemaphore := false. semaphore := Semaphore new. readSemaphore := Semaphore new. writeSemaphore := Semaphore new. semaIndex := Smalltalk registerExternalObject: semaphore. readSemaIndex := Smalltalk registerExternalObject: readSemaphore. writeSemaIndex := Smalltalk registerExternalObject: writeSemaphore. socketHandle := self primAcceptFrom: aSocket socketHandle receiveBufferSize: 8000 sendBufSize: 8000 semaIndex: semaIndex readSemaIndex: readSemaIndex writeSemaIndex: writeSemaIndex. + socketHandle + ifNotNil: [ self register ] + ifNil: [ "socket creation failed" + Smalltalk unregisterExternalObject: semaphore. + Smalltalk unregisterExternalObject: readSemaphore. + Smalltalk unregisterExternalObject: writeSemaphore. + readSemaphore := writeSemaphore := semaphore := nil ] - socketHandle = nil ifTrue: [ "socket creation failed" - Smalltalk unregisterExternalObject: semaphore. - Smalltalk unregisterExternalObject: readSemaphore. - Smalltalk unregisterExternalObject: writeSemaphore. - readSemaphore := writeSemaphore := semaphore := nil - ] ifFalse:[self register]. ! Item was changed: ----- Method: Socket>>destroy (in category 'initialize-destroy') ----- destroy "Destroy this socket. Its connection, if any, is aborted and its resources are freed. Do nothing if the socket has already been destroyed (i.e., if its socketHandle is nil)." + socketHandle ifNotNil: [ + self isValid ifTrue: [ self primSocketDestroy: socketHandle ]. - socketHandle = nil ifFalse: - [self isValid ifTrue: [self primSocketDestroy: socketHandle]. Smalltalk unregisterExternalObject: semaphore. Smalltalk unregisterExternalObject: readSemaphore. Smalltalk unregisterExternalObject: writeSemaphore. socketHandle := nil. readSemaphore := writeSemaphore := semaphore := nil. + self unregister ]! - self unregister]. - ! Item was changed: ----- Method: Socket>>initialize: (in category 'initialize-destroy') ----- initialize: socketType "Initialize a new socket handle. If socket creation fails, socketHandle will be set to nil." | semaIndex readSemaIndex writeSemaIndex | primitiveOnlySupportsOneSemaphore := false. semaphore := Semaphore new. readSemaphore := Semaphore new. writeSemaphore := Semaphore new. semaIndex := Smalltalk registerExternalObject: semaphore. readSemaIndex := Smalltalk registerExternalObject: readSemaphore. writeSemaIndex := Smalltalk registerExternalObject: writeSemaphore. socketHandle := self primSocketCreateNetwork: 0 type: socketType receiveBufferSize: 8000 sendBufSize: 8000 semaIndex: semaIndex readSemaIndex: readSemaIndex writeSemaIndex: writeSemaIndex. + socketHandle + ifNotNil: [ self register ] + ifNil: [ "socket creation failed" + Smalltalk unregisterExternalObject: semaphore. + Smalltalk unregisterExternalObject: readSemaphore. + Smalltalk unregisterExternalObject: writeSemaphore. + readSemaphore := writeSemaphore := semaphore := nil ] - socketHandle = nil ifTrue: [ "socket creation failed" - Smalltalk unregisterExternalObject: semaphore. - Smalltalk unregisterExternalObject: readSemaphore. - Smalltalk unregisterExternalObject: writeSemaphore. - readSemaphore := writeSemaphore := semaphore := nil - ] ifFalse:[self register]. !

1 2

[Pharo-project] Issue 3382 in pharo: BUG: Class variable creation behavior Inconsistent/incorrect
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: New Owner: ---- New issue 3382 by sean.p.denigris: BUG: Class variable creation behavior Inconsistent/incorrect http://code.google.com/p/pharo/issues/detail?id=3382 * Class>>canFindWithoutEnvironment: checks the environment, making the behavior like bindingOf: * changed Class>>declare: and Class>>addClassVarName: - check the environment (i.e. Class names) for class variable name conflicts - conflict error message confusing/inaccurate * above conflict error in #declare is resumable, same error in #addClassVarName: is not ClassTests * uses depreciated methods on Class * testHaSharedPools should be testHasSharedPools Pharo image: Pharo-core Pharo core version: Pharo1.2a Latest update: #12264

2 5

[Pharo-project] Issue 3466 in pharo: Display the leading zero while printing the hexadecimal version of a Character
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: New Owner: ---- New issue 3466 by geo.couprie: Display the leading zero while printing the hexadecimal version of a Character http://code.google.com/p/pharo/issues/detail?id=3466 Pharo image: Pharo | Pharo-core Pharo core version: Pharo1.2beta Virtual machine used: pharo-vm-4.0.2-win32 Steps to reproduce: 1.(Character value:15) printStringHex -> 'F' it should return '0F'. Character>>hex returns '16rF' and should not be fixed, but printStringHex must display the leading zero, because the smallest representation of a Character is a byte. Additionally, String>>asHex should use Character>>printStringHex instead of Character>>hex.

1 5

[Pharo-project] Issue 3424 in pharo: Improved class Tests
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: FixedWaitingToBePharoed Owner: stephane.ducasse Labels: Milestone-1.3 Difficulty-Easy New issue 3424 by stephane.ducasse: Improved class Tests http://code.google.com/p/pharo/issues/detail?id=3424 A new version of KernelTests was added to project The Inbox: http://source.squeak.org/inbox/KernelTests-spd.149.mcz ==================== Summary ==================== Name: KernelTests-spd.149 Author: spd Time: 4 December 2010, 1:33:50.265 pm UUID: 89c23bef-103f-4b9d-885c-bcf19d6b6fa9 Ancestors: KernelTests-cmm.148 * refactored and extended ClassTest, including adding a test for Class>>canFindWithoutEnvironment: (fixed in Kernel-spd.444 in inbox) n.b. no conflicts with trunk as of 12/4/2010 =============== Diff against KernelTests-cmm.148 =============== Item was changed: TestCase subclass: #ClassTest + instanceVariableNames: 'className renamedName subClassName anotherClassName class subclass anotherClass' - instanceVariableNames: 'className renamedName' classVariableNames: '' poolDictionaries: '' category: 'KernelTests-Classes'! Item was added: + ----- Method: ClassTest classSide>>deleteClassNamed: (in category 'setup') ----- + deleteClassNamed: aString + | cl | + cl := Smalltalk at: aString ifAbsent: [^self]. + cl removeFromChanges; removeFromSystemUnlogged + ! Item was removed: - ----- Method: ClassTest>>deleteClass (in category 'setup') ----- - deleteClass - | cl | - cl := Smalltalk at: className ifAbsent: [^self]. - cl removeFromChanges; removeFromSystemUnlogged - ! Item was removed: - ----- Method: ClassTest>>deleteRenamedClass (in category 'setup') ----- - deleteRenamedClass - | cl | - cl := Smalltalk at: renamedName ifAbsent: [^self]. - cl removeFromChanges; removeFromSystemUnlogged - ! Item was added: + ----- Method: ClassTest>>deleteTestClasses (in category 'setup') ----- + deleteTestClasses + + self class deleteClassNamed: class name. + self class deleteClassNamed: subclass name. + self class deleteClassNamed: renamedName. + self class deleteClassNamed: anotherClass name. + ! Item was changed: ----- Method: ClassTest>>setUp (in category 'setup') ----- setUp + - className := #TUTU. renamedName := #RenamedTUTU. + + self deleteTestClasses. + + class := Object subclass: #TUTU - self deleteClass. - self deleteRenamedClass. - Object subclass: className instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'KernelTests-Classes'. + + subclass := class subclass: #SubTUTU + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'KernelTests-Classes'. + + anotherClass := Object subclass: #AnotherClass + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'KernelTests-Classes'.! - category: 'KernelTests-Classes'! Item was added: + ----- Method: ClassTest>>superclass (in category 'accessing') ----- + superclass + + ^ class.! Item was changed: ----- Method: ClassTest>>tearDown (in category 'setup') ----- tearDown + + self deleteTestClasses.! - self deleteClass. - self deleteRenamedClass! Item was added: + ----- Method: ClassTest>>testAddClassVarName (in category 'testing') ----- + testAddClassVarName + "self run: #testAddClassVarName" + + class addClassVarName: #MyShinyNewClassVar. + self assert: (class classVarNames anySatisfy: [ :name | name = #MyShinyNewClassVar ]). + + ! Item was added: + ----- Method: ClassTest>>testAddClassVarNameWithSameNameAsAGlobal (in category 'testing') ----- + testAddClassVarNameWithSameNameAsAGlobal + "self run: #testAddClassVarName" + + self shouldnt: [ class addClassVarName: anotherClass name ] raise: Exception. + self assert: (class classVarNames anySatisfy: [ :name | name = anotherClass name ]). + + ! Item was changed: ----- Method: ClassTest>>testAddInstVarName (in category 'testing') ----- testAddInstVarName "self run: #testAddInstVarName" + class addInstVarName: 'x'. + self assert: (class instVarNames = #('x')). + class addInstVarName: 'y'. + self assert: (class instVarNames = #('x' 'y')) - | tutu | - tutu := Smalltalk at: #TUTU. - tutu addInstVarName: 'x'. - self assert: (tutu instVarNames = #('x')). - tutu addInstVarName: 'y'. - self assert: (tutu instVarNames = #('x' 'y')) - ! Item was added: + ----- Method: ClassTest>>testCanFindWithoutEnvironment (in category 'testing') ----- + testCanFindWithoutEnvironment + "self debug: #testCanFindWithoutEnvironment" + "self run: #testCanFindWithoutEnvironment" + + self deny: (subclass canFindWithoutEnvironment: #ClassVarInSuperclass). + self deny: (subclass canFindWithoutEnvironment: #PoolVarInSuperclass). + self deny: (subclass canFindWithoutEnvironment: #ClassVar). + self deny: (subclass canFindWithoutEnvironment: #PoolVar). + + subclass addClassVarName: 'ClassVar'. + self assert: (subclass canFindWithoutEnvironment: #ClassVar). + + subclass addSharedPool: (Dictionary newFromPairs: #(PoolVar->5)). + self assert: (subclass canFindWithoutEnvironment: #PoolVar). + + self superclass addClassVarName: 'ClassVarInSupersubclass'. + self assert: (subclass canFindWithoutEnvironment: #ClassVarInSupersubclass). + + self superclass addSharedPool: (Dictionary newFromPairs: #(PoolVarInSupersubclass->5)). + self assert: (subclass canFindWithoutEnvironment: #PoolVarInSupersubclass).! Item was changed: ----- Method: ClassTest>>testRenaming (in category 'testing') ----- testRenaming "self debug: #testRenaming" "self run: #testRenaming" + | newMetaclassName | - | oldName newMetaclassName class | - oldName := className. newMetaclassName := (renamedName, #' class') asSymbol. - class := Smalltalk at: oldName. class class compile: 'dummyMeth'. class rename: renamedName. self assert: class name = renamedName. self assert: (ChangeSet current changedClassNames includes: renamedName). self assert: (ChangeSet current changedClassNames includes: newMetaclassName). !

1 1

[Pharo-project] Issue 3370 in pharo: NewParagraph and MultiNewParagraph should be merged
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: Accepted Owner: aplantec Labels: Milestone-1.2 New issue 3370 by aplantec: NewParagraph and MultiNewParagraph should be merged http://code.google.com/p/pharo/issues/detail?id=3370 Merged in a Paragraph class then NewParagraph and MultiNewParagraph deprecated in 1.2

1 5

[Pharo-project] Issue 3347 in pharo: simplified and unified String's line-ending changing methods
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: FixedWaitingToBePharoed Owner: stephane.ducasse Labels: Milestone-1.3 Type-Squeak New issue 3347 by stephane.ducasse: simplified and unified String's line-ending changing methods http://code.google.com/p/pharo/issues/detail?id=3347 Levente Uzonyi uploaded a new version of Collections to project The Trunk: http://source.squeak.org/trunk/Collections-ul.409.mcz ==================== Summary ==================== Name: Collections-ul.409 Author: ul Time: 22 November 2010, 1:35:14.026 pm UUID: 849eb41a-5717-9e44-ab23-eae36fb603bb Ancestors: Collections-ul.408 - introduced String >> #withLineEndings: - simplified and unified String's line-ending changing methods: #withInternetLineEndings, #withSqueakLineEndings and #withUnixLineEndings =============== Diff against Collections-ul.408 =============== Item was changed: ----- Method: String>>withInternetLineEndings (in category 'internet') ----- withInternetLineEndings "change line endings from CR's and LF's to CRLF's. This is probably in prepration for sending a string over the Internet" + ^self withLineEndings: String crlf! - ^self class - new: self size * 16 // 15 "provisions for CR-LF pairs" - streamContents: [ :stream | - self lineIndicesDo: [:start :endWithoutDelimiters :end | - stream next: 1 + endWithoutDelimiters - start putAll: self startingAt: start. - endWithoutDelimiters = end ifFalse: [ - stream crlf ] ] ]! Item was added: + ----- Method: String>>withLineEndings: (in category 'internet') ----- + withLineEndings: lineEndingString + + | stream | + stream := nil. + self lineIndicesDo: [ :start :endWithoutDelimiters :end | + (stream isNil and: [ endWithoutDelimiters ~= end ]) ifTrue: [ + (self copyFrom: endWithoutDelimiters + 1 to: end) = lineEndingString ifFalse: [ + stream := WriteStream with: self copy. + stream position: start - 1 ] ]. + stream ifNotNil: [ + stream next: endWithoutDelimiters - start + 1 putAll: self startingAt: start. + endWithoutDelimiters = end ifFalse: [ + stream nextPutAll: lineEndingString ] ] ]. + ^stream + ifNil: [ self ] + ifNotNil: [ + stream position = self size + ifTrue: [ stream originalContents ] + ifFalse: [ stream contents ] ]! Item was changed: ----- Method: String>>withSqueakLineEndings (in category 'internet') ----- withSqueakLineEndings "Assume the string is textual, and that CR, LF, and CRLF are all valid line endings. Replace each occurence with a single CR." + | cr lf indexLF indexCR | - | cr lf inPos outPos outString newOutPos indexLF indexCR | lf := Character linefeed. indexLF := self indexOf: lf startingAt: 1. indexLF = 0 ifTrue: [^self]. cr := Character cr. indexCR := self indexOf: cr startingAt: 1. indexCR = 0 ifTrue: [^self copy replaceAll: lf with: cr]. + ^self withLineEndings: String cr! - inPos := outPos := 1. - outString := String new: self size. - - ["check if next CR (if any) is before next LF" - (indexCR > 0 and: [indexCR < indexLF]) - ifTrue: [ - newOutPos := outPos + 1 + indexCR - inPos. - outString replaceFrom: outPos to: newOutPos - 1 with: self startingAt: inPos. - outPos := newOutPos. - 1 + indexCR = indexLF - ifTrue: ["Caught a CR-LF pair" - inPos := 1 + indexLF. - indexLF := self indexOf: lf startingAt: inPos] - ifFalse: [inPos := 1 + indexCR]. - indexCR := self indexOf: cr startingAt: inPos] - ifFalse: [ - newOutPos := outPos + 1 + indexLF - inPos. - outString replaceFrom: outPos to: newOutPos - 2 with: self startingAt: inPos. - outString at: newOutPos - 1 put: cr. - outPos := newOutPos. - inPos := 1 + indexLF. - indexLF := self indexOf: lf startingAt: inPos]. - indexLF = 0] - whileFalse. - - "no more LF line endings. copy the rest" - newOutPos := outPos + (self size - inPos + 1). - outString replaceFrom: outPos to: newOutPos - 1 with: self startingAt: inPos. - ^outString copyFrom: 1 to: newOutPos - 1! Item was changed: ----- Method: String>>withUnixLineEndings (in category 'internet') ----- withUnixLineEndings "Assume the string is textual, and that CR, LF, and CRLF are all valid line endings. Replace each occurence with a single LF." + | cr lf indexLF indexCR | - | cr lf inPos outPos outString newOutPos indexLF indexCR | cr := Character cr. indexCR := self indexOf: cr startingAt: 1. indexCR = 0 ifTrue: [^self]. lf := Character linefeed. indexLF := self indexOf: lf startingAt: 1. indexLF = 0 ifTrue: [^self copy replaceAll: cr with: lf]. + ^self withLineEndings: String lf! - inPos := outPos := 1. - outString := String new: self size. - - ["check if next CR is before next LF or if there are no more LF" - (indexLF = 0 or: [indexCR < indexLF]) - ifTrue: [ - newOutPos := outPos + 1 + indexCR - inPos. - outString replaceFrom: outPos to: newOutPos - 2 with: self startingAt: inPos. - outString at: newOutPos - 1 put: lf. - outPos := newOutPos. - 1 + indexCR = indexLF - ifTrue: ["Caught a CR-LF pair" - inPos := 1 + indexLF. - indexLF := self indexOf: lf startingAt: inPos] - ifFalse: [inPos := 1 + indexCR]. - indexCR := self indexOf: cr startingAt: inPos] - ifFalse: [ - newOutPos := outPos + 1 + indexLF - inPos. - outString replaceFrom: outPos to: newOutPos - 1 with: self startingAt: inPos. - outPos := newOutPos. - inPos := 1 + indexLF. - indexLF := self indexOf: lf startingAt: inPos]. - indexCR = 0] - whileFalse. - - "no more CR line endings. copy the rest" - newOutPos := outPos + (self size - inPos + 1). - outString replaceFrom: outPos to: newOutPos - 1 with: self startingAt: inPos. - ^outString copyFrom: 1 to: newOutPos - 1!

1 2

[Pharo-project] Issue 3340 in pharo: ThreadSafe DebuggerMethodMap
by pharo＠googlecode.com April 7, 2011

April 7, 2011

Status: Accepted Owner: stephane.ducasse Labels: Milestone-1.3 Type-Squeak New issue 3340 by stephane.ducasse: ThreadSafe DebuggerMethodMap http://code.google.com/p/pharo/issues/detail?id=3340 We should have a look at that fix from squeak A new version of Tools was added to project The Inbox: http://source.squeak.org/inbox/Tools-ul.278.mcz ==================== Summary ==================== Name: Tools-ul.278 Author: ul Time: 15 November 2010, 8:46:10.672 am UUID: d03d7286-1db1-f943-9e1c-6e86626b5f89 Ancestors: Tools-ul.277 Thread-safe DebuggerMethodMap =============== Diff against Tools-ul.277 =============== Item was changed: Object subclass: #DebuggerMethodMap instanceVariableNames: 'timestamp methodReference methodNode abstractSourceRanges sortedSourceMap' + classVariableNames: 'AccessLock MapCache MapCacheEntries' - classVariableNames: 'MapCache MapCacheEntries' poolDictionaries: '' category: 'Tools-Debugger'! !DebuggerMethodMap commentStamp: '<historical>' prior: 0! I am a place-holder for information needed by the Debugger to inspect method activations. I insulate the debugger from details of code generation such as exact bytecode offsets and temporary variable locations. I have two concreate subclasses, one for methods compiled using BlueBook blocks and one for methods compiled using Closures. These classes deal with temporary variable access. My function is to abstract the source map away from actual bytecode pcs to abstract bytecode pcs. To reduce compilation time I try and defer as much computation to access time as possible as instances of me will be created after each compilation. I maintain a WeakIdentityDictionary of method to DebuggerMethodMap to cache maps. I refer to my method through a WeakArray to keep the map cache functional. If the reference from a DebuggerMethodMap to its method were strong then the method would never be dropped from the cache because the reference from its map would keep it alive.! Item was changed: ----- Method: DebuggerMethodMap class>>cacheDebugMap:forMethod: (in category 'debugger support') ----- cacheDebugMap: aDebuggerMethodMap forMethod: aCompiledMethod + + ^self protected: [ + MapCache size >= MapCacheEntries ifTrue: [ + MapCache slowSize >= MapCacheEntries + ifFalse: [ MapCache rehash ] + ifTrue: [ + | mapsByAge | + mapsByAge := MapCache keys sort: [ :m1 :m2 | + "We are holding strongly on the keys, so #at: is suitable." + (MapCache at: m1) timestamp < (MapCache at: m2) timestamp]. + mapsByAge from: 1 to: mapsByAge size - MapCacheEntries do: [ :each | + MapCache removeKey: each ] ] ]. + MapCache + at: aCompiledMethod + put: aDebuggerMethodMap ]! - MapCache finalizeValues. - [MapCache size >= MapCacheEntries] whileTrue: - [| mapsByAge | - mapsByAge := MapCache keys asArray sort: - [:m1 :m2| - (MapCache at: m1) timestamp - < (MapCache at: m2) timestamp]. - mapsByAge notEmpty ifTrue: "There be race conditions and reentrancy issues here" - [MapCache removeKey: mapsByAge last]]. - - ^MapCache - at: aCompiledMethod - put: aDebuggerMethodMap! Item was changed: ----- Method: DebuggerMethodMap class>>forMethod: (in category 'instance creation') ----- forMethod: aMethod "<CompiledMethod>" "Answer a DebuggerMethodMap suitable for debugging activations of aMethod. Answer an existing instance from the cache if it exists, cacheing a new one if required." + + ^self protected: [ + MapCache + at: aMethod + ifAbsent: [self + cacheDebugMap: + (self + forMethod: aMethod + methodNode: aMethod methodNode) + forMethod: aMethod] ]! - ^MapCache - at: aMethod - ifAbsent: [self - cacheDebugMap: - (self - forMethod: aMethod - methodNode: aMethod methodNode) - forMethod: aMethod]! Item was added: + ----- Method: DebuggerMethodMap class>>protected: (in category 'synchronization') ----- + protected: aBlock + + ^(AccessLock ifNil: [ AccessLock := Mutex new ]) critical: aBlock! Item was changed: ----- Method: DebuggerMethodMap class>>voidMapCache (in category 'class initialization') ----- voidMapCache + + self protected: [ + MapCache := WeakIdentityKeyDictionary new. + MapCacheEntries := 16 ]! - MapCache := WeakIdentityKeyDictionary new. - MapCacheEntries := 16!

1 1