Vm-dev September 2009

vm-dev@lists.squeakfoundation.org

24 participants
46 discussions

ScratchPlugin
by Bert Freudenberg 15 Sep '09

15 Sep '09

Hi folks, is it okay if I add the ScratchPlugin to VMMaker? We are including it in Etoys and it makes it simpler for John Maloney if was maintained in the official VM. We got explicit permission for that (even though it's MIT it doesn't hurt to ask), see forwarded message below. John is working on the 1.4 version as he wrote below, but the previous one would suit us fine for now, current source is here: http://info.scratch.mit.edu/Source_Code - Bert - Begin forwarded message: > From: John Maloney <jmaloney(a)media.mit.edu> > Date: 10. September 2009 13:12:00 MESZ > To: Bert Freudenberg <bert(a)freudenbergs.de> > Cc: "Software Squeakland.org" <software(a)squeakland.org> > Subject: [sq-software] Re: ScratchPlugin > > Hi, Bert. > > Re: we're about to include the ScratchPlugin with Etoys > > Great! > > Re: >> Mostly for the incredibly useful openURL prim ;) but secondly for >> access to the ScratchBoard etc., Korakurider already made an Etoys >> interface for it (though this won't make it in this release). Now >> the question is if we need to include the "Scratch Source Code >> License" file with the Etoys release. My reading of it is that we >> don't. Also we both agreed that having the plugin be part of the >> Squeak VM proper would make things quite a bit easier, and you >> certainly would not require the license to be bundled with the VM >> in that case, right? > > Mitchel has given permission for you to bundle the ScratchPlugin > code with the Squeak VM. (You can keep this email as proof!) You > don't need to include the Scratch source license. > > It's also fine to include the include the ScratchPlugin accessor > methods (and the entire class). Giving credit in a class comment is > fine. > > Two questions: > > (a) Are you interested in including the Scratch Unicode plugin as > well? > (b) Should I send you the latest C code for the Scratch Plugin? > > Actually, I'm working to bundle up the Scratch 1.4 source code > release, so I'll be putting a zip file of the latest C code online > in the next week or so. But I can send you a copy sooner if you need > it. > > -- John >

2 3

[commit] r2132 - add vm-sound-pulse to autoloaded drivers
by commits＠squeakvm.org 14 Sep '09

14 Sep '09

Author: piumarta Date: 2009-09-14 14:25:16 -0700 (Mon, 14 Sep 2009) New Revision: 2132 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/vm-sound-pulse/config.cmake trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c trunk/platforms/unix/vm/sqUnixMain.c Log: add vm-sound-pulse to autoloaded drivers Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-09-14 21:00:51 UTC (rev 2131) +++ trunk/platforms/unix/ChangeLog 2009-09-14 21:25:16 UTC (rev 2132) @@ -3,6 +3,15 @@ * vm-sound-pulse: Pulse Audio driver added, thanks to Derek O'Connell. + * vm-sound-pulse/sqUnixSoundPulseAudio.c: Driver interface + structure is called "pulse". + + * vm-sound-pulse/config.cmake: Require libpulse-simple rather than + libpulse. + + * vm/sqUnixMain.c (moduleDescriptions): Add vm-sound-pulse to list + of auto-loaded sound drivers. + 2009-09-10 <piumarta(a)ubuntu.piumarta.com> * plugins/SqueakFFIPrims/x86-sysv-asm.S (ffiCallAddressOf): Pop a Modified: trunk/platforms/unix/vm/sqUnixMain.c =================================================================== --- trunk/platforms/unix/vm/sqUnixMain.c 2009-09-14 21:00:51 UTC (rev 2131) +++ trunk/platforms/unix/vm/sqUnixMain.c 2009-09-14 21:25:16 UTC (rev 2132) @@ -27,7 +27,7 @@ /* Author: Ian Piumarta <ian.piumarta(a)squeakland.org> * - * Last edited: 2009-09-02 15:08:53 by piumarta on ubuntu.piumarta.com + * Last edited: 2009-09-14 14:03:15 by piumarta on ubuntu.piumarta.com */ #include "sq.h" @@ -702,6 +702,7 @@ { &soundModule, "sound", "OSS" }, { &soundModule, "sound", "MacOSX" }, { &soundModule, "sound", "Sun" }, + { &soundModule, "sound", "pulse" }, { &soundModule, "sound", "ALSA" }, { &soundModule, "sound", "null" }, { 0, 0, 0 } Modified: trunk/platforms/unix/vm-sound-pulse/config.cmake =================================================================== --- trunk/platforms/unix/vm-sound-pulse/config.cmake 2009-09-14 21:00:51 UTC (rev 2131) +++ trunk/platforms/unix/vm-sound-pulse/config.cmake 2009-09-14 21:25:16 UTC (rev 2132) @@ -1 +1 @@ -PLUGIN_REQUIRE_PACKAGE (LIBPULSE libpulse) +PLUGIN_REQUIRE_LIBRARY (PULSE pulse-simple) Modified: trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c =================================================================== --- trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c 2009-09-14 21:00:51 UTC (rev 2131) +++ trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c 2009-09-14 21:25:16 UTC (rev 2132) @@ -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 13:59:33 by piumarta on ubuntu.piumarta.com + * Last edited: 2009-09-14 14:15:05 by piumarta on ubuntu.piumarta.com */ /* ========== */ @@ -1189,7 +1189,7 @@ #include "SqSound.h" -SqSoundDefine(PA); +SqSoundDefine(pulse); #include "SqModule.h" @@ -1248,8 +1248,7 @@ ioInit(); - return &sound_PA_itf; + return &sound_pulse_itf; } -SqModuleDefine(sound, PA); - +SqModuleDefine(sound, pulse);

1 0

[commit] r2131 - add pulse audio driver
by commits＠squeakvm.org 14 Sep '09

14 Sep '09

Author: piumarta Date: 2009-09-14 14:00:51 -0700 (Mon, 14 Sep 2009) New Revision: 2131 Added: trunk/platforms/unix/vm-sound-pulse/ trunk/platforms/unix/vm-sound-pulse/config.cmake trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c Modified: trunk/platforms/unix/ChangeLog Log: add pulse audio driver Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-09-10 20:04:16 UTC (rev 2130) +++ trunk/platforms/unix/ChangeLog 2009-09-14 21:00:51 UTC (rev 2131) @@ -1,3 +1,8 @@ +2009-09-14 <piumarta(a)ubuntu.piumarta.com> + + * vm-sound-pulse: Pulse Audio driver added, thanks to Derek + O'Connell. + 2009-09-10 <piumarta(a)ubuntu.piumarta.com> * plugins/SqueakFFIPrims/x86-sysv-asm.S (ffiCallAddressOf): Pop a Added: trunk/platforms/unix/vm-sound-pulse/config.cmake =================================================================== --- trunk/platforms/unix/vm-sound-pulse/config.cmake (rev 0) +++ trunk/platforms/unix/vm-sound-pulse/config.cmake 2009-09-14 21:00:51 UTC (rev 2131) @@ -0,0 +1 @@ +PLUGIN_REQUIRE_PACKAGE (LIBPULSE libpulse) Added: trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c =================================================================== --- trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c (rev 0) +++ trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c 2009-09-14 21:00:51 UTC (rev 2131) @@ -0,0 +1,1255 @@ +/* sqUnixSoundPulseAudio.c -- sound module for Pulse Audio + * + * Author: Derek O'Connell <doc(a)doconnel.f9.co.uk> + * + * Copyright (C) 2009 by Derek O'Connel + * All rights reserved. + * + * This file is part of Unix Squeak. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Last edited: 2009-09-14 13:59:33 by piumarta on ubuntu.piumarta.com + */ + +/* ========== */ +/* INCLUDES */ +/* ========== */ + +#include "sq.h" +#include <errno.h> +#include <signal.h> + +#include <stdio.h> +#include <stdlib.h> +#include <sys/errno.h> +#include <sys/mman.h> +#include <string.h> +#include <unistd.h> + +/* +#include <glib.h> +*/ +#include <pthread.h> + +#include <pulse/simple.h> +#include <pulse/error.h> +/* +#include <pulse/gccmacro.h> +*/ + +/* ========== */ +/* MACROS */ +/* ========== */ + +#define FAIL(X) \ +{ \ + success(false); \ + return X; \ +} + +#define snd(expr, what) \ + if ((rc = snd_##expr) < 0) \ + { \ + fprintf(stderr, "%s: %s\n", what, snd_strerror(rc)); \ + success(false); \ + return rc; \ + } + + +/* ================================== DEBUGGING */ + +#define xDBG + +#ifdef DBG + #define DBG_MSG_MAX_LEN 128 + + char *dbg_msg[DBG_MSG_MAX_LEN]; + + #define DBGMSG(M) { \ + printf("DBG: sqUnixSoundMaemo: %s (%d, %s)\n", M, errno, strerror (errno)); \ + errno = 0; \ + } + + #define DBGERR(M, E) { \ + sprintf(*dbg_msg, M, E); \ + DBGMSG(dbg_msg); \ + } + +#else + #define DBGMSG(M) + #define DBGERR(M, E) +#endif + + +/* ================================== TYPES */ + +typedef struct { + short *buffer; + unsigned long samples; + int isFree; +} audioBuffer_t; + +typedef struct { + pthread_mutex_t *mutex; + pthread_cond_t *cond; + unsigned int count; +} gen_sig_t; + +typedef struct { + /* Left in for debugging >>> */ + const char *dbgName; + const char *device; + /* <<< */ + + int open; + + unsigned long maxSamples; + unsigned long maxWords; + unsigned long maxBytes; + + audioBuffer_t *buffer; + + int maxBuffers; + int buffersAllocated; + int bufferFree; + int bufferNext; + int bufferCount; + int bufferFull; + + pthread_mutex_t *bufferMutex; + + void * threadFunc; + pthread_t thread; + + gen_sig_t sigRun; + gen_sig_t sigStalled; + + int running; + int exit; + int stall; + int sqSemaphore; + + int rateID; + 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; + + +/* ================================== FUNCTION PROTOTYPES */ + +static int rate(int rateID); +static int rateID(int rate); + +static inline unsigned short _swapw(unsigned short v); /* From io.h */ + +static int devInputReady(int dev_fd); + +static void sigWait(gen_sig_t *sig); +static void sigReset(gen_sig_t *sig); +static void sigSignal(gen_sig_t *sig); + +static void ioThreadWaitToRun(audioIO_t *audioIO); +static void ioThreadExit(audioIO_t *audioIO); +static int ioThreadStart(audioIO_t *audioIO); +static int ioThreadIsRunning(audioIO_t *audioIO); +static void ioThreadStall(audioIO_t *audioIO); + +static void ioZeroBuffers(audioIO_t *audioIO); +static void ioFreeBuffers(audioIO_t *audioIO); +static int ioFreeBytes(audioIO_t *audioIO); +static int ioIsFull(audioIO_t *audioIO); +static int ioAddPlayBuffer(void *buffer, int frameCount); +static int ioGetRecordBuffer(void *buffer, int bufferBytes); +static int ioAllocBuffers(audioIO_t *audioIO, int frameCount); +static int ioGetBufferData(audioIO_t *audioIO, void **buffer, int *frames); +static int ioNextBuffer(audioIO_t *audioIO); + +static void *writerThread(void *ptr); +static void *readerThread(void *ptr); + +static int ioInit(); + +/* SQUEAK INTERFACE */ + +static int trace(); + +static sqInt sound_AvailableSpace(void); +static sqInt sound_InsertSamplesFromLeadTime(int frameCount, int srcBufPtr, int samplesOfLeadTime); +static sqInt sound_PlaySamplesFromAtLength(int frameCount, int arrayIndex, int startIndex); +static sqInt sound_PlaySilence(void); +static sqInt sound_Start(int frameCount, int samplesPerSec, int stereo, int semaIndex); +static sqInt sound_Stop(void); + +static sqInt sound_StartRecording(int desiredSamplesPerSec, int stereo, int semaIndex); +static sqInt sound_StopRecording(void); +static double sound_GetRecordingSampleRate(void); +static sqInt sound_RecordSamplesIntoAtLength(int buf, int startSliceIndex, int bufferSizeInBytes); + +static int mixer_open(char *name); +static void mixer_close(void); +static inline void mixer_getVolume(char *name, int captureFlag, double *leftLevel, double *rightLevel); +static inline void mixer_setVolume(char *name, int captureFlag, double leftLevel, double rightLevel); +static int mixer_setSwitch(char *name, int captureFlag, int parameter); +static int mixer_getSwitch(char *name, int captureFlag, int channel); +static void sound_Volume(double *left, double *right); +static void sound_SetVolume(double left, double right); +static sqInt sound_SetRecordLevel(sqInt level); +static sqInt sound_SetDevice(sqInt id, char *arg); +static sqInt sound_GetSwitch(sqInt id, sqInt captureFlag, sqInt channel); +static sqInt sound_SetSwitch(sqInt id, sqInt captureFlag, sqInt parameter); + + +/* ==================== */ +/* ==================== GLOBALS */ +/* ==================== */ + +/* Left in but not used >>> */ +#define SQ_SND_PLAY_START_THRESHOLD 7/8 +#define SQ_SND_PLAY_AVAIL_MIN 4/8 +/* <<< */ + +/* Arbitrary (apart from minmising latency) >>> */ +#define MAX_INPUT_BUFFERS 10 +#define MAX_OUTPUT_BUFFERS 2 +/* <<< */ + +audioBuffer_t iBuffer[MAX_INPUT_BUFFERS]; +audioBuffer_t oBuffer[MAX_OUTPUT_BUFFERS]; + +/* STATICALLY INITIALISED SO AUTO-DESTROYED (ON CRASHING FOR INSTANCE) >>> */ + +/* input */ + +pthread_mutex_t audioInBufferMutex = PTHREAD_MUTEX_INITIALIZER; + +pthread_mutex_t audioInRunMutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t audioInRunCond = PTHREAD_COND_INITIALIZER; + +pthread_mutex_t audioInStalledMutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t audioInStalledCond = PTHREAD_COND_INITIALIZER; + +/* output */ + +pthread_mutex_t audioOutBufferMutex = PTHREAD_MUTEX_INITIALIZER; + +pthread_mutex_t audioOutRunMutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t audioOutRunCond = PTHREAD_COND_INITIALIZER; + +pthread_mutex_t audioOutStalledMutex = PTHREAD_MUTEX_INITIALIZER; +pthread_cond_t audioOutStalledCond = PTHREAD_COND_INITIALIZER; + +/* <<< */ + + +audioIO_t audioIn, audioOut; + +int initDone = false; + +/* EXTRA FOR ALSA BUT UNUSED >>> */ +/* +static int output_buffer_frames_available = 1; +static double max_delay_frames = 0; +*/ +/* <<< */ + + +/* ================================== UTILS */ + +/* RATE CONVERSION: from dsp code but not used (yet). Maybe not needed at all with AlSA */ +/* RATE CONVERSION: fixed preset rates are used. TBD: choose nearest to requested */ +/* +static int rate(int rateID) { + if (SAMPLE_RATE_8KHZ == rateID) return 8000; + if (SAMPLE_RATE_16KHZ == rateID) return 16000; + if (SAMPLE_RATE_11_025KHZ == rateID) return 11025; + if (SAMPLE_RATE_22_05KHZ == rateID) return 22050; + if (SAMPLE_RATE_44_1KHZ == rateID) return 44100; + return -1; +} + +static int rateID(int rate) { + if ( 8000 == rate) return SAMPLE_RATE_8KHZ; + if ( 8192 == rate) return SAMPLE_RATE_8KHZ; + if (16000 == rate) return SAMPLE_RATE_16KHZ; + if (11025 == rate) return SAMPLE_RATE_11_025KHZ; + if (22050 == rate) return SAMPLE_RATE_22_05KHZ; + if (44100 == rate) return SAMPLE_RATE_44_1KHZ; + return -1; +} +*/ + +/* From io.h because recorded data has to be Big Endian */ +static inline unsigned short _swapw(unsigned short v) { + return ((v << 8) | (v >> 8)); +} + + +/* Not used but maybe useful */ +/* +static int devInputReady(int dev_fd) { + struct pollfd pfd; + pfd.fd = dev_fd; + pfd.events = POLLIN; + if (poll (&pfd,1,0)>0) return true; + return false; +} +*/ + +static void printPALatency() { + pa_usec_t latency; + int error; + + if ((latency = pa_simple_get_latency(audioOut.pa_conn, &error)) == (pa_usec_t) -1) + fprintf(stderr, __FILE__": pa_simple_get_latency() failed: %s\n", pa_strerror(error)); + else + 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) { + pthread_mutex_lock(sig->mutex); + while( !sig->count ) + pthread_cond_wait(sig->cond, sig->mutex); + sig->count -= 1; + pthread_mutex_unlock(sig->mutex); +} + +static void sigReset(gen_sig_t *sig) { + pthread_mutex_lock(sig->mutex); + sig->count = 0; + pthread_mutex_unlock(sig->mutex); +} + +static void sigSignal(gen_sig_t *sig) { + pthread_mutex_lock(sig->mutex); + sig->count += 1; + pthread_cond_signal(sig->cond); + pthread_mutex_unlock(sig->mutex); +} + +/* Here for debugging but direct calls would be ok >>> */ +static void signalSqueak(audioIO_t *audioIO) { +/* printf("@%d",audioIO->sqSemaphore); +*/ + if (0 < audioIO->sqSemaphore) + signalSemaphoreWithIndex(audioIO->sqSemaphore); +} +/* <<< */ + + +/* ================================== Thread Ops */ + +static void ioThreadExit(audioIO_t *audioIO) { + if (!audioIO->thread) return; + audioIO->exit = 1; + sigSignal(&audioIO->sigRun); + pthread_join(audioIO->thread, NULL); + audioIO->thread = 0; +} + +static int ioThreadStart(audioIO_t *audioIO) { + int rc; + if (audioIO->thread) return true; + rc = pthread_create(&audioIO->thread, NULL, audioIO->threadFunc, NULL); + if (0 != rc) DBGERR("ioThreadStart(): %d", rc); + return rc; +} + +static int ioThreadIsRunning(audioIO_t *audioIO) { + return audioIO->running; +} + +static void ioThreadStall(audioIO_t *audioIO) { + audioIO->stall = true; + sigSignal(&audioIO->sigRun); + sigWait(&audioIO->sigStalled); +} + +/* Don't attempt to signal Sq here as we may not have a semaphore! */ +static void ioThreadWaitToRun(audioIO_t *audioIO) { + sigSignal(&audioIO->sigStalled); + + pthread_mutex_lock(audioIO->sigRun.mutex); + audioIO->running = false; + + if (audioIO->stall) audioIO->sigRun.count = 0; + audioIO->stall = false; + + while( !audioIO->sigRun.count ) + pthread_cond_wait(audioIO->sigRun.cond, audioIO->sigRun.mutex); + audioIO->sigRun.count -= 1; + + audioIO->running = true; + pthread_mutex_unlock(audioIO->sigRun.mutex); + + sigReset(&audioIO->sigStalled); +} + +/* ================================== Buffer ops */ + +static void ioZeroBuffers(audioIO_t *audioIO) { + int i; + for(i=0; i < audioIO->maxBuffers; i++) { + audioIO->buffer[i].samples = 0; + audioIO->buffer[i].isFree = true; + } +} + +static void ioFreeBuffers(audioIO_t *audioIO) { + int i; + for(i=0; i < audioIO->maxBuffers; i++) { + free(audioIO->buffer[i].buffer); + audioIO->buffer[i].buffer = 0; + audioIO->buffer[i].samples = 0; + } + audioIO->bufferFree = audioIO->bufferNext = 0; + /* audioIO->bufferCount differs for play/record */ +} + +/* Only used for playing, not for recording */ +static int ioFreeBytes(audioIO_t *audioIO) { + int freeBytes; + pthread_mutex_lock(audioIO->bufferMutex); + freeBytes = audioIO->maxBytes * audioIO->bufferCount; + pthread_mutex_unlock(audioIO->bufferMutex); + return freeBytes; +} + +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; + */ + + if (audioIO->buffersAllocated) + if (audioOut.maxSamples == frameCount) + return true; + else + ioFreeBuffers(audioIO); + + audioIO->maxSamples = frameCount; + audioIO->maxBytes = audioIO->maxSamples * audioIO->bytesPerFrame; + audioIO->maxWords = audioIO->maxBytes >> 1; + for(i=0; i < audioIO->maxBuffers; i++) { + audioIO->buffer[i].buffer = (short *)calloc(audioIO->maxBytes, 1); + audioIO->buffer[i].isFree = true; + } + audioIO->buffersAllocated = true; + + return true; +} + +static int ioIsFull(audioIO_t *audioIO) { + pthread_mutex_lock(audioIO->bufferMutex); + audioIO->bufferFull = (0 < audioIO->buffer[audioIO->bufferFree].samples); + pthread_mutex_unlock(audioIO->bufferMutex); + return audioIO->bufferFull; +} + +/* Could combine some of the following but makes debugging difficult */ + +static int ioAddPlayBuffer(void *buffer, int frameCount) { + long bytes; + if (ioIsFull(&audioOut)) return 0; + pthread_mutex_lock(audioOut.bufferMutex); + bytes = MIN(audioOut.maxBytes, frameCount * audioOut.bytesPerFrame); + memcpy(audioOut.buffer[audioOut.bufferFree].buffer, buffer, bytes); + audioOut.buffer[audioOut.bufferFree].samples = frameCount; + audioOut.buffer[audioOut.bufferFree].isFree = false; + audioOut.bufferFree = (audioOut.bufferFree + 1) % audioOut.maxBuffers; + audioOut.bufferCount -= 1; + pthread_mutex_unlock(audioOut.bufferMutex); + return bytes; +} + +static int ioGetRecordBuffer(void *buffer, int bufferBytes) { + long samples, sampleBytes; + + if (bufferBytes <= 0) return 0; +/* if (audioIn.buffer[audioIO->bufferNext].samples <=0) return 0; +*/ + if (audioIn.buffer[audioIn.bufferNext].isFree) return 0; + + pthread_mutex_lock(audioIn.bufferMutex); + samples = audioIn.buffer[audioIn.bufferNext].samples; + sampleBytes = MIN(2 * audioIn.pa_spec.channels * samples, bufferBytes); + memcpy(buffer, (char *)audioIn.buffer[audioIn.bufferNext].buffer, sampleBytes); + /* DMOC 090909 1800: Hmmmm, what if Squeak does not read whole buffer? ATM remaining buffer data lost since */ + /* ioGetRecordBuffer() frees the buffer after single visit. Needs more work */ + audioIn.buffer[audioIn.bufferNext].samples = 0; + audioIn.buffer[audioIn.bufferNext].isFree = true; + audioIn.bufferNext = (audioIn.bufferNext + 1) % audioIn.maxBuffers; + audioIn.bufferCount -= 1; + pthread_mutex_unlock(audioIn.bufferMutex); + return sampleBytes; +} + +static int ioGetBufferData(audioIO_t *audioIO, void **buffer, int *frames) { + if (audioIO->buffer[audioIO->bufferNext].isFree) return false; + pthread_mutex_lock(audioIO->bufferMutex); + *buffer = (void *)(audioIO->buffer[audioIO->bufferNext].buffer); + *frames = audioIO->buffer[audioIO->bufferNext].samples; + pthread_mutex_unlock(audioIO->bufferMutex); + return true; +} + +static int ioNextPlayBuffer() { + pthread_mutex_lock(audioOut.bufferMutex); + audioOut.buffer[audioOut.bufferNext].samples = 0; + audioOut.buffer[audioOut.bufferNext].isFree = true; + audioOut.bufferNext = (audioOut.bufferNext + 1) % audioOut.maxBuffers; + audioOut.stall = (audioOut.bufferNext == audioOut.bufferFree); + audioOut.bufferCount += 1; + pthread_mutex_unlock(audioOut.bufferMutex); +} + +static int ioNextRecordBuffer() { + pthread_mutex_lock(audioIn.bufferMutex); + audioIn.buffer[audioIn.bufferNext].isFree = false; + audioIn.bufferFree = (audioIn.bufferNext + 1) % audioIn.maxBuffers; + audioIn.stall = (audioIn.bufferNext == audioIn.bufferFree); + audioIn.bufferCount += 1; + pthread_mutex_unlock(audioIn.bufferMutex); +} + +/* ================================== IO THREADS */ + +static void *writerThread(void *ptr) { + struct timespec tm = {0, 1000 * 1000}; + int rc; + int nextBuffer, frames; + void *buffer; + + DBGMSG("[writerThread: started]"); + + audioOut.exit = 0; + + for (;;) { + DBGMSG("[writerThread: waiting]"); + + /* No point signalling squeak *before* running as there may not be a semaphore */ + ioThreadWaitToRun(&audioOut); + + if (audioOut.exit) break; + if (!audioOut.open || audioOut.stall) continue; + + DBGMSG("[writerThread: running]"); + + for (;;) { + if (!audioOut.open || audioOut.stall || audioOut.exit) break; + + if (!ioGetBufferData(&audioOut, &buffer, &frames)) { + signalSqueak(&audioOut); + break; + } + +/*printf("writerThread: buffer: %d, frames %d\n", audioOut.bufferNext, frames); +*/ + + while (frames > 0) { + if (!audioOut.open || audioOut.stall || audioOut.exit) break; +/* 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)); +/* printf("writerThread: sent %d, actual %d\n", frames, rc); +*/ + break; + } + + /* PA: Have to assume for now that all frames were written */ +/* buffer = (short *)((char *)buffer + rc * audioOut.bytesPerFrame); + frames -= rc; +*/ + /* *** SO FOLLOWING CODE *AND* THE ENCLOSING WHILE-LOOP REDUNDANT!!! (so just break out of loop) *** */ +/* buffer = (short *)((char *)buffer + frames * audioOut.bytesPerFrame); + frames -= frames; +*/ + break; + } /* while */ + + if (!audioOut.open || audioOut.stall || audioOut.exit) break; + ioNextPlayBuffer(); + if (!audioOut.open || audioOut.stall || audioOut.exit) break; + + signalSqueak(&audioOut); + } + + if (audioOut.exit) break; + } + + DBGMSG("[writerThread: stopped]"); + +} + + +static void *readerThread(void *ptr) { + int rc; + int wc; + unsigned short *p; + + DBGMSG("[readerThread: started]"); + + audioIn.exit = 0; + + for (;;) { + DBGMSG("[readerThread: waiting]"); + + ioThreadWaitToRun(&audioIn); + + if (audioIn.exit) break; + if (!audioIn.open || audioIn.stall) continue; + + DBGMSG("[readerThread: running]"); + + for (;;) { + if (!audioIn.open || audioIn.stall || audioIn.exit) break; + + /* NB: PA Simple API does not return number of bytes/samples recorded */ + /* (so have to assume full buffer everytime (poss padded if less than requested) */ + +/* rc = snd_pcm_readi(audioIn.alsaHandle, audioIn.alsaBuffer, audioIn.alsaFrames); +*/ + if (pa_simple_read(audioIn.pa_conn, (char *)(audioIn.buffer[audioIn.bufferFree].buffer), audioIn.maxBytes, &rc) < 0) { + fprintf(stderr, __FILE__": pa_simple_read() failed: %s\n", pa_strerror(rc)); + continue; + } + + if (!audioIn.open || audioIn.stall || audioIn.exit) break; + + /* PA: Assume max buffer frames returned... */ + rc = audioIn.maxSamples; + + /* EPIPE means overrun */ +/* + if (rc == -EPIPE) { + printf("readerThread: overrun occurred\n"); + snd_pcm_prepare(audioIn.alsaHandle); + continue; + } + + if (rc < 0) { + printf("readerThread: error from read: %s\n", snd_strerror(rc)); + continue; + } + + if (rc != (int)audioIn.alsaFrames) { + printf("readerThread: short read, read %d frames\n", rc); + continue; + } +*/ + if (!audioIn.buffer[audioIn.bufferFree].isFree) { + printf("readerThread: No free buffers!\n"); + continue; + } + + if (!audioIn.open || audioIn.stall || audioIn.exit) break; + + /* PA: Complete buffer should be returned so skipping check and moving guts to end of loop */ +/* + if ((audioIn.buffer[audioIn.bufferFree].samples + rc) > audioIn.maxSamples) { + ioNextRecordBuffer(); + if (!audioIn.open || audioIn.stall || audioIn.exit) break; + signalSqueak(&audioIn); + } +*/ + +/* Next won't get called anyway because of "stall" in ioNextRecordBuffer() */ +/* Left here in case needed for debugging */ +/* + if (!audioIn.buffer[audioIn.bufferFree].isFree) { + printf("readerThread: No free buffers!\n"); + continue; + } +*/ + + /* PA: Endian swap is N810 left-over... */ + + /* Endian Swap (rc = frames = Word Count in this case) */ +/* + p = (unsigned short *)(audioIn.buffer[audioIn.bufferFree].buffer); + wc = rc; + while (wc--) + *p = _swapw(*p); +*/ + + /* PA: No copy required since record buffer used directly... */ +/* + memcpy((char *)(audioIn.buffer[audioIn.bufferFree].buffer) + 2 * audioIn.buffer[audioIn.bufferFree].samples, audioIn.alsaBuffer, rc*2); + audioIn.buffer[audioIn.bufferFree].samples += rc; +*/ + + /* PA: No indication of actual bytes/samples read so assuming full buffer read (or padded)... */ + audioIn.buffer[audioIn.bufferFree].samples = audioIn.maxSamples; + + if (!audioIn.open || audioIn.stall || audioIn.exit) break; + + /* PA: These three lines moved from above (since assuming full buffers are read every time) */ + ioNextRecordBuffer(); + if (!audioIn.open || audioIn.stall || audioIn.exit) break; + signalSqueak(&audioIn); + + } + if (audioIn.exit) break; + } +DBGMSG("[readerThread: stopped]"); +} + + +/* ================================== 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 >>>>>>>>>>>> */ + /* >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> */ + +/* NOT USED >>> */ + audioOut.dbgName = "play"; + audioOut.device = "pa-simple"; +/* <<< */ + + audioOut.open = false; /* Squeak state */ + + audioOut.maxSamples = 0; + audioOut.maxWords = 0; + audioOut.maxBytes = 0; + + audioOut.maxBuffers = MAX_OUTPUT_BUFFERS; + audioOut.buffer = oBuffer; + audioOut.bufferFree = 0; + audioOut.bufferNext = 0; + audioOut.bufferCount = audioOut.maxBuffers; + audioOut.bufferFull = 0; + audioOut.bufferMutex = &audioOutBufferMutex; + audioOut.buffersAllocated = false; + + audioOut.threadFunc = writerThread; + audioOut.thread = 0; + + audioOut.sigRun.mutex = &audioOutRunMutex; + audioOut.sigRun.cond = &audioOutRunCond; + sigReset(&audioOut.sigRun); + + audioOut.sigStalled.mutex = &audioOutStalledMutex; + audioOut.sigStalled.cond = &audioOutStalledCond; + sigReset(&audioOut.sigStalled); + + audioOut.running = 0; + audioOut.exit = 0; + audioOut.stall = 0; + + audioOut.sqSemaphore = 0; + + 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; + + /* 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 >>>>>>>>>>>>> */ + /* >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> */ + +/* NOT USED >>> */ + audioIn.dbgName = "rec"; + audioIn.device = "pa-simple"; +/* <<< */ + + audioIn.open = false; /* Squeak state */ + + audioIn.maxSamples = 0; + audioIn.maxWords = 0; + audioIn.maxBytes = 0; + + audioIn.maxBuffers = MAX_INPUT_BUFFERS; + audioIn.buffer = iBuffer; + audioIn.bufferFree = 0; + audioIn.bufferNext = 0; + audioIn.bufferCount = 0; /* No buffers yet. Was audioIn.maxBuffers; */ + audioIn.bufferFull = 0; + audioIn.bufferMutex = &audioInBufferMutex; + audioIn.buffersAllocated = false; + + audioIn.threadFunc= readerThread; + audioIn.thread = 0; + + audioIn.sigRun.mutex = &audioInRunMutex; + audioIn.sigRun.cond = &audioInRunCond; + sigReset(&audioIn.sigRun); + + audioIn.sigStalled.mutex = &audioInStalledMutex; + audioIn.sigStalled.cond = &audioInStalledCond; + sigReset(&audioIn.sigStalled); + + audioIn.running = 0; + audioIn.exit = 0; + audioIn.stall = 0; + + audioIn.sqSemaphore = 0; + + 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; + + /* DMOC 090912: Not attempting to open default PA connection for recording */ + + ioThreadStart(&audioIn); +} + +/* ============================================ */ +/* ================================== VM PLUGIN */ +/* ============================================ */ + +static int trace() { +} + +/* ================================== AUDIO OUT */ + +static sqInt sound_AvailableSpace(void) { + return ioFreeBytes(&audioOut); +} + +static sqInt sound_InsertSamplesFromLeadTime(int frameCount, int srcBufPtr, int samplesOfLeadTime) { +DBGMSG(">sound_InsertSamplesFromLeadTime()"); + return 0; /* or maxBytes? */ +} + +static sqInt sound_PlaySamplesFromAtLength(int frameCount, int arrayIndex, int startIndex) { + unsigned int bufferNext, samples, sampleBytes; + + if (0 >= frameCount) return 0; + + samples = MIN(audioOut.maxSamples, frameCount); + + if (0 == (sampleBytes = ioAddPlayBuffer((void *)(arrayIndex + startIndex * 2 * audioOut.pa_spec.channels), samples))) + DBGMSG("sound_PlaySamplesFromAtLength(): No free buffers!"); + + sigSignal(&audioOut.sigRun); + + return samples; +} + +static sqInt sound_PlaySilence(void) { +DBGMSG(">sound_PlaySilence()"); + ioThreadStall(&audioOut); + 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()"); + +#ifdef DBG +printf("\tframeCount: %d, samplesPerSec: %d, stereo: %d, semaIndex: %d\n", frameCount, samplesPerSec, stereo, semaIndex); +#endif + + if (audioOut.open) return true; + + if (!openPulseAudio(&audioOut, samplesPerSec, stereo)) { + success(false); + return false; + } + + printf("sound_Start() frameCount >> 1: %i\n", frameCount >> 1); + + ioAllocBuffers(&audioOut, frameCount >> 1); + + /* 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); + +DBGMSG("<sound_Start()"); + return true; +} + + +static sqInt sound_Stop(void) { + int rc; + +DBGMSG(">sound_Stop()"); + + if (!audioOut.open) return true; + audioOut.open = false; + + if (NULL == audioOut.pa_conn) return true; + + ioThreadStall(&audioOut); + + closePulseAudio(&audioOut); + + ioFreeBuffers(&audioOut); + + audioOut.sqSemaphore = 0; + +DBGMSG("<sound_Stop()"); + return true; +} + + + +/* ================================== AUDIO IN */ + +static sqInt sound_StartRecording(int desiredSamplesPerSec, int stereo, int semaIndex) { + int rc; + +DBGMSG(">sound_StartRecording()"); + + if (audioIn.open) return true; + + /* Only rate supported on the N810 (atm) is 8000 */ +/* + desiredSamplesPerSec = 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; + + audioIn.sqSemaphore = semaIndex; + + audioIn.open = true; + + sigSignal(&audioIn.sigRun); + +DBGMSG("<sound_StartRecording()"); + return true; +} + +static sqInt sound_StopRecording(void) { +DBGMSG(">sound_StopRecording()"); + + if (!audioIn.open) return; + audioIn.open = false; + + if (NULL == audioIn.pa_conn) return; + + ioThreadStall(&audioIn); + + closePulseAudio(&audioIn); + + ioFreeBuffers(&audioIn); + + audioIn.pa_conn = NULL; + + audioIn.sqSemaphore = 0; + +DBGMSG("<sound_StopRecording()"); + return true; +} + +static double sound_GetRecordingSampleRate(void) { + return (double)audioIn.pa_spec.rate; +} + +static sqInt sound_RecordSamplesIntoAtLength(int buf, int startSliceIndex, int bufferSizeInBytes) { + unsigned int bufferNext, bufferBytes, sampleBytes; + + bufferBytes = MAX(0, bufferSizeInBytes - (startSliceIndex * 2)); + if (0 == bufferBytes) { + printf("***(%d) sound_RecordSamplesIntoAtLength(): No space in Squeak buffer!\n", startSliceIndex); + return 0; + } + + /* DMOC 090909 1800: Hmmmm, what if Squeak does not read whole buffer? ATM remaining buffer data lost since */ + /* ioGetRecordBuffer() frees the buffer after single visit. Needs more work */ + + bufferNext = audioIn.bufferNext; /* preserved for debug output */ + sampleBytes = ioGetRecordBuffer((void *)(buf + (startSliceIndex * 2)), bufferBytes); +/* + if (0 < sampleBytes) + printf(" sound_RecordSamplesIntoAtLength(%d, %d, %d) %d, %d\n", buf, startSliceIndex, bufferSizeInBytes, bufferNext, sampleBytes); + else + printf("***sound_RecordSamplesIntoAtLength(%d, %d, %d) %d, %d\n", buf, startSliceIndex, bufferSizeInBytes, bufferNext, sampleBytes); +*/ + return MAX(0, sampleBytes)/(2 * audioIn.pa_spec.channels); +} + + +/* ================================== sound mixer */ + +/* +static int sound_nomixer = 0; +static snd_mixer_t *mixer_handle = 0; +static snd_mixer_elem_t *mixer_element = 0; +*/ + +static int mixer_open(char *name) { + trace(); + return -EACCES; +} + +static void mixer_close(void) { + trace(); +} + +static inline void mixer_getVolume(char *name, int captureFlag, double *leftLevel, double *rightLevel) { + trace(); +} + +static inline void mixer_setVolume(char *name, int captureFlag, double leftLevel, double rightLevel) { + trace(); +} + +static int mixer_setSwitch(char *name, int captureFlag, int parameter) { + trace(); + return 0; +} + +static int mixer_getSwitch(char *name, int captureFlag, int channel) { + trace(); + return -1; +} + +static void sound_Volume(double *left, double *right) { + trace(); + *left= 1.0; + *right= 1.0; +} + +static void sound_SetVolume(double left, double right) { + trace(); +} + +static sqInt sound_SetRecordLevel(sqInt level) { + trace(); + return 1; + return level; +} + +static sqInt sound_SetDevice(sqInt id, char *arg) { + trace(); + return -1; +} + +static sqInt sound_GetSwitch(sqInt id, sqInt captureFlag, sqInt channel) { + trace(); + return -1; +} + +static sqInt sound_SetSwitch(sqInt id, sqInt captureFlag, sqInt parameter) { + trace(); + return -1; +} + + +/* module */ + +#include "SqSound.h" + +SqSoundDefine(PA); + +#include "SqModule.h" + +static void sound_parseEnvironment(void) { +/* + char *ev= 0; + + sound_SetDevice(0, NULL); + sound_SetDevice(1, NULL); + sound_SetDevice(2, NULL); + + if ( getenv("SQUEAK_NOMIXER" )) sound_nomixer= 1; + if ((ev= getenv("SQUEAK_SOUNDCARD"))) sound_SetDevice(0, ev); + if ((ev= getenv("SQUEAK_PLAYBACK" ))) sound_SetDevice(1, ev); + if ((ev= getenv("SQUEAK_CAPTURE" ))) sound_SetDevice(2, ev); +*/ +} + +static int sound_parseArgument(int argc, char **argv) { +/* + if (!strcmp(argv[0], "-nomixer" )) { sound_nomixer= 1; return 1; } + else if (argv[1]) + { + if (!strcmp(argv[0], "-soundcard")) { sound_SetDevice(0, argv[1]); return 2; } + if (!strcmp(argv[0], "-playback" )) { sound_SetDevice(1, argv[1]); return 2; } + if (!strcmp(argv[0], "-capture" )) { sound_SetDevice(2, argv[1]); return 2; } + } +*/ + return 0; +} + +static void sound_printUsage(void) { + printf("\nPulseAudio <option>s: <none>\n"); +/* + printf(" -nomixer disable mixer (volume) adjustment\n"); + printf(" -soundcard <name> open the named sound card (default: %s)\n", sound_device); + printf(" -playback <name> play to the named sound device (default: %s)\n", sound_playback); + printf(" -capture <name> record from the named sound device (default: %s)\n", sound_capture); +*/ +} + +static void sound_printUsageNotes(void) { +} + +static void *sound_makeInterface(void) { +//#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"); +#endif + + ioInit(); + + return &sound_PA_itf; +} + +SqModuleDefine(sound, PA); +

1 0

RFC: Unix 3.11.3-2116 VM
by Ian Piumarta 14 Sep '09

14 Sep '09

Unix VM hackers, I've published a preview of the 3.11.3 Unix VM for the amusement of alpha testers everywhere. Lots of things are bound to be broken and/ or forgotten and/or incomplete and/or begging for improvement. I'm not quite finished tweaking but comments and suggestions are definitely welcome at this stage! Grab sources from the trunk of Subversion, or look in http://squeakvm.org/unix/alpha for archives of sources and binaries for i386 (Linux, NetBSD, FreeBSD and Solaris) and powerpc (Darwin). (Files ending in '.sh' are self- extracting archives; run as shell script and follow instructions.) The noticeable changes since 3.10 are: 0. Plugins have been regenerated from latest releases At least for those on squeaksource. Any hiding in more obscure places might still be stale. 1. New build process based on CMake See README in the source archive or platforms/unix/README.CMake in the repository. 2. Different plugin and FFI library search strategy The default plugin directory is now the VM binary directory. This is correct for installed VMs where the binary lives alongside the plugins in /usr/.../lib/squeak/version/squeakvm. A launcher script installed as /usr/.../bin/squeak figures out where the VM is (either installed or running from a build directory) and adds a -plugins option appropriately. The script also does the pulse audio OSS kludge if necessary. (Another script, squeak.sh, is intended to launch Squeak from a menu. It's begging for improvement.) SQUEAK_PLUGINS (or the argument to -plugins) can be set to a colon- separated list of places to look for plugins. (Dave can debug one plugin at a time using 'squeakvm -plugins bld/%n:/usr/lib/squeak/ <version>'.) Libraries are searched only by whatever mechanisms dlopen() uses. Applications that used to rely on the VM searching every nook and cranny for FFI callouts may have to set LD_LIBRARY_PATH, or whatever local equivalent is provided, to ensure their external functions' libraries are found. 3. New numbering scheme The VM is now numbered X.Y.Z-R where X.Y.Z are the version of VMMaker used to generate the Interpreter and plugins, and R is the Subversion repository revision of the Unix support code. (The archives are named X.Y.Z.R, just because rpmbuild is grumpy otherwise.) Cheers, Ian

7 25

VM without plugin
by arnaud Jean Baptiste 11 Sep '09

11 Sep '09

Hi, i just want to know if that making sense to rebuild the VM without plugin? cheers

2 3

[commit] r2130 - pop when storing float return value from ffi call
by commits＠squeakvm.org 10 Sep '09

10 Sep '09

Author: piumarta Date: 2009-09-10 13:04:16 -0700 (Thu, 10 Sep 2009) New Revision: 2130 Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/plugins/SqueakFFIPrims/x86-sysv-asm.S Log: pop when storing float return value from ffi call Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-09-08 23:42:09 UTC (rev 2129) +++ trunk/platforms/unix/ChangeLog 2009-09-10 20:04:16 UTC (rev 2130) @@ -1,3 +1,9 @@ +2009-09-10 <piumarta(a)ubuntu.piumarta.com> + + * plugins/SqueakFFIPrims/x86-sysv-asm.S (ffiCallAddressOf): Pop a + float return value off the FPU stack, even though we don't know + there's anything there to pop nor whether we own it if there is. + 2009-09-08 <piumarta(a)ubuntu.piumarta.com> * plugins/ClipboardExtendedPlugin/config.cmake: Added: disable Modified: trunk/platforms/unix/plugins/SqueakFFIPrims/x86-sysv-asm.S =================================================================== --- trunk/platforms/unix/plugins/SqueakFFIPrims/x86-sysv-asm.S 2009-09-08 23:42:09 UTC (rev 2129) +++ trunk/platforms/unix/plugins/SqueakFFIPrims/x86-sysv-asm.S 2009-09-10 20:04:16 UTC (rev 2130) @@ -2,9 +2,9 @@ * * Author: Ian.Piumarta(a)INRIA.Fr * - * Last edited: 2006-10-18 10:07:25 by piumarta on emilia.local + * Last edited: 2009-09-10 12:55:54 by piumarta on emilia-2.local * - * Copyright (C) 1996-2004 by Ian Piumarta and other authors/contributors + * Copyright (C) 1996-2009 by Ian Piumarta and other authors/contributors * listed elsewhere in this file. * All rights reserved. * @@ -48,7 +48,7 @@ 2: call *8(%ebp) movl %eax, ffiIntReturnValue movl %edx, ffiLongReturnValue - fstl ffiFloatReturnValue + fstpl ffiFloatReturnValue movl %ebp, %esp popl %ebp ret

1 0

[commit] r2129 - do not build clipextplg if x not found
by commits＠squeakvm.org 09 Sep '09

09 Sep '09

Author: piumarta Date: 2009-09-08 16:42:09 -0700 (Tue, 08 Sep 2009) New Revision: 2129 Modified: trunk/platforms/unix/ChangeLog Log: do not build clipextplg if x not found Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-09-08 23:39:44 UTC (rev 2128) +++ trunk/platforms/unix/ChangeLog 2009-09-08 23:42:09 UTC (rev 2129) @@ -1,3 +1,8 @@ +2009-09-08 <piumarta(a)ubuntu.piumarta.com> + + * plugins/ClipboardExtendedPlugin/config.cmake: Added: disable + plugin if X11 not found. + 2009-09-02 <piumarta(a)ubuntu.piumarta.com> * plugins/FileCopyPlugin/sqUnixFileCopyPlugin.c (copy): Repeat

1 0

[commit] r2128 - do not build clipextplg if x not found
by commits＠squeakvm.org 09 Sep '09

09 Sep '09

Author: piumarta Date: 2009-09-08 16:39:44 -0700 (Tue, 08 Sep 2009) New Revision: 2128 Added: trunk/platforms/unix/plugins/ClipboardExtendedPlugin/config.cmake Modified: trunk/platforms/unix/vm/config.cmake Log: do not build clipextplg if x not found Added: trunk/platforms/unix/plugins/ClipboardExtendedPlugin/config.cmake =================================================================== --- trunk/platforms/unix/plugins/ClipboardExtendedPlugin/config.cmake (rev 0) +++ trunk/platforms/unix/plugins/ClipboardExtendedPlugin/config.cmake 2009-09-08 23:39:44 UTC (rev 2128) @@ -0,0 +1,3 @@ +IF (NOT X11_FOUND) + PLUGIN_DISABLE() +ENDIF () Modified: trunk/platforms/unix/vm/config.cmake =================================================================== --- trunk/platforms/unix/vm/config.cmake 2009-09-02 22:13:21 UTC (rev 2127) +++ trunk/platforms/unix/vm/config.cmake 2009-09-08 23:39:44 UTC (rev 2128) @@ -20,6 +20,7 @@ INCLUDE (TestBigEndian) INCLUDE (CheckIncludeFile) +INCLUDE (CheckLibraryExists) INCLUDE (CheckTypeSize) INCLUDE (CheckFunctionExists) INCLUDE (CheckVariableExists) @@ -27,7 +28,9 @@ INCLUDE (FindPkgConfig) FIND_PACKAGE (X11) -LIST (REMOVE_DUPLICATES X11_INCLUDE_DIR) +IF (X11_FOUND) + LIST (REMOVE_DUPLICATES X11_INCLUDE_DIR) +ENDIF () IF (NOT without-gl) FIND_PACKAGE (OpenGL) @@ -52,6 +55,10 @@ ENDIF (X11_FOUND) ENDIF (APPLE AND NOT without-gl) +IF (NOT OPENGL_FOUND) + SET (OPENGL_INCLUDE_DIR "") +ENDIF () + # FOREACH (var AGL_FOUND AGL_INCLUDE_DIR AGL_LIBRARIES OPENGL_FOUND OPENGL_INCLUDE_DIR OPENGL_LIBRARIES) # MESSAGE ("${var} = ${${var}}") # ENDFOREACH ()

1 0

Re: [Vm-dev] Rebuild VMMaker on MacOS 10.5
by John M McIntosh 08 Sep '09

08 Sep '09

Well there was some changes to the serial code in VMMaker-dtl.136 maybe try using vmmaker at VMMaker-dtl.135 until I can change things to support that stuff in 1.36 Or maybe in xcode uncheck building the sqMacSerialPort.c and check to build the sqUnixSerial.c. On 8-Sep-09, at 4:16 PM, arnaud Jean Baptiste wrote: > serialPortCloseByName -- = = = ======================================================================== John M. McIntosh <johnmci(a)smalltalkconsulting.com> Twitter: squeaker68882 Corporate Smalltalk Consulting Ltd. http://www.smalltalkconsulting.com = = = ========================================================================

1 0

Rebuild VMMaker on MacOS 10.5
by jean baptiste arnaud 08 Sep '09

08 Sep '09

Hi, I try to rebuild the VM on a Mac OS 10.5, to do that i follow all the step of the ReadMe.txt in documentation of the source. First i install Xcode ( ver 3.1.3, with powerPC support). Then, i install a clean install of VMMaker : -Last Squeak image (ver 3.10.2 7179). -Installing ballon 3D, then FFI and Klatt. -VMMaker and Alien Support. generate a the src. "Gnuify" the src. and build the project xcode (with the project in platform Mac Os source ): all file are present except "Squeak VM Opt.app", but i think it's normal. i try to compile, a error ld: library not found for -lcrt1.10.5.o any idea of how i resolve that ? -- Arnaud Jean Baptiste PhD Student - Rmod Team - INRIA http://rmod.lille.inria.fr

2 1

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2009