Pd-cvs May 2005

pd-cvs@lists.iem.at

14 participants
407 discussions

pd/src s_audio_asio.cpp,1.1.4.23,1.1.4.24
by Tim Blechmann 11 May '05

11 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4038 Modified Files: Tag: devel_0_38 s_audio_asio.cpp Log Message: thread safety Index: s_audio_asio.cpp =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/s_audio_asio.cpp,v retrieving revision 1.1.4.23 retrieving revision 1.1.4.24 diff -C2 -d -r1.1.4.23 -r1.1.4.24 *** s_audio_asio.cpp 18 Jan 2005 20:15:04 -0000 1.1.4.23 --- s_audio_asio.cpp 11 May 2005 12:35:27 -0000 1.1.4.24 *************** *** 779,782 **** --- 779,784 ---- /* perform the processing */ + sys_lock(); + for (long i = 0; i < sys_outchannels + sys_inchannels; i++) { *************** *** 797,804 **** pthread_cond_broadcast(&asio_ringbuf_cond); ! if(asio_useoutputready) ASIOOutputReady(); ! return 0L; /* time info!!! */ } --- 799,808 ---- pthread_cond_broadcast(&asio_ringbuf_cond); ! ! sys_unlock(); ! if(asio_useoutputready) ASIOOutputReady(); ! return 0L; /* time info!!! */ } *************** *** 1280,1284 **** /* perform the processing */ ! sys_lock(); for (int j = 0; j != asio_ticks_per_callback; j++) --- 1284,1292 ---- /* perform the processing */ ! int timeout = sys_dacblocksize * (float)asio_ticks_per_callback / (float) sys_dacsr * 1e6; ! ! if (sys_timedlock(timeout) == ETIMEDOUT) ! /* we're late ... lets hope that jack doesn't kick us out */ ! return 0; for (int j = 0; j != asio_ticks_per_callback; j++)

1 0

externals/nusmuk/msd2D/editor gem_masses.pd,1.5,1.6
by Frank Barknecht 11 May '05

11 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16068 Modified Files: gem_masses.pd Log Message: Circle to sphere. Index: gem_masses.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/gem_masses.pd,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gem_masses.pd 11 May 2005 09:09:47 -0000 1.5 --- gem_masses.pd 11 May 2005 09:13:06 -0000 1.6 *************** *** 9,13 **** #X obj 48 300 loadbang; #X obj 141 104 unpack 0 0 0; - #X obj 150 453 circle 0.05; #X obj 338 297 inlet; #X obj 150 362 spigot; --- 9,12 ---- *************** *** 39,61 **** #X obj 192 44 r MSD-TYPE; #X obj 238 104 unpack 0 0 0 0; ! #X connect 0 0 14 0; ! #X connect 1 0 9 0; #X connect 2 0 4 1; #X connect 3 0 1 0; ! #X connect 4 0 11 0; #X connect 5 0 4 0; #X connect 5 1 1 1; ! #X connect 6 0 9 0; #X connect 7 0 6 0; #X connect 8 1 5 0; #X connect 8 2 1 2; ! #X connect 10 0 11 1; ! #X connect 11 0 3 0; ! #X connect 12 0 11 1; ! #X connect 13 0 12 0; ! #X connect 14 0 8 0; ! #X connect 14 1 16 0; ! #X connect 15 0 14 1; ! #X connect 16 1 5 0; ! #X connect 16 2 1 2; ! #X connect 16 3 1 3; --- 38,61 ---- #X obj 192 44 r MSD-TYPE; #X obj 238 104 unpack 0 0 0 0; ! #X obj 150 453 sphere 0.05; ! #X connect 0 0 13 0; ! #X connect 1 0 16 0; #X connect 2 0 4 1; #X connect 3 0 1 0; ! #X connect 4 0 10 0; #X connect 5 0 4 0; #X connect 5 1 1 1; ! #X connect 6 0 16 0; #X connect 7 0 6 0; #X connect 8 1 5 0; #X connect 8 2 1 2; ! #X connect 9 0 10 1; ! #X connect 10 0 3 0; ! #X connect 11 0 10 1; ! #X connect 12 0 11 0; ! #X connect 13 0 8 0; ! #X connect 13 1 15 0; ! #X connect 14 0 13 1; ! #X connect 15 1 5 0; ! #X connect 15 2 1 2; ! #X connect 15 3 1 3;

1 0

externals/nusmuk/msd2D/editor 16plane.txt,NONE,1.1
by Frank Barknecht 11 May '05

11 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15582 Added Files: 16plane.txt Log Message: New example --- NEW FILE: 16plane.txt --- data; template liaison; float x1; float y1; float x2; float y2; float mid1; float mid2; float lid; float K; float D; float D2; ; template mass; float x; float y; float mid; float mob; float M; ; ; liaison 697 489 697 539 29 35 0 10 2.5 1.5; liaison 697 439 697 489 23 29 0 10 2.5 1.5; liaison 697 389 697 439 17 23 0 10 2.5 1.5; liaison 697 339 697 389 11 17 0 10 2.5 1.5; liaison 697 289 697 339 5 11 0 10 2.5 1.5; liaison 647 489 647 539 28 34 0 10 2.5 1.5; liaison 647 439 647 489 22 28 0 10 2.5 1.5; liaison 647 389 647 439 16 22 0 10 2.5 1.5; liaison 647 339 647 389 10 16 0 10 2.5 1.5; liaison 647 289 647 339 4 10 0 10 2.5 1.5; liaison 597 489 597 539 27 33 0 10 2.5 1.5; liaison 597 439 597 489 21 27 0 10 2.5 1.5; liaison 597 389 597 439 15 21 0 10 2.5 1.5; liaison 597 339 597 389 9 15 0 10 2.5 1.5; liaison 597 289 597 339 3 9 0 10 2.5 1.5; liaison 547 489 547 539 26 32 0 10 2.5 1.5; liaison 547 439 547 489 20 26 0 10 2.5 1.5; liaison 547 389 547 439 14 20 0 10 2.5 1.5; liaison 547 339 547 389 8 14 0 10 2.5 1.5; liaison 547 289 547 339 2 8 0 10 2.5 1.5; liaison 497 489 497 539 25 31 0 10 2.5 1.5; liaison 497 439 497 489 19 25 0 10 2.5 1.5; liaison 497 389 497 439 13 19 0 10 2.5 1.5; liaison 497 339 497 389 7 13 0 10 2.5 1.5; liaison 497 289 497 339 1 7 0 10 2.5 1.5; liaison 447 489 447 539 24 30 0 10 2.5 1.5; liaison 447 439 447 489 18 24 0 10 2.5 1.5; liaison 447 389 447 439 12 18 0 10 2.5 1.5; liaison 447 339 447 389 6 12 0 10 2.5 1.5; liaison 447 289 447 339 0 6 0 10 2.5 1.5; liaison 647 539 697 539 34 35 0 10 2.5 1.5; liaison 597 539 647 539 33 34 0 10 2.5 1.5; liaison 547 539 597 539 32 33 0 10 2.5 1.5; liaison 497 539 547 539 31 32 0 10 2.5 1.5; liaison 447 539 497 539 30 31 0 10 2.5 1.5; liaison 647 489 697 489 28 29 0 10 2.5 1.5; liaison 597 489 647 489 27 28 0 10 2.5 1.5; liaison 547 489 597 489 26 27 0 10 2.5 1.5; liaison 497 489 547 489 25 26 0 10 2.5 1.5; liaison 447 489 497 489 24 25 0 10 2.5 1.5; liaison 647 439 697 439 22 23 0 10 2.5 1.5; liaison 597 439 647 439 21 22 0 10 2.5 1.5; liaison 547 439 597 439 20 21 0 10 2.5 1.5; liaison 497 439 547 439 19 20 0 10 2.5 1.5; liaison 447 439 497 439 18 19 0 10 2.5 1.5; liaison 647 389 697 389 16 17 0 10 2.5 1.5; liaison 597 389 647 389 15 16 0 10 2.5 1.5; liaison 547 389 597 389 14 15 0 10 2.5 1.5; liaison 497 389 547 389 13 14 0 10 2.5 1.5; liaison 447 389 497 389 12 13 0 10 2.5 1.5; liaison 647 339 697 339 10 11 0 10 2.5 1.5; liaison 597 339 647 339 9 10 0 10 2.5 1.5; liaison 547 339 597 339 8 9 0 10 2.5 1.5; liaison 497 339 547 339 7 8 0 10 2.5 1.5; liaison 447 339 497 339 6 7 0 10 2.5 1.5; liaison 647 289 697 289 4 5 0 10 2.5 1.5; liaison 597 289 647 289 3 4 0 10 2.5 1.5; liaison 547 289 597 289 2 3 0 10 2.5 1.5; liaison 497 289 547 289 1 2 0 10 2.5 1.5; liaison 447 289 497 289 0 1 0 10 2.5 1.5; mass 447 289 0 900 100; mass 447 339 6 0 100; mass 447 389 12 0 100; mass 447 439 18 0 100; mass 447 489 24 0 100; mass 447 539 30 900 100; mass 497 289 1 0 100; mass 497 339 7 0 100; mass 497 389 13 0 100; mass 497 439 19 0 100; mass 497 489 25 0 100; mass 497 539 31 0 100; mass 547 289 2 0 100; mass 547 339 8 0 100; mass 547 389 14 0 100; mass 547 439 20 0 100; mass 547 489 26 0 100; mass 547 539 32 0 100; mass 597 289 3 0 100; mass 597 339 9 0 100; mass 597 389 15 0 100; mass 597 439 21 0 100; mass 597 489 27 0 100; mass 597 539 33 0 100; mass 647 289 4 0 100; mass 647 339 10 0 100; mass 647 389 16 0 100; mass 647 439 22 0 100; mass 647 489 28 0 100; mass 647 539 34 0 100; mass 697 289 5 900 100; mass 697 339 11 0 100; mass 697 389 17 0 100; mass 697 439 23 0 100; mass 697 489 29 0 100; mass 697 539 35 900 100;

1 0

externals/nusmuk/msd2D/editor msd-editor.pd, NONE, 1.1 README, 1.1, 1.2 gem_links.pd, 1.4, 1.5 gem_masses.pd, 1.4, 1.5 link-set.pd, 1.3, 1.4 mass-set.pd, 1.3, 1.4 msd_append.pd, 1.4, 1.5 msd2d-editor.pd, 1.11, NONE
by Frank Barknecht 11 May '05

11 May '05

Update of /cvsroot/pure-data/externals/nusmuk/msd2D/editor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15230 Modified Files: README gem_links.pd gem_masses.pd link-set.pd mass-set.pd msd_append.pd Added Files: msd-editor.pd Removed Files: msd2d-editor.pd Log Message: Support for msd3D added. Index: gem_masses.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/gem_masses.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gem_masses.pd 5 May 2005 15:12:45 -0000 1.4 --- gem_masses.pd 11 May 2005 09:09:47 -0000 1.5 *************** *** 8,18 **** #X msg 47 325 draw line; #X obj 48 300 loadbang; ! #X obj 141 61 unpack 0 0 0; #X obj 150 453 circle 0.05; ! #X obj 240 311 inlet; #X obj 150 362 spigot; ! #X msg 239 289 1; ! #X obj 239 264 loadbang; ! #X connect 0 0 8 0; #X connect 1 0 9 0; #X connect 2 0 4 1; --- 8,43 ---- #X msg 47 325 draw line; #X obj 48 300 loadbang; ! #X obj 141 104 unpack 0 0 0; #X obj 150 453 circle 0.05; ! #X obj 338 297 inlet; #X obj 150 362 spigot; ! #X msg 337 275 1; ! #X obj 337 250 loadbang; ! #N canvas 0 0 450 300 demux 0; ! #X obj 91 69 inlet; ! #X obj 255 73 inlet; ! #X obj 223 106 select 0; ! #X obj 73 213 spigot 1; ! #X obj 165 219 spigot 0; ! #X obj 141 188 unpack 1 0; ! #X obj 96 255 outlet; ! #X obj 173 257 outlet; ! #X msg 174 140 1 0; ! #X msg 216 140 0 1; ! #X connect 0 0 3 0; ! #X connect 0 0 4 0; ! #X connect 1 0 2 0; ! #X connect 2 0 8 0; ! #X connect 2 1 9 0; ! #X connect 3 0 6 0; ! #X connect 4 0 7 0; ! #X connect 5 0 3 1; ! #X connect 5 1 4 1; ! #X connect 8 0 5 0; ! #X connect 9 0 5 0; ! #X restore 141 71 pd demux; ! #X obj 192 44 r MSD-TYPE; ! #X obj 238 104 unpack 0 0 0 0; ! #X connect 0 0 14 0; #X connect 1 0 9 0; #X connect 2 0 4 1; *************** *** 29,30 **** --- 54,61 ---- #X connect 12 0 11 1; #X connect 13 0 12 0; + #X connect 14 0 8 0; + #X connect 14 1 16 0; + #X connect 15 0 14 1; + #X connect 16 1 5 0; + #X connect 16 2 1 2; + #X connect 16 3 1 3; Index: mass-set.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/mass-set.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mass-set.pd 5 May 2005 15:12:45 -0000 1.3 --- mass-set.pd 11 May 2005 09:09:47 -0000 1.4 *************** *** 2,6 **** #X obj 251 159 pack 0 p; #X obj 251 187 route \$1; ! #X obj 130 347 set mass x y; #X obj 251 100 t p p; #X obj 251 131 get mass mid; --- 2,6 ---- #X obj 251 159 pack 0 p; #X obj 251 187 route \$1; ! #X obj 118 383 set mass x y; #X obj 251 100 t p p; #X obj 251 131 get mass mid; *************** *** 30,35 **** #X msg 307 536 posX \$2 \$3; #X msg 327 562 posY \$2 \$4; ! #X obj 51 319 scale-msd2ds; #X obj 337 422 scale-ds2msd; #X connect 0 0 1 0; #X connect 1 0 8 0; --- 30,36 ---- #X msg 307 536 posX \$2 \$3; #X msg 327 562 posY \$2 \$4; ! #X obj 39 355 scale-msd2ds; #X obj 337 422 scale-ds2msd; + #X msg 95 323 \$1 \$2; #X connect 0 0 1 0; #X connect 1 0 8 0; *************** *** 45,49 **** #X connect 8 1 14 1; #X connect 9 0 6 0; ! #X connect 11 0 27 2; #X connect 13 0 3 0; #X connect 14 0 22 0; --- 46,50 ---- #X connect 8 1 14 1; #X connect 9 0 6 0; ! #X connect 11 0 29 0; #X connect 13 0 3 0; #X connect 14 0 22 0; *************** *** 65,66 **** --- 66,68 ---- #X connect 28 0 21 2; #X connect 28 1 21 3; + #X connect 29 0 27 2; --- msd2d-editor.pd DELETED --- Index: msd_append.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/msd_append.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** msd_append.pd 8 May 2005 13:19:05 -0000 1.4 --- msd_append.pd 11 May 2005 09:09:47 -0000 1.5 *************** *** 30,34 **** #X obj 66 203 + 20; #X obj 105 148 + 20; ! #X obj 192 177 r \$0-M; #X obj 68 231 append mass x y mid mob M; #X obj 553 175 f \$1; --- 30,34 ---- #X obj 66 203 + 20; #X obj 105 148 + 20; ! #X obj 208 133 r \$0-M; #X obj 68 231 append mass x y mid mob M; #X obj 553 175 f \$1; *************** *** 39,42 **** --- 39,45 ---- #X obj 21 135 r \$0-geos; #X obj 252 77 r \$0-start-traverse; + #X obj 179 204 f 0; + #X obj 21 158 t a b; + #X obj 195 173 r \$0-mfds; #X connect 0 0 24 5; #X connect 1 0 21 0; *************** *** 69,79 **** #X connect 28 0 27 0; #X connect 29 0 25 0; ! #X connect 30 0 24 0; #X connect 31 0 2 0; #X restore 105 79 pd guts; #X obj 126 6 inlet; #X obj 169 5 inlet; #X obj 25 59 nbx 5 14 -1e+37 1e+37 0 0 \$0-counter \$0-counter-in id ! -22 8 0 10 -262144 -1 -1 0 256; #X obj 2 77 cnv 15 80 30 empty empty empty 10 10 0 10 -195568 -1 0 ; --- 72,86 ---- #X connect 28 0 27 0; #X connect 29 0 25 0; ! #X connect 30 0 33 0; #X connect 31 0 2 0; + #X connect 32 0 24 3; + #X connect 33 0 24 0; + #X connect 33 1 32 0; + #X connect 34 0 32 1; #X restore 105 79 pd guts; #X obj 126 6 inlet; #X obj 169 5 inlet; #X obj 25 59 nbx 5 14 -1e+37 1e+37 0 0 \$0-counter \$0-counter-in id ! -22 8 0 10 -262144 -1 -1 400 256; #X obj 2 77 cnv 15 80 30 empty empty empty 10 10 0 10 -195568 -1 0 ; *************** *** 86,90 **** #X obj 48 33 r \$0-make-rect; #X msg 93 67 bang; ! #N canvas 449 480 450 300 1016-geos 1; #X obj 48 82 bng 24 250 50 0 \$0-make-rect empty make-rect 0 -6 0 8 -24198 -1 -1; --- 93,97 ---- #X obj 48 33 r \$0-make-rect; #X msg 93 67 bang; ! #N canvas 449 480 450 300 6969-geos 0; #X obj 48 82 bng 24 250 50 0 \$0-make-rect empty make-rect 0 -6 0 8 -24198 -1 -1; *************** *** 105,108 **** --- 112,119 ---- #X floatatom 251 184 5 0 0 0 masses_# - #0-masses-circ; #X text 107 266 All coords as used by data structs.; + #X obj 54 233 hradio 15 1 0 2 \$0-mf \$0-mf Mobile/Fix 0 -6 0 8 -262144 + -1 -1 0; + #X obj 91 234 cnv 15 60 15 \$0-mobfix \$0-mobfix mobile 2 6 0 10 -233017 + -66577 0; #X restore 518 165 pd \$0-geos; #X msg 519 125 \; \$1 vis 1; *************** *** 112,116 **** #X obj 48 66 t b b; #X obj 78 226 s \$0-start-traverse; ! #N canvas 0 0 930 534 1016-sixpack 0; #X obj 250 282 r \$0-x0; #X text 452 208 Args; --- 123,127 ---- #X obj 48 66 t b b; #X obj 78 226 s \$0-start-traverse; ! #N canvas 0 0 930 534 6969-sixpack 0; #X obj 250 282 r \$0-x0; #X text 452 208 Args; *************** *** 133,137 **** #X obj 524 45 r \$0-show-geos; #X obj 63 322 r \$0-make-circ; ! #N canvas 0 0 930 534 1016-fourpack 0; #X text 452 208 Args; #X obj 320 310 sixpack --------------------; --- 144,148 ---- #X obj 524 45 r \$0-show-geos; #X obj 63 322 r \$0-make-circ; ! #N canvas 0 0 930 534 6969-fourpack 0; #X text 452 208 Args; #X obj 320 310 sixpack --------------------; *************** *** 155,158 **** --- 166,177 ---- #X obj 106 407 t b a; #X obj 63 370 make_circ 300 300 100 8; + #X obj 368 266 select 0; + #X msg 368 306 label mobile; + #X obj 368 329 s \$0-mobfix; + #X msg 420 288 label fix; + #X obj 368 236 r \$0-mf; + #X obj 507 332 s \$0-mfds; + #X msg 508 301 0; + #X msg 544 299 900; #X connect 0 0 13 0; #X connect 3 0 10 0; *************** *** 174,177 **** --- 193,205 ---- #X connect 21 1 17 0; #X connect 22 0 21 0; + #X connect 23 0 24 0; + #X connect 23 0 29 0; + #X connect 23 1 26 0; + #X connect 23 1 30 0; + #X connect 24 0 25 0; + #X connect 26 0 25 0; + #X connect 27 0 23 0; + #X connect 29 0 28 0; + #X connect 30 0 28 0; #X restore 113 41 pd geos; #X obj 59 29 bng 15 250 50 0 \$0-show-geos \$0-show-geos geos 0 -6 Index: README =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/README,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** README 29 Apr 2005 19:28:36 -0000 1.1 --- README 11 May 2005 09:09:47 -0000 1.2 *************** *** 1,10 **** ! msd2d-editor ------------ patched by Frank Barknecht <fbar(a)footils.org> with a big hand from Nicolas ! Montgermont <montgermont(a)la-kitchen.fr> who wrote the msd2D external required ! for using this patch. GEM is used to provide an alternative visualization, but ! it is not required for the patch to work. Thanks Nicolas for a great external colletion. ! msd2d-editor.pd is the patch to open, further documentation is inside. --- 1,14 ---- ! msd-editor ------------ patched by Frank Barknecht <fbar(a)footils.org> with a big hand from Nicolas ! Montgermont <montgermont(a)la-kitchen.fr> who wrote the msd2D and msd3D externals ! required for using this patch. GEM is used to provide an alternative ! visualization, but it is not required for the patch to work. ! ! If you want to export the messages to msd2d, that are created, you also need a ! [prepend] external, preferably the one from the Cyclone library. ! Thanks Nicolas for a great external colletion. ! msd-editor.pd is the patch to open, further documentation is inside. Index: link-set.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/link-set.pd,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** link-set.pd 5 May 2005 15:12:45 -0000 1.3 --- link-set.pd 11 May 2005 09:09:47 -0000 1.4 *************** *** 1,3 **** ! #N canvas 511 393 574 502 10; #X obj 251 159 pack 0 p; #X obj 251 187 route \$1; --- 1,3 ---- ! #N canvas 449 81 747 726 10; #X obj 251 159 pack 0 p; #X obj 251 187 route \$1; *************** *** 13,21 **** #X obj 251 131 get liaison lid; #X text 261 220 Select pointer with lid matching \$1; ! #X obj 90 349 set liaison x1 y1 x2 y2; #X obj 251 73 r myliapointer; ! #X obj 90 292 unpack 0 0 0 0; ! #X obj 92 320 scale-msd2ds; ! #X obj 183 319 scale-msd2ds; #X connect 0 0 1 0; #X connect 1 0 5 0; --- 13,48 ---- #X obj 251 131 get liaison lid; #X text 261 220 Select pointer with lid matching \$1; ! #X obj 90 526 set liaison x1 y1 x2 y2; #X obj 251 73 r myliapointer; ! #X obj 90 337 unpack 0 0 0 0; ! #X obj 90 497 scale-msd2ds; ! #X obj 181 496 scale-msd2ds; ! #N canvas 0 0 450 300 demux 0; ! #X obj 91 69 inlet; ! #X obj 255 73 inlet; ! #X obj 223 106 select 0; ! #X obj 73 213 spigot 1; ! #X obj 165 219 spigot 0; ! #X obj 141 188 unpack 1 0; ! #X obj 96 255 outlet; ! #X obj 173 257 outlet; ! #X msg 174 140 1 0; ! #X msg 216 140 0 1; ! #X connect 0 0 3 0; ! #X connect 0 0 4 0; ! #X connect 1 0 2 0; ! #X connect 2 0 8 0; ! #X connect 2 1 9 0; ! #X connect 3 0 6 0; ! #X connect 4 0 7 0; ! #X connect 5 0 3 1; ! #X connect 5 1 4 1; ! #X connect 8 0 5 0; ! #X connect 9 0 5 0; ! #X restore 90 292 pd demux; ! #X obj 272 340 unpack 0 0 0 0 0 0; ! #X text 198 336 msd2D; ! #X text 410 338 msd3D: skip Z; ! #X obj 157 255 r MSD-TYPE; #X connect 0 0 1 0; #X connect 1 0 5 0; *************** *** 27,31 **** #X connect 5 0 4 0; #X connect 5 1 12 4; ! #X connect 6 0 14 0; #X connect 8 0 3 0; #X connect 10 0 0 0; --- 54,58 ---- #X connect 5 0 4 0; #X connect 5 1 12 4; ! #X connect 6 0 17 0; #X connect 8 0 3 0; #X connect 10 0 0 0; *************** *** 39,40 **** --- 66,74 ---- #X connect 16 0 12 2; #X connect 16 1 12 3; + #X connect 17 0 14 0; + #X connect 17 1 18 0; + #X connect 18 0 15 0; + #X connect 18 1 15 1; + #X connect 18 3 16 0; + #X connect 18 4 16 1; + #X connect 21 0 17 1; Index: gem_links.pd =================================================================== RCS file: /cvsroot/pure-data/externals/nusmuk/msd2D/editor/gem_links.pd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gem_links.pd 5 May 2005 15:12:45 -0000 1.4 --- gem_links.pd 11 May 2005 09:09:47 -0000 1.5 *************** *** 7,17 **** #X obj 156 432 curve 2; #X obj 178 210 pack 0 0 0; ! #X obj 255 189 pack 0 0 0; ! #X obj 141 62 unpack 0 0 0 0 0; ! #X obj 248 322 inlet; #X obj 109 364 spigot; ! #X msg 247 300 1; ! #X obj 247 275 loadbang; ! #X connect 0 0 8 0; #X connect 1 0 3 1; #X connect 2 0 5 0; --- 7,42 ---- #X obj 156 432 curve 2; #X obj 178 210 pack 0 0 0; ! #X obj 269 213 pack 0 0 0; ! #X obj 141 97 unpack 0 0 0 0 0; ! #X obj 282 324 inlet; #X obj 109 364 spigot; ! #X msg 281 302 1; ! #X obj 281 277 loadbang; ! #N canvas 0 0 450 300 demux 0; ! #X obj 91 69 inlet; ! #X obj 255 73 inlet; ! #X obj 223 106 select 0; ! #X obj 73 213 spigot 1; ! #X obj 165 219 spigot 0; ! #X obj 141 188 unpack 1 0; ! #X obj 96 255 outlet; ! #X obj 173 257 outlet; ! #X msg 174 140 1 0; ! #X msg 216 140 0 1; ! #X connect 0 0 3 0; ! #X connect 0 0 4 0; ! #X connect 1 0 2 0; ! #X connect 2 0 8 0; ! #X connect 2 1 9 0; ! #X connect 3 0 6 0; ! #X connect 4 0 7 0; ! #X connect 5 0 3 1; ! #X connect 5 1 4 1; ! #X connect 8 0 5 0; ! #X connect 9 0 5 0; ! #X restore 141 64 pd demux; ! #X obj 192 37 r MSD-TYPE; ! #X obj 280 97 unpack 0 0 0 0 0 0 0; ! #X connect 0 0 13 0; #X connect 1 0 3 1; #X connect 2 0 5 0; *************** *** 29,30 **** --- 54,64 ---- #X connect 11 0 10 1; #X connect 12 0 11 0; + #X connect 13 0 8 0; + #X connect 13 1 15 0; + #X connect 14 0 13 1; + #X connect 15 1 4 0; + #X connect 15 2 6 1; + #X connect 15 3 6 2; + #X connect 15 4 7 0; + #X connect 15 5 7 1; + #X connect 15 6 7 2; --- NEW FILE: msd-editor.pd --- #N canvas 33 84 866 562 10; #N canvas 0 64 1222 870 data 0; #X restore 719 42 pd data; #X obj 24 523 structures; #X obj 30 314 bng 24 250 50 0 empty \$0-generate generate 0 -6 0 8 -24198 -1 -1; #X text 25 499 Data Struct Definitions; #N canvas 460 399 104 45 save 0; #X obj 2 3 cnv 15 100 40 empty empty empty 20 12 0 14 -228992 -66577 0; #X obj 4 17 bng 20 250 50 0 empty empty load 0 -6 0 8 -258699 -1 -1 ; #X obj 34 17 bng 20 250 50 0 empty empty saveas 0 -6 0 8 -24198 -1 -1; #X obj 101 60 savepanel; #X obj 50 168 s pd-data; #X msg 101 115 write \$1; #X obj 20 91 openpanel; #X msg 20 115 read \$1; [...1025 lines suppressed...] #X connect 22 1 2 0; #X coords 0 0 1 1 77 44 1; #X restore 703 208 pd save; #X text 683 188 Save MSD messages:; #X obj 92 315 tgl 24 0 MSD-TYPE \$0-MSD-TYPE 3-D 0 -6 0 8 -233017 -1 -1 1 1; #X text 120 320 MSD-TYPE; #X obj 25 14 msd_append; #X text 240 304 Press "generate" to generate messages to the msd object and create the physical model inside. You can select which type of msd* to use as well: msd2D or msd3D. With 3-D \, the Z-coordinate will default to a value of zero.; #X connect 2 0 6 0; #X connect 7 0 8 0; #X connect 7 1 9 0; #X connect 8 0 7 0; #X connect 9 0 7 1; #X connect 11 0 7 2; #X connect 24 0 23 0; #X connect 25 0 23 0;

1 0

pd/src m_sched.c,1.5.4.27,1.5.4.28
by Tim Blechmann 11 May '05

11 May '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28191 Modified Files: Tag: devel_0_38 m_sched.c Log Message: improved syslock handling, especially for idle callbacks Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.27 retrieving revision 1.5.4.28 diff -C2 -d -r1.5.4.27 -r1.5.4.28 *** m_sched.c 8 May 2005 23:14:35 -0000 1.5.4.27 --- m_sched.c 10 May 2005 23:42:34 -0000 1.5.4.28 *************** *** 406,413 **** ((double)sys_schedblocksize) / sys_dacsr; - #ifdef THREAD_LOCKING /* T.Grill - lock mutex */ sys_lock(); - #endif sys_clearhist(); --- 406,411 ---- *************** *** 488,500 **** if (timeforward != SENDDACS_SLEPT) { - #ifdef THREAD_LOCKING - /* T.Grill - enter idle phase -> unlock thread lock */ - sys_unlock(); - #endif run_idle_callbacks(sys_sleepgrain); - #ifdef THREAD_LOCKING - /* T.Grill - leave idle phase -> lock thread lock */ - sys_lock(); - #endif } } --- 486,490 ---- *************** *** 510,515 **** if (sys_pollgui()) didsomething = 1; ! /* test for idle; if so, do graphics updates. */ if (!didsomething) --- 500,509 ---- if (sys_pollgui()) + { + /* tb: allow the audio callback to run */ + sys_unlock(); + sys_lock(); didsomething = 1; ! } /* test for idle; if so, do graphics updates. */ if (!didsomething) *************** *** 517,539 **** sched_pollformeters(); } - - #ifdef THREAD_LOCKING - sys_unlock(); - #endif - run_idle_callbacks(sys_sleepgrain); ! #ifdef THREAD_LOCKING ! sys_lock(); ! #endif } sys_keepsched = 1; } - - #ifdef THREAD_LOCKING - /* T.Grill - done */ sys_unlock(); - #endif - return (0); } --- 511,521 ---- sched_pollformeters(); } ! run_idle_callbacks(sys_sleepgrain); } sys_keepsched = 1; } sys_unlock(); return (0); } *************** *** 565,568 **** --- 547,557 ---- int sys_timedlock(int microsec) { + #if 0 /* this would be the clean solution, why doesn't it work??? */ + struct timespec timeout; + timeout.tv_sec = 0; + timeout.tv_nsec = 1000 * microsec; + + return pthread_mutex_timedlock(&sys_mutex, &timeout); + #else int count = microsec * 0.001; int ret; *************** *** 578,581 **** --- 567,571 ---- } return ETIMEDOUT; + #endif } /* tb } */ *************** *** 639,646 **** static t_sched_callback *ringbuffer_head; static void run_idle_callbacks(int microsec) { t_sched_callback * new_callback; ! double stop = sys_getrealtime()*1.e6 + (double)microsec; /* append idle callback to ringbuffer */ --- 629,641 ---- static t_sched_callback *ringbuffer_head; + static void run_idle_callbacks(int microsec) { t_sched_callback * new_callback; ! double stop; ! ! sys_unlock(); ! ! stop = sys_getrealtime()*1.e6 + (double)microsec; /* append idle callback to ringbuffer */ *************** *** 672,677 **** do { ! int status = (idle_callback->function)(idle_callback->argv); ! switch (status) { --- 667,675 ---- do { ! int status; ! sys_lock(); ! status = (idle_callback->function)(idle_callback->argv); ! sys_unlock(); ! switch (status) { *************** *** 708,711 **** --- 706,710 ---- else sys_microsleep(microsec); + sys_lock(); } /* } tb */

1 0

externals/miXed/test/pddp pddp.css, NONE, 1.1 pddplink-test-01.html, NONE, 1.1 pddplink-test-01.pd, NONE, 1.1 pddplink-test-01.xml, NONE, 1.1 pddplink-test-02.html, NONE, 1.1 pddplink-test-02.pd, NONE, 1.1 pddplink-test-02.xml, NONE, 1.1 test.bg.jpg, NONE, 1.1 toonepage, NONE, 1.1 topdf, NONE, 1.1
by Krzysztof Czaja 10 May '05

10 May '05

Update of /cvsroot/pure-data/externals/miXed/test/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15441/test/pddp Added Files: pddp.css pddplink-test-01.html pddplink-test-01.pd pddplink-test-01.xml pddplink-test-02.html pddplink-test-02.pd pddplink-test-02.xml test.bg.jpg toonepage topdf Log Message: toxy alpha17 and pddp alpha1 (see notes.txt for toxy, pddp and shared) --- NEW FILE: toonepage --- #!/bin/bash usage () { cat << EOF usage: toonepage <pddpsource>.xml EOF } [ "$#" == 0 ] && { usage; exit 1; } SOURCE_NAME="$(basename $1)" SOURCE_STUB="$(basename $SOURCE_NAME .xml)" [ $SOURCE_STUB == $SOURCE_NAME ] && { usage; exit 1; } xmllint >/dev/null --xinclude --postvalid $1 xsltproc --nonet --xinclude \ --stringparam html.stylesheet pddp.css \ -o "$SOURCE_STUB.html" \ /usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl \ $1 --- NEW FILE: pddp.css --- body { color: brown ; background: gray url(test.bg.jpg) ; margin-top: 10 ; font-family: Helvetica, sans-serif ; font-size: larger ; } pre.programlisting { display: table ; background-color: #EEEEEE ; padding: 2pt ; border-style: solid ; border-width: 1pt ; border-color: #000000 ; border-spacing: 3pt ; margin: 3pt ; } --- NEW FILE: pddplink-test-01.pd --- #N canvas 232 221 450 300 12; #X obj 61 83 pddplink pddplink-test-01.html; #X text 21 12 first entry; #X text 59 47 linking to a local html page:; #X text 58 130 linking to a remote html page:; #X obj 60 166 pddplink http://puredata.info; #X obj 59 254 pddplink pddplink-test-02.pd; #X text 57 218 linking to another local patch:; --- NEW FILE: pddplink-test-02.pd --- #N canvas 332 321 450 300 12; #X obj 61 83 pddplink pddplink-test-02.html; #X text 21 12 second entry; #X text 59 47 linking to a local html page:; #X text 58 130 linking to a remote html page:; #X obj 60 166 pddplink http://puredata.info; #X obj 59 254 pddplink pddplink-test-01.pd; #X text 57 218 linking to another local patch:; --- NEW FILE: pddplink-test-01.html --- <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>first simple test</title><link rel="stylesheet" href="pddp.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.66.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2447708"></a>first simple test</h2></div></div><hr></div><p>test patch is here: <a href="pddplink-test-01.pd" target="_top">pddplink-test-01.pd</a></p><p>The above link works if you opened this page from Pd, for example, by clicking on an object </p><pre class="programlisting"><span><b class="command">pddplink</b></span> pddplink-test-01.html</pre><p> </p><p>Pd links should also work in all pages opened through any other, initiating, Pd-opened page.</p><p>Another simple test page is here: <a href="pddplink-test-02.html" target="_top">pddplink-test-02.html</a></p></div></body></html> --- NEW FILE: pddplink-test-01.xml --- <?xml version="1.0"?> <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <sect1> <title>first simple test</title> <para>test patch is here: <ulink url="pddplink-test-01.pd"/></para> <para>The above link works if you opened this page from Pd, for example, by clicking on an object <programlisting><command>pddplink</command> pddplink-test-01.html</programlisting> </para> <para>Pd links should also work in all pages opened through any other, initiating, Pd-opened page.</para> <para>Another simple test page is here: <ulink url="pddplink-test-02.html"/></para> </sect1> --- NEW FILE: test.bg.jpg --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pddplink-test-02.html --- <html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>second simple test</title><link rel="stylesheet" href="pddp.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.66.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="id2447708"></a>second simple test</h2></div></div><hr></div><p>test patch is here: <a href="pddplink-test-02.pd" target="_top">pddplink-test-02.pd</a></p><p>The above link works if you opened this page from Pd, for example, by clicking on an object </p><pre class="programlisting"><span><b class="command">pddplink</b></span> pddplink-test-02.html</pre><p> </p><p>Pd links should also work in all pages opened through any other, initiating, Pd-opened page.</p><p>Another simple test page is here: <a href="pddplink-test-01.html" target="_top">pddplink-test-01.html</a></p></div></body></html> --- NEW FILE: pddplink-test-02.xml --- <?xml version="1.0"?> <!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> <sect1> <title>second simple test</title> <para>test patch is here: <ulink url="pddplink-test-02.pd"/></para> <para>The above link works if you opened this page from Pd, for example, by clicking on an object <programlisting><command>pddplink</command> pddplink-test-02.html</programlisting> </para> <para>Pd links should also work in all pages opened through any other, initiating, Pd-opened page.</para> <para>Another simple test page is here: <ulink url="pddplink-test-01.html"/></para> </sect1> --- NEW FILE: topdf --- #!/bin/bash usage () { cat << EOF usage: topdf <pddpsource>.xml EOF } [ "$#" == 0 ] && { usage; exit 1; } SOURCE_NAME="$(basename $1)" SOURCE_STUB="$(basename $SOURCE_NAME .xml)" [ $SOURCE_STUB == $SOURCE_NAME ] && { usage; exit 1; } xmllint >/dev/null --xinclude --postvalid $1 xsltproc --nonet --xinclude \ -o "$SOURCE_STUB.fo" \ /usr/share/xml/docbook/stylesheet/nwalsh/fo/docbook.xsl \ $1 # FIXME need to run this twice, it should be check-wrapped too pdfxmltex "$SOURCE_STUB.fo"

1 0

externals/miXed/pddp Makefile, NONE, 1.1 Makefile.objects, NONE, 1.1 Makefile.sources, NONE, 1.1 build_counter, NONE, 1.1 notes.txt, NONE, 1.1 pddp-all.exclude, NONE, 1.1 pddp-help.include, NONE, 1.1 pddp-shared.include, NONE, 1.1 pddp-test.exclude, NONE, 1.1 pddp-vicious.exclude, NONE, 1.1 pddpboot.tcl, NONE, 1.1 pddpclient.tcl, NONE, 1.1 pddplink.c, NONE, 1.1 pddpserver.tcl, NONE, 1.1
by Krzysztof Czaja 10 May '05

10 May '05

Update of /cvsroot/pure-data/externals/miXed/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15441/pddp Added Files: Makefile Makefile.objects Makefile.sources build_counter notes.txt pddp-all.exclude pddp-help.include pddp-shared.include pddp-test.exclude pddp-vicious.exclude pddpboot.tcl pddpclient.tcl pddplink.c pddpserver.tcl Log Message: toxy alpha17 and pddp alpha1 (see notes.txt for toxy, pddp and shared) --- NEW FILE: pddp-test.exclude --- *~ import-result.pd import-debug.pd temporary temporary/* --- NEW FILE: pddp-all.exclude --- *~ *.o *.gz *.html *.out ref ref/* dumpsetups --- NEW FILE: pddpboot.tcl --- #!/bin/sh # \ exec tclsh "$0" -- "$@" # Synopsis # test run: # ./pddpboot.tcl [root [port [path]]] # from Pd: # source pddpboot.tcl # ::pddp::srvUse root (or ::pddp::srvStart root [port]) # ::pddp::cliOpen path # ... (more "::pddp::cliOpen" calls) ... # ::pddp::srvStop if {[namespace exists ::pddp]} { ;# created by pddplink's setup puts stderr "Booting pddp" set ::pddp::testrun 0 } else { puts stderr "Booting pddp, test run..." namespace eval ::pddp { variable testrun 1 } } puts stderr "current directory: [pwd]" source pddpclient.tcl source pddpserver.tcl if {[info exists ::pddp::theDir]} { puts stderr "restoring directory: $::pddp::theDir" cd $::pddp::theDir unset ::pddp::theDir } --- NEW FILE: Makefile.sources --- TYPES = PDDPLINK PDDPLINK_SOURCES = pddplink.c --- NEW FILE: Makefile --- ROOT_DIR = .. redefault: pddpboot default pddpboot: $(ROOT_DIR)/bin/pddpboot.tcl \ $(ROOT_DIR)/bin/pddpclient.tcl $(ROOT_DIR)/bin/pddpserver.tcl $(ROOT_DIR)/bin/%.tcl: %.tcl cp $< $@ include $(ROOT_DIR)/Makefile.common --- NEW FILE: pddplink.c --- /* Copyright (c) 2005 krzYszcz and others. * For information on usage and redistribution, and for a DISCLAIMER OF ALL * WARRANTIES, see the file, "LICENSE.txt," in this distribution. */ #include <stdio.h> #include <string.h> #include "m_pd.h" #include "m_imp.h" /* FIXME need access to c_externdir... */ #include "g_canvas.h" #include "common/loud.h" #include "build_counter" #ifdef KRZYSZCZ //#define PDDPLINK_DEBUG #endif enum { PDDPLINK_PD, PDDPLINK_HTML }; /* LATER add others */ typedef struct _pddplink { t_object x_ob; t_glist *x_glist; int x_isboxed; t_symbol *x_dirsym; t_symbol *x_ulink; t_atom x_openargs[2]; int x_linktype; int x_ishit; } t_pddplink; static t_class *pddplink_class; /* FIXME need access to glob_pdobject... */ static t_pd *pddplink_pdtarget(t_pddplink *x) { t_pd *pdtarget = gensym("pd")->s_thing; if (pdtarget && !strcmp(class_getname(*pdtarget), "pd")) return (pdtarget); else return ((t_pd *)x); /* internal error */ } static void pddplink_anything(t_pddplink *x, t_symbol *s, int ac, t_atom *av) { if (x->x_ishit) { startpost("pddplink: internal error (%s", (s ? s->s_name : "")); postatom(ac, av); post(")"); } } static void pddplink_click(t_pddplink *x, t_floatarg xpos, t_floatarg ypos, t_floatarg shift, t_floatarg ctrl, t_floatarg alt) { x->x_ishit = 1; switch (x->x_linktype) { case PDDPLINK_PD: typedmess(pddplink_pdtarget(x), gensym("open"), 2, x->x_openargs); break; case PDDPLINK_HTML: sys_vgui("after 0 {::pddp::cliOpen %s}\n", x->x_ulink->s_name); break; } x->x_ishit = 0; } #ifdef PDDPLINK_DEBUG static void pddplink_debug(t_pddplink *x) { } #endif static void pddplink_free(t_pddplink *x) { } static void *pddplink_new(t_symbol *s1, t_symbol *s2) { t_pddplink *x = (t_pddplink *)pd_new(pddplink_class); t_symbol *dirsym; x->x_glist = canvas_getcurrent(); x->x_isboxed = (s2 == gensym("box")); x->x_dirsym = canvas_getdir(x->x_glist); /* FIXME */ if (!s1 || s1 == &s_) { x->x_linktype = PDDPLINK_HTML; x->x_ulink = gensym("index.html"); } else { int len = strlen(s1->s_name); if (len > 3 && !strcmp(s1->s_name + len - 3, ".pd")) x->x_linktype = PDDPLINK_PD; else x->x_linktype = PDDPLINK_HTML; x->x_ulink = s1; } SETSYMBOL(&x->x_openargs[0], x->x_ulink); SETSYMBOL(&x->x_openargs[1], x->x_dirsym); x->x_ishit = 0; if (x->x_isboxed) { inlet_new((t_object *)x, (t_pd *)x, 0, 0); outlet_new((t_object *)x, &s_anything); } if (x->x_linktype == PDDPLINK_HTML) sys_vgui("after 0 {::pddp::srvUse %s}\n", x->x_dirsym->s_name); return (x); } void pddplink_setup(void) { t_symbol *dirsym; post("this is pddplink %s, %s %s build...", PDDP_VERSION, loud_ordinal(PDDP_BUILD), PDDP_RELEASE); pddplink_class = class_new(gensym("pddplink"), (t_newmethod)pddplink_new, (t_method)pddplink_free, sizeof(t_pddplink), CLASS_NOINLET | CLASS_PATCHABLE, A_DEFSYM, A_DEFSYM, 0); class_addanything(pddplink_class, pddplink_anything); class_addmethod(pddplink_class, (t_method)pddplink_click, gensym("click"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); #ifdef PDDPLINK_DEBUG class_addmethod(pddplink_class, (t_method)pddplink_debug, gensym("debug"), 0); #endif dirsym = pddplink_class->c_externdir; /* FIXME */ sys_vgui("namespace eval ::pddp {variable theDir [pwd]}; cd %s\n", dirsym->s_name); sys_gui("after 0 {source pddpboot.tcl}\n"); } --- NEW FILE: pddpserver.tcl --- # pddpserver.tcl # Synopsis # not to be run by itself (see pddpboot.tcl) # based on: # Simple Sample httpd/1.[01] server # Stephen Uhler (c) 1996-1997 Sun Microsystems # http://cvs.sourceforge.net/viewcvs.py/tclhttpd/tclhttpd/bin/mini/mini1.1.tcl # modified by krzYszcz (2005): # putting per-server data and all commands in a namespace "::pddp" # supporting sourcing from within Pd, through the "pddpboot.tcl" wrapper # inserting the .pd handler # lots of other changes, too many to list here (run "diff" if curious...) if {![namespace exists ::pddp]} { puts stderr "Error: invalid invocation of pddpserver (boot pddp first)" puts stderr "exiting..." exit 1 } if {$::pddp::testrun} { ;# true if sourced from standalone "pddpboot.tcl" puts stderr "Loading pddpserver, test run..." proc bgerror {msg} { global errorInfo puts stderr "bgerror: $msg\n$errorInfo" } } else { puts stderr "Loading pddpserver" catch {console show} } namespace eval ::pddp { variable thePort 8080 variable theState variable theMimeTypes variable theErrors variable theErrorFormat # "theState" contains the server state: # root: the root of the document directory # default: default document name # listen: the main listening socket id # naccepts: a count of accepted connections so far # maxtime: the max time (msec) allowed to complete an http request # maxused: the max # of requests for a socket array set theState { root "" default index.html listen "" naccepts 0 nrequests 0 nerrors 0 maxtime 600000 maxused 25 bufsize 32768 } set theState(root) $env(HOME) array set theMimeTypes { {} text/plain .txt text/plain .html text/html .gif image/gif .jpg image/jpeg .pd text/html } # HTTP/1.[01] error codes (the ones we use) array set theErrors { 204 {No Content} 400 {Bad Request} 404 {Not Found} 405 {Method Not Allowed} 408 {Request Timeout} 411 {Length Required} 419 {Expectation Failed} 500 {Internal Server Error} 503 {Service Unavailable} 504 {Service Temporarily Unavailable} 505 {HTTP Version Not Supported} } # Generic error response set theErrorFormat { <title>Error: %1$s</title> Got the error: <b>%2$s</b><br> while trying to obtain <b>%3$s</b> } } proc ::pddp::srvUse {{root {}} {port 8080}} { variable theState if {[string length $theState(listen)]} { if {[string length $root] && ![string equal $root $theState(root)]} { srvLog $theState(listen) Warning "Redirection attempt for $root" } } else { srvStart $root $port } } # Start the server by listening for connections on the desired port. proc ::pddp::srvStart {{root {}} {port 8080}} { variable thePort variable theState puts stderr "Starting pddp server on [info hostname]" if {[string length $root]} { set theState(root) $root } # we do not handle multiple pddpservers, LATER rethink srvStop array set theState [list naccepts 0 nrequests 0 nerrors 0] for { set thePort $port } {$thePort < 32767 } {incr thePort } { if {[catch {set theState(listen) \ [socket -server ::pddp::srvAccept $thePort]} res]} { if {$thePort == 0} { # FIXME this is a critical error set thePort 8080 } } else { break } } if {$thePort == 32767} { srvLog none Error "Could not find port available for listening" } else { if {$thePort == 0} { set thePort [lindex [fconfigure $theState(listen) -sockname] 2] } srvLog $theState(listen) Port $thePort srvLog $theState(listen) Root directory \"$root\" } after 120 update ;# FIXME might be needed on windows they say, test there return $thePort } proc ::pddp::srvStop {} { variable thePort variable theState if {[string length $theState(listen)]} { if {[catch {close $theState(listen)} res]} { srvLog $theState(listen) Warning [list $res while closing socket] } else { srvLog $theState(listen) Closed. } set theState(listen) "" update } } # Accept a new connection from the server and set up a handler # to read the request from the client. proc ::pddp::srvAccept {sock ipaddr port} { variable theState variable theSockData$sock # reject remote requests, LATER revisit if {[string equal $ipaddr "127.0.0.1"]} { incr theState(naccepts) srvReset $sock $theState(maxused) srvLog $sock Connect $ipaddr $port } else { srvLog $sock Warning "rejecting remote connection request from $ipaddr" srvSockDone $sock 1 } } # Initialize or reset the socket state proc ::pddp::srvReset {sock nlft} { variable theState upvar 0 ::pddp::theSockData$sock sockData array set sockData [list state start linemode 1 version 0 nleft $nlft] set sockData(cancel) \ [after $theState(maxtime) [list srvTimeout $sock]] fconfigure $sock -blocking 0 -buffersize $theState(bufsize) \ -translation {auto crlf} fileevent $sock readable [list ::pddp::srvRead $sock] } # Read data from a client request # 1) read the request line # 2) read the mime headers # 3) read the additional data (if post && content-length not satisfied) proc ::pddp::srvRead {sock} { variable theState upvar 0 ::pddp::theSockData$sock sockData # Use line mode to read the request and the mime headers if {$sockData(linemode)} { set readCount [gets $sock line] set state [string compare $readCount 0],$sockData(state) switch -glob -- $state { 1,start { if {[regexp {(HEAD|POST|GET) ([^?]+)\??([^ ]*) HTTP/1.([01])} \ $line x sockData(proto) sockData(url) \ sockData(query) sockData(version)]} { set sockData(state) mime incr theState(nrequests) srvLog $sock Request $sockData(nleft) $line } else { srvError $sock 400 $line } } 0,start { srvLog $sock Warning "Initial blank line fetching request" } 1,mime { if {[regexp {([^:]+):[ ]*(.*)} $line {} key value]} { set key [string tolower $key] set sockData(key) $key if {[info exists sockData(mime,$key)]} { append sockData(mime,$key) ", $value" } else { set sockData(mime,$key) $value } } elseif {[regexp {^[ ]+(.+)} $line {} value] && \ [info exists sockData(key)]} { append sockData(mime,$sockData($key)) " " $value } else { srvError $sock 400 $line } } 0,mime { if {$sockData(proto) == "POST" && \ [info exists sockData(mime,content-length)]} { set sockData(linemode) 0 set sockData(count) $sockData(mime,content-length) if {$sockData(version) && \ [info exists sockData(mime,expect)]} { if {$sockData(mime,expect) == "100-continue"} { puts $sock "100 Continue HTTP/1.1\n" flush $sock } else { srvError $sock 419 $sockData(mime,expect) } } fconfigure $sock -translation {binary crlf} } elseif {$sockData(proto) != "POST"} { srvRespond $sock } else { srvError $sock 411 "Confusing mime headers" } } -1,* { if {[eof $sock]} { srvLog $sock Error "Broken connection fetching request" srvSockDone $sock 1 } else { puts stderr "Partial read, retrying" } } default { srvError $sock 404 "Invalid http state: $state,[eof $sock]" } } # Use counted mode to get the post data } elseif {![eof $sock]} { append sockData(postdata) [read $sock $sockData(count)] set sockData(count) [expr {$sockData(mime,content-length) - \ [string length $sockData(postdata)]}] if {$sockData(count) == 0} { srvRespond $sock } } else { srvLog $sock Error "Broken connection reading POST data" srvSockDone $sock 1 } } # Done with the socket, either close it, or set up for next fetch # sock: The socket I'm done with # doclose: If true, close the socket, otherwise set up for reuse proc ::pddp::srvSockDone {sock doclose} { variable theState upvar 0 ::pddp::theSockData$sock sockData after cancel $sockData(cancel) set nleft [incr sockData(nleft) -1] unset sockData if {$doclose} { close $sock } else { srvReset $sock $nleft } return "" } # A timeout happened proc ::pddp::srvTimeout {sock} { srvError $sock 408 } # FIXME test if "path" has its patch window already open... proc ::pddp::srvPdHandler {sock path} { set dir [file dirname $path] set tail [file tail $path] if {[catch {pd [concat pd open $tail $dir \;]}]} { srvError $sock 504 } else { srvError $sock 204 # FIXME raise; focus (test on windows) } } # Handle file system queries. This is a place holder for a more # generic dispatch mechanism. proc ::pddp::srvRespond {sock} { variable theState variable theUrlCache upvar 0 ::pddp::theSockData$sock sockData regsub {(^http://[^/]+)?} $sockData(url) {} url if {[info exists theUrlCache($url)]} { set mypath $theUrlCache($url) } else { set mypath [srvUrl2File $theState(root) $url] if {[file isdirectory $mypath]} { append mypath / $theState(default) } set theUrlCache($url) $mypath } if {[string length $mypath] == 0} { srvError $sock 400 } elseif {![file readable $mypath]} { if {[string equal [file tail $mypath] "favicon.ico"]} { srvError $sock 204 ;# FIXME design something } else { srvError $sock 404 $mypath } } else { set ext [file extension $mypath] if {[string equal $ext ".pd"]} { srvPdHandler $sock $mypath return } puts $sock "HTTP/1.$sockData(version) 200 Data follows" puts $sock "Date: [srvGetDate [clock seconds]]" puts $sock "Last-Modified: [srvGetDate [file mtime $mypath]]" puts $sock "Content-Type: [srvContentType $ext]" puts $sock "Content-Length: [file size $mypath]" ## Should also close socket if recvd connection close header set doclose [expr {$sockData(nleft) == 0}] if {$doclose} { puts $sock "Connection close:" } elseif {$sockData(version) == 0 && \ [info exists sockData(mime,connection)]} { if {$sockData(mime,connection) == "Keep-Alive"} { set doclose 0 puts $sock "Connection: Keep-Alive" } } puts $sock "" flush $sock if {$sockData(proto) != "HEAD"} { set in [open $mypath] fconfigure $sock -translation binary fconfigure $in -translation binary fcopy $in $sock -command \ [list ::pddp::srvCopyDone $in $sock $doclose] } else { srvSockDone $sock $doclose } } } # Callback when file is done being output to client # in: The fd for the file being copied # sock: The client socket # doclose: close the socket if true # bytes: The # of bytes copied # error: The error message (if any) proc ::pddp::srvCopyDone {in sock doclose bytes {error {}}} { close $in srvLog $sock Done $bytes bytes srvSockDone $sock $doclose } # Convert the file suffix into a mime type. proc ::pddp::srvContentType {ext} { variable theMimeTypes set type text/plain catch {set type $theMimeTypes($ext)} return $type } # Respond with an error reply # sock: The socket handle to the client # code: The httpd error code # args: Additional information for error logging proc ::pddp::srvError {sock code args} { variable theState variable theErrors variable theErrorFormat upvar 0 ::pddp::theSockData$sock sockData append sockData(url) "" incr theState(nerrors) set message [format $theErrorFormat $code $theErrors($code) $sockData(url)] append head "HTTP/1.$sockData(version) $code $theErrors($code)" \n append head "Date: [srvGetDate [clock seconds]]" \n append head "Connection: close" \n append head "Content-Length: [string length $message]" \n # Because there is an error condition, the socket may be "dead" catch { fconfigure $sock -translation crlf puts -nonewline $sock $head\n$message flush $sock } reason srvSockDone $sock 1 if {$code < 300} {set status Status} else {set status Error} srvLog $sock $status $code $theErrors($code) $args $reason } # Generate a date string in HTTP format. proc ::pddp::srvGetDate {seconds} { return [clock format $seconds -format {%a, %d %b %Y %T %Z}] } # Log an Httpd transaction. # This should be replaced as needed. proc ::pddp::srvLog {sock args} { puts stderr "pddp log ($sock): $args" } # Convert a url into a pathname. (UNIX version only) # This is probably not right, and belongs somewhere else. # - Remove leading http://... if any # - Collapse all /./ and /../ constructs # - expand %xx sequences -> disallow "/"'s and "."'s due to expansions proc ::pddp::srvUrl2File {root url} { regsub -all {//+} $url / url ;# collapse multiple /'s while {[regsub -all {/\./} $url / url]} {} ;# collapse /./ while {[regsub -all {/\.\.(/|$)} $url /\x81\\1 url]} {} ;# mark /../ while {[regsub "/\[^/\x81]+/\x81/" $url / url]} {} ;# collapse /../ if {![regexp "\x81|%2\[eEfF]" $url]} { ;# invalid /../, / or . ? return $root[srvCgiMap $url] } else { return "" } } # Decode url-encoded strings. proc ::pddp::srvCgiMap {data} { regsub -all {([][$\\])} $data {\\\1} data regsub -all {%([0-9a-fA-F][0-9a-fA-F])} $data {[format %c 0x\1]} data return [subst $data] } if {$::pddp::testrun} { ;# true if tested as a standalone script if {$argc > 1} { set root [lindex $argv 1] set port [lindex $argv 2] if {![string is integer -strict $port]} { set port 8080 } } else { set root $env(HOME) set port 8080 } ::pddp::srvStart $root $port vwait forever } --- NEW FILE: notes.txt --- TODO for pddp * pddplink: . standardize server's root directory (use $help_directory from pd.tk?) . nonboxed version DONE for pddp alpha1 * prototype versions of the external "pddplink" and two pd-gui extensions "pddpserver.tcl", "pddpclient.tcl" --- NEW FILE: pddp-help.include --- --- NEW FILE: build_counter --- #define PDDP_VERSION "0.1" #define PDDP_RELEASE "alpha" #define PDDP_BUILD 1 #if 0 PDDP_SNAPSHOT = 0.1-alpha1 #endif --- NEW FILE: Makefile.objects --- PDDPLINK_OBJECTS = \ common/loud.o \ common/os.o --- NEW FILE: pddp-shared.include --- shared/shared.h shared/common/loud.c shared/common/loud.h shared/common/os.c shared/common/os.h --- NEW FILE: pddpclient.tcl --- # pddpclient.tcl # Synopsis # not to be run by itself (see pddpboot.tcl) if {![namespace exists ::pddp]} { puts stderr "Error: invalid invocation of pddpclient (boot pddp first)" puts stderr "exiting..." exit 1 } if {$::pddp::testrun} { ;# true if sourced from standalone "pddpboot.tcl" puts stderr "Loading pddpclient, test run..." if {$argc > 3} { set path [lindex $argv 3] if {[string length $path]} { puts stderr "Scheduling \"$path\" for opening" after idle ::pddp::cliOpen $path } unset path } } else { puts stderr "Loading pddpclient" } namespace eval ::pddp { variable theBrowserCommand switch -- $::tcl_platform(platform) { unix { switch -- $tcl_platform(os) { Darwin { set theBrowserCommand "sh -c open %s" } Linux { foreach candidate \ {firefox mozilla galeon konqueror netscape lynx} { set browser [lindex [auto_execok $candidate] 0] if {[string length $browser]} { set theBrowserCommand "$browser %s &" break } } } } } windows { # should not this be just: [auto_execok start]? set theBrowserCommand \ "rundll32 url.dll,FileProtocolHandler file:%s &" } } } proc ::pddp::cliError {err} { puts stderr "Error in pddpclient: $err" } proc ::pddp::cliOpen {path} { if {[string first "://" $path] < 1} { if {[info exists ::pddp::thePort]} { set path "http://localhost:$::pddp::thePort/$path" } else { cliError "pddpserver not running" return } } variable theBrowserCommand if {[string length $theBrowserCommand]} { set command [format $theBrowserCommand $path] puts stderr "pddpclient: open $command" if {[catch {eval [list exec] $command} err]} { if {[lindex $::errorCode 0] eq "CHILDSTATUS"} { cliError "$err (child status [lindex $::errorCode 2])" } else { cliError $err } } } else { cliError "browser unavailable" } } --- NEW FILE: pddp-vicious.exclude --- *~ old old/*

1 0

externals/miXed/ViCious/pddp makefile, NONE, 1.1 objects, NONE, 1.1 snapfiles, NONE, 1.1
by Krzysztof Czaja 10 May '05

10 May '05

Update of /cvsroot/pure-data/externals/miXed/ViCious/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15441/ViCious/pddp Added Files: makefile objects snapfiles Log Message: toxy alpha17 and pddp alpha1 (see notes.txt for toxy, pddp and shared) --- NEW FILE: snapfiles --- SNAPFILES = \ miXed\bin\pddplink.dll \ miXed\bin\pddpboot.tcl \ miXed\bin\pddpclient.tcl \ miXed\bin\pddpserver.tcl \ miXed\ViCious\pddp\makefile \ miXed\ViCious\pddp\objects \ miXed\ViCious\pddp\snapfiles \ miXed\LICENSE.txt \ miXed\test\pddp\*.* --- NEW FILE: objects --- PDDPLINK_OBJECTS = $(SRCDIR)\pddplink.obj \ $(SHAREDDIR)\common\loud.obj \ $(SHAREDDIR)\common\os.obj --- NEW FILE: makefile --- current: pddp .SUFFIXES: .dll .obj ROOTDIR = ..\..\.. SRCDIR = $(ROOTDIR)\miXed\pddp BINDIR = $(ROOTDIR)\miXed\bin SHAREDDIR = $(ROOTDIR)\miXed\shared EXTDIR = e:\PureData\externals PDDIR = e:\PureData\pd VCLIBDIR = "e:\Program Files\Microsoft Visual Studio\Vc98\lib" ZIPCOMMAND = d:\dosowe\arc\info-zip\zip INCLUDES = /I. /I$(SHAREDDIR) /I$(PDDIR)\src CFLAGS = /W3 /WX /DNT /DMSW /DPD /nologo LIBS = $(VCLIBDIR)\libc.lib \ $(VCLIBDIR)\oldnames.lib \ $(VCLIBDIR)\wsock32.lib \ $(VCLIBDIR)\kernel32.lib \ $(VCLIBDIR)\uuid.lib \ $(PDDIR)\bin\pd.lib !INCLUDE objects !INCLUDE snapfiles !INCLUDE $(SRCDIR)\build_counter pddp: pddpboot pddplink.dll @cd $(ROOTDIR) @$(ZIPCOMMAND) pddp-$(PDDP_SNAPSHOT)-dll.zip $(SNAPFILES) pddpboot: -@copy $(SRCDIR)\pddpboot.tcl $(EXTDIR) -@copy $(SRCDIR)\pddpclient.tcl $(EXTDIR) -@copy $(SRCDIR)\pddpserver.tcl $(EXTDIR) -@copy $(SRCDIR)\pddpboot.tcl $(BINDIR) -@copy $(SRCDIR)\pddpclient.tcl $(BINDIR) -@copy $(SRCDIR)\pddpserver.tcl $(BINDIR) pddplink.dll: $(PDDPLINK_OBJECTS) -link /dll /out:$@ $(LIBS) $** /export:$(@:.dll=_setup) -@copy $@ $(EXTDIR) -@move $@ $(BINDIR) -del $(@:.dll=.exp) -del $(@:.dll=.lib) .c.obj: ; cl /c $(CFLAGS) $(INCLUDES) /Fo$*.obj $*.c clean: del *.obj del *.exp del *.lib del *.dll

1 0

externals/miXed/ViCious/pddp - New directory
by Krzysztof Czaja 10 May '05

10 May '05

Update of /cvsroot/pure-data/externals/miXed/ViCious/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14931/ViCious/pddp Log Message: Directory /cvsroot/pure-data/externals/miXed/ViCious/pddp added to the repository

1 0

externals/miXed/test/pddp - New directory
by Krzysztof Czaja 10 May '05

10 May '05

Update of /cvsroot/pure-data/externals/miXed/test/pddp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14833/test/pddp Log Message: Directory /cvsroot/pure-data/externals/miXed/test/pddp added to the repository

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
41
Older →

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 May 2005