Merge pull request #1 from dionisiydk/dev

syncronizationFixForWaitingToBorrowObject

Author: dionisiydk

ObjectPool.package/OPBasicPool.class/instance/ensureMinimumIdleObjects.st

@@ -1,3 +1,3 @@
-as yet unclassified
+pooling
 ensureMinimumIdleObjects
 	self critical: [ self whileNotEnoughIdleObjects: [ self addObject ] ]

ObjectPool.package/OPBasicPool.class/instance/fixMaxActiveObjects.st

@@ -1,4 +1,4 @@
-as yet unclassified
+pooling
 fixMaxActiveObjects
 
 	self critical: [maxActiveObjects := self numberOfAvailableObjects].

ObjectPool.package/OPBasicPool.class/instance/hasEnoughIdleObjects.st

@@ -1,3 +1,3 @@
-as yet unclassified
+pooling
 hasEnoughIdleObjects
 	^ minIdleObjects ifNil: [ true ] ifNotNil: [ idleObjects size >= minIdleObjects ]

ObjectPool.package/OPBasicPool.class/instance/ifNotEnoughIdleObjects..st

@@ -1,3 +1,3 @@
-as yet unclassified
+pooling
 ifNotEnoughIdleObjects: aBlock
 	^ self hasEnoughIdleObjects ifTrue: aBlock

ObjectPool.package/OPBasicPool.class/instance/migrateObjectsInto.andDo..st

@@ -1,8 +1,8 @@
-as yet unclassified
+pooling
 migrateObjectsInto: anotherPool andDo: aBlock
 
 	self critical: [ 
-		borrowedObjects ifNotEmpty: [ self error: 'Pool allow migration only when al objects are free' ].
+		borrowedObjects ifNotEmpty: [ self error: 'Pool allow migration only when all objects are free' ].
 
 		idleObjects do: [ :each | 
 			anotherPool objectToPool: each.

ObjectPool.package/OPBasicPool.class/instance/objectForBorrow.st

@@ -0,0 +1,13 @@
+pooling
+unsafeBorrow
+	| newObject |
+	self critical: [ 
+		maxActiveObjects ifNotNil: [ 
+			maxWaitForBorrow
+				ifNil: [ self waitUntil: [ self numberOfActiveObjects < maxActiveObjects ] ]
+				ifNotNil: [ self waitUntil: [ self numberOfActiveObjects < maxActiveObjects ] timoutAfterMilliseconds: maxWaitForBorrow ]].
+		idleObjects ifNotEmpty: [ 
+			^ borrowedObjects add: self objectFromPool ]	].
+	newObject := self makeObject.
+	self critical: [borrowedObjects add: newObject].
+	^newObject

ObjectPool.package/OPBasicPool.class/instance/unsafeBorrow.st

@@ -1,3 +1,3 @@
-as yet unclassified
+pooling
 whileNotEnoughIdleObjects: aBlock
 	^ [self hasEnoughIdleObjects] whileFalse: aBlock.

ObjectPool.package/OPBasicPool.class/instance/whileNotEnoughIdleObjects..st

@@ -11,8 +11,6 @@
 		"activator",
 		"destroyer",
 		"validator",
-		"maxWait",
-		"maxActive",
 		"minIdleObjects",
 		"maxIdleObjects",
 		"maxActiveObjects",

ObjectPool.package/OPBasicPool.class/properties.json

@@ -3,12 +3,11 @@ borrow
 	"Returns activated object from pool or creates new pooled object and returns it."
 
 	| object |
-	[ 
-	object := self objectForBorrow.
-	self objectGoingToBeBorrowed: object.
-	self critical: [borrowedObjects add: object] ]
+	[ object := self unsafeBorrow.
+	self objectGoingToBeBorrowed: object]
 		on: OPAbortOperation
 		do: [ :e | 
+			self critical: [borrowedObjects remove: object].
 			self destroyObject: object.
 			e retry ].
 	^ object

ObjectPool.package/OPPool.class/instance/borrow.st

@@ -3,12 +3,13 @@ return: anObject
 	"Returns previously borrowed object from the pool. If object is not from this pool then
 	ObjectPoolWrongPoolError is raised."
 
-	self
-		critical: [ 
-			(borrowedObjects includes: anObject)
-				ifTrue: [ borrowedObjects remove: anObject ]
-				ifFalse: [ OPWrongPoolError signal: 'Object is not from this pool instance.' ] ].
-	[ 
-	self objectGoingToBeReturned: anObject.
-	self objectToPool: anObject.
-	] on: OPAbortOperation do: [ self destroyObject: anObject. ].
+	self critical: [ 
+		(borrowedObjects includes: anObject)
+			ifFalse: [ OPWrongPoolError signal: 'Object is not from this pool instance.' ]].
+	
+	[self objectGoingToBeReturned: anObject] on: OPAbortOperation do: [ 
+		^self destroyObject: anObject].
+	
+	self critical: [
+		borrowedObjects remove: anObject.
+		self objectToPool: anObject]

ObjectPool.package/OPPool.class/instance/objectForBorrow.st

@@ -0,0 +1,6 @@
+private
+unsafeBorrow
+	| object |
+	object := self objectFromPoolOrElse: [ self makeObject ].
+	self critical: [borrowedObjects add: object].
+	^object