Vm-dev April 2010

vm-dev@lists.squeakfoundation.org

33 participants
95 discussions

Easy SqueakVM build
by laurent laffont 21 Apr '10

21 Apr '10

Hi, I've written a script to build the squeak vm from scratch on Linux in one command. It's here http://github.com/lolgzs/easy_squeakvm To build the VM, just get the the script and ./easy_squeakvm.sh This will - checkout squeakvm sources from svn repository - download PharoCore image - load VMMaker into PharoCore - generate the interpreter - build the VM - put binaries in out/squeakvm, ready to use I was tired of typing the same commands over and over :) Cheers, Laurent Laffont

2 1

Re: [Pharo-project] [Vm-dev] Re: we need help for rome
by Bert Freudenberg 19 Apr '10

19 Apr '10

On 19.04.2010, at 10:42, Stéphane Ducasse wrote: > > > On Apr 18, 2010, at 11:57 PM, Bert Freudenberg wrote: > >> On 18.04.2010, at 20:14, stephane ducasse wrote: >>> >>> >>> Thanks Bert >>> >>>> >>>> I think only the first 4 inst vars are actually used by the plugin: >>>> >>>> http://squeakvm.org/svn/squeak/trunk/platforms/unix/src/plugins/RomePlugin/… >>>> #define CanvasHandleIndex 0 >>>> #define CanvasTargetIndex 1 >>>> #define CanvasFlagsIndex 2 >>>> #define CanvasStrokeColorIndex 3 >>>> #define CanvasInstSize 8 >>> >>> how did you get that information? from the image side or C code? >>> Because I tried to see but unsure. >> >> It's in the C code I linked above. I just reordered it for better readability. > > Yes I saw my question was more how do we identify code that is not used anymore? > We just do the closure over the published primitives and the rest means that it is useful. > My question was how did you identify that only 4 inst were used and not more. If you look at the RomePlugin class you see that 8 class vars are defined. But in the generated C code, only the first four are declared. That is because the Slang translator only exports the used ones. That's how I know the others are unused - they were not exported :) >>>> The proper fix would be to modify RomePlugin class>>initializeInstVarIndices to not generate the indices, but simply hard-code only the used ones (setting CanvasInstSize to 4), and change the comparison John mentioned below to <=. Also remove the unused *Index class vars. Now that there are plugins in the wild, hard-coding the indices is a good idea anyway. During development, the flexible generator version was useful, but not anymore. > > > Ok I will browse the RomePlugin class with Cyrille and Jean-Baptiste > > >>> I browsed a bit the C code and I'm learning so may be my questions are not clever, but >>> >>> - do we need the pango primitives for ROME? >>> Apparently Pango may use Cairo for fonts rendering but do Rome needs that? >>> So is it simpler to use fonts via pango than cairo. >> >> Pango provides word/paragraph layout. Many non-latin scripts (e.g. Devanagari) require "glyph shaping", there is no one-to-one mapping between Unicode characters and glyphs rendered in context. Pango can do that. I'm not aware of any other renderer in Squeak that would support this (Yoshiki added it for OLPC). Well, maybe the Unicode plugin from Scratch could do it too, not sure. >> >>> - then what about FormInstSize? >>> >>> (interpreterProxy->slotSizeOf(formOop)) < FormInstSize >>> does it mean >> >> Same thing. The instance variables actually used by the plugin should be hard coded. Otherwise the same would happen as in Sophie - some inst vars were added to the Canvas, so the inst size compiled into the plugin became larger than necessary. >> >> Btw, by now you probably have guessed that a workaround for the Mac issue would be to add 5 dummy inst vars to RomePluginCanvas just to make the plugin happy. > > Yes. In fact my question was more is FormInstSize used (or are the functionality using FormInstSize used)? If you see it in the C code then yes, it is used. > I have problems to see how we can clean the C code. > All my questions should be interpreted with this slant. Well, no need to "clean the C code" because it is just generated. Clean the RomePlugin class instead :^) >>> It doesn't need to be "in sync". But maybe I do not understand the question. > > Sorry was not clear. > My question is how Cairo supports backwards compatibility? > What happens if the plugin expect a different version of Cairo on the machine? > May be they do not change their interface? Many projects are better about backwards compatibility than we are ;) Generally, once an API was added, it is *never* removed or changed in the same major version of a library. Only additions are allowed in point releases. This ensures code can dynamically link to older binaries and not break with newer releases. Also, the major version is part of the library name (executables actually link against bla.so.1 not bla.so) so multiple major versions of the same library can co-exist on a system. So major releases can remove or change existing API. In short, I wouldn't worry about it - I'm not sure in cairo's particular case but in general that's how it works. There is something to be said about published vs. public interfaces, and in Smalltalk we usually don't respect either ... - Bert -

2 1

Re: [Pharo-project] we need help for rome
by Bert Freudenberg 19 Apr '10

19 Apr '10

I think only the first 4 inst vars are actually used by the plugin: http://squeakvm.org/svn/squeak/trunk/platforms/unix/src/plugins/RomePlugin/… #define CanvasHandleIndex 0 #define CanvasTargetIndex 1 #define CanvasFlagsIndex 2 #define CanvasStrokeColorIndex 3 #define CanvasInstSize 8 So on Linux, Rome does use the "right" size. John appears to have used a Sophie image to generate his Plugin, which makes this fail (though I could not find his Rome plugin in the Mac OS platform code so can't verify that theory). The proper fix would be to modify RomePlugin class>>initializeInstVarIndices to not generate the indices, but simply hard-code only the used ones (setting CanvasInstSize to 4), and change the comparison John mentioned below to <=. Also remove the unused *Index class vars. Now that there are plugins in the wild, hard-coding the indices is a good idea anyway. During development, the flexible generator version was useful, but not anymore. - Bert - On 18.04.2010, at 18:45, Stéphane Ducasse wrote: > > John > > how can I know the order and the iv that are used by the plugin? > > Stef > > On Apr 17, 2010, at 4:09 AM, John M McIntosh wrote: > >> (a) In Sophie >> RomeCanvas subclass: #RomePluginCanvas >> instanceVariableNames: 'handle target flags strokeColor stack font fontSize fontMatrix currentFillColor currentBackColor glyphAccuracy cachedGlyphBlt cachedClearBlt drawRunPositions drawRunGlyph drawRunPointY' >> classVariableNames: 'CachedTarget FlagFill FlagStro >> >> (b) In Pharo >> >> RomeCanvas subclass: #RomePluginCanvas >> instanceVariableNames: 'handle target flags strokeColor stack font fontSize fontMatrix' >> classVariableNames: 'FlagFill FlagStroke Registry' >> poolDictionaries: '' >> category: 'Rome-PluginCanvas' >> >> Comment warning: >> >> INST VAR ORDER IS KNOWN TO PLUGIN! DO NOT REARRANGE! >> >> >> So in the plugin we have... >> >> if (interpreterProxy->slotSizeOf(canvasOop)) < CanvasInstSize) >> fail(). >> >> >> where CanvasInstSize is 13 >> >> but as you see in (b) the number of instance slots for the canvas Oops is 8. >> >> 8 < 13, oops you fail. >> >> So where did the instance vars currentFillColor currentBackColor glyphAccuracy cachedGlyphBlt cachedClearBlt >> go? On purpose gone, refactored, old code. etc.... >> >> >> On 2010-04-16, at 1:37 PM, Stéphane Ducasse wrote: >> >>> >>> On Apr 16, 2010, at 10:30 PM, John McIntosh wrote: >>> >>>> Well I'm just as puzzled as you since the primitive gets executed and you are using the same binary that was shipped with Sophie years back. >>> >>> I like to hear that because I feel less idiot. :)

3 5

4.0 in Debian
by Bert Freudenberg 18 Apr '10

18 Apr '10

José submitted 4.0.3.2202 to Debian. There are build failures on some platforms (see below), but yay! Anyone interested in packaging Squeak for Linux (in particular Debian and Ubuntu), please join the list at http://alioth.debian.org/projects/pkg-squeak/ - Bert - Begin forwarded message: > > From: Debian buildds <noreply(a)buildd.debian.org> > Date: 15. April 2010 20:45:07 MESZ > To: squeak-vm(a)packages.qa.debian.org > Subject: failed amd64 build of squeak-vm 1:4.0.3.2202-1 > > * Source package: squeak-vm > * Version: 1:4.0.3.2202-1 > * Architecture: amd64 > * State: failed > * Suite: unstable > * Builder: excelsior.roeckx.be > * Build log: https://buildd.debian.org/fetch.cgi?pkg=squeak-vm&arch=amd64&ver=1%3A4.0.3.… > > Please note that these notifications do not necessarily mean bug reports > in your package but could also be caused by other packages, temporary > uninstallabilities and arch-specific breakages. A look at the build log > despite this disclaimer would be appreciated however. > Begin forwarded message: > From: Debian buildds <noreply(a)buildd.debian.org> > Date: 15. April 2010 20:45:10 MESZ > To: squeak-vm(a)packages.qa.debian.org > Subject: failed kfreebsd-amd64 build of squeak-vm 1:4.0.3.2202-1 > > * Source package: squeak-vm > * Version: 1:4.0.3.2202-1 > * Architecture: kfreebsd-amd64 > * State: failed > * Suite: unstable > * Builder: fasch.debian.org > * Build log: https://buildd.debian.org/fetch.cgi?pkg=squeak-vm&arch=kfreebsd-amd64&ver=1… > > Please note that these notifications do not necessarily mean bug reports > in your package but could also be caused by other packages, temporary > uninstallabilities and arch-specific breakages. A look at the build log > despite this disclaimer would be appreciated however. > Begin forwarded message: > From: Debian buildds <noreply(a)buildd.debian.org> > Date: 15. April 2010 20:45:13 MESZ > To: squeak-vm(a)packages.qa.debian.org > Subject: failed kfreebsd-i386 build of squeak-vm 1:4.0.3.2202-1 > > * Source package: squeak-vm > * Version: 1:4.0.3.2202-1 > * Architecture: kfreebsd-i386 > * State: failed > * Suite: unstable > * Builder: field.debian.org > * Build log: https://buildd.debian.org/fetch.cgi?pkg=squeak-vm&arch=kfreebsd-i386&ver=1%… > > Please note that these notifications do not necessarily mean bug reports > in your package but could also be caused by other packages, temporary > uninstallabilities and arch-specific breakages. A look at the build log > despite this disclaimer would be appreciated however. > Begin forwarded message: > From: Debian buildds <noreply(a)buildd.debian.org> > Date: 15. April 2010 20:45:18 MESZ > To: squeak-vm(a)packages.qa.debian.org > Subject: failed ia64 build of squeak-vm 1:4.0.3.2202-1 > > * Source package: squeak-vm > * Version: 1:4.0.3.2202-1 > * Architecture: ia64 > * State: failed > * Suite: unstable > * Builder: mundy.debian.org > * Build log: https://buildd.debian.org/fetch.cgi?pkg=squeak-vm&arch=ia64&ver=1%3A4.0.3.2… > > Please note that these notifications do not necessarily mean bug reports > in your package but could also be caused by other packages, temporary > uninstallabilities and arch-specific breakages. A look at the build log > despite this disclaimer would be appreciated however. > Begin forwarded message: > From: Debian buildds <noreply(a)buildd.debian.org> > Date: 15. April 2010 20:45:21 MESZ > To: squeak-vm(a)packages.qa.debian.org > Subject: failed s390 build of squeak-vm 1:4.0.3.2202-1 > > * Source package: squeak-vm > * Version: 1:4.0.3.2202-1 > * Architecture: s390 > * State: failed > * Suite: unstable > * Builder: debian-31.osdl.marist.edu > * Build log: https://buildd.debian.org/fetch.cgi?pkg=squeak-vm&arch=s390&ver=1%3A4.0.3.2… > > Please note that these notifications do not necessarily mean bug reports > in your package but could also be caused by other packages, temporary > uninstallabilities and arch-specific breakages. A look at the build log > despite this disclaimer would be appreciated however. > Begin forwarded message: > From: Debian buildds <noreply(a)buildd.debian.org> > Date: 15. April 2010 21:45:04 MESZ > To: squeak-vm(a)packages.qa.debian.org > Subject: failed armel build of squeak-vm 1:4.0.3.2202-1 > > * Source package: squeak-vm > * Version: 1:4.0.3.2202-1 > * Architecture: armel > * State: failed > * Suite: unstable > * Builder: argento.debian.org > * Build log: https://buildd.debian.org/fetch.cgi?pkg=squeak-vm&arch=armel&ver=1%3A4.0.3.… > > Please note that these notifications do not necessarily mean bug reports > in your package but could also be caused by other packages, temporary > uninstallabilities and arch-specific breakages. A look at the build log > despite this disclaimer would be appreciated however. > Begin forwarded message: > From: Debian buildds <noreply(a)buildd.debian.org> > Date: 15. April 2010 20:45:04 MESZ > To: squeak-vm(a)packages.qa.debian.org > Subject: failed hppa build of squeak-vm 1:4.0.3.2202-1 > > * Source package: squeak-vm > * Version: 1:4.0.3.2202-1 > * Architecture: hppa > * State: failed > * Suite: unstable > * Builder: peri.debian.org > * Build log: https://buildd.debian.org/fetch.cgi?pkg=squeak-vm&arch=hppa&ver=1%3A4.0.3.2… > > Please note that these notifications do not necessarily mean bug reports > in your package but could also be caused by other packages, temporary > uninstallabilities and arch-specific breakages. A look at the build log > despite this disclaimer would be appreciated however. >

2 5

InputSemaphore on Windows
by Henrik Sperre Johansen 18 Apr '10

18 Apr '10

Is there a reason why this isn't signalled when inputSemaphoreIndex > 0? In sqWin32Window.c, the comment for synchronizedSignalSemaphoreWithIndex looks somewhat scary... But looking at the svn logs, it seems it never was used in the record...Event() functions at all, so I wondered if a problem was encountered before svn was in use that lead to its removal, or if it's just not done by default? Cheers, Henry

3 4

Fwd: loading library with FFI fails (was [Pharo-project] Linux vm: assertions and strategy)
by laurent laffont 17 Apr '10

17 Apr '10

Hi, it seems that on Linux loading a library with FFI fails (rev 2135 -> rev 2151). Bill submit a patch below. Is this a known problem ? Furthermore, the Linux VM I've built for Pharo is rev. 2151 with 2 patchs (found on this mailing list) - http://lolgzs.free.fr/pharo/ft2plugin.patch so FT2Plugin can be built - http://lolgzs.free.fr/pharo/CFLAGS.patch for multiple CFLAGS options to work Are the above issues fixed in current trunk ? Maybe I forgot to read important things, it's not clear for me how to report bugs on squeak-vm and how to submit patchs... Cheers, Laurent Laffont ---------- Forwarded message ---------- From: Schwab,Wilhelm K <bschwab(a)anest.ufl.edu> Date: Fri, Apr 9, 2010 at 12:11 AM Subject: Re: [Pharo-project] Linux vm: assertions and strategy To: "Pharo-project(a)lists.gforge.inria.fr" < Pharo-project(a)lists.gforge.inria.fr> Laurent, The promised code for tryLoadModule(); it goes just before if (!handle) { struct stat buf; if ((0 == stat(path, &buf)) && ! S_ISDIR(buf.st_mode)) fprintf(stderr, "%s\n", dlerror()); } return handle; Drop the fprintf() calls if you want - I know what was happening now? Bill ======================== /* wks - have not loaded a library? Is the path absolute? Use the name as given. */ if( (!handle) && ( (int)(name[0])==47 ) ) { handle=dlopen(name, RTLD_NOW | RTLD_GLOBAL); fprintf(stdout,"WKS-load-by-name(%s) = %p\n", path,handle); } else { if(!handle){ fprintf(stdout,"WKS-refuse-load-by-name(%s) - not absolute path\n", path); } } ________________________________________ From: pharo-project-bounces(a)lists.gforge.inria.fr [ pharo-project-bounces(a)lists.gforge.inria.fr] On Behalf Of Schwab,Wilhelm K [ bschwab(a)anest.ufl.edu] Sent: Thursday, April 08, 2010 6:10 PM To: Pharo-project(a)lists.gforge.inria.fr Subject: Re: [Pharo-project] Linux vm: assertions and strategy Laurent, A part-time boss/full-time friend once advised me to "get the machine to tell you what it's doing" (I was doing just that at the time, but I've never forgotten his advise<g>). I compiled your vm and then decided to stick some tracing code in strategic places to find what the vm thinks it is doing in trying to load unixODBC. Get ready: tryLoading(/sr/local/slib/squeak/3.11.13-/so.libodbc.so) = (nil) In short, it does not appear to recognize a difference between plugins (the names of which it twists around to avoid collisions with external libraries - that's fine) and external libraries that have been minding their own business for many clock cycles. The latter deserve special attention. So I had an absolutely nutty idea: give dlopen() the name of the library as written :) Clearly, that works only if one provides an absolute path in #moduleName, but (forgive/correct possible *nix-noob syndrome here) that is easy to test and even easier to do in the code. So, in sqUnixExternalPrims.c in the unix/vm directory, look near the end of tryLoadModule(). My proposed workaround is to add some code before the !handle test at the end. I will send a cut-down version of it in a separate email. Unless someone has a better idea, I suggest we make this change to you source to give people an opportunity to use external libraries: (1) I fear at all(!!); (2) by absolute path if desired. BTW, the 3.11-3 vm indeed appears to have fixed my problem w/ double return values, at least the boiled-down test works. Bill ________________________________ From: pharo-project-bounces(a)lists.gforge.inria.fr [mailto: pharo-project-bounces(a)lists.gforge.inria.fr] On Behalf Of laurent laffont Sent: Thursday, April 08, 2010 3:22 PM To: Pharo-project(a)lists.gforge.inria.fr Subject: Re: [Pharo-project] Linux vm: assertions and strategy 2010/4/8 Schwab,Wilhelm K <bschwab(a)anest.ufl.edu<mailto: bschwab(a)anest.ufl.edu>> Laurent, I was reading a little about Eliot's proposed FPU init changes to FFI and then took another look at your evolving Pharo vm source and I was struck by either: (1) a brilliant (well, fairly clever) workaround to my external library hassles; (2) a completely and totally stupid idea. You have based the vm on the 3.11-3 sources, so it hopefully fixes the double return defect that has been driving me nuts. My remaining problem is to get the vm to load external libraries. Would a simple plugin to expose dlopen() (and perhaps dlsym() while we're at it) solve the problem? I should then be able to bypass the FFI code that calls dlopen() (I suspect that it's pretty badly broken) by setting the handle of any ailing library by using absolute paths if necessary. From there, I *think* everything will just work. What do you think? Well, I'm noob on VM stuff, I've just worked on how to generate VM source for Linux, that's all :) So I cannot tell anything...I have to learn before. Somewhat related, have you looked at compiling the Alien plugin? The more I look at posts on Alien, the more I wonder whether it will help, as there are suggestions that it is weak on external calls. Still, it would be nice to get it going and look over the tests the boldness that comes from watching them pass having actually done something. Yes I can compile it, but the VM crashes loudly when trying to use it. This thread has a lot of informations: http://n4.nabble.com/Trying-to-build-alien-plugin-in-linux-tc1562896.html Laurent Laffont Bill ________________________________ From: pharo-project-bounces(a)lists.gforge.inria.fr<mailto: pharo-project-bounces(a)lists.gforge.inria.fr> [mailto: pharo-project-bounces(a)lists.gforge.inria.fr<mailto: pharo-project-bounces(a)lists.gforge.inria.fr>] On Behalf Of laurent laffont Sent: Thursday, April 08, 2010 7:32 AM To: Pharo-project(a)lists.gforge.inria.fr<mailto: Pharo-project(a)lists.gforge.inria.fr> Subject: Re: [Pharo-project] Linux vm: assertions and strategy I'm totally noob on FFI. Maybe the vm-dev mailing list is more appropriate ? It seems there's actually some problems with it http://n4.nabble.com/forum/Search.jtp?tpl=search-page&node=104410&query=ffi On my machine, 20/21 FFI unit tests fails... I haven't been able to build last revision of squeak-vm trunk. Laurent Laffont On Thu, Apr 8, 2010 at 1:53 PM, Schwab,Wilhelm K <bschwab(a)anest.ufl.edu <mailto:bschwab@anest.ufl.edu>> wrote: Laurent, all, If I may jump to conclusions a little, the 3.11-3 vm's changes break the loading of libraries, certainly to the point of being arkane. Beyond that, LinuxODBC is transparent to it, so I am left wondering how it is suppose to work at all?? The RC3 one-click image and vm produce very nice fonts on my Ubuntu laptop, but it retains the FFI/double defect, and from the naming of the plugins, must be based on a pre 3.11-3 vm. Is the plan to use 3.11-3 for the one-click? If so, we need to do something about external libraries; at a minimum, LinuxODBC should work, whether by fully understanding how to use environment variables, or (as I suspect) getting the dlopen() call to work again. Another option is to identify the FPU related fixes and apply them to the current one-click vm. Any preferences? Any success with 3.11-3 and LinuxODBC? I'd be happy to be wrong about this. Bill _______________________________________________ Pharo-project mailing list Pharo-project(a)lists.gforge.inria.fr<mailto: Pharo-project(a)lists.gforge.inria.fr> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list Pharo-project(a)lists.gforge.inria.fr<mailto: Pharo-project(a)lists.gforge.inria.fr> http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project _______________________________________________ Pharo-project mailing list Pharo-project(a)lists.gforge.inria.fr http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

2 1

OSS+padsp vs pulse?
by Derek O'Connell 15 Apr '10

15 Apr '10

Is there is any advantage to defaulting to the OSS driver via padsp rather than directly using pulse now that it is working? I can't tell by ear if latency is better/worse but play/record seem to work equally well for both options. Also I cannot check full-duplex operation (play and record at the same time) on this machine so if that is important to anyone it needs checking for both options. -D

1 0

Re: UUID as internal (was 4.0.3.2196 for Unix)
by laurent laffont 14 Apr '10

14 Apr '10

I have just built last release (Squeak-4.0.3.2200-src.tar.gz) with UUID as internal and it works like a charm. All Pharo 1.0-RC4 tests green ! Thank you all. So there's a real problem when UUID is external. Cheers, Laurent Laffont On Tue, Apr 13, 2010 at 1:36 AM, David T. Lewis <lewis(a)mail.msen.com> wrote: > > On Mon, Apr 12, 2010 at 01:48:32PM +0200, laurent laffont wrote: > > > > I tend to think that if it's really a libuuid problem the VM would crash > > whether UUIDPlugin is built Internal or External. > > Hi Laurent, > > This bug is documented on Mantis > http://bugs.squeak.org/view.php?id=7358 > > Can you confirm that the bug does *not* exist when you build the plugin > as internal, and that it *does" exist if you build it external on the > same platform. It would be a big help to know if this is the case. > > My impression up until now is that this is a bug in the runtime libuuid > library, and that it has something to do with running a program with > pthreads (i.e. it does not happen with a simple test program). But I > have never actually seen the bug on my own system, so I'm guessing based > on some google searches and the information that I read on the Pharo list. > > Thanks! > > Dave > >

4 12

[commit] r2202 - version 4.0.3.2202
by commits＠squeakvm.org 14 Apr '10

14 Apr '10

Author: piumarta Date: 2010-04-13 11:55:21 -0700 (Tue, 13 Apr 2010) New Revision: 2202 Added: trunk/platforms/unix/doc/RELEASE_NOTES_4.0.3.2202 Modified: trunk/platforms/unix/ChangeLog Log: version 4.0.3.2202 Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2010-04-13 14:51:56 UTC (rev 2201) +++ trunk/platforms/unix/ChangeLog 2010-04-13 18:55:21 UTC (rev 2202) @@ -1,3 +1,10 @@ +2010-04-13 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> + + * doc/RELEASE_NOTES_4.0.3.2202: Release 4.0.3.2202. + + * vm-sound-pulse/sqUnixSoundPulseAudio.c: New version from Derek + O'Connell as used in Scratch. Fixes bad behaviour on Karmic. + 2010-04-12 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)> * src: UUIDPlugin is now internal. Added: trunk/platforms/unix/doc/RELEASE_NOTES_4.0.3.2202 =================================================================== --- trunk/platforms/unix/doc/RELEASE_NOTES_4.0.3.2202 (rev 0) +++ trunk/platforms/unix/doc/RELEASE_NOTES_4.0.3.2202 2010-04-13 18:55:21 UTC (rev 2202) @@ -0,0 +1,9 @@ +Changes since 4.0.3.2196: + +Changes to pulseaudio driver from Derek O'Connell, as used in Scratch. +(Fixes bad behaviour on Karmic.) + +UUIDPlugin is now internal. + +Top-level Makefile in source archive uses cmake/configure and no +longer fails because of bogus dependency bld/squeakvm.

6 5

[commit] r2201 - adopt latest pulse audio driver from Scratch
by commits＠squeakvm.org 13 Apr '10

13 Apr '10

Author: piumarta Date: 2010-04-13 07:51:56 -0700 (Tue, 13 Apr 2010) New Revision: 2201 Modified: trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c Log: adopt latest pulse audio driver from Scratch Modified: trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c =================================================================== --- trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c 2010-04-12 23:53:14 UTC (rev 2200) +++ trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c 2010-04-13 14:51:56 UTC (rev 2201) @@ -2,7 +2,7 @@ * * Author: Derek O'Connell <doc(a)doconnel.f9.co.uk> * - * Copyright (C) 2009 by Derek O'Connel + * Copyright (C) 2009--2010 by Derek O'Connell * All rights reserved. * * This file is part of Unix Squeak. @@ -25,7 +25,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * Last edited: 2009-09-14 14:15:05 by piumarta on ubuntu.piumarta.com + * Last edited: 2010-04-13 07:45:37 by piumarta on ubuntu */ /* ========== */ @@ -150,8 +150,6 @@ int bytesPerFrame; /* PULSE, Simple API parameters */ - pa_stream_direction_t dir; - const char *stream_name; pa_simple *pa_conn; pa_sample_spec pa_spec; } audioIO_t; @@ -327,13 +325,6 @@ fprintf(stderr, "%0.0f usec \r", (float)latency); } -/* -static int bytesPerChannel(audioIO_t *audioIO) { - if ( PA_SAMPLE_S16LE == audioIO->rate) return SAMPLE_RATE_8KHZ; - PA_SAMPLE_S16LE -} -*/ - /* ================================== Signal Ops */ static void sigWait(gen_sig_t *sig) { @@ -446,20 +437,12 @@ } static int ioAllocBuffers(audioIO_t *audioIO, int frameCount) { - int maxBytes; int i; - /* NTS: should take audioIO->bytesPerFrame into account... - and that depends on stereo or not. Revisit at later date. - maxBytes = frameCount * audioIO->bytesPerFrame; - */ + /* Not preserving buffers when play/record stopped */ + /* Choosing memory conservation over speed of starting play/record */ - if (audioIO->buffersAllocated) - if (audioOut.maxSamples == frameCount) - return true; - else - ioFreeBuffers(audioIO); - + ioFreeBuffers(audioIO); audioIO->maxSamples = frameCount; audioIO->maxBytes = audioIO->maxSamples * audioIO->bytesPerFrame; audioIO->maxWords = audioIO->maxBytes >> 1; @@ -468,8 +451,6 @@ audioIO->buffer[i].isFree = true; } audioIO->buffersAllocated = true; - - return true; } static int ioIsFull(audioIO_t *audioIO) { @@ -584,10 +565,6 @@ /* if ((rc = snd_pcm_writei(audioOut.alsaHandle, buffer, frames)) < frames) { */ - /* Experiment to see if draining removes delay, result: undecided, seems slightly better */ - pa_simple_drain(audioOut.pa_conn, &rc); - - /* PA: Have to assume for now that all frames were written */ if (pa_simple_write(audioOut.pa_conn, buffer, (size_t) (frames * audioOut.bytesPerFrame), &rc) < 0) { fprintf(stderr, __FILE__": pa_simple_write() failed: %s\n", pa_strerror(rc)); @@ -702,7 +679,7 @@ } */ - /* PA: Endian swap is N810 left-over... */ + /* PA: Endian swap may not be needed... */ /* Endian Swap (rc = frames = Word Count in this case) */ /* @@ -735,93 +712,20 @@ } -/* ================================== OPEN/CLOSE PA */ - -static int closePulseAudio(audioIO_t *audioIO) { - int rc; - - if (!audioIO->pa_conn) - return true; - - if (PA_STREAM_PLAYBACK == audioIO->dir) - if (pa_simple_drain(audioIO->pa_conn, &rc) < 0) - fprintf(stderr, __FILE__": pa_simple_drain() failed: %s\n", pa_strerror(rc)); - - pa_simple_free(audioIO->pa_conn); - audioIO->pa_conn = NULL; - - printf("closePulseAudio((): %s\n", audioIO->dbgName); - - return true; -} - -static int openPulseAudio(audioIO_t *audioIO, int samplesPerSec, int stereo) { - int rc; - int channels; - -/* -DBGMSG(">pa_Open()"); -#ifdef DBG -printf("\tframeCount: %d, samplesPerSec: %d, stereo: %d\n", frameCount, samplesPerSec, stereo, semaIndex); -#endif -*/ - - /* DMOC 090912: - Connection for playback stream should already have been opened when module loaded so - now only open if that failed or parameters have changed. Could also avoid buffer - creation if default frameCount known/agreed. - */ - - channels = stereo ? 2 : 1; - - /* If already connected then check if same spec */ - if (audioIO->pa_conn) - if ((audioIO->pa_spec.rate == samplesPerSec) && (audioIO->pa_spec.channels == channels)) - return true; - - if (audioIO->pa_conn) - closePulseAudio(audioIO); - - audioIO->pa_spec.rate = samplesPerSec; - audioIO->pa_spec.channels = channels; - - if (!(audioIO->pa_conn = pa_simple_new(NULL, "Scratch", audioIO->dir, NULL, audioIO->stream_name, &audioIO->pa_spec, NULL, NULL, &rc))) { - fprintf(stderr, __FILE__": pa_simple_new() failed: %s\n", pa_strerror(rc)); - return false; - } - -/* - if (PA_STREAM_PLAYBACK == audioIO->dir) - pa_simple_drain(audioIO->pa_conn, &rc); -*/ - printf("openPulseAudio() %s, rate: %i, chans: %i\n", audioIO->dbgName, samplesPerSec, channels); - - return true; -} - /* ================================== IO INIT */ -/* ioInit() called when module loaded... - N810: Threads pre-started and held on semaphore - PA: Connection opened for audio-out with default settings -*/ - static int ioInit() { - int rc; - if (initDone) return true; initDone = true; - /* >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> */ - /* >>>>>>>>>>>>> AUDIO OUT >>>>>>>>>>>> */ - /* >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> */ + /* AUDIO OUT */ /* NOT USED >>> */ audioOut.dbgName = "play"; audioOut.device = "pa-simple"; /* <<< */ - audioOut.open = false; /* Squeak state */ + audioOut.open = false; audioOut.maxSamples = 0; audioOut.maxWords = 0; @@ -856,35 +760,19 @@ audioOut.rateID = 0; audioOut.bytesPerFrame = 4; /* Stereo S16LE */ - /* PA Specific (defaults for Scratch/Squeak) */ - audioOut.dir = PA_STREAM_PLAYBACK; - audioOut.stream_name = "playback"; - audioOut.pa_spec.format = PA_SAMPLE_S16LE; /* Squeak default */ - audioOut.pa_spec.rate = 0; - audioOut.pa_spec.channels = 0; - audioOut.pa_conn = NULL; + audioOut.pa_conn = null; - /* Open PA connection here to avoid delays later on */ - openPulseAudio(&audioOut, 22050, true); - - /* Allocate buffers here to avoid delays later on */ - /* Hmmm, tricky because varies... so not doing it atm */ -/* ioAllocBuffers(&audioOut, frameCount); -*/ - ioThreadStart(&audioOut); + /* AUDIO IN */ - /* >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> */ - /* >>>>>>>>>>>>> AUDIO IN >>>>>>>>>>>>> */ - /* >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> */ + audioIn.dbgName = "rec"; /* NOT USED >>> */ - audioIn.dbgName = "rec"; audioIn.device = "pa-simple"; /* <<< */ - audioIn.open = false; /* Squeak state */ + audioIn.open = false; audioIn.maxSamples = 0; audioIn.maxWords = 0; @@ -919,16 +807,8 @@ audioIn.rateID = 0; audioIn.bytesPerFrame = 2; /* Mono S16LE */ - /* PA Specific */ - audioIn.dir = PA_STREAM_RECORD; - audioIn.stream_name = "record"; - audioIn.pa_spec.format = PA_SAMPLE_S16LE; /* Squeak default */ - audioIn.pa_spec.rate = 0; - audioIn.pa_spec.channels = 0; - audioIn.pa_conn = NULL; + audioIn.pa_conn = null; - /* DMOC 090912: Not attempting to open default PA connection for recording */ - ioThreadStart(&audioIn); } @@ -950,6 +830,7 @@ return 0; /* or maxBytes? */ } + static sqInt sound_PlaySamplesFromAtLength(int frameCount, int arrayIndex, int startIndex) { unsigned int bufferNext, samples, sampleBytes; @@ -971,10 +852,9 @@ return 0; /* or maxBytes? */ } + static sqInt sound_Start(int frameCount, int samplesPerSec, int stereo, int semaIndex) { int rc; - int channels; - int reopen; DBGMSG(">sound_Start()"); @@ -984,23 +864,33 @@ if (audioOut.open) return true; - if (!openPulseAudio(&audioOut, samplesPerSec, stereo)) { - success(false); - return false; + audioOut.pa_spec.format = PA_SAMPLE_S16LE; + audioOut.pa_spec.rate = samplesPerSec; /* rate(SAMPLE_RATE_22_05KHZ) for Squeak */ + audioOut.pa_spec.channels = stereo ? 2 : 1; + audioOut.pa_conn = NULL; + + /* Create a new playback stream */ + if (!(audioOut.pa_conn = pa_simple_new(NULL, "Scratch", PA_STREAM_PLAYBACK, NULL, "playback", &audioOut.pa_spec, NULL, NULL, &rc))) { + fprintf(stderr, __FILE__": pa_simple_new() failed: %s\n", pa_strerror(rc)); + success(false); + return false; } - - printf("sound_Start() frameCount >> 1: %i\n", frameCount >> 1); - ioAllocBuffers(&audioOut, frameCount >> 1); + ioAllocBuffers(&audioOut, frameCount); + audioOut.bufferCount = audioOut.maxBuffers; /* Has to be reset everytime */ - /* EVERY TIME: Initialise buffer count, ie, Squeak-ready buffers (max for audio-out) */ - audioOut.bufferCount = audioOut.maxBuffers; - audioOut.sqSemaphore = semaIndex; + audioOut.open = true; sigSignal(&audioOut.sigRun); + /* error possibly left over from dsp-protocol.c code */ + /* dsp-protocol.c in current ALSA not capturing EINTR/EAGAIN */ + /* EINTR/EAGAIN from dsp-protocol.c not raised up to ALSA so not caught by ALSA */ + /* Clearing errno here to see if Squeak can continue regardless */ + errno = 0; + DBGMSG("<sound_Start()"); return true; } @@ -1018,10 +908,16 @@ ioThreadStall(&audioOut); - closePulseAudio(&audioOut); + if (pa_simple_drain(audioOut.pa_conn, &rc) < 0) { + fprintf(stderr, __FILE__": pa_simple_drain() failed: %s\n", pa_strerror(rc)); + } + + if (NULL != audioOut.pa_conn) + pa_simple_free(audioOut.pa_conn); ioFreeBuffers(&audioOut); + audioOut.pa_conn = NULL; audioOut.sqSemaphore = 0; DBGMSG("<sound_Stop()"); @@ -1034,30 +930,57 @@ static sqInt sound_StartRecording(int desiredSamplesPerSec, int stereo, int semaIndex) { int rc; + pa_buffer_attr pa_buffer_metrics; /* For recording */ DBGMSG(">sound_StartRecording()"); if (audioIn.open) return true; + audioIn.pa_spec.format = PA_SAMPLE_S16LE; + audioIn.pa_spec.rate = desiredSamplesPerSec; + audioIn.pa_spec.channels = stereo ? 2 : 1; + audioIn.pa_conn = NULL; + + pa_buffer_metrics.maxlength = (uint32_t) -1; + pa_buffer_metrics.tlength = (uint32_t) -1; /* playback only */ + pa_buffer_metrics.prebuf = (uint32_t) -1; /* playback only */ + pa_buffer_metrics.minreq = (uint32_t) -1; /* playback only */ + pa_buffer_metrics.fragsize = pa_usec_to_bytes(20*1000, &audioIn.pa_spec); + + /* Create the recording stream */ + if (!(audioIn.pa_conn = pa_simple_new( NULL, + "Scratch", + PA_STREAM_RECORD, + NULL, + "record", + &audioIn.pa_spec, + NULL, + &pa_buffer_metrics, + &rc))) + { + fprintf(stderr, __FILE__": pa_simple_new() failed: %s\n", pa_strerror(rc)); + success(false); + return false; + } + /* Only rate supported on the N810 (atm) is 8000 */ /* - desiredSamplesPerSec = 8000; + audioIn.alsaRate = 8000; */ - if (!openPulseAudio(&audioIn, desiredSamplesPerSec, stereo)) { - success(false); - return false; - } - - /* Buffers will be filled before signalling Squeak. So rate & buffer size determined signalling freq... */ /* 20Hz update freq for Squeak sounds reasonable, so... */ audioIn.maxSamples = audioIn.pa_spec.rate / 20; - ioAllocBuffers(&audioIn, audioIn.maxSamples); - - /* EVERY TIME: Initialise buffer count, ie, Squeak-ready buffers (ZERO for audio-in) */ - audioIn.bufferCount = 0; + /* Use a buffer large enough to hold one period (assuming 2 bytes/sample) */ +/* + audioIn.alsaBufferSize = audioIn.maxSamples * 2 * audioIn.pa_spec.channels; + audioIn.alsaBuffer = (char *) malloc(audioIn.alsaBufferSize); +*/ + /* Buffers will be filled before signalling Squeak. So rate & buffer size determined signalling freq... */ + ioAllocBuffers(&audioIn, audioIn.pa_spec.rate / 20 ); /* for Sq signalling rate of 20Hz */ + audioIn.bufferCount = 0; /* Has to be reset everytime */ + audioIn.sqSemaphore = semaIndex; audioIn.open = true; @@ -1078,7 +1001,7 @@ ioThreadStall(&audioIn); - closePulseAudio(&audioIn); + pa_simple_free(audioIn.pa_conn); ioFreeBuffers(&audioIn); @@ -1189,7 +1112,7 @@ #include "SqSound.h" -SqSoundDefine(pulse); +SqSoundDefine(PA); #include "SqModule.h" @@ -1235,12 +1158,13 @@ } static void *sound_makeInterface(void) { -//#ifdef NEWSIG +/*#ifdef NEWSIG // sigalrm_save(); // DMOC: Being here assumes old handler same for run duration! Same for sigio handler. //#else // DMOC: Rethink: Signal captured once, preserved and restored when/where necessary? // sigio_save(); //#endif +*/ #ifdef USE_RESOURCE_MANAGER printf("USE_RESOURCE_MANAGER\n"); @@ -1248,7 +1172,7 @@ ioInit(); - return &sound_pulse_itf; + return &sound_PA_itf; } SqModuleDefine(sound, pulse);

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2010