Pd-cvs December 2004

pd-cvs@lists.iem.at

7 participants
231 discussions

externals/miXed Makefile.common,1.23,1.24
by Krzysztof Czaja 08 Dec '04

08 Dec '04

Update of /cvsroot/pure-data/externals/miXed In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10934 Modified Files: Makefile.common Log Message: various bug-fixes, maxmode, toxy .#args Index: Makefile.common =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/Makefile.common,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Makefile.common 25 Apr 2004 10:37:26 -0000 1.23 --- Makefile.common 8 Dec 2004 15:40:10 -0000 1.24 *************** *** 24,33 **** ifeq ($(OS_NAME),Linux) - # FIXME - CC = gcc-2.95 X_SUFFIX = pd_linux ! DEFINES = -DUNIX ! OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer LFLAGS = -export_dynamic -shared endif --- 24,37 ---- ifeq ($(OS_NAME),Linux) X_SUFFIX = pd_linux ! CC = gcc LFLAGS = -export_dynamic -shared + # FIXME strict-aliasing + OPT_CFLAGS = -O6 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing + ifeq ($(shell whoami),krzYszcz) + DEFINES = -DUNIX -DKRZYSZCZ + else + DEFINES = -DUNIX + endif endif *************** *** 41,45 **** ifeq ($(OS_NAME),Darwin) ! CC = gcc2 X_SUFFIX = pd_darwin DEFINES = -DUNIX -DMACOSX --- 45,49 ---- ifeq ($(OS_NAME),Darwin) ! CC = gcc X_SUFFIX = pd_darwin DEFINES = -DUNIX -DMACOSX *************** *** 88,91 **** --- 92,96 ---- WARN_CFLAGS = -Wall -W -Wstrict-prototypes -Werror \ -Wno-unused -Wno-parentheses -Wno-switch + DBG_CFLAGS = CFLAGS = $(WARN_CFLAGS) $(OPT_CFLAGS) $(DEFINES) $(INCLUDES)

1 0

externals/miXed/ViCious/cyclone makefile,1.1,1.2 objects,1.3,1.4 snapfiles,1.1,1.2
by Krzysztof Czaja 08 Dec '04

08 Dec '04

Update of /cvsroot/pure-data/externals/miXed/ViCious/cyclone In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10934/ViCious/cyclone Modified Files: makefile objects snapfiles Log Message: various bug-fixes, maxmode, toxy .#args Index: snapfiles =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/ViCious/cyclone/snapfiles,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** snapfiles 31 Mar 2004 10:24:16 -0000 1.1 --- snapfiles 8 Dec 2004 15:40:10 -0000 1.2 *************** *** 4,7 **** --- 4,8 ---- miXed\bin\sickle.dll \ miXed\bin\dummies.dll \ + miXed\bin\maxmode.dll \ miXed\bin\cyclist.exe \ miXed\ViCious\cyclone\makefile \ Index: objects =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/ViCious/cyclone/objects,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** objects 12 May 2004 15:01:34 -0000 1.3 --- objects 8 Dec 2004 15:40:10 -0000 1.4 *************** *** 4,7 **** --- 4,8 ---- $(SHAREDDIR)\common\loud.obj \ $(SHAREDDIR)\common\grow.obj \ + $(SHAREDDIR)\common\lex.obj \ $(SHAREDDIR)\common\binport.obj \ $(SHAREDDIR)\common\port.obj \ *************** *** 99,105 **** $(SHAREDDIR)\common\rand.obj \ $(SHAREDDIR)\common\vefl.obj \ - $(SHAREDDIR)\common\sq.obj \ - $(SHAREDDIR)\common\bifi.obj \ $(SHAREDDIR)\common\mifi.obj \ $(SHAREDDIR)\common\binport.obj \ $(SHAREDDIR)\common\port.obj \ --- 100,105 ---- $(SHAREDDIR)\common\rand.obj \ $(SHAREDDIR)\common\vefl.obj \ $(SHAREDDIR)\common\mifi.obj \ + $(SHAREDDIR)\common\lex.obj \ $(SHAREDDIR)\common\binport.obj \ $(SHAREDDIR)\common\port.obj \ *************** *** 109,114 **** $(SHAREDDIR)\unstable\forky.obj \ $(SHAREDDIR)\unstable\fragile.obj \ ! $(SHAREDDIR)\unstable\fringe.obj \ ! $(SHAREDDIR)\unstable\loader.obj ALL_SICKLES = \ --- 109,113 ---- $(SHAREDDIR)\unstable\forky.obj \ $(SHAREDDIR)\unstable\fragile.obj \ ! $(SHAREDDIR)\unstable\fringe.obj ALL_SICKLES = \ *************** *** 196,199 **** --- 195,200 ---- $(SHAREDDIR)\common\grow.obj \ $(SHAREDDIR)\common\vefl.obj \ + $(SHAREDDIR)\common\clc.obj \ + $(SHAREDDIR)\common\lex.obj \ $(SHAREDDIR)\common\binport.obj \ $(SHAREDDIR)\common\port.obj \ *************** *** 203,208 **** $(SHAREDDIR)\unstable\forky.obj \ $(SHAREDDIR)\unstable\fragile.obj \ ! $(SHAREDDIR)\unstable\fringe.obj \ ! $(SHAREDDIR)\unstable\loader.obj DUMMIES_OBJECTS = \ --- 204,208 ---- $(SHAREDDIR)\unstable\forky.obj \ $(SHAREDDIR)\unstable\fragile.obj \ ! $(SHAREDDIR)\unstable\fringe.obj DUMMIES_OBJECTS = \ *************** *** 210,213 **** --- 210,214 ---- $(SHAREDDIR)\common\loud.obj \ $(SHAREDDIR)\common\grow.obj \ + $(SHAREDDIR)\common\lex.obj \ $(SHAREDDIR)\common\binport.obj \ $(SHAREDDIR)\common\port.obj \ *************** *** 216,220 **** $(SHAREDDIR)\unstable\fringe.obj ! CYCLIST_OBJECTS = \ ! $(SHAREDDIR)\common\binport.obj ! --- 217,222 ---- $(SHAREDDIR)\unstable\fringe.obj ! MAXMODE_OBJECTS = \ ! $(SRCDIR)\shadow\maxmode.obj \ ! $(SHAREDDIR)\common\loud.obj \ ! $(SHAREDDIR)\unstable\loader.obj Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/miXed/ViCious/cyclone/makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** makefile 31 Mar 2004 10:24:16 -0000 1.1 --- makefile 8 Dec 2004 15:40:10 -0000 1.2 *************** *** 26,30 **** !INCLUDE $(SRCDIR)\build_counter ! cyclone: cyclone.dll hammer.dll sickle.dll dummies.dll cyclist.exe @cd $(ROOTDIR) @$(ZIPCOMMAND) cyclone-$(CYCLONE_SNAPSHOT).zip $(SNAPFILES) --- 26,30 ---- !INCLUDE $(SRCDIR)\build_counter ! cyclone: cyclone.dll hammer.dll sickle.dll dummies.dll maxmode.dll cyclist.exe @cd $(ROOTDIR) @$(ZIPCOMMAND) cyclone-$(CYCLONE_SNAPSHOT).zip $(SNAPFILES) *************** *** 58,67 **** -del $(@:.dll=.lib) ! cyclist.exe: $(SHAREDDIR)\common\binport.c ! -del /S $(SHAREDDIR)\common\binport.obj ! -cl $(CFLAGS) $(INCLUDES) /DBINPORT_STANDALONE /o $@ \ ! $(VCLIBDIR)\libc.lib $(SHAREDDIR)\common\binport.c -@move $@ $(BINDIR) ! -del /S binport.obj .c.obj: ; cl /c $(CFLAGS) $(INCLUDES) /Fo$*.obj $*.c --- 58,76 ---- -del $(@:.dll=.lib) ! maxmode.dll: $(MAXMODE_OBJECTS) ! -link /dll /out:$@ $(LIBS) $** /export:$(@:.dll=_setup) ! -@copy $@ $(EXTDIR) -@move $@ $(BINDIR) ! -del $(@:.dll=.exp) ! -del $(@:.dll=.lib) ! ! cyclist.exe: $(SHAREDDIR)\common\binport.c \ ! $(SHAREDDIR)\common\lex.c $(SHAREDDIR)\unstable\standalone.c ! -del /S $(SHAREDDIR)\common\binport.obj $(SHAREDDIR)\common\lex.obj ! -cl $(CFLAGS) $(INCLUDES) /DMIXED_STANDALONE /o $@ \ ! $(VCLIBDIR)\libc.lib $(SHAREDDIR)\common\binport.c \ ! $(SHAREDDIR)\common\lex.c $(SHAREDDIR)\unstable\standalone.c ! -@move $@ $(BINDIR) ! -del /S binport.obj lex.obj .c.obj: ; cl /c $(CFLAGS) $(INCLUDES) /Fo$*.obj $*.c

1 0

externals/hcs blocksize_in_ms-help.pd,NONE,1.1 blocksize_in_ms.pd,NONE,1.1
by Hans-Christoph Steiner 06 Dec '04

06 Dec '04

Update of /cvsroot/pure-data/externals/hcs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2579 Added Files: blocksize_in_ms-help.pd blocksize_in_ms.pd Log Message: added generic object for getting the blocksize and outputing in ms. Currently this is fixed at a blocksize of 64, but once the changable blocksize is fully implemented, this object should use the actual current blocksize. --- NEW FILE: blocksize_in_ms-help.pd --- #N canvas 256 153 461 330 10; #X obj 5 2 cnv 15 450 20 empty empty [blocksize_in_ms] 2 11 1 18 -233017 -66577 0; #X obj 422 3 pddp; #X text 27 270 (C) Copyright 2004 Hans-Christoph Steiner <hans(a)at.or.at> ; #X text 244 284 released under the GNU GPL; #X obj 152 157 blocksize_in_ms; #X msg 152 115 bang; #X text 197 117 bang to recalculate; #X floatatom 152 210 7 0 0 1 ms - -; #X text 18 36 Output the current blocksize in ms rather than samples. This is currently set at a fixed blocksize of 64 \, but it will change dynamically in the future.; #X connect 4 0 7 0; #X connect 5 0 4 0; --- NEW FILE: blocksize_in_ms.pd --- #N canvas 0 22 454 304 10; #X obj 178 272 outlet; #X obj 164 31 inlet; #X obj 164 56 bang; #X text 209 31 bang to recalculate; #X obj 164 124 samplerate~; #X obj 183 98 loadbang; #X obj 178 192 /; #X msg 164 170 64; #X obj 164 151 t b f; #X obj 147 104 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X text 30 170 default block size:; #X text 8 25 [blocksize_in_ms]; #X obj 178 229 * 1000; #X connect 1 0 2 0; #X connect 2 0 4 0; #X connect 4 0 8 0; #X connect 5 0 4 0; #X connect 6 0 12 0; #X connect 7 0 6 0; #X connect 8 0 7 0; #X connect 8 1 6 1; #X connect 9 0 4 0; #X connect 12 0 0 0;

1 0

externals/hcs/pan linearpan~.pd,1.1,1.2
by Hans-Christoph Steiner 06 Dec '04

06 Dec '04

Update of /cvsroot/pure-data/externals/hcs/pan In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2579/pan Modified Files: linearpan~.pd Log Message: added generic object for getting the blocksize and outputing in ms. Currently this is fixed at a blocksize of 64, but once the changable blocksize is fully implemented, this object should use the actual current blocksize. Index: linearpan~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/pan/linearpan~.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** linearpan~.pd 28 Nov 2004 20:48:31 -0000 1.1 --- linearpan~.pd 5 Dec 2004 23:08:45 -0000 1.2 *************** *** 1,3 **** ! #N canvas 149 216 438 560 10; #X obj 121 27 inlet~; #X obj 233 26 inlet; --- 1,3 ---- ! #N canvas 149 83 442 564 10; #X obj 121 27 inlet~; #X obj 233 26 inlet; *************** *** 17,27 **** #X obj 46 418 line~; #X text 10 17 [linearpan~]; ! #X obj 297 162 samplerate~; ! #X obj 297 141 loadbang; ! #X obj 311 230 /; ! #X msg 297 208 64; ! #X obj 297 189 t b f; ! #X floatatom 304 272 8 0 0 3 block_size_in_secs - -; ! #X obj 280 142 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 196 337 t f b; --- 17,23 ---- #X obj 46 418 line~; #X text 10 17 [linearpan~]; ! #X obj 287 183 loadbang; ! #X floatatom 295 244 7 0 0 3 block_size_in_ms - -; ! #X obj 270 184 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 -1; #X obj 196 337 t f b; *************** *** 29,37 **** #X obj 196 379 pack f f; #X msg 196 399 \$1 \$2; - #X text 163 208 default block size:; #X obj 46 337 t f b; #X obj 76 356 f; #X obj 46 379 pack f f; #X msg 46 399 \$1 \$2; #X connect 0 0 2 0; #X connect 0 0 4 0; --- 25,33 ---- #X obj 196 379 pack f f; #X msg 196 399 \$1 \$2; #X obj 46 337 t f b; #X obj 76 356 f; #X obj 46 379 pack f f; #X msg 46 399 \$1 \$2; + #X obj 287 215 blocksize_in_ms; #X connect 0 0 2 0; #X connect 0 0 4 0; *************** *** 40,65 **** #X connect 4 0 5 0; #X connect 8 0 11 0; ! #X connect 8 0 24 0; #X connect 9 0 8 0; ! #X connect 11 0 29 0; #X connect 14 0 4 1; #X connect 15 0 2 1; ! #X connect 17 0 21 0; ! #X connect 18 0 17 0; ! #X connect 19 0 22 0; ! #X connect 19 0 25 1; ! #X connect 19 0 30 1; ! #X connect 20 0 19 0; ! #X connect 21 0 20 0; ! #X connect 21 1 19 1; ! #X connect 23 0 17 0; #X connect 24 0 26 0; #X connect 24 1 25 0; #X connect 25 0 26 1; #X connect 26 0 27 0; ! #X connect 27 0 14 0; ! #X connect 29 0 31 0; ! #X connect 29 1 30 0; ! #X connect 30 0 31 1; ! #X connect 31 0 32 0; ! #X connect 32 0 15 0; --- 36,57 ---- #X connect 4 0 5 0; #X connect 8 0 11 0; ! #X connect 8 0 20 0; #X connect 9 0 8 0; ! #X connect 11 0 24 0; #X connect 14 0 4 1; #X connect 15 0 2 1; ! #X connect 17 0 28 0; ! #X connect 19 0 28 0; ! #X connect 20 0 22 0; ! #X connect 20 1 21 0; ! #X connect 21 0 22 1; ! #X connect 22 0 23 0; ! #X connect 23 0 14 0; #X connect 24 0 26 0; #X connect 24 1 25 0; #X connect 25 0 26 1; #X connect 26 0 27 0; ! #X connect 27 0 15 0; ! #X connect 28 0 18 0; ! #X connect 28 0 21 1; ! #X connect 28 0 25 1;

1 0

externals/hcs/hid joystick-help.pd,1.7,1.8
by Hans-Christoph Steiner 04 Dec '04

04 Dec '04

Update of /cvsroot/pure-data/externals/hcs/hid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8704 Modified Files: joystick-help.pd Log Message: cleaned up and commented Index: joystick-help.pd =================================================================== RCS file: /cvsroot/pure-data/externals/hcs/hid/joystick-help.pd,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** joystick-help.pd 28 Nov 2004 23:57:26 -0000 1.7 --- joystick-help.pd 4 Dec 2004 18:04:34 -0000 1.8 *************** *** 1,4 **** ! #N canvas 526 230 658 456 10; ! #X obj 168 91 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 1 1 ; #X floatatom 63 234 7 0 0 3 Y-axis - -; --- 1,4 ---- ! #N canvas 248 419 666 464 10; ! #X obj 168 91 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 0 1 ; #X floatatom 63 234 7 0 0 3 Y-axis - -; *************** *** 46,50 **** #X msg 225 131 open 5; #X obj 168 154 joystick 0; ! #N canvas 674 327 430 481 joystick_noise 0; #X obj 73 25 inlet; #X obj 219 426 dac~; --- 46,50 ---- #X msg 225 131 open 5; #X obj 168 154 joystick 0; ! #N canvas 674 327 446 497 joystick_noise 0; #X obj 73 25 inlet; #X obj 219 426 dac~; *************** *** 98,111 **** #X connect 21 0 20 0; #X connect 22 0 5 0; ! #X restore 440 167 pd joystick_noise; ! #X obj 440 104 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 1 ! 1; ! #X text 333 85 Select your device and turn on to make noise:; #X obj 619 3 pddp; ! #X msg 503 137 open \$1; ! #X obj 503 117 hradio 15 1 1 8 \$0-device-number empty choose_a_device ! 0 -6 1 9 -262144 -1 -1 3; ! #X obj 477 117 nbx 1 14 -1e+37 1e+37 0 0 empty \$0-device-number empty ! 0 -6 0 14 -166441 -1 -1 3 256; #X text 8 36 Use a joystick device with Pd. This object auto-calibrates the output of axis data. Move each element of the device thru its full --- 98,111 ---- #X connect 21 0 20 0; #X connect 22 0 5 0; ! #X restore 440 155 pd joystick_noise; ! #X obj 440 92 tgl 25 0 empty empty empty 0 -6 0 8 -225271 -1 -1 1 1 ! ; ! #X text 333 73 Select your device and turn on to make noise:; #X obj 619 3 pddp; ! #X msg 503 125 open \$1; ! #X obj 503 105 hradio 15 1 1 8 \$0-device-number empty choose_a_device ! 0 -6 1 9 -262144 -1 -1 0; ! #X obj 477 105 nbx 1 14 -1e+37 1e+37 0 0 empty \$0-device-number empty ! 0 -6 0 14 -166441 -1 -1 0 256; #X text 8 36 Use a joystick device with Pd. This object auto-calibrates the output of axis data. Move each element of the device thru its full *************** *** 113,116 **** --- 113,119 ---- #X obj 335 215 unpack s f; #X obj 339 375 all_about_hid_mapping; + #X text 422 177 (remember to calibrate all parts; + #X text 430 190 of the joystick first); + #X msg 394 120 print; #X connect 0 0 31 0; #X connect 19 0 31 0; *************** *** 140,141 **** --- 143,145 ---- #X connect 40 0 15 0; #X connect 40 1 16 0; + #X connect 44 0 32 0;

1 0

pd/src m_fifo.c,1.1.2.1,1.1.2.2
by Tim Blechmann 02 Dec '04

02 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7621 Modified Files: Tag: devel_0_38 m_fifo.c Log Message: cas/cas2 for msvc Index: m_fifo.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_fifo.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** m_fifo.c 2 Dec 2004 15:17:51 -0000 1.1.2.1 --- m_fifo.c 2 Dec 2004 19:19:53 -0000 1.1.2.2 *************** *** 16,20 **** ! --- 16,20 ---- ! #define LOCKFREE *************** *** 26,49 **** */ - /* for gcc on i386 */ #if defined(__GNUC__) && (defined(_X86_) || defined(__i386__) || defined(__i586__) || defined(__i686__)) ! #define CAS(mem, old, new) \ ! ({ __asm__ __volatile__( \ ! "lock cmpxchg %2,%0 \n" \ ! : : \ ! "m" (mem), "a" (old), "r" (new) ); \ ! old != (__typeof__(old))(mem); \ }) ! #define CAS2(mem, old1, old2, new1, new2) \ ! ({ __asm__ __volatile__( \ ! "lock cmpxchg8b %0 \n" \ ! : : \ ! "m" (mem), "a" (old1), "d" (old2), \ ! "b" (new1), "c"(new2)); \ ! old1 != (__typeof__(old1)) (mem); \ }) #else --- 26,78 ---- */ #if defined(__GNUC__) && (defined(_X86_) || defined(__i386__) || defined(__i586__) || defined(__i686__)) ! /* gcc on i386 */ ! ! #define CAS(mem, old, new) \ ! ({ __asm__ __volatile__( \ ! "lock cmpxchg %2,%0 \n" \ ! : : \ ! "m" (*mem), "a" (old), "r" (new) ); \ ! (void*)old != (void*)(*mem); \ }) ! #define CAS2(mem, old1, old2, new1, new2) \ ! ({ __asm__ __volatile__( \ ! "lock cmpxchg8b %0 \n" \ ! : : \ ! "m" (*mem), "a" (old1), "d" (old2), \ ! "b" (new1), "c"(new2)); \ ! (void*) old1 != (void*) (*mem); \ }) + #elif defined(NT) && defined(_MSC_VER) + + /* msvc on i386 */ + + __inline int CAS(void** mem, void* old, void* new1) + { + __asm { + mov eax, old + mov ebx, new1 + mov esi, mem + lock cmpxchg dword ptr [esi], ebx + } + return ((void*) old != (void*)(*mem)); + } + + __inline int CAS2(void** mem, void* old1, void* old2, void* new1, void* new2) + { + __asm { + mov eax, old1 + mov edx, old2 + mov ebx, new1 + mov ecx, new2 + mov esi, mem + lock cmpxchg8b qword ptr [esi] + } + return ((void*) old1 != (void*)(*mem)); + } + #else *************** *** 52,56 **** #endif - struct _fifo { --- 81,84 ---- *************** *** 108,118 **** tail = fifo->tail; ! if (CAS(tail->next, NULL, cell)) break; else ! CAS2(fifo->tail, tail, icount, tail->next, icount + 1); } ! CAS2(fifo->tail, tail, icount, cell, icount +1); return; } --- 136,146 ---- tail = fifo->tail; ! if (CAS(&tail->next, NULL, cell)) break; else ! CAS2(&fifo->tail, tail, icount, tail->next, icount + 1); } ! CAS2(&fifo->tail, tail, icount, cell, icount +1); return; } *************** *** 142,151 **** if (next == NULL) return NULL; ! CAS2(fifo->tail, head, icount, next, icount + 1); } else { data = next->data; ! if (CAS2(fifo->head, head, ocount, next, ocount+1)) break; } --- 170,179 ---- if (next == NULL) return NULL; ! CAS2(&fifo->tail, head, icount, next, icount + 1); } else { data = next->data; ! if (CAS2(&fifo->head, head, ocount, next, ocount+1)) break; }

1 0

pd/src m_sched.c,1.5.4.11,1.5.4.12
by Tim Blechmann 02 Dec '04

02 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29709 Modified Files: Tag: devel_0_38 m_sched.c Log Message: oops Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.11 retrieving revision 1.5.4.12 diff -C2 -d -r1.5.4.11 -r1.5.4.12 *** m_sched.c 2 Dec 2004 15:19:15 -0000 1.5.4.11 --- m_sched.c 2 Dec 2004 16:40:24 -0000 1.5.4.12 *************** *** 28,33 **** #include "m_fifo.h" static t_int run_idle_callbacks(void); ! static t_sched_callback * idle_callback = NULL; /* tb: }*/ --- 28,35 ---- #include "m_fifo.h" + static t_int run_idle_callbacks(void); ! t_fifo * callback_fifo = NULL; ! /* tb: }*/ *************** *** 620,624 **** #include "m_fifo.h" - /* linked list of callbacks * callback will be freed after returning 0 */ --- 622,625 ---- *************** *** 630,634 **** } t_sched_callback; ! t_fifo * callback_fifo = NULL; void set_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) --- 631,635 ---- } t_sched_callback; ! static t_sched_callback * idle_callback = NULL; void set_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) *************** *** 665,672 **** } while ( (sys_getrealtime() > stop) && (idle_callback != NULL)); } } - #endif - /* } tb */ --- 666,674 ---- } while ( (sys_getrealtime() > stop) && (idle_callback != NULL)); + return 0; } + else + return 1; /* sleep */ } /* } tb */

1 0

pd/src d_soundfile.c,1.4.4.7,1.4.4.8
by Tim Blechmann 02 Dec '04

02 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11349 Modified Files: Tag: devel_0_38 d_soundfile.c Log Message: bugfix in idle callbacks Index: d_soundfile.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_soundfile.c,v retrieving revision 1.4.4.7 retrieving revision 1.4.4.8 diff -C2 -d -r1.4.4.7 -r1.4.4.8 *** d_soundfile.c 30 Nov 2004 09:50:47 -0000 1.4.4.7 --- d_soundfile.c 2 Dec 2004 15:22:33 -0000 1.4.4.8 *************** *** 1171,1175 **** pthread_cond_t resume_after_callback = PTHREAD_COND_INITIALIZER; pthread_mutex_t resume_after_callback_mutex = PTHREAD_MUTEX_INITIALIZER; /* dummy */ ! t_int outargs[2]; while (argc > 0 && argv->a_type == A_SYMBOL && --- 1171,1175 ---- pthread_cond_t resume_after_callback = PTHREAD_COND_INITIALIZER; pthread_mutex_t resume_after_callback_mutex = PTHREAD_MUTEX_INITIALIZER; /* dummy */ ! t_int* outargs; while (argc > 0 && argv->a_type == A_SYMBOL && *************** *** 1395,1399 **** for (i = 0; i < argc; i++) { ! t_int w[2]; w[0] = (t_int)(garrays[i]); --- 1395,1399 ---- for (i = 0; i < argc; i++) { ! t_int* w = (t_int*)getbytes(2*sizeof(t_int)); w[0] = (t_int)(garrays[i]); *************** *** 1422,1425 **** --- 1422,1426 ---- #endif + outargs = (t_int*)getbytes(2*sizeof(t_int)); outargs[0] = (t_int)x->x_obj.ob_outlet; outargs[1] = (t_int)itemsread; *************** *** 1469,1472 **** --- 1470,1474 ---- /* if this is the only array in the graph, reset the graph's coordinates */ + gl = garray->x_glist; if (gl->gl_list == &garray->x_gobj && !garray->x_gobj.g_next) *************** *** 1480,1483 **** --- 1482,1486 ---- garray_redraw(garray); + /* freebytes(w, 2*sizeof(t_int)); */ return 0; } *************** *** 1490,1494 **** outlet_float (outlet, itemsread); ! return 0; } --- 1493,1498 ---- outlet_float (outlet, itemsread); ! ! /* freebytes(w, 2*sizeof(t_int)); */ return 0; }

1 0

pd/src m_sched.c,1.5.4.10,1.5.4.11
by Tim Blechmann 02 Dec '04

02 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10680 Modified Files: Tag: devel_0_38 m_sched.c Log Message: updating idle callback system Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.10 retrieving revision 1.5.4.11 diff -C2 -d -r1.5.4.10 -r1.5.4.11 *** m_sched.c 29 Nov 2004 21:31:23 -0000 1.5.4.10 --- m_sched.c 2 Dec 2004 15:19:15 -0000 1.5.4.11 *************** *** 27,31 **** --- 27,34 ---- int sys_callbackscheduler = 0; /* if 1: change scheduler to callback based dsp */ + #include "m_fifo.h" static t_int run_idle_callbacks(void); + static t_sched_callback * idle_callback = NULL; + /* tb: }*/ *************** *** 413,416 **** --- 416,422 ---- sys_sleepgrain = 5000; sys_initmidiqueue(); + + callback_fifo = fifo_init(); /* tb: initialize fifo for idle callbacks */ + while (!sys_quit) { *************** *** 612,684 **** * { */ ! #if 1 ! /* linked list of callbacks ! * callback will be freed after returning 0 */ ! typedef struct _sched_callback ! { ! t_int (*function) (t_int* argv); ! t_int* argv; ! t_int argc; ! struct _sched_callback* next; ! } t_sched_callback; ! ! /* this is not save ... possibly not atomic */ ! static volatile t_sched_callback * cb_fifo_begin = NULL; ! static volatile t_sched_callback * cb_fifo_end = NULL; ! ! void set_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) ! { ! t_sched_callback* new = (t_sched_callback*) getbytes ! (sizeof(t_sched_callback)); ! ! new->function = callback; ! new->argv = (t_int*) copybytes (argv, argc * sizeof (t_int)); ! new->argc = argc; ! new->next = NULL; ! ! if (cb_fifo_begin != NULL) ! { ! cb_fifo_end->next = new; ! cb_fifo_end = new; ! } ! else ! { ! cb_fifo_begin = new; ! cb_fifo_end = new; ! } ! ! } ! ! ! static t_int run_idle_callbacks(void) ! { ! if (cb_fifo_begin) ! { ! double stop = sys_getrealtime() + sys_sleepgrain; ! ! do ! { ! int resume = cb_fifo_begin->function(cb_fifo_begin->argv); ! ! if (resume == 0) ! { ! t_sched_callback* next = cb_fifo_begin->next; ! ! freebytes (cb_fifo_begin->argv, cb_fifo_begin->argc); ! freebytes ((void*)cb_fifo_begin, sizeof(t_sched_callback)); ! ! cb_fifo_begin = next; ! } ! } ! while ( sys_getrealtime() > stop && cb_fifo_begin); ! ! return 0; /* don't sleep */ ! } ! return 1; /* sleep now */ ! } ! ! ! #else ! #include "m_lockfree_fifo.h" --- 618,622 ---- * { */ ! #include "m_fifo.h" *************** *** 709,719 **** } - static t_sched_callback * idle_callback = NULL; - static t_int run_idle_callbacks(void) { - if (callback_fifo == NULL) - callback_fifo = fifo_init(); - if (idle_callback == NULL) idle_callback = (t_sched_callback*) fifo_get(callback_fifo); --- 647,652 ----

1 0

pd/src m_fifo.h,NONE,1.1.2.1 m_fifo.c,NONE,1.1.2.1
by Tim Blechmann 02 Dec '04

02 Dec '04

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10276 Added Files: Tag: devel_0_38 m_fifo.h m_fifo.c Log Message: added fifo api ... lockfree at least on gcc / x86 --- NEW FILE: m_fifo.h --- /* Copyright (c) 2004, Tim Blechmann * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt" in this distribution. */ #include "m_pd.h" /* possibly this can go to m_pd.h */ /* used data structures */ EXTERN_STRUCT _fifo; #define t_fifo struct _fifo /* function prototypes */ t_fifo * fifo_init(); void fifo_destroy(t_fifo*); /* fifo_put() and fifo_get are the only threadsafe functions!!! */ void fifo_put(t_fifo*, void*); void* fifo_get(t_fifo*); --- NEW FILE: m_fifo.c --- /* Copyright (c) 2004, Tim Blechmann * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt" in this distribution. */ #include "stddef.h" #include "m_pd.h" #include "m_fifo.h" typedef struct _fifocell { void* data; /* pointer to our data */ struct _fifocell* next; } t_fifocell; #ifdef LOCKFREE /* lock-free fifo implementation adapted from: * Dominique Fober, Yann Orlarey, Stephane Letz * Lock-Free Techniques for Concurrent Access to Shared Objects */ /* for gcc on i386 */ #if defined(__GNUC__) && (defined(_X86_) || defined(__i386__) || defined(__i586__) || defined(__i686__)) #define CAS(mem, old, new) \ ({ __asm__ __volatile__( \ "lock cmpxchg %2,%0 \n" \ : : \ "m" (mem), "a" (old), "r" (new) ); \ old != (__typeof__(old))(mem); \ }) #define CAS2(mem, old1, old2, new1, new2) \ ({ __asm__ __volatile__( \ "lock cmpxchg8b %0 \n" \ : : \ "m" (mem), "a" (old1), "d" (old2), \ "b" (new1), "c"(new2)); \ old1 != (__typeof__(old1)) (mem); \ }) #else #error Lockfree Fifo not yet implemented on this platform #endif struct _fifo { t_fifocell* head; unsigned long ocount; /* operation counter */ t_fifocell* tail; unsigned long icount; /* operation counter */ }; t_fifo* fifo_init() { t_fifo* ret = (t_fifo*) getbytes(sizeof(t_fifo)); t_fifocell * fifo_begin = (t_fifocell*) getbytes (sizeof (t_fifocell) ); fifo_begin->data = NULL; fifo_begin->next = NULL; ret->head = fifo_begin; ret->tail = fifo_begin; ret->icount = 0; ret->ocount = 0; return ret; } void fifo_destroy(t_fifo* fifo) { void * data; do { data = fifo_get(fifo); } while (data != NULL); freebytes(fifo->head, sizeof(t_fifocell)); freebytes(fifo, sizeof(t_fifo)); return; } void fifo_put(t_fifo* fifo, void* data) { if (data != NULL) { t_fifocell * cell = (t_fifocell*) getbytes(sizeof(t_fifocell)); t_fifocell * tail; unsigned long icount; cell->data = data; cell->next = NULL; while(1) { icount = fifo->icount; tail = fifo->tail; if (CAS(tail->next, NULL, cell)) break; else CAS2(fifo->tail, tail, icount, tail->next, icount + 1); } CAS2(fifo->tail, tail, icount, cell, icount +1); return; } else error("invalid data: NULL"); } void* fifo_get(t_fifo* fifo) { t_fifocell * head; void* data; while (1) { unsigned long ocount = fifo->ocount; unsigned long icount = fifo->icount; t_fifocell * next; head = fifo->head; next = head->next; if (ocount == fifo->ocount) { if (head == fifo->tail) { if (next == NULL) return NULL; CAS2(fifo->tail, head, icount, next, icount + 1); } else { data = next->data; if (CAS2(fifo->head, head, ocount, next, ocount+1)) break; } } } freebytes(head, sizeof(t_fifocell)); return data; } #else /* we always have the implementation for posix systems with threadlocks */ #include "pthread.h" #include "errno.h" struct _fifo { t_fifocell * head; t_fifocell * tail; pthread_mutex_t mutex; }; t_fifo * fifo_init() { t_fifo* ret = (t_fifo*) getbytes(sizeof (t_fifo)); t_fifocell * fifo_begin = (t_fifocell*) getbytes (sizeof (t_fifocell) ); fifo_begin->data = NULL; fifo_begin->next = NULL; ret->head = fifo_begin; ret->tail = fifo_begin; pthread_mutex_init(&ret->mutex, NULL); pthread_mutex_unlock(&ret->mutex); return ret; } void fifo_destroy(t_fifo* fifo) { void * data; do { data = fifo_get(fifo); } while (data != NULL); pthread_mutex_lock(&fifo->mutex); pthread_mutex_destroy(&fifo->mutex); freebytes(fifo, sizeof(t_fifo)); return; } /* fifo_put() and fifo_get are the only threadsafe functions!!! */ void fifo_put(t_fifo* fifo, void* data) { if (data != NULL) { t_fifocell * cell = (t_fifocell*) getbytes(sizeof(t_fifocell)); cell->data = data; cell->next = NULL; pthread_mutex_lock(&fifo->mutex); fifo->tail->next = cell; fifo->tail = cell; pthread_mutex_unlock(&fifo->mutex); } return; } /* this fifo_get returns NULL if the fifo is empty * or locked by another thread */ void* fifo_get(t_fifo* fifo) { t_fifocell * cell; void* data; if(pthread_mutex_trylock(&fifo->mutex) != EBUSY) { cell = fifo->head->next; if (cell != NULL) { fifo->head->next = cell->next; if(cell == fifo->tail) fifo->tail = fifo->head; data = cell->data; freebytes (cell, sizeof(t_fifocell)); } else data = NULL; pthread_mutex_unlock(&fifo->mutex); } else data = NULL; return data; } #endif

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs December 2004