--- a/BackgroundJob.st Tue Aug 02 09:36:21 2011 +0200
+++ b/BackgroundJob.st Tue Aug 02 19:48:55 2011 +0200
@@ -1,6 +1,6 @@
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
- All Rights Reserved
+ All Rights Reserved
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -23,9 +23,7 @@
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
"
-"{ Package: 'stx:libtool' }"
-
-"{ NameSpace: Tools }"
+"{ Package: 'stx:libbasic2' }"
Object subclass:#BackgroundJob
instanceVariableNames:'name job priority thread running'
@@ -39,7 +37,7 @@
copyright
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
- All Rights Reserved
+ All Rights Reserved
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -120,7 +118,7 @@
priority:anInteger
"Set the priority of a job thread"
-
+
priority := anInteger.
"Modified (comment): / 29-07-2011 / 10:54:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -179,7 +177,7 @@
restart
running ifTrue:[
- self stop.
+ self stop.
].
self start
@@ -197,17 +195,17 @@
| t |
((t := thread) isNil or:[t isDead]) ifTrue:
- [thread := [
- [
- self process
- ] ensure: [
- running := false.
- thread := nil
- ]
- ] newProcess.
- thread priority: prio.
- thread name: name.
- thread resume.
+ [thread := [
+ [
+ self process
+ ] ensure: [
+ running := false.
+ thread := nil
+ ]
+ ] newProcess.
+ thread priority: prio.
+ thread name: name.
+ thread resume.
]
"Created: / 29-07-2011 / 11:04:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -229,7 +227,7 @@
!BackgroundJob class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic2/BackgroundJob.st,v 1.3 2011-07-29 10:55:50 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/BackgroundJob.st,v 1.4 2011-08-02 17:48:55 cg Exp $'
!
version_SVN
--- a/BackgroundQueueProcessingJob.st Tue Aug 02 09:36:21 2011 +0200
+++ b/BackgroundQueueProcessingJob.st Tue Aug 02 19:48:55 2011 +0200
@@ -1,6 +1,6 @@
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
- All Rights Reserved
+ All Rights Reserved
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -23,9 +23,7 @@
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
"
-"{ Package: 'stx:libtool' }"
-
-"{ NameSpace: Tools }"
+"{ Package: 'stx:libbasic2' }"
BackgroundJob subclass:#BackgroundQueueProcessingJob
instanceVariableNames:'queue queueAccessLock'
@@ -39,7 +37,7 @@
copyright
"
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague
- All Rights Reserved
+ All Rights Reserved
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -71,9 +69,9 @@
"includes: is not synchronized, but should not harm"
queueAccessLock critical:[
- (queue includes: object)
- ifFalse:[queue add: object].
- self start].
+ (queue includes: object)
+ ifFalse:[queue add: object].
+ self start].
"Created: / 28-04-2011 / 20:40:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
"Modified: / 18-05-2011 / 23:30:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
@@ -98,9 +96,9 @@
| item |
[
- item := nil.
- queueAccessLock critical:
- [queue isEmpty ifFalse:[item := queue removeFirst]].
+ item := nil.
+ queueAccessLock critical:
+ [queue isEmpty ifFalse:[item := queue removeFirst]].
item isNil ifFalse:
[self processItem: item].
item notNil.
@@ -120,7 +118,7 @@
!BackgroundQueueProcessingJob class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic2/BackgroundQueueProcessingJob.st,v 1.3 2011-07-29 10:55:27 vrany Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/BackgroundQueueProcessingJob.st,v 1.4 2011-08-02 17:48:55 cg Exp $'
!
version_SVN
--- a/Make.proto Tue Aug 02 09:36:21 2011 +0200
+++ b/Make.proto Tue Aug 02 19:48:55 2011 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic2/Make.proto,v 1.180 2011-02-21 13:14:13 cg Exp $
+# $Header: /cvs/stx/stx/libbasic2/Make.proto,v 1.181 2011-08-02 17:48:55 cg Exp $
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libbasic2.
@@ -63,7 +63,7 @@
all:: preMake classLibRule postMake
-pre_objs:: bz2lib zlib
+pre_objs:: bz2lib zlib
zlib:
@@ -206,7 +206,8 @@
$(OUTDIR)HttpURI.$(O) HttpURI.$(H): HttpURI.st $(INCLUDE_TOP)/stx/libbasic2/HierarchicalURI.$(H) $(INCLUDE_TOP)/stx/libbasic2/URI.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)IPv6SocketAddress.$(O) IPv6SocketAddress.$(H): IPv6SocketAddress.st $(INCLUDE_TOP)/stx/libbasic2/IPSocketAddress.$(H) $(INCLUDE_TOP)/stx/libbasic2/SocketAddress.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)SftpURI.$(O) SftpURI.$(H): SftpURI.st $(INCLUDE_TOP)/stx/libbasic2/HierarchicalURI.$(H) $(INCLUDE_TOP)/stx/libbasic2/URI.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)BackgroundJob.$(O) BackgroundJob.$(H): BackgroundJob.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
+$(OUTDIR)BackgroundQueueProcessingJob.$(O) BackgroundQueueProcessingJob.$(H): BackgroundQueueProcessingJob.st $(INCLUDE_TOP)/stx/libbasic2/BackgroundJob.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
$(OUTDIR)extensions.$(O): extensions.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/CharacterArray.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(STCHDR)
# ENDMAKEDEPEND --- do not remove this line
-
--- a/Make.spec Tue Aug 02 09:36:21 2011 +0200
+++ b/Make.spec Tue Aug 02 19:48:55 2011 +0200
@@ -1,6 +1,6 @@
-# $Header: /cvs/stx/stx/libbasic2/Make.spec,v 1.78 2011-02-21 13:14:11 cg Exp $
+# $Header: /cvs/stx/stx/libbasic2/Make.spec,v 1.79 2011-08-02 17:48:55 cg Exp $
#
-# DO NOT EDIT
+# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libbasic2.
#
# Warning: once you modify this file, do not rerun
@@ -153,6 +153,9 @@
SftpURI \
ZipArchive \
CharacterSet \
+ BackgroundJob \
+ BackgroundQueueProcessingJob \
+
WIN32_CLASSES= \
SerialPort \
@@ -264,10 +267,9 @@
$(OUTDIR)SftpURI.$(O) \
$(OUTDIR)ZipArchive.$(O) \
$(OUTDIR)CharacterSet.$(O) \
+ $(OUTDIR)BackgroundJob.$(O) \
+ $(OUTDIR)BackgroundQueueProcessingJob.$(O) \
$(OUTDIR)extensions.$(O) \
WIN32_OBJS= \
$(OUTDIR)SerialPort.$(O) \
-
-
-
--- a/abbrev.stc Tue Aug 02 09:36:21 2011 +0200
+++ b/abbrev.stc Tue Aug 02 19:48:55 2011 +0200
@@ -19,6 +19,8 @@
ConsStream ConsStream stx:libbasic2 'Collections-Linked' 0
Curve Curve stx:libbasic2 'Graphics-Geometry-Objects' 0
DecNetSocketAddress DecNetSocketAddress stx:libbasic2 'OS-Sockets' 0
+Tools::BackgroundJob Tools__BackgroundJob stx:libtool 'Interface-CodeView' 0
+Tools::BackgroundQueueProcessingJob Tools__BackgroundQueueProcessingJob stx:libtool 'Interface-CodeView' 0
DirectoryContents DirectoryContents stx:libbasic2 'System-Support' 0
EllipticalArc EllipticalArc stx:libbasic2 'Graphics-Geometry-Objects' 0
EpsonFX1PrinterStream EpsonFX1PrinterStream stx:libbasic2 'Interface-Printing' 8
--- a/bc.mak Tue Aug 02 09:36:21 2011 +0200
+++ b/bc.mak Tue Aug 02 19:48:55 2011 +0200
@@ -1,4 +1,4 @@
-# $Header: /cvs/stx/stx/libbasic2/bc.mak,v 1.125 2011-02-21 13:14:16 cg Exp $
+# $Header: /cvs/stx/stx/libbasic2/bc.mak,v 1.126 2011-08-02 17:48:55 cg Exp $
#
# DO NOT EDIT
# automagically generated from the projectDefinition: stx_libbasic2.
@@ -34,7 +34,7 @@
LOCALINCLUDES=-I$(ZLIB_DIR) -I$(INCLUDE_TOP)\stx\libbasic
LOCALDEFINES=
-STCLOCALOPT=-package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
+STCLOCALOPT=-messageFormat: MSBuild -package=$(PACKAGE) -I. $(LOCALINCLUDES) -H. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALDEFINES) $(COMMONSYMBOLS) -varPrefix=$(LIBNAME)
LOCALLIBS=$(ZLIB_DIR)\$(ZLIB)
OBJS= $(COMMON_OBJS) $(WIN32_OBJS)
@@ -124,6 +124,8 @@
$(OUTDIR)StringUtilities.$(O) StringUtilities.$(H): StringUtilities.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)TSTree.$(O) TSTree.$(H): TSTree.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)Text.$(O) Text.$(H): Text.st $(INCLUDE_TOP)\stx\libbasic\CharacterArray.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)BackgroundJob.$(O) BackgroundJob.$(H): BackgroundJob.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
+$(OUTDIR)BackgroundQueueProcessingJob.$(O) BackgroundQueueProcessingJob.$(H): BackgroundQueueProcessingJob.st $(INCLUDE_TOP)\stx\libbasic2\BackgroundJob.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)TextStream.$(O) TextStream.$(H): TextStream.st $(INCLUDE_TOP)\stx\libbasic\CharacterWriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\WriteStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PositionableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\PeekableStream.$(H) $(INCLUDE_TOP)\stx\libbasic\Stream.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)TimeDuration.$(O) TimeDuration.$(H): TimeDuration.st $(INCLUDE_TOP)\stx\libbasic\Time.$(H) $(INCLUDE_TOP)\stx\libbasic\AbstractTime.$(H) $(INCLUDE_TOP)\stx\libbasic\Magnitude.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
$(OUTDIR)TreeSet.$(O) TreeSet.$(H): TreeSet.st $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
--- a/libInit.cc Tue Aug 02 09:36:21 2011 +0200
+++ b/libInit.cc Tue Aug 02 19:48:55 2011 +0200
@@ -1,5 +1,5 @@
/*
- * $Header: /cvs/stx/stx/libbasic2/libInit.cc,v 1.104 2011-02-21 13:14:27 cg Exp $
+ * $Header: /cvs/stx/stx/libbasic2/libInit.cc,v 1.105 2011-08-02 17:48:55 cg Exp $
*
* DO NOT EDIT
* automagically generated from the projectDefinition: stx_libbasic2.
@@ -130,6 +130,8 @@
_HttpURI_Init(pass,__pRT__,snd);
_IPv6SocketAddress_Init(pass,__pRT__,snd);
_SftpURI_Init(pass,__pRT__,snd);
+_BackgroundJob_Init(pass,__pRT__,snd);
+_BackgroundQueueProcessingJob_Init(pass,__pRT__,snd);
#ifdef WIN32
_SerialPort_Init(pass,__pRT__,snd);
#endif /* WIN32 */
--- a/stx_libbasic2.st Tue Aug 02 09:36:21 2011 +0200
+++ b/stx_libbasic2.st Tue Aug 02 19:48:55 2011 +0200
@@ -42,7 +42,7 @@
!
extensionsVersion_CVS
- ^ '$Header: /cvs/stx/stx/libbasic2/stx_libbasic2.st,v 1.73 2011-02-21 13:14:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/stx_libbasic2.st,v 1.74 2011-08-02 17:48:55 cg Exp $'
! !
!stx_libbasic2 class methodsFor:'description'!
@@ -140,141 +140,143 @@
Attributes are: #autoload or #<os> where os is one of win32, unix,..."
^ #(
- "<className> or (<className> attributes...) in load order"
- ActorStream
- (AppletalkSocketAddress autoload)
- Archiver
- (BIG5EncodedString autoload)
- (BZip2Stream unix autoload)
- BaseNCoder
- Bezier
- BinaryTree
- BinaryTreeNode
- BitArray
- BooleanArray
- CRC32Stream
- CacheDictionary
- Circle
- (CollectingSharedQueueStream autoload)
- CompressionStream
- (CompressionStreamTest autoload)
- (Cons autoload)
- (ConsStream autoload)
- Curve
- (DecNetSocketAddress autoload)
- DirectoryContents
- EllipticalArc
- (EpsonFX1PrinterStream autoload)
- ExternalLong
- FileSorter
- (FileText autoload)
- FourByteString
- (GBEncodedString autoload)
- (HPLjetIIPrinterStream autoload)
- (HandlerCollection autoload)
- InterestConverterWithParameters
- (InternalPipeStream autoload)
- Iterator
- JISEncodedString
- (KSCEncodedString autoload)
- (KeywordInContextIndexBuilder autoload)
- (LazyArray autoload)
- (LazyCons autoload)
- (LazyValue autoload)
- LineSegment
- Bezier2Segment
- List
- MappedCollection
- (MessageChannel autoload)
- Monitor
- NameLookupError
- (NumberSet autoload)
- (OperationQueue autoload)
- OrderedDictionary
- OrderedSet
- Polygon
- (PowerSet autoload)
- PrinterStream
- PrintfScanf
- Promise
- Queue
- Random
- RandomGenerator
- (RandomParkMiller autoload)
- (RandomTT800 autoload)
- ReindexedCollection
- RunArray
- SequenceWithSentinel
- (SequenceableCollectionSorter autoload)
- (SerialPort win32)
- SharedCollection
- Singleton
- Socket
- SocketAddress
- SocketAddressInfo
- SoundStream
- Spline
- ArrowedSpline
- (SplittingWriteStream autoload)
- Stack
- Text
- TextStream
- TimeDuration
- URI
- UUID
- UnboxedIntegerArray
- UndoSupport
- UnitConverter
- (UnixPTYStream autoload)
- (ValueLink autoload)
- (WinAPIFunction autoload)
- #'stx_libbasic2'
- Arrow
- Base32Coder
- Base64Coder
- CacheDictionaryWithFactory
- HierarchicalURI
- HostAddressLookupError
- HostNameLookupError
- IPSocketAddress
- IntegerArray
- LongIntegerArray
- PostscriptPrinterStream
- SharedQueue
- SignedIntegerArray
- SignedLongIntegerArray
- SignedWordArray
- TimedPromise
- UDSocketAddress
- Unicode32String
- WordArray
- ZipStream
- FileURI
- FtpURI
- HttpURI
- IPv6SocketAddress
- ZipArchive
- HTMLUtilities
- IncrementNotification
- PhoneticStringUtilities
- StringUtilities
- AATree
- AATreeNode
- BTree
- TSTree
- TreeSet
- Lazy
- Future
- Heap
- SelectingReadStream
- CollectingReadStream
- FilteringStream
- LineNumberReadStream
- FilteringLineStream
- MultiReadStream
- SftpURI
- ZipArchiveConstants
- CharacterSet
+ "<className> or (<className> attributes...) in load order"
+ ActorStream
+ (AppletalkSocketAddress autoload)
+ Archiver
+ (BIG5EncodedString autoload)
+ (BZip2Stream unix autoload)
+ BaseNCoder
+ Bezier
+ BinaryTree
+ BinaryTreeNode
+ BitArray
+ BooleanArray
+ CRC32Stream
+ CacheDictionary
+ Circle
+ (CollectingSharedQueueStream autoload)
+ CompressionStream
+ (CompressionStreamTest autoload)
+ (Cons autoload)
+ (ConsStream autoload)
+ Curve
+ (DecNetSocketAddress autoload)
+ DirectoryContents
+ EllipticalArc
+ (EpsonFX1PrinterStream autoload)
+ ExternalLong
+ FileSorter
+ (FileText autoload)
+ FourByteString
+ (GBEncodedString autoload)
+ (HPLjetIIPrinterStream autoload)
+ (HandlerCollection autoload)
+ InterestConverterWithParameters
+ (InternalPipeStream autoload)
+ Iterator
+ JISEncodedString
+ (KSCEncodedString autoload)
+ (KeywordInContextIndexBuilder autoload)
+ (LazyArray autoload)
+ (LazyCons autoload)
+ (LazyValue autoload)
+ LineSegment
+ Bezier2Segment
+ List
+ MappedCollection
+ (MessageChannel autoload)
+ Monitor
+ NameLookupError
+ (NumberSet autoload)
+ (OperationQueue autoload)
+ OrderedDictionary
+ OrderedSet
+ Polygon
+ (PowerSet autoload)
+ PrinterStream
+ PrintfScanf
+ Promise
+ Queue
+ Random
+ RandomGenerator
+ (RandomParkMiller autoload)
+ (RandomTT800 autoload)
+ ReindexedCollection
+ RunArray
+ SequenceWithSentinel
+ (SequenceableCollectionSorter autoload)
+ (SerialPort win32)
+ SharedCollection
+ Singleton
+ Socket
+ SocketAddress
+ SocketAddressInfo
+ SoundStream
+ Spline
+ ArrowedSpline
+ (SplittingWriteStream autoload)
+ Stack
+ Text
+ TextStream
+ TimeDuration
+ URI
+ UUID
+ UnboxedIntegerArray
+ UndoSupport
+ UnitConverter
+ (UnixPTYStream autoload)
+ (ValueLink autoload)
+ (WinAPIFunction autoload)
+ #'stx_libbasic2'
+ Arrow
+ Base32Coder
+ Base64Coder
+ CacheDictionaryWithFactory
+ HierarchicalURI
+ HostAddressLookupError
+ HostNameLookupError
+ IPSocketAddress
+ IntegerArray
+ LongIntegerArray
+ PostscriptPrinterStream
+ SharedQueue
+ SignedIntegerArray
+ SignedLongIntegerArray
+ SignedWordArray
+ TimedPromise
+ UDSocketAddress
+ Unicode32String
+ WordArray
+ ZipStream
+ FileURI
+ FtpURI
+ HttpURI
+ IPv6SocketAddress
+ ZipArchive
+ HTMLUtilities
+ IncrementNotification
+ PhoneticStringUtilities
+ StringUtilities
+ AATree
+ AATreeNode
+ BTree
+ TSTree
+ TreeSet
+ Lazy
+ Future
+ Heap
+ SelectingReadStream
+ CollectingReadStream
+ FilteringStream
+ LineNumberReadStream
+ FilteringLineStream
+ MultiReadStream
+ SftpURI
+ ZipArchiveConstants
+ CharacterSet
+ #'BackgroundJob'
+ #'BackgroundQueueProcessingJob'
)
!
@@ -325,9 +327,9 @@
!stx_libbasic2 class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic2/stx_libbasic2.st,v 1.73 2011-02-21 13:14:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/stx_libbasic2.st,v 1.74 2011-08-02 17:48:55 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic2/stx_libbasic2.st,v 1.73 2011-02-21 13:14:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/stx_libbasic2.st,v 1.74 2011-08-02 17:48:55 cg Exp $'
! !