Pd-cvs December 2006

pd-cvs@lists.iem.at

19 participants
825 discussions

autobuild: pd-main macosx104-powerpc 2006-12-03 03.15.05
by pd＠macosx104-powerpc.idmi.poly.edu 03 Dec '06

03 Dec '06

_sleep referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _socket referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _strcspn referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _task_get_special_port referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_terminate referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _vsnprintf referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _write referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _AudioConvertNanosToHostTime referenced from Jack expected to be defined in /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio _pthread_create referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_info referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib _thread_policy_set referenced from Jack expected to be defined in /usr/lib/libSystem.B.dylib collect2: ld returned 1 exit status /usr/bin/ld: for architecture ppc /usr/bin/ld: warning multiple definitions of symbol _jack_error s_audio_jack.o definition of _jack_error in section (__TEXT,__text) /Library/Frameworks/Jack.framework/Jack(single module) definition of _jack_error lipo: can't open input file: /var/tmp//cc6F6st7.out (No such file or directory) make[2]: *** [../bin/pd] Error 1 make[1]: *** [pd_install] Error 2 make: *** [darwin_app_core] Error 2

1 0

pd/src desire.tk,1.1.2.600.2.6,1.1.2.600.2.7
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2840 Modified Files: Tag: desiredata desire.tk Log Message: small gui fixes Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.6 retrieving revision 1.1.2.600.2.7 diff -C2 -d -r1.1.2.600.2.6 -r1.1.2.600.2.7 *** desire.tk 3 Dec 2006 00:24:58 -0000 1.1.2.600.2.6 --- desire.tk 3 Dec 2006 05:35:49 -0000 1.1.2.600.2.7 *************** *** 599,605 **** } } ! bind . <Motion> { ! .debug.1 configure -text "widget = %W" ! } } --- 599,603 ---- } } ! # bind . <Motion> {.debug.1 configure -text "widget = %W"} } *************** *** 636,650 **** } .mbar.window configure -postcommand "$self fix_window_menu" ! foreach z {in out} { set f .controls.$z frame $f frame $f.1 -borderwidth 2 -relief groove canvas $f.1.mtr -width 100 -height 10 -bg #222222 ! $f.1.mtr create line 0 0 0 0 -width 24 \ ! -fill [switch $z {in {set 0 blue} out {set 0 green}}] -tags m canvas $f.1.clip -width 5 -height 10 -bg #222222 ! pack $f.1.mtr $f.1.clip -side left -pady 2 -padx 0 ! pack $f.1 -padx 6 -pady 9 ! place [label $f.2 -text [say $z]] -x 11 -y -4 pack $f -side left -pady 0 -padx 0 } --- 634,646 ---- } .mbar.window configure -postcommand "$self fix_window_menu" ! foreach {z fill} {in #0060ff out #00ff60} { set f .controls.$z frame $f frame $f.1 -borderwidth 2 -relief groove canvas $f.1.mtr -width 100 -height 10 -bg #222222 ! $f.1.mtr create line 0 0 0 0 -width 24 -fill $fill -tags m canvas $f.1.clip -width 5 -height 10 -bg #222222 ! pack $f.1.mtr $f.1.clip -side left ! pack [label $f.2 -text [say $z]:] $f.1 -side left -padx 4 pack $f -side left -pady 0 -padx 0 } *************** *** 660,666 **** pack .controls.switches -side right frame .debug ! pack [label .debug.1 -anchor w -text ""] -side left ! pack [entry .debug.3 -textvariable ::serial] -side right ! pack [label .debug.2 -text "serial: "] -side right pack .debug -side bottom -fill x . configure -menu .mbar --- 656,662 ---- pack .controls.switches -side right frame .debug ! # pack [label .debug.1 -anchor w -text ""] -side left ! pack [entry .controls.3 -textvariable ::serial -width 10] -side right ! pack [label .controls.2 -text "obj.serial: " -justify right] -side right pack .debug -side bottom -fill x . configure -menu .mbar *************** *** 2789,2793 **** $child deconstruct_to $clipboard } - puts [array names obj_index_sel -glob $self:*] foreach wire $@selection_wire { if {[array names obj_index_sel $self:[$wire from]] == ""} {continue} --- 2785,2788 ---- *************** *** 5507,5511 **** if {$cmdline(console) == 0} {return} frame .log ! text .log.1 -width 80 -height 24 -yscrollcommand ".log.2 set" -font $look(View:font) scrollbar .log.2 -command ".log.1 yview" .log.1 insert end "DesireData 0.39.A, Tcl $::tcl_version, Tk $::tk_version\n" --- 5502,5506 ---- if {$cmdline(console) == 0} {return} frame .log ! text .log.1 -width 72 -height 20 -yscrollcommand ".log.2 set" -font $look(View:font) scrollbar .log.2 -command ".log.1 yview" .log.1 insert end "DesireData 0.39.A, Tcl $::tcl_version, Tk $::tk_version\n" *************** *** 5629,5637 **** set butt { ! {object obj {pd %W obj 0}} ! {message msg {pd %W msg 0}} ! {number floatatom {pd %W floatatom 0}} ! {symbol symbolatom {pd %W symbolatom 0}} ! {comment text {pd %W text 0}} {bang bng {pd %W bng 0}} {toggle tgl {pd %W toggle 0}} --- 5624,5632 ---- set butt { ! {object Object {pd %W obj 0}} ! {message Message {pd %W msg 0}} ! {number Number {pd %W floatatom 0}} ! {symbol Symbol {pd %W symbolatom 0}} ! {comment Comment {pd %W text 0}} {bang bng {pd %W bng 0}} {toggle tgl {pd %W toggle 0}} *************** *** 5677,5683 **** foreach e $butt { mset {icon name cmd} $e ! pack [button $bb.$name -image icon_$icon -border 1 \ -command "$@canvas editmode= 1; [regsub -all -- %W $cmd .$@canvas]"] -side left ! balloon $bb.$name [say $name] } pack [entry $bb.name -font {helvetica -12} -width 10 -border 0] -side right --- 5672,5678 ---- foreach e $butt { mset {icon name cmd} $e ! pack [button $bb._$name -image icon_$icon -border 1 \ -command "$@canvas editmode= 1; [regsub -all -- %W $cmd .$@canvas]"] -side left ! balloon $bb._$name [say $name] } pack [entry $bb.name -font {helvetica -12} -width 10 -border 0] -side right *************** *** 7416,7420 **** def Box deconstruct {} { global fields - puts " <> [array names fields $@pdclass]" if {[array names fields $@pdclass] == ""} { return [concat [list #X obj $@x1 $@y1] $@text] --- 7411,7414 ----

1 0

pd/src desire.c, 1.1.2.217.2.16, 1.1.2.217.2.17 desire.h, 1.1.2.49.2.2, 1.1.2.49.2.3
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3085 Modified Files: Tag: desiredata desire.c desire.h Log Message: #X pop uses a serial. Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.49.2.2 retrieving revision 1.1.2.49.2.3 diff -C2 -d -r1.1.2.49.2.2 -r1.1.2.49.2.3 *** desire.h 2 Dec 2006 03:08:12 -0000 1.1.2.49.2.2 --- desire.h 3 Dec 2006 04:04:20 -0000 1.1.2.49.2.3 *************** *** 325,328 **** --- 325,329 ---- EXTERN void scalar_redraw(t_scalar *x, t_canvas *canvas); //EXTERN int pd_pickle(t_foo *foo, char *fmt, ...); + void pd_set_newest (t_pd *x); #if defined(_LANGUAGE_C_PLUS_PLUS) || defined(__cplusplus) Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.16 retrieving revision 1.1.2.217.2.17 diff -C2 -d -r1.1.2.217.2.16 -r1.1.2.217.2.17 *** desire.c 3 Dec 2006 03:25:37 -0000 1.1.2.217.2.16 --- desire.c 3 Dec 2006 04:04:18 -0000 1.1.2.217.2.17 *************** *** 758,766 **** static void canvas_pop(t_canvas *x, t_floatarg fvis) { ! if (fvis!=0) canvas_vis(x, 1); pd_popsym(x); canvas_resortinlets(x); canvas_resortoutlets(x); ! x->loading = 0; } --- 758,767 ---- static void canvas_pop(t_canvas *x, t_floatarg fvis) { ! pd_set_newest(x); pd_popsym(x); + x->loading = 0; canvas_resortinlets(x); canvas_resortoutlets(x); ! if (fvis!=0) canvas_vis(x, 1); } *************** *** 844,848 **** } ! extern "C" void pd_set_newest (t_pd *x) { newest = x; if (!origin) return; /* the following only applies to objects created by client */ --- 845,849 ---- } ! void pd_set_newest (t_pd *x) { newest = x; if (!origin) return; /* the following only applies to objects created by client */

1 0

pd/src desire.c,1.1.2.217.2.15,1.1.2.217.2.16
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21779 Modified Files: Tag: desiredata desire.c Log Message: re-enabled serials Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.15 retrieving revision 1.1.2.217.2.16 diff -C2 -d -r1.1.2.217.2.15 -r1.1.2.217.2.16 *** desire.c 3 Dec 2006 02:09:57 -0000 1.1.2.217.2.15 --- desire.c 3 Dec 2006 03:25:37 -0000 1.1.2.217.2.16 *************** *** 324,337 **** /* this also has to change when we get stackable origins */ extern "C" void manager_anything (t_manager *self, t_symbol *s, int argc, t_atom *argv) { - /* - t_binbuf b = {argc,argv}; origin = manager; - binbuf_eval(&b,0,0,0); - origin = 0; - */ binbuf_clear(self->b); binbuf_addv(self->b,"s",s); binbuf_add(self->b,argc,argv); binbuf_eval(self->b,0,0,0); } --- 324,333 ---- /* this also has to change when we get stackable origins */ extern "C" void manager_anything (t_manager *self, t_symbol *s, int argc, t_atom *argv) { origin = manager; binbuf_clear(self->b); binbuf_addv(self->b,"s",s); binbuf_add(self->b,argc,argv); binbuf_eval(self->b,0,0,0); + origin = 0; }

1 0

pd/src s_inter.c, 1.5.4.10.2.25.2.7, 1.5.4.10.2.25.2.8 s_main.c, 1.7.4.17.2.22.2.9, 1.7.4.17.2.22.2.10
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13024 Modified Files: Tag: desiredata s_inter.c s_main.c Log Message: option -d removed (will be replaced by client-side option) Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.25.2.7 retrieving revision 1.5.4.10.2.25.2.8 diff -C2 -d -r1.5.4.10.2.25.2.7 -r1.5.4.10.2.25.2.8 *** s_inter.c 3 Dec 2006 00:20:33 -0000 1.5.4.10.2.25.2.7 --- s_inter.c 3 Dec 2006 03:02:25 -0000 1.5.4.10.2.25.2.8 *************** *** 422,427 **** /* this is in a separately called subroutine so that the buffer isn't sitting on the stack while the messages are getting passed. */ ! static int socketreceiver_doread(t_socketreceiver *x) ! { char messbuf[INBUFSIZE], *bp = messbuf; int indx; --- 422,426 ---- /* this is in a separately called subroutine so that the buffer isn't sitting on the stack while the messages are getting passed. */ ! static int socketreceiver_doread(t_socketreceiver *x) { char messbuf[INBUFSIZE], *bp = messbuf; int indx; *************** *** 430,454 **** char *inbuf = x->inbuf; if (intail == inhead) return 0; ! for (indx = intail; indx != inhead; indx = (indx+1)&(INBUFSIZE-1)) ! { ! /* if we hit a semi that isn't preceeded by a \, it's a message ! boundary. LATER we should deal with the possibility that the ! preceding \ might itself be escaped! */ char c = *bp++ = inbuf[indx]; ! if (c == ';' && (!indx || inbuf[indx-1] != '\\')) ! { intail = (indx+1)&(INBUFSIZE-1); binbuf_text(inbinbuf, messbuf, bp - messbuf); - if (sys_debuglevel & DEBUG_MESSDOWN) - { - write(2, messbuf, bp - messbuf); - write(2, "\n", 1); - } x->inhead = inhead; x->intail = intail; ! return (1); } } ! return (0); } --- 429,445 ---- char *inbuf = x->inbuf; if (intail == inhead) return 0; ! for (indx = intail; indx != inhead; indx = (indx+1)&(INBUFSIZE-1)) { ! /* ";" not preceded by "\" is a message boundary in current syntax. ! in future syntax it might become more complex. */ char c = *bp++ = inbuf[indx]; ! if (c == ';' && (!indx || inbuf[indx-1] != '\\')) { intail = (indx+1)&(INBUFSIZE-1); binbuf_text(inbinbuf, messbuf, bp - messbuf); x->inhead = inhead; x->intail = intail; ! return 1; } } ! return 0; } *************** *** 553,557 **** if (msglen >= self->osize-self->ohead) msglen = self->osize-self->ohead; } - if (sys_debuglevel & DEBUG_MESSUP) fprintf(stderr, "%s", self->obuf+self->ohead); self->ohead += msglen; self->bytessincelastping += msglen; --- 544,547 ---- Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.22.2.9 retrieving revision 1.7.4.17.2.22.2.10 diff -C2 -d -r1.7.4.17.2.22.2.9 -r1.7.4.17.2.22.2.10 *** s_main.c 3 Dec 2006 02:09:01 -0000 1.7.4.17.2.22.2.9 --- s_main.c 3 Dec 2006 03:02:25 -0000 1.7.4.17.2.22.2.10 *************** *** 54,58 **** #endif /* THREDED_SF */ - int sys_debuglevel; int sys_verbose; int sys_noloadbang; --- 54,57 ---- *************** *** 643,650 **** if (ARG("-verbose",1)) {sys_verbose++; NEXT(1);} if (ARG("-version",1)) {sys_version = 1; NEXT(1);} - if (ARG("-d",2)) { - if (sscanf(argv[1], "%d", &sys_debuglevel)<1) goto usage; - NEXT(2); - } if (ARG("-noloadbang",1)) {sys_noloadbang = 1; NEXT(1);} if (ARG("-nogui",1)) { --- 642,645 ---- *************** *** 700,703 **** --- 695,699 ---- } usage: + if (argc) fprintf(stderr, "Can't handle option '%s'.\n",*argv); for (i = 0; i < sizeof(usagemessage)/sizeof(*usagemessage); i++) fprintf(stderr, "%s", usagemessage[i]);

1 0

pd/src desire.c,1.1.2.217.2.14,1.1.2.217.2.15
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26095 Modified Files: Tag: desiredata desire.c Log Message: removed support for .pdsettings, windows registry and .plist files Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.14 retrieving revision 1.1.2.217.2.15 diff -C2 -d -r1.1.2.217.2.14 -r1.1.2.217.2.15 *** desire.c 2 Dec 2006 16:20:55 -0000 1.1.2.217.2.14 --- desire.c 3 Dec 2006 02:09:57 -0000 1.1.2.217.2.15 *************** *** 7719,7723 **** void glob_startup_dialog(t_pd *dummy, t_symbol *s, int argc, t_atom *argv); void glob_ping(t_pd *dummy); - void glob_savepreferences(t_pd *dummy); void glob_tooltips(t_pd *dummy, t_float f); /* tb: message-based audio configuration { */ --- 7719,7722 ---- *************** *** 7771,7775 **** class_addmethod3(c,glob_startup_dialog, "startup-dialog", "*"); class_addmethod3(c,glob_ping, "ping",""); - class_addmethod3(c,glob_savepreferences, "save-preferences", ""); class_addmethod3(c,glob_tooltips, "tooltips", "F"); /* tb: message-based audio configuration { */ --- 7770,7773 ----

1 0

pd/src makefile.in, 1.4.4.2.2.21.2.5, 1.4.4.2.2.21.2.6 s_main.c, 1.7.4.17.2.22.2.8, 1.7.4.17.2.22.2.9 s_file.c, 1.2.4.8.2.8, NONE
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25703 Modified Files: Tag: desiredata makefile.in s_main.c Removed Files: Tag: desiredata s_file.c Log Message: removed support for .pdsettings, windows registry and .plist files Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.21.2.5 retrieving revision 1.4.4.2.2.21.2.6 diff -C2 -d -r1.4.4.2.2.21.2.5 -r1.4.4.2.2.21.2.6 *** makefile.in 2 Dec 2006 03:53:56 -0000 1.4.4.2.2.21.2.5 --- makefile.in 3 Dec 2006 02:09:01 -0000 1.4.4.2.2.21.2.6 *************** *** 17,27 **** # from pd miller ! SRC += m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c \ ! m_sched.c s_main.c s_inter.c s_file.c s_loader.c s_path.c s_audio.c s_midi.c \ d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \ d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \ ! d_delay.c d_resample.c \ x_arithmetic.c x_connective.c x_midi.c x_misc.c \ ! x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c x_list.c d_soundfile.c # audio drivers and midi drivers --- 17,27 ---- # from pd miller ! SRC += m_pd.c m_class.c m_obj.c m_atom.c m_memory.c m_binbuf.c m_sched.c \ ! s_main.c s_inter.c s_loader.c s_path.c s_audio.c s_midi.c \ d_ugen.c d_ctl.c d_arithmetic.c d_osc.c d_filter.c d_dac.c d_misc.c \ d_math.c d_fft.c d_mayer_fft.c d_fftroutine.c d_array.c d_global.c \ ! d_delay.c d_resample.c d_soundfile.c \ x_arithmetic.c x_connective.c x_midi.c x_misc.c \ ! x_time.c x_acoustics.c x_net.c x_qlist.c x_gui.c x_list.c # audio drivers and midi drivers Index: s_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_main.c,v retrieving revision 1.7.4.17.2.22.2.8 retrieving revision 1.7.4.17.2.22.2.9 diff -C2 -d -r1.7.4.17.2.22.2.8 -r1.7.4.17.2.22.2.9 *** s_main.c 2 Dec 2006 03:12:12 -0000 1.7.4.17.2.22.2.8 --- s_main.c 3 Dec 2006 02:09:01 -0000 1.7.4.17.2.22.2.9 *************** *** 60,63 **** --- 60,66 ---- int sys_guisetportnumber = 5400; + int sys_defeatrt; + t_symbol *sys_flags; + char *sys_guicmd; t_symbol *sys_libdir; *************** *** 192,200 **** } ! if (!defeat_presets) ! { ! sys_loadpreferences(); /* load default settings */ ! sys_rcfile(); /* parse the startup file */ ! } /* initalize idle callbacks before starting the gui */ sys_init_idle_callbacks(); --- 195,199 ---- } ! if (!defeat_presets) sys_rcfile(); /* parse the startup file */ /* initalize idle callbacks before starting the gui */ sys_init_idle_callbacks(); --- s_file.c DELETED ---

1 0

pd/src desire.tk,1.1.2.600.2.5,1.1.2.600.2.6
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21102 Modified Files: Tag: desiredata desire.tk Log Message: removed old debug messages Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.5 retrieving revision 1.1.2.600.2.6 diff -C2 -d -r1.1.2.600.2.5 -r1.1.2.600.2.6 *** desire.tk 3 Dec 2006 00:11:24 -0000 1.1.2.600.2.5 --- desire.tk 3 Dec 2006 00:24:58 -0000 1.1.2.600.2.6 *************** *** 660,664 **** pack .controls.switches -side right frame .debug ! pack [label .debug.1 -anchor w -text ""] pack [entry .debug.3 -textvariable ::serial] -side right pack [label .debug.2 -text "serial: "] -side right --- 660,664 ---- pack .controls.switches -side right frame .debug ! pack [label .debug.1 -anchor w -text ""] -side left pack [entry .debug.3 -textvariable ::serial] -side right pack [label .debug.2 -text "serial: "] -side right *************** *** 966,970 **** #-----------------------------------------------------------------------------------# ! proc* read_ddrc {{filename ""}} { global cmdline look key accels if {$filename == ""} { --- 966,970 ---- #-----------------------------------------------------------------------------------# ! proc read_ddrc {{filename ""}} { global cmdline look key accels if {$filename == ""} { *************** *** 1234,1237 **** --- 1234,1238 ---- } } + #-----------------------------------------------------------------------------------# *************** *** 1447,1451 **** set @canvasys [lindex $mess 5] set args [lrange $mess 6 end] - puts " canvas args::: $args" switch [llength $args] { 1 { --- 1448,1451 ---- *************** *** 1510,1514 **** default {error "huh? mess=$mess"} } - puts " $self mapped = $@mapped" } --- 1510,1513 ---- *************** *** 4019,4022 **** --- 4018,4023 ---- } + def Box popup_help {} {pd pd help $@pdclass} + #-----------------------------------------------------------------------------------# class_new Wire {View} *************** *** 6455,6459 **** } - tracedef Dialog font_update def Dialog font_update {f} { global font --- 6456,6459 ----

1 0

pd/src x_net.c,1.2.4.2.2.2.2.1,1.2.4.2.2.2.2.2
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21070 Modified Files: Tag: desiredata x_net.c Log Message: . Index: x_net.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_net.c,v retrieving revision 1.2.4.2.2.2.2.1 retrieving revision 1.2.4.2.2.2.2.2 diff -C2 -d -r1.2.4.2.2.2.2.1 -r1.2.4.2.2.2.2.2 *** x_net.c 2 Dec 2006 03:12:13 -0000 1.2.4.2.2.2.2.1 --- x_net.c 3 Dec 2006 00:24:20 -0000 1.2.4.2.2.2.2.2 *************** *** 206,210 **** int msg, natom = binbuf_getnatom(b); t_atom *at = binbuf_getvec(b); - fprintf(stderr,"%s\n",__PRETTY_FUNCTION__); for (msg = 0; msg < natom;) { --- 206,209 ----

1 0

pd/src s_inter.c,1.5.4.10.2.25.2.6,1.5.4.10.2.25.2.7
by Mathieu Bouchard 03 Dec '06

03 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19631 Modified Files: Tag: desiredata s_inter.c Log Message: cleanup. Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.25.2.6 retrieving revision 1.5.4.10.2.25.2.7 diff -C2 -d -r1.5.4.10.2.25.2.6 -r1.5.4.10.2.25.2.7 *** s_inter.c 2 Dec 2006 05:21:51 -0000 1.5.4.10.2.25.2.6 --- s_inter.c 3 Dec 2006 00:20:33 -0000 1.5.4.10.2.25.2.7 *************** *** 11,14 **** --- 11,15 ---- #include "s_stuff.h" #include "m_imp.h" + #include "pthread.h" #ifdef UNISTD #include <unistd.h> *************** *** 147,196 **** } ! ! int sys_pollsockets (void) ! { struct timeval timout; int didsomething = 0; ! int i; t_fdpoll *fp; ! fd_set readset, writeset, exceptset; ! timout.tv_sec = 0; timout.tv_usec = 0; - FD_ZERO(&writeset); FD_ZERO(&readset); FD_ZERO(&exceptset); ! for (fp = sys_fdpoll, i = sys_nfdpoll; i--; fp++) ! FD_SET(fp->fdp_fd, &readset); select(sys_maxfd+1, &readset, &writeset, &exceptset, &timout); for (i = 0; i < sys_nfdpoll; i++) if (FD_ISSET(sys_fdpoll[i].fdp_fd, &readset)) { ! (*sys_fdpoll[i].fdp_fn)(sys_fdpoll[i].fdp_ptr, sys_fdpoll[i].fdp_fd); didsomething = 1; } ! return (didsomething); } ! void sys_microsleep(int microsec) ! { ! /* tb: ! sleep granularity on "modern" operating systems is only 1ms??? ! ! linux: we might be better with the high precision posix timer kernel ! patches ... ! ! windows: win9x doesn't implement a SwitchToThread function, so we can't ! sleep for small timeslices ! ! osx: ??? */ ! ! if (!sys_callbackscheduler && microsec < 1000) ! if (500 < microsec) ! microsec = 1000; ! else ! return; #ifndef MSW struct timeval timeout; --- 148,182 ---- } ! int sys_pollsockets (void) { struct timeval timout; int didsomething = 0; ! int i; t_fdpoll *fp; ! fd_set readset, writeset, exceptset; timout.tv_sec = 0; timout.tv_usec = 0; FD_ZERO(&writeset); FD_ZERO(&readset); FD_ZERO(&exceptset); ! for (fp = sys_fdpoll, i = sys_nfdpoll; i--; fp++) FD_SET(fp->fdp_fd, &readset); select(sys_maxfd+1, &readset, &writeset, &exceptset, &timout); for (i = 0; i < sys_nfdpoll; i++) if (FD_ISSET(sys_fdpoll[i].fdp_fd, &readset)) { ! sys_fdpoll[i].fdp_fn(sys_fdpoll[i].fdp_ptr, sys_fdpoll[i].fdp_fd); didsomething = 1; } ! return didsomething; } ! void sys_microsleep(int microsec) { ! /* Tim says: sleep granularity on "modern" operating systems is only 1ms??? ! - linux: we might be better with the high precision posix timer kernel patches ... ! - windows: win9x doesn't implement a SwitchToThread function, so we can't sleep for small timeslices ! - osx: ??? */ ! if (!sys_callbackscheduler && microsec < 1000) { ! if (500 < microsec) microsec = 1000; else return; ! } #ifndef MSW struct timeval timeout; *************** *** 202,212 **** Sleep(microsec/1000); #endif - /* a solution for lower timeslices might be a busysleep but this might block a low-priority thread and won't work for win9x - #define _WIN32_WINNT 0x0400 - - double end = sys_getrealtime() + (double)microsec * 1e-6; do --- 188,194 ---- *************** *** 219,223 **** } while(sys_getrealtime() < end); - */ } --- 201,204 ---- *************** *** 472,500 **** } ! static void socketreceiver_getudp(t_socketreceiver *x, int fd) ! { char buf[INBUFSIZE+1]; int ret = recv(fd, buf, INBUFSIZE, 0); ! if (ret < 0) ! { sys_sockerror("recv"); sys_rmpollfn(fd); sys_closesocket(fd); ! } ! else if (ret > 0) ! { buf[ret] = 0; ! #if 0 ! post("%s", buf); ! #endif ! if (buf[ret-1] != '\n') ! { ! #if 0 ! buf[ret] = 0; ! error("dropped bad buffer %s\n", buf); ! #endif ! } ! else ! { char *semi = strchr(buf, ';'); if (semi) --- 453,466 ---- } ! static void socketreceiver_getudp(t_socketreceiver *x, int fd) { char buf[INBUFSIZE+1]; int ret = recv(fd, buf, INBUFSIZE, 0); ! if (ret < 0) { sys_sockerror("recv"); sys_rmpollfn(fd); sys_closesocket(fd); ! } else if (ret > 0) { buf[ret] = 0; ! if (buf[ret-1] == '\n') { char *semi = strchr(buf, ';'); if (semi) *************** *** 503,507 **** outlet_setstacklim(); x->socketreceivefn(x->owner, inbinbuf); ! } } } --- 469,473 ---- outlet_setstacklim(); x->socketreceivefn(x->owner, inbinbuf); ! } else {/*bad buffer ignored */} } } *************** *** 597,601 **** int writesize = self->ohead-self->otail, nwrote = 0; if (!writesize) return 0; - fprintf(stderr,"sys_flushtogui self=%p writesize=%d\n",self,writesize); nwrote = send(self->fd, self->obuf+self->otail, writesize, 0); if (nwrote < 0) { --- 563,566 ---- *************** *** 803,807 **** } - #include "pthread.h" static pthread_t watchdog_id; static pthread_t main_pd_thread; --- 768,771 ---- *************** *** 809,828 **** static pthread_cond_t watchdog_cond = PTHREAD_COND_INITIALIZER; ! static void * watchdog_thread(void*); /* start a high priority watchdog thread */ ! static int sys_start_watchdog_thread(void) ! { pthread_attr_t w_attr; int status; - - /* get parent thread ID */ main_pd_thread = pthread_self(); - - /* set up attributes */ pthread_attr_init(&w_attr); - pthread_attr_setschedpolicy(&w_attr, SCHED_FIFO); /* use rt scheduling */ - status = pthread_create(&watchdog_id, &w_attr, (void*(*)(void*)) watchdog_thread, NULL); return status; /* what is this function supposed to return anyway? it tried returning void though declared as int */ --- 773,785 ---- static pthread_cond_t watchdog_cond = PTHREAD_COND_INITIALIZER; ! static void *watchdog_thread(void *); /* start a high priority watchdog thread */ ! static int sys_start_watchdog_thread(void) { pthread_attr_t w_attr; int status; main_pd_thread = pthread_self(); pthread_attr_init(&w_attr); pthread_attr_setschedpolicy(&w_attr, SCHED_FIFO); /* use rt scheduling */ status = pthread_create(&watchdog_id, &w_attr, (void*(*)(void*)) watchdog_thread, NULL); return status; /* what is this function supposed to return anyway? it tried returning void though declared as int */ *************** *** 849,886 **** */ ! static void * watchdog_thread(void* dummy) ! { sys_set_priority(1); post("watchdog thread started"); - sys_microsleep(6e7); /* start polling after 60 seconds ... hoping that everything is set up */ - post("watchdog thread active"); ! ! while (1) ! { ! /* - register idle callback ! - wait for condition variable ! - in case of timeout kill the parent thread ! - sleep ! */ struct timespec timeout; struct timeval now; - int status; - gettimeofday(&now,0); timeout.tv_sec = now.tv_sec + 15; /* timeout: 15 seconds */ timeout.tv_nsec = now.tv_usec * 1000; - sys_callback((t_int(*)(t_int*))watchdog_callback, 0, 0); status = pthread_cond_timedwait(&watchdog_cond, &watchdog_mutex, &timeout); ! ! if (status) ! { #if defined(__linux__) || defined(IRIX) fprintf(stderr, "watchdog killing"); ! /* kill parent thread */ ! kill(0,9); #endif } --- 806,827 ---- */ ! static void * watchdog_thread(void* dummy) { sys_set_priority(1); post("watchdog thread started"); sys_microsleep(6e7); /* start polling after 60 seconds ... hoping that everything is set up */ post("watchdog thread active"); ! while (1) { struct timespec timeout; struct timeval now; int status; gettimeofday(&now,0); timeout.tv_sec = now.tv_sec + 15; /* timeout: 15 seconds */ timeout.tv_nsec = now.tv_usec * 1000; sys_callback((t_int(*)(t_int*))watchdog_callback, 0, 0); status = pthread_cond_timedwait(&watchdog_cond, &watchdog_mutex, &timeout); ! if (status) { #if defined(__linux__) || defined(IRIX) fprintf(stderr, "watchdog killing"); ! kill(0,9); /* kill parent thread */ #endif }

1 0

← Newer
1
...
76
77
78
79
80
81
82
83
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 December 2006