Vm-dev July 2011

vm-dev@lists.squeakfoundation.org

31 participants
164 discussions

Event-driven Cog still crashing (more observations)
by Dimitry Golubovsky 18 Jul '11

18 Jul '11

Hi, My variant of Cog still keeps crashing in GC, but now it seems I made those crashes more "consistent". Now I am posting my code to better illustrate the problem, maybe this helps. Fileout of the class which implements my variant of VM. http://pastebin.com/WJKtXVk5 It overrides few methods of its parent classes to implement the event-driven VM. Most important changes are in methods interpret, wakeHighestPriority, and transferTo. The crash log (output of printOop inserted at each entry of markAndTrace) http://pastebin.com/sHSyHqHE It shows the debug output from the last entry in the interpreter after which GC happens which crashes. The host program runs the interpreter like this: ------------------------------------------------------ if (runInterpreter) { interpret(); while(1) { int rc; if(!aioPoll(1000)) continue; heartbeat(); printf("enter interpreter\n"); rc = interpret(); printf("exit interpreter: %d\n", rc); if(rc == 1) break; } } ------------------------------------------------------ and heartbeat() is reduced to ------------------------------------------------------ void heartbeat() { int saved_errno = errno; printf("heartbeat\n"); updateMicrosecondClock(); if (get64(frequencyMeasureStart) == 0) { set64(frequencyMeasureStart,utcMicrosecondClock); heartbeats = 0; } else heartbeats += 1; forceInterruptCheckFromHeartbeat(); errno = saved_errno; } ------------------------------------------------------ In order to put the VM into event-driven mode, the following is executed in a workspace: (ProcessorScheduler classPool at: #BackgroundProcess) terminate. VM continues working, interpreter is entered on any mouse move or click, I could open World menu for example. First GC crashes. It is my understanding that longjmp I use to exit the interpreter somehow does not unwind the native stack properly thus corrupting the heap which crashes GC. What could it be? Thanks for any ideas. -- Dimitry Golubovsky Anywhere on the Web

4 3

Workaround for mac vms.
by Igor Stasenko 18 Jul '11

18 Jul '11

While hacking with Stephane, we found this little workaround in event handling. I just wanna to ask , is it still the case? generateMouseEvent: evtBuf "Generate the appropriate mouse event for the given raw event buffer" | position buttons modifiers type trail stamp oldButtons evtChanged | evtBuf first = lastEventBuffer first ifTrue: ["Workaround for Mac VM bug, *always* generating 3 events on clicks" evtChanged := false. 3 to: evtBuf size do: [:i | (lastEventBuffer at: i) = (evtBuf at: i) ifFalse: [evtChanged := true]]. evtChanged ifFalse: [^nil]]. -- Best regards, Igor Stasenko AKA sig.

1 0

released Mac VM won't use relinquish primitive from a plugin, but locally-built one will
by Craig Latta 18 Jul '11

18 Jul '11

Hi-- Weird, another behavior difference between the released Mac VM and one I built myself from svn... The released one crashes if I use my own relinquish-processor primitive from an external plugin, but the locally-built one doesn't. Any idea why? So it looks like I'll have to give in and provide a custom VM for Squeak 4.2 images to browse Spoon images (remote messaging performance is still horrible using the release relinquish primitive). Hopefully that VM can just become the release VM. -C -- Craig Latta www.netjam.org/resume +31 6 2757 7177 + 1 415 287 3547

1 0

About too many event generated
by stephane ducasse 17 Jul '11

17 Jul '11

Hi I was reading the following code in HandMorph generateMouseEvent: evtBuf "Generate the appropriate mouse event for the given raw event buffer" evtBuf first = lastEventBuffer first ifTrue: ["Workaround for Mac VM bug, *always* generating 3 events on clicks" evtChanged := false. 3 to: evtBuf size do: [:i | (lastEventBuffer at: i) = (evtBuf at: i) ifFalse: [evtChanged := true]]. evtChanged ifFalse: [^nil]]. .... and I was wondering why/or if it was still the case? Tx Stef

1 0

Source Tree/Repository revision info for the VM [was Re: [Vm-dev] new Cog VMs available]
by Eliot Miranda 16 Jul '11

16 Jul '11

Hi All, I juts committed a workable scheme for including version info in the VM and the Mac .app, checked in on http://www.squeakvm.org/svn/squeak/branches/Cog. - I've added a file platforms/Cross/vm/sqSCCSVersion.h which is included by the platform files that answer the Smalltalk getSystemAttribute: information (sqMacMain.c sqUnixMain.c & sqWin32Window.c). - I've modified the getSystemAttribute: code to answer the revision and repository URL in response to getSystemAttribute: 1009. - I've added a check-in script that makes sure sqSCCSVersion.h is updated (if the script is used) so sqSCCSVersion.h's revision number is up-to-date. So now e.g. Smalltalk getSystemAttribute: 1009 answers 'r2461 http://www.squeakvm.org/svn/squeak/branches/Cog' The scheme in sqSCCSVersion.h is simple and I hope extensible to other repositories such that it is the only file that needs to fork between repositories, and then only by altering the following lines to choose the relevant repository: #define SCCS 0 #define RCS 0 #define CVS 0 #define SUBVERSION 1 #define BAZAAR 0 #define MERCURIAL 0 #define GIT 0 e.g. choosing the repository on the command line via a Makefile means changing lots of makefiles. So this approach, while not ideal, having file different between different repositories does localise the fork to just one file. Here's sqSCCSVersion.h in its entirety. It computes char *sourceVersionString(), which is that above. If this approach makes sense to people we can a) standardise on an attribute number (I chose 1009 as the next unused number but am open to change if there's a good reason), and b) extend sqSCCSVersion.h with the relevant sccs-specific code to collect revision and url information for each specific repository. Thoughts, comments? HTH Eliot /* * A set of definitions for C source code control systems, to provide accurate * and definitive version information to the VM. * * Currently instantiated only for Subversion. Please add definitions for * other repositories as appropriate. * * I guess a good way to manage this is to edit the below define list to select * appropriate the repository type, and then that's the extent of the fork. * * Eliot Miranda * eliot.miranda(a)gmail.com * 15 July 2011 */ #define SCCS 0 #define RCS 0 #define CVS 0 #define SUBVERSION 1 #define BAZAAR 0 #define MERCURIAL 0 #define GIT 0 #if SUBVERSION static char SvnRawRevisionString[] = "$Rev: 2461 $"; # define REV_START (SvnRawRevisionString + 6) static char SvnRawRepositoryURL[] = "$URL: http://www.squeakvm.org/svn/squeak/branches/Cog/platforms/Cross/vm/sqSCCSVe… $"; # define URL_START (SvnRawRepositoryURL + 6) static long revisionAsLong() { return atol(REV_START); } static char * revisionAsString() { char *maybe_space = strchr(REV_START,' '); if (maybe_space) *maybe_space = 0; return REV_START; } static char * repositoryURL() { char *maybe_platforms = strstr(URL_START, "/platforms"); if (maybe_platforms) *maybe_platforms = 0; return URL_START; } # undef REV_START # undef URL_START #else /* SUBVERSION */ static long revisionAsLong() { return -1; } static char * revisionAsString() { return "?"; } static char * repositoryURL() { return "unknown"; } #endif /* SUBVERSION */ static char *sourceVersion = 0; static char *sourceVersionString() { if (!sourceVersion) { int len = strlen(revisionAsString()) + strlen(repositoryURL()) + 3; sourceVersion = malloc(len); sprintf(sourceVersion,"r%s %s",revisionAsString(),repositoryURL()); } return sourceVersion; } On Fri, Jul 15, 2011 at 9:27 AM, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: > Hi Bert, > > On Thu, Jul 14, 2011 at 12:45 AM, Bert Freudenberg <bert(a)freudenbergs.de> wrote: >> >> >> On 13.07.2011, at 22:56, Eliot Miranda wrote: >> >> > Hi All, >> > >> > find new Cog VMs in http://www.mirandabanda.org/files/Cog/VM/VM.r2459/. These have functional ALien callbacks. Previous VMs had buggy code that could easily crash when heavily stressed, as discovered with Vassili Bykov's native Hopscotch UI in Newspeak on Win32. >> >> Hi Eliot, >> >> do you keep a continuous changelog somewhere for your releases? It would be nice to include that in the VM. >> >> Also, your Mac VM bundles always have the same version number which is somewhat inconvenient. Would be nice to splice the release version into Info.plist. > > I think I've found what's required: > http://stackoverflow.com/questions/206183/how-can-i-force-subversion-to-com… > In particular > > If you want the file contents to remain unchanged you can always > change one of the properties on the file. > > eg. > > svn propset dummyproperty 1 yourfile > > hence "Use Case: A file (config, xml, etc.) is chosen as a canonical > version beacon for other apps. It indicates that "the code queried > represents version rXYZ in SVN". Using SVN's macros on commit ("$Rev: > xxxxx $") would be ideal for these purposes, provided SVN would deign > to update an unchanged file. – pcorcoran" > > So I can now force a change to each Info.plist file and embed the Rev > property. I can also embed the Rev property in relevant .c or .h > files to cause the Rev property to show in the relevant VM version > strings. > > And I can fire off the svn propset via a precommit hook. What I can't > do is make this corss-platform. It'll work on unixes but fall flat on > e.g. Windows wirth TortoiseSVN. Unless anyone knows better. If so, > let me know. > >> >> While I'm in nitpicking mode: CFBundleVersion is recommended to be a simple integer, incremented for each bundle release - your "2459" might serve fine. This is not shown in the UI. The Finder shows CFBundleShortVersionString and the Get Info dialog shows CFBundleGetInfoString. Both of these are free-form as far as OS X is concerned, you can put anything you want in there. "Smalltalk vmVersion" includes CFBundleShortVersionString so there may be users expecting a certain format. >> >> Your current CFBundleGetInfoString has a link to a "boutique web design" company. I'm almost certain that's not what you wanted to put in there. >> >> In other words: Thanks for the new release ;) >> >> - Bert - >> > > > > -- > best, > Eliot > -- best, Eliot

3 4

Re: [Pharo-project] image freezes when setting time "back"
by Mariano Martinez Peck 16 Jul '11

16 Jul '11

On Sat, Jul 16, 2011 at 8:07 PM, Philippe Marschall <kustos(a)gmx.net> wrote: > Hi > > I have had the following experience. I'm running Pharo 1.3 on a Linux > box where the time is set on start up using ntp. The hardware clock is > set to the local time (because I'm dual booting). When there is no > network connection during booting the system the clock is two hours > "ahead" until I get network connection and set the time using ntp. When > a Pharo image is running during this the UI freezes and doesn't react > anymore. Does anybody else observe this? Is this a known limitation? > > Yes. It seems the known limitation of Cog VM that uses clock and something related to heartbeat and etc...When you change time you confuse Cog generating a freeze. At least I remember that something like that could happens. Try with a non-Cog VM. Sorry if this message got sent twice. I had some trouble with the > mailing list. > > Cheers > Philippe > > > -- Mariano http://marianopeck.wordpress.com

1 0

Delays should wakeup the idle process (patch)
by Matthew Fulmer 16 Jul '11

16 Jul '11

On my unix vm, Delay wakeups often happen a lot later than requested if the idle process kicks in. Craig provided a bit of code from spoon that fixes this issue: http://bugs.squeak.org/view.php?id=7652

6 6

Event-driven Cog: crashing in GC
by Dimitry Golubovsky 16 Jul '11

16 Jul '11

Hi, I am trying to reproduce Andreas' experiment [1] with Stack Cog. It always ends up with crash during garbage collection. Andreas' approach was to my understanding as follows: 1. Set a jmp_buf to to hold the jump target at the start of the interpret() function 2. longjmp to this jmp_buf in the transferTo function if its argument is 0 (thus exiting the interpreter once no processes are ready to run). 3. in the wakeHighestPriority function do not terminate with error if the list of ready to run processes is exhausted: just return 0 (which goes to transferTo) 4. implement an external event loop in the hosting process polling for events, entering the interpreter once any events are available. My addition to this: heartbeat is no longer a separate thread: it is invoked from either the lowest priority process (when ioRelinquishProcessor is called) or right before entering the interpreter from the external event loop if there are events. Once I do-it in a running VM: (ProcessorScheduler classPool at: #BackgroundProcess) terminate. returns from the interpreter start occurring, transferTo is periodically called with 0 argument, interpreter is not entered until mouse is clicked etc. But once garbage collection occurs, VM crashes on SEGV inside markAndTrace. markAndTrace may be called with weird address like 30303030 (is this sort of magic number?) If I disable GC completely, VM runs, responds to mouse clicks, I can even open widgets but it crashes once memory exhausts. How can process scheduler and GC conflict so terribly? What else am I missing? Thanks for any ideas. ------------------------------------- [1] http://lists.squeakfoundation.org/pipermail/vm-dev/2009-November/003437.html -- Dimitry Golubovsky Anywhere on the Web

1 0

[commit] r2462 - Fix a typo in mkvmarchives
by commits＠squeakvm.org 16 Jul '11

16 Jul '11

Author: eliot Date: 2011-07-15 15:35:48 -0700 (Fri, 15 Jul 2011) New Revision: 2462 Modified: branches/Cog/scripts/mkvmarchives Log: Fix a typo in mkvmarchives Modified: branches/Cog/scripts/mkvmarchives =================================================================== --- branches/Cog/scripts/mkvmarchives 2011-07-15 22:18:34 UTC (rev 2461) +++ branches/Cog/scripts/mkvmarchives 2011-07-15 22:35:48 UTC (rev 2462) @@ -40,7 +40,7 @@ EXES=coglinux/lib/squeak/3.9-7/squeak fi REV=`grep 'SvnRawRevisionString.*Rev:' platforms/Cross/vm/sqSCCSVersion.h \ - | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/' + | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/'` if [ -n "$CM" ]; then test -d Cog.app || mkdir Cog.app rm -rf Cog.app/* Cog.app.tgz @@ -84,7 +84,8 @@ do echo echo checking $vm version - strings - $vm | egrep "Interp.*VMMaker|Cogit.*VMMaker| built on " | grep -v 'Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__' | sed 's/ uuid:.*//' +# strings - $vm | egrep '\$Rev: |Interp.*VMMaker|Cogit.*VMMaker| built on ' | grep -v 'Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__' | sed 's/ uuid:.*//' + strings - $vm | egrep '\$Rev: |Interp.*VMMaker|Cogit.*VMMaker| built on ' | sed 's/ uuid:.*//' echo checking $vm for asserts strings - $vm | grep "assert[^0-9]*[0-9][0-9][0-9]" done

1 0

[commit] r2461 - Fix Newspeak main window opening on Win32.
by commits＠squeakvm.org 16 Jul '11

16 Jul '11

Author: eliot Date: 2011-07-15 15:18:34 -0700 (Fri, 15 Jul 2011) New Revision: 2461 Added: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/scripts/svnci Modified: branches/Cog/macbuild/CoreVM.plist branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/nsbuild/macbuild/CoreVM.plist branches/Cog/nscogbuild/macbuild/CoreVM.plist branches/Cog/nscogbuild/macbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/platforms/Mac OS/vm/sqMacMain.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/win32/vm/sqWin32Window.c branches/Cog/scripts/mkvmarchives Log: Fix Newspeak main window opening on Win32. Add getSystemAttribute 1009 to answer the revision and repository URL of the current source tree. See platforms/Cross/vm/sqSCCSVersion.h. Provide a script svnci that causes sqSCCSVersion.h to be updated on check-in so its REV is up-to-date. Modify mkvmarchives script to add rev to end of version numbers in the Mac Info.plist files. Modified: branches/Cog/macbuild/CoreVM.plist =================================================================== --- branches/Cog/macbuild/CoreVM.plist 2011-07-15 15:17:51 UTC (rev 2460) +++ branches/Cog/macbuild/CoreVM.plist 2011-07-15 22:18:34 UTC (rev 2461) @@ -368,7 +368,11 @@ <key>CFBundleExecutable</key> <string>Croquet</string> <key>CFBundleGetInfoString</key> - <string>Croquet Cog 4.0.0 http://www.squeak.com</string> + <string>Croquet Cog 4.0.0 http://www.mirandabanda.org</string> + <key>CFBundleShortVersionString</key> + <string>Croquet Cog 4.0.0</string> + <key>CFBundleVersion</key> + <string>4.0.0</string> <key>CFBundleIconFile</key> <string>Croquet.icns</string> <key>CFBundleIdentifier</key> @@ -379,12 +383,8 @@ <string>Croquet</string> <key>CFBundlePackageType</key> <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>Croquet Cog 3.0.0</string> <key>CFBundleSignature</key> <string>????</string> - <key>CFBundleVersion</key> - <string>4.0.0</string> <key>CGDisableCoalescedUpdates</key> <true/> <key>LSBackgroundOnly</key> Modified: branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj 2011-07-15 15:17:51 UTC (rev 2460) +++ branches/Cog/macbuild/CoreVM.xcodeproj/project.pbxproj 2011-07-15 22:18:34 UTC (rev 2461) @@ -11,6 +11,8 @@ 733B2C37106AB74B004652BE /* sqExternalSemaphores.c in Sources */ = {isa = PBXBuildFile; fileRef = 733B2C36106AB74B004652BE /* sqExternalSemaphores.c */; }; 7351A09B100963670035A878 /* sqUnixThreads.c in Sources */ = {isa = PBXBuildFile; fileRef = 7351A09A100963670035A878 /* sqUnixThreads.c */; }; 735B4CA30E8069B7008FA2CA /* VMProfileMacSupportPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 735B4CA20E8069B7008FA2CA /* VMProfileMacSupportPlugin.c */; }; + 737888E713D0DE6500C5E1AD /* sqMemoryFence.h in Headers */ = {isa = PBXBuildFile; fileRef = 737888E513D0DE6500C5E1AD /* sqMemoryFence.h */; }; + 737888E813D0DE6500C5E1AD /* sqSCCSVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 737888E613D0DE6500C5E1AD /* sqSCCSVersion.h */; }; 738FB1EA0EE4CF94004BEE42 /* ia32abicc.c in Sources */ = {isa = PBXBuildFile; fileRef = 738FB1E90EE4CF94004BEE42 /* ia32abicc.c */; }; 738FB1ED0EE4D092004BEE42 /* IA32ABI.c in Sources */ = {isa = PBXBuildFile; fileRef = 738FB1EC0EE4D092004BEE42 /* IA32ABI.c */; }; 739C6ED6112DCBB00049B7D3 /* sqTicker.c in Sources */ = {isa = PBXBuildFile; fileRef = 739C6ED5112DCBB00049B7D3 /* sqTicker.c */; }; @@ -284,6 +286,8 @@ 733B2C36106AB74B004652BE /* sqExternalSemaphores.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqExternalSemaphores.c; sourceTree = "<group>"; }; 7351A09A100963670035A878 /* sqUnixThreads.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixThreads.c; path = vm/sqUnixThreads.c; sourceTree = "<group>"; }; 735B4CA20E8069B7008FA2CA /* VMProfileMacSupportPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = VMProfileMacSupportPlugin.c; sourceTree = "<group>"; }; + 737888E513D0DE6500C5E1AD /* sqMemoryFence.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqMemoryFence.h; sourceTree = "<group>"; }; + 737888E613D0DE6500C5E1AD /* sqSCCSVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqSCCSVersion.h; sourceTree = "<group>"; }; 738FB1E90EE4CF94004BEE42 /* ia32abicc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ia32abicc.c; path = IA32ABI/ia32abicc.c; sourceTree = "<group>"; }; 738FB1EC0EE4D092004BEE42 /* IA32ABI.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = IA32ABI.c; path = IA32ABI/IA32ABI.c; sourceTree = "<group>"; }; 739C6ED5112DCBB00049B7D3 /* sqTicker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqTicker.c; sourceTree = "<group>"; }; @@ -294,7 +298,7 @@ 73BC1BB60F576864003412C5 /* cogit.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = cogit.c; sourceTree = "<group>"; }; 73BC1BB70F576864003412C5 /* cogit.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cogit.h; sourceTree = "<group>"; }; 73BC1BB80F576864003412C5 /* cogmethod.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cogmethod.h; sourceTree = "<group>"; }; - 73BC1BB90F576864003412C5 /* gcc3x-cointerp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = gcc3x-cointerp.c; sourceTree = "<group>"; }; + 73BC1BB90F576864003412C5 /* gcc3x-cointerp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "gcc3x-cointerp.c"; sourceTree = "<group>"; }; 73BC1BBA0F576864003412C5 /* cointerp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cointerp.h; sourceTree = "<group>"; }; 73BC1BC60F57699F003412C5 /* sqCogStackAlignment.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqCogStackAlignment.h; sourceTree = "<group>"; }; 94002C4209EB18EF003C4BF2 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMemoryAccess.h; sourceTree = "<group>"; }; @@ -1611,6 +1615,8 @@ F5F8AFDC02EB4E0A0100013C /* sq.h */, 739C6ED8112DCBD10049B7D3 /* sqAssert.h */, 73BC1BC60F57699F003412C5 /* sqCogStackAlignment.h */, + 737888E513D0DE6500C5E1AD /* sqMemoryFence.h */, + 737888E613D0DE6500C5E1AD /* sqSCCSVersion.h */, 733B2C36106AB74B004652BE /* sqExternalSemaphores.c */, 739C6ED7112DCBD10049B7D3 /* sqAtomicOps.h */, A2835CFE0E07A13300308978 /* sqHeapMap.c */, @@ -1711,6 +1717,8 @@ A2F27E691087169800F905FB /* nsPoolManagement.h in Headers */, 739C6ED9112DCBD10049B7D3 /* sqAtomicOps.h in Headers */, 739C6EDA112DCBD10049B7D3 /* sqAssert.h in Headers */, + 737888E713D0DE6500C5E1AD /* sqMemoryFence.h in Headers */, + 737888E813D0DE6500C5E1AD /* sqSCCSVersion.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1750,7 +1758,14 @@ isa = PBXProject; buildConfigurationList = 94D95B1D0923E6810034C6F0 /* Build configuration list for PBXProject "CoreVM" */; compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 08773EB500C6A1C4C0A80109; productRefGroup = 08773F3000C6A1C4C0A80109 /* Products */; projectDirPath = ""; Modified: branches/Cog/nsbuild/macbuild/CoreVM.plist =================================================================== --- branches/Cog/nsbuild/macbuild/CoreVM.plist 2011-07-15 15:17:51 UTC (rev 2460) +++ branches/Cog/nsbuild/macbuild/CoreVM.plist 2011-07-15 22:18:34 UTC (rev 2461) @@ -76,7 +76,11 @@ <key>CFBundleExecutable</key> <string>Newspeak Virtual Machine</string> <key>CFBundleGetInfoString</key> - <string>Newspeak Virtual Machine 4.0.0 http://www. bracha.org</string> + <string>Newspeak Virtual Machine 4.0.0 http://newspeaklanguage.org</string> + <key>CFBundleShortVersionString</key> + <string>Newspeak Virtual Machine 4.0.0</string> + <key>CFBundleVersion</key> + <string>4.0.0</string> <key>CFBundleIconFile</key> <string>Newspeak Virtual Machine.icns</string> <key>CFBundleIdentifier</key> @@ -87,12 +91,8 @@ <string>Newspeak Virtual Machine</string> <key>CFBundlePackageType</key> <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>Newspeak Virtual Machine 4.0.0</string> <key>CFBundleSignature</key> <string>????</string> - <key>CFBundleVersion</key> - <string>4.0.0</string> <key>CGDisableCoalescedUpdates</key> <true/> <key>DTCompiler</key> Modified: branches/Cog/nscogbuild/macbuild/CoreVM.plist =================================================================== --- branches/Cog/nscogbuild/macbuild/CoreVM.plist 2011-07-15 15:17:51 UTC (rev 2460) +++ branches/Cog/nscogbuild/macbuild/CoreVM.plist 2011-07-15 22:18:34 UTC (rev 2461) @@ -76,7 +76,11 @@ <key>CFBundleExecutable</key> <string>Newspeak Virtual Machine</string> <key>CFBundleGetInfoString</key> - <string>Newspeak Virtual Machine 4.0.0 http://www. bracha.org</string> + <string>Newspeak Virtual Machine 4.0.0 http://newspeaklanguage.org</string> + <key>CFBundleShortVersionString</key> + <string>Newspeak Virtual Machine 4.0.0</string> + <key>CFBundleVersion</key> + <string>4.0.0</string> <key>CFBundleIconFile</key> <string>Newspeak Virtual Machine.icns</string> <key>CFBundleIdentifier</key> @@ -87,12 +91,8 @@ <string>Newspeak Virtual Machine</string> <key>CFBundlePackageType</key> <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>Newspeak Virtual Machine 4.0.0</string> <key>CFBundleSignature</key> <string>????</string> - <key>CFBundleVersion</key> - <string>4.0.0</string> <key>CGDisableCoalescedUpdates</key> <true/> <key>DTCompiler</key> Modified: branches/Cog/nscogbuild/macbuild/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/nscogbuild/macbuild/CoreVM.xcodeproj/project.pbxproj 2011-07-15 15:17:51 UTC (rev 2460) +++ branches/Cog/nscogbuild/macbuild/CoreVM.xcodeproj/project.pbxproj 2011-07-15 22:18:34 UTC (rev 2461) @@ -57,6 +57,9 @@ 737D7E2A13BAB68900347756 /* cogit.h in Headers */ = {isa = PBXBuildFile; fileRef = 737D7E2313BAB68900347756 /* cogit.h */; }; 737D7E2B13BAB68900347756 /* vmCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 737D7E2413BAB68900347756 /* vmCallback.h */; }; 737D7E2C13BAB68900347756 /* cogmethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 737D7E2513BAB68900347756 /* cogmethod.h */; }; + 737F48B913D0DB5D0071BDEB /* sqCogStackAlignment.h in Headers */ = {isa = PBXBuildFile; fileRef = 737F48B613D0DB5D0071BDEB /* sqCogStackAlignment.h */; }; + 737F48BA13D0DB5D0071BDEB /* sqMemoryFence.h in Headers */ = {isa = PBXBuildFile; fileRef = 737F48B713D0DB5D0071BDEB /* sqMemoryFence.h */; }; + 737F48BB13D0DB5D0071BDEB /* sqSCCSVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 737F48B813D0DB5D0071BDEB /* sqSCCSVersion.h */; }; 73804CA7137DEA0E00D96A60 /* osExports.c in Sources */ = {isa = PBXBuildFile; fileRef = 73804CA6137DEA0E00D96A60 /* osExports.c */; }; 738563101378A00200EF6ED1 /* SoundPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 7385630F1378A00200EF6ED1 /* SoundPlugin.h */; }; 738FB1EA0EE4CF94004BEE42 /* ia32abicc.c in Sources */ = {isa = PBXBuildFile; fileRef = 738FB1E90EE4CF94004BEE42 /* ia32abicc.c */; }; @@ -320,6 +323,9 @@ 737D7E2313BAB68900347756 /* cogit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cogit.h; path = ../../nscogsrc/vm/cogit.h; sourceTree = "<group>"; }; 737D7E2413BAB68900347756 /* vmCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = vmCallback.h; path = ../../nscogsrc/vm/vmCallback.h; sourceTree = "<group>"; }; 737D7E2513BAB68900347756 /* cogmethod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cogmethod.h; path = ../../nscogsrc/vm/cogmethod.h; sourceTree = "<group>"; }; + 737F48B613D0DB5D0071BDEB /* sqCogStackAlignment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqCogStackAlignment.h; sourceTree = "<group>"; }; + 737F48B713D0DB5D0071BDEB /* sqMemoryFence.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqMemoryFence.h; sourceTree = "<group>"; }; + 737F48B813D0DB5D0071BDEB /* sqSCCSVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqSCCSVersion.h; sourceTree = "<group>"; }; 73804CA6137DEA0E00D96A60 /* osExports.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = osExports.c; sourceTree = "<group>"; }; 7385630F1378A00200EF6ED1 /* SoundPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SoundPlugin.h; sourceTree = "<group>"; }; 738FB1E90EE4CF94004BEE42 /* ia32abicc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ia32abicc.c; path = IA32ABI/ia32abicc.c; sourceTree = "<group>"; }; @@ -1357,6 +1363,9 @@ F5F8AFDB02EB4E0A0100013C /* vm */ = { isa = PBXGroup; children = ( + 737F48B613D0DB5D0071BDEB /* sqCogStackAlignment.h */, + 737F48B713D0DB5D0071BDEB /* sqMemoryFence.h */, + 737F48B813D0DB5D0071BDEB /* sqSCCSVersion.h */, A2C08F420EA3E0FD0036416C /* dispdbg.h */, F5F8AFDC02EB4E0A0100013C /* sq.h */, 739C6ED8112DCBD10049B7D3 /* sqAssert.h */, @@ -1444,6 +1453,9 @@ 737D7E2A13BAB68900347756 /* cogit.h in Headers */, 737D7E2B13BAB68900347756 /* vmCallback.h in Headers */, 737D7E2C13BAB68900347756 /* cogmethod.h in Headers */, + 737F48B913D0DB5D0071BDEB /* sqCogStackAlignment.h in Headers */, + 737F48BA13D0DB5D0071BDEB /* sqMemoryFence.h in Headers */, + 737F48BB13D0DB5D0071BDEB /* sqSCCSVersion.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; Added: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h (rev 0) +++ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2011-07-15 22:18:34 UTC (rev 2461) @@ -0,0 +1,75 @@ +/* + * A set of definitions for C source code control systems, to provide accurate + * and definitive version information to the VM. + * + * Currently instantiated only for Subversion. Please add definitions for + * other repositories as appropriate. + * + * I guess a good way to manage this is to edit the below define list to select + * appropriate the repository type, and then that's the extent of the fork. + * + * Eliot Miranda + * eliot.miranda(a)gmail.com + * 15 July 2011 + */ + +#define SCCS 0 +#define RCS 0 +#define CVS 0 +#define SUBVERSION 1 +#define BAZAAR 0 +#define MERCURIAL 0 +#define GIT 0 + + +#if SUBVERSION +static char SvnRawRevisionString[] = "$Rev$"; +# define REV_START (SvnRawRevisionString + 6) + +static char SvnRawRepositoryURL[] = "$URL$"; +# define URL_START (SvnRawRepositoryURL + 6) + +static long +revisionAsLong() { return atol(REV_START); } + +static char * +revisionAsString() +{ + char *maybe_space = strchr(REV_START,' '); + if (maybe_space) + *maybe_space = 0; + return REV_START; +} + +static char * +repositoryURL() +{ + char *maybe_platforms = strstr(URL_START, "/platforms"); + if (maybe_platforms) + *maybe_platforms = 0; + return URL_START; +} +# undef REV_START +# undef URL_START +#else /* SUBVERSION */ +static long +revisionAsLong() { return -1; } + +static char * +revisionAsString() { return "?"; } + +static char * +repositoryURL() { return "unknown"; } +#endif /* SUBVERSION */ + +static char *sourceVersion = 0; + +static char *sourceVersionString() +{ + if (!sourceVersion) { + int len = strlen(revisionAsString()) + strlen(repositoryURL()) + 3; + sourceVersion = malloc(len); + sprintf(sourceVersion,"r%s %s",revisionAsString(),repositoryURL()); + } + return sourceVersion; +} Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Added: checkindate + Fri Jul 15 15:16:27 PDT 2011 Added: svn:keywords + URL Rev Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c =================================================================== --- branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2011-07-15 15:17:51 UTC (rev 2460) +++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c 2011-07-15 22:18:34 UTC (rev 2461) @@ -94,6 +94,7 @@ #include "sqaio.h" #include "sqMacNSPluginUILogic2.h" #include "sqUnixCharConv.h" +#include "sqSCCSVersion.h" #include <unistd.h> #include <pthread.h> @@ -594,6 +595,9 @@ # endif #endif + if (id == 1009) /* source tree version info */ + return sourceVersionString(); + // return "Mac Carbon 3.8.18b4 29-May-08 >02DA4BFD-4050-4372-8DBB-9582DA7D0218<"; // return "Mac Carbon 3.8.18b3 10-Apr-08 >DC0EAF5D-C46C-479D-B2A3-DBD4A2DF95A8<"; // return "Mac Carbon 3.8.18b2 17-Aug-07 >F439DEFF-4327-403D-969B-78695EE835DB<"; Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMain.c 2011-07-15 15:17:51 UTC (rev 2460) +++ branches/Cog/platforms/unix/vm/sqUnixMain.c 2011-07-15 22:18:34 UTC (rev 2461) @@ -37,6 +37,7 @@ #include "sqMemoryAccess.h" #include "sqaio.h" #include "sqUnixCharConv.h" +#include "sqSCCSVersion.h" #include "debug.h" #ifdef ioMSecs @@ -423,7 +424,8 @@ # endif #endif -static char *getAttribute(sqInt id) +static char * +getAttribute(sqInt id) { if (id < 0) /* VM argument */ { @@ -467,6 +469,10 @@ } # endif #endif + + case 1009: /* source tree version info */ + return sourceVersionString(); + default: if ((id - 2) < squeakArgCnt) return squeakArgVec[id - 2]; Modified: branches/Cog/platforms/win32/vm/sqWin32Window.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Window.c 2011-07-15 15:17:51 UTC (rev 2460) +++ branches/Cog/platforms/win32/vm/sqWin32Window.c 2011-07-15 22:18:34 UTC (rev 2461) @@ -37,6 +37,7 @@ #include "sq.h" #include "sqWin32Prefs.h" +#include "sqSCCSVersion.h" #ifndef NO_RCSID static TCHAR RCSID[]= TEXT("$Id: sqWin32Window.c 1693 2007-06-03 02:09:21Z andreas $"); @@ -282,20 +283,29 @@ } #endif /* defined(_WIN32_WCE) */ if(cmd == SC_CLOSE) { - if(prefsEnableAltF4Quit() || GetKeyState(VK_SHIFT) < 0) { - TCHAR msg[1001], label[1001]; - GetPrivateProfileString(U_GLOBAL, TEXT("QuitDialogMessage"), - TEXT("Quit " VM_NAME " without saving?"), - msg, 1000, squeakIniName); - GetPrivateProfileString(U_GLOBAL, TEXT("QuitDialogLabel"), - TEXT(VM_NAME), - label, 1000, squeakIniName); - if(MessageBox(stWindow, msg, label, MB_YESNO) != IDYES) return 0; - DestroyWindow(stWindow); - ioExit(); - } else { - recordWindowEvent(WindowEventClose, NULL); - } +#if NewspeakVM + /* Newspeak doesn't easnt to quit if the main window is closed. Only + * when the last native window is closed. + */ + if(fEnableAltF4Quit) + ShowWindow(stWindow, SW_HIDE); +#else + if(prefsEnableAltF4Quit() || GetKeyState(VK_SHIFT) < 0) { + TCHAR msg[1001], label[1001]; + GetPrivateProfileString(U_GLOBAL, TEXT("QuitDialogMessage"), + TEXT("Quit " VM_NAME " without saving?"), + msg, 1000, squeakIniName); + GetPrivateProfileString(U_GLOBAL, TEXT("QuitDialogLabel"), + TEXT(VM_NAME), + label, 1000, squeakIniName); + if(MessageBox(stWindow, msg, label, MB_YESNO) != IDYES) + return 0; + DestroyWindow(stWindow); + ioExit(); + /*NOTREACHED*/ + } + recordWindowEvent(WindowEventClose, NULL); +#endif /* NewspeakVM */ break; } return DefWindowProcW(hwnd,message,wParam,lParam); @@ -2092,6 +2102,10 @@ /* force an update of the squeak window if using deferred updates */ int ioForceDisplayUpdate(void) { + /* With Newspeak and the native GUI we do not want the main window to appear + * unless explicitly asked for. + */ +#if !NewspeakVM /* Show the main window if it's been hidden so far */ if(IsWindow(stWindow) && !IsWindowVisible(stWindow)) { HideSplashScreen(); @@ -2100,15 +2114,14 @@ ioSetFullScreen(shouldBeFullScreen); UpdateWindow(stWindow); } +#endif /* Check if a) We should do deferred updates at all b) The window is valid c) The Interpreter does not defer updates by itself */ if(fDeferredUpdate && IsWindow(stWindow) && !deferDisplayUpdates) - { UpdateWindow(stWindow); - } return 1; } @@ -2779,6 +2792,9 @@ # endif #endif + case 1009: /* source tree version info */ + return sourceVersionString(); + /* Windows internals */ case 10001: /* addl. hardware info */ return hwInfoString; Modified: branches/Cog/scripts/mkvmarchives =================================================================== --- branches/Cog/scripts/mkvmarchives 2011-07-15 15:17:51 UTC (rev 2460) +++ branches/Cog/scripts/mkvmarchives 2011-07-15 22:18:34 UTC (rev 2461) @@ -39,10 +39,14 @@ COPYFILE_DISABLE=1 tar czf coglinux.tgz coglinux EXES=coglinux/lib/squeak/3.9-7/squeak fi +REV=`grep 'SvnRawRevisionString.*Rev:' platforms/Cross/vm/sqSCCSVersion.h \ + | sed 's/^.*Rev: $[0-9][0-9]*$ $";/\1/' if [ -n "$CM" ]; then test -d Cog.app || mkdir Cog.app rm -rf Cog.app/* Cog.app.tgz (cd macbuild/Fast.app>/dev/null;tar cf - *)|(cd Cog.app;tar xvf -) + ex "+g/[ >][0-9][0-9]*\.[0-9][0-9]*\.0/s/0$[< ]$/$REV\1/" +w +q Cog.app/Contents/Info.plist +g/ [ tar czf Cog.app.tgz Cog.app EXES="$EXES Cog.app/Contents/MacOS/Croquet" fi @@ -63,6 +67,7 @@ test -d Newspeak\ Virtual\ Machine.app || mkdir Newspeak\ Virtual\ Machine.app rm -rf Newspeak\ Virtual\ Machine.app/* Newspeak\ Virtual\ Machine.app.tgz (cd $NSB/macbuild/Fast.app>/dev/null;tar cf - *)|(cd Newspeak\ Virtual\ Machine.app;tar xvf -) + ex "+g/[ >][0-9][0-9]*\.[0-9][0-9]*\.0/s/0$[< ]$/$REV\1/" +w +q Newspeak\ Virtual\ Machine.app/Contents/Info.plist tar czf Newspeak\ Virtual\ Machine.app.tgz Newspeak\ Virtual\ Machine.app EXES="$EXES Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" fi Added: branches/Cog/scripts/svnci =================================================================== --- branches/Cog/scripts/svnci (rev 0) +++ branches/Cog/scripts/svnci 2011-07-15 22:18:34 UTC (rev 2461) @@ -0,0 +1,6 @@ +#!/bin/sh +# checkin script for subverison that serves to cause +# platforms/Cross/vm/sqSCCSVersion.h to be checked-in so that its version +# info reflects that of the current check-in. +svn propset checkindate "`date`" platforms/Cross/vm/sqSCCSVersion.h +svn ci Property changes on: branches/Cog/scripts/svnci ___________________________________________________________________ Added: svn:executable + *

1 0

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev July 2011