Pd-cvs January 2007

pd-cvs@lists.iem.at

21 participants
539 discussions

pd/src builtins.c,1.1.2.13,1.1.2.14
by Mathieu Bouchard 09 Jan '07

09 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1999 Modified Files: Tag: desiredata builtins.c Log Message: introducing in() out() C++ methods in t_object Index: builtins.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/builtins.c,v retrieving revision 1.1.2.13 retrieving revision 1.1.2.14 diff -C2 -d -r1.1.2.13 -r1.1.2.14 *** builtins.c 9 Jan 2007 18:58:26 -0000 1.1.2.13 --- builtins.c 9 Jan 2007 19:59:19 -0000 1.1.2.14 *************** *** 64,98 **** template <class T> T max(T a, T b) {return a>b?a:b;} ! float mtof(float f) { ! if (f <= -1500) return 0; ! if (f > 1499) f = 1499; ! return 8.17579891564 * exp(.0577622650 * f); ! } ! ! float ftom(float f) { ! return f > 0 ? 17.3123405046 * log(.12231220585 * f) : -1500; ! } ! ! float powtodb(float f) { ! if (f <= 0) return 0; ! return max(100 + 10./LOGTEN * log(f),0.); ! } ! ! float rmstodb(float f) { ! if (f <= 0) return 0; ! return max(100 + 20./LOGTEN * log(f),0.); ! } ! ! float dbtopow(float f) { ! if (f <= 0) return 0; ! f = min(f,870.f); ! return exp((LOGTEN * 0.1) * (f-100.)); ! } ! ! float dbtorms(float f) { ! if (f <= 0) return 0; ! f = min(f,485.f); ! return exp((LOGTEN * 0.05) * (f-100.)); ! } /* ------------- corresponding objects ----------------------- */ --- 64,73 ---- template <class T> T max(T a, T b) {return a>b?a:b;} ! float mtof(float f) {return f>-1500 ? 8.17579891564 * exp(.0577622650 * min(f,1499.f)) : 0;} ! float ftom(float f) {return f>0 ? 17.3123405046 * log(.12231220585 * f) : -1500;} ! float powtodb(float f) {return f>0 ? max(100 + 10./LOGTEN * log(f),0.) : 0;} ! float rmstodb(float f) {return f>0 ? max(100 + 20./LOGTEN * log(f),0.) : 0;} ! float dbtopow(float f) {return f>0 ? exp((LOGTEN * 0.1 ) * (min(f,870.f)-100.)) : 0;} ! float dbtorms(float f) {return f>0 ? exp((LOGTEN * 0.05) * (min(f,485.f)-100.)) : 0;} /* ------------- corresponding objects ----------------------- */ *************** *** 202,219 **** static void keyup_float(t_keyup *x, t_floatarg f) {outlet_float(x->outlet, f);} ! struct t_keyname : t_object { ! t_outlet *out1; ! t_outlet *out2; ! }; static void *keyname_new() { t_keyname *x = (t_keyname *)pd_new(keyname_class); ! x->out1 = outlet_new(x, &s_float); ! x->out2 = outlet_new(x, &s_symbol); pd_bind(x, keyname_sym); return x; } static void keyname_list(t_keyname *x, t_symbol *s, int ac, t_atom *av) { ! outlet_symbol(x->out2, atom_getsymbolarg(1, ac, av)); ! outlet_float(x->out1, atom_getfloatarg(0, ac, av)); } static void key_free(t_key *x) {pd_unbind(x, key_sym);} --- 177,191 ---- static void keyup_float(t_keyup *x, t_floatarg f) {outlet_float(x->outlet, f);} ! struct t_keyname : t_object {}; static void *keyname_new() { t_keyname *x = (t_keyname *)pd_new(keyname_class); ! outlet_new(x, &s_float); ! outlet_new(x, &s_symbol); pd_bind(x, keyname_sym); return x; } static void keyname_list(t_keyname *x, t_symbol *s, int ac, t_atom *av) { ! outlet_symbol(x->out(1), atom_getsymbolarg(1, ac, av)); ! outlet_float( x->out(0), atom_getfloatarg( 0, ac, av)); } static void key_free(t_key *x) {pd_unbind(x, key_sym);} *************** *** 455,459 **** struct t_qlist : t_object { - t_outlet *bangout; t_binbuf *binbuf; int onset; /* playback position */ --- 427,430 ---- *************** *** 473,477 **** x->clock = clock_new(x, (t_method)qlist_tick); outlet_new(x, &s_list); ! x->bangout = outlet_new(x, &s_bang); x->onset = 0x7fffffff; x->tempo = 1; --- 444,448 ---- x->clock = clock_new(x, (t_method)qlist_tick); outlet_new(x, &s_list); ! outlet_new(x, &s_bang); x->onset = 0x7fffffff; x->tempo = 1; *************** *** 542,546 **** end: x->onset = 0x7fffffff; ! outlet_bang(x->bangout); x->whenclockset = 0; } --- 513,517 ---- end: x->onset = 0x7fffffff; ! outlet_bang(x->out(1)); x->whenclockset = 0; } *************** *** 611,615 **** x->binbuf = binbuf_new(); outlet_new(x, &s_list); ! x->bangout = outlet_new(x, &s_bang); x->onset = 0x7fffffff; x->reentered = 0; --- 582,586 ---- x->binbuf = binbuf_new(); outlet_new(x, &s_list); ! outlet_new(x, &s_bang); x->onset = 0x7fffffff; x->reentered = 0; *************** *** 636,640 **** } else { x->onset = 0x7fffffff; ! outlet_bang(x->bangout); } } --- 607,611 ---- } else { x->onset = 0x7fffffff; ! outlet_bang(x->out(1)); } } *************** *** 806,818 **** struct t_list_split : t_object { t_float f; - t_outlet *out1; - t_outlet *out2; - t_outlet *out3; }; static t_pd *list_split_new(t_floatarg f) { t_list_split *x = (t_list_split *)pd_new(list_split_class); ! x->out1 = outlet_new(x, &s_list); ! x->out2 = outlet_new(x, &s_list); ! x->out3 = outlet_new(x, &s_list); floatinlet_new(x, &x->f); x->f = f; --- 777,786 ---- struct t_list_split : t_object { t_float f; }; static t_pd *list_split_new(t_floatarg f) { t_list_split *x = (t_list_split *)pd_new(list_split_class); ! outlet_new(x, &s_list); ! outlet_new(x, &s_list); ! outlet_new(x, &s_list); floatinlet_new(x, &x->f); x->f = f; *************** *** 823,829 **** if (n < 0) n = 0; if (argc >= n) { ! outlet_list(x->out2, &s_list, argc-n, argv+n); ! outlet_list(x->out1, &s_list, n, argv); ! } else outlet_list(x->out3, &s_list, argc, argv); } static void list_split_anything(t_list_split *x, t_symbol *s, int argc, t_atom *argv) { --- 791,797 ---- if (n < 0) n = 0; if (argc >= n) { ! outlet_list(x->out(1), &s_list, argc-n, argv+n); ! outlet_list(x->out(0), &s_list, n, argv); ! } else outlet_list(x->out(2), &s_list, argc, argv); } static void list_split_anything(t_list_split *x, t_symbol *s, int argc, t_atom *argv) { *************** *** 1442,1455 **** struct t_sel1 : t_object { t_atom atom; - t_outlet *out1; - t_outlet *out2; }; static void sel1_float(t_sel1 *x, t_float f) { ! if (x->atom.a_type == A_FLOAT && f == x->atom.a_w.w_float) outlet_bang(x->out1); ! else outlet_float(x->out2, f); } static void sel1_symbol(t_sel1 *x, t_symbol *s) { ! if (x->atom.a_type == A_SYMBOL && s == x->atom.a_w.w_symbol) outlet_bang(x->out1); ! else outlet_symbol(x->out2, s); } static t_class *sel2_class; --- 1410,1419 ---- struct t_sel1 : t_object { t_atom atom; }; static void sel1_float(t_sel1 *x, t_float f) { ! if (x->atom.a_type==A_FLOAT && f == x->atom.a_w.w_float) outlet_bang(x->out(0)); else outlet_float(x->out(1),f); } static void sel1_symbol(t_sel1 *x, t_symbol *s) { ! if (x->atom.a_type==A_SYMBOL && s == x->atom.a_w.w_symbol) outlet_bang(x->out(0)); else outlet_symbol(x->out(1),s); } static t_class *sel2_class; *************** *** 1495,1505 **** t_sel1 *x = (t_sel1 *)pd_new(sel1_class); x->atom = *argv; ! x->out1 = outlet_new(x, &s_bang); if (argv->a_type == A_FLOAT) { ! floatinlet_new(x, &x->atom.a_w.w_float); ! x->out2 = outlet_new(x, &s_float); } else { ! symbolinlet_new(x, &x->atom.a_w.w_symbol); ! x->out2 = outlet_new(x, &s_symbol); } return x; --- 1459,1467 ---- t_sel1 *x = (t_sel1 *)pd_new(sel1_class); x->atom = *argv; ! outlet_new(x, &s_bang); if (argv->a_type == A_FLOAT) { ! floatinlet_new(x, &x->atom.a_w.w_float); outlet_new(x, &s_float); } else { ! symbolinlet_new(x, &x->atom.a_w.w_symbol); outlet_new(x, &s_symbol); } return x; *************** *** 1896,1905 **** } static void trigger_bang(t_trigger *x) {trigger_list(x, 0, 0, 0);} ! static void trigger_pointer(t_trigger *x, t_gpointer *gp) { ! t_atom at; SETPOINTER(&at, gp); trigger_list(x, 0, 1, &at);} ! static void trigger_float(t_trigger *x, t_float f) { ! t_atom at; SETFLOAT(&at, f); trigger_list(x, 0, 1, &at);} ! static void trigger_symbol(t_trigger *x, t_symbol *s) { ! t_atom at; SETSYMBOL(&at, s); trigger_list(x, 0, 1, &at);} static void trigger_free(t_trigger *x) {free(x->vec);} static void trigger_setup() { --- 1858,1864 ---- } static void trigger_bang(t_trigger *x) {trigger_list(x, 0, 0, 0);} ! static void trigger_pointer(t_trigger *x, t_gpointer *gp) {t_atom at; SETPOINTER(&at, gp); trigger_list(x, 0, 1, &at);} ! static void trigger_float(t_trigger *x, t_float f) { t_atom at; SETFLOAT(&at, f); trigger_list(x, 0, 1, &at);} ! static void trigger_symbol(t_trigger *x, t_symbol *s) { t_atom at; SETSYMBOL(&at, s); trigger_list(x, 0, 1, &at);} static void trigger_free(t_trigger *x) {free(x->vec);} static void trigger_setup() { *************** *** 1949,1953 **** static t_class *moses_class; struct t_moses : t_object { - t_outlet *out2; float y; }; --- 1908,1911 ---- *************** *** 1956,1967 **** floatinlet_new(x, &x->y); outlet_new(x, &s_float); ! x->out2 = outlet_new(x, &s_float); x->y = f; return x; } ! static void moses_float(t_moses *x, t_float f) { ! if (f < x->y) outlet_float(x->outlet, f); ! else outlet_float(x->out2, f); ! } static void moses_setup() { moses_class = class_new2("moses",moses_new,0,sizeof(t_moses),0,"F"); --- 1914,1922 ---- floatinlet_new(x, &x->y); outlet_new(x, &s_float); ! outlet_new(x, &s_float); x->y = f; return x; } ! static void moses_float(t_moses *x, t_float f) {outlet_float(x->out(f>=x->y), f);} static void moses_setup() { moses_class = class_new2("moses",moses_new,0,sizeof(t_moses),0,"F"); *************** *** 2031,2035 **** static t_class *swap_class; struct t_swap : t_object { - t_outlet *out2; t_float f1; t_float f2; --- 1986,1989 ---- *************** *** 2040,2050 **** x->f1 = 0; outlet_new(x, &s_float); ! x->out2 = outlet_new(x, &s_float); floatinlet_new(x, &x->f2); return x; } static void swap_bang(t_swap *x) { ! outlet_float(x->out2, x->f1); ! outlet_float(x->outlet, x->f2); } static void swap_float(t_swap *x, t_float f) { --- 1994,2004 ---- x->f1 = 0; outlet_new(x, &s_float); ! outlet_new(x, &s_float); floatinlet_new(x, &x->f2); return x; } static void swap_bang(t_swap *x) { ! outlet_float(x->out(1), x->f1); ! outlet_float(x->out(0), x->f2); } static void swap_float(t_swap *x, t_float f) { *************** *** 2163,2174 **** static t_symbol *midiin_sym, *sysexin_sym; static t_class *midiin_class, *sysexin_class; ! struct t_midiin : t_object { ! t_outlet *out1; ! t_outlet *out2; ! }; static void *midiin_new() { t_midiin *x = (t_midiin *)pd_new(midiin_class); ! x->out1 = outlet_new(x, &s_float); ! x->out2 = outlet_new(x, &s_float); pd_bind(x, midiin_sym); return x; --- 2117,2125 ---- static t_symbol *midiin_sym, *sysexin_sym; static t_class *midiin_class, *sysexin_class; ! struct t_midiin : t_object {}; static void *midiin_new() { t_midiin *x = (t_midiin *)pd_new(midiin_class); ! outlet_new(x, &s_float); ! outlet_new(x, &s_float); pd_bind(x, midiin_sym); return x; *************** *** 2176,2187 **** static void *sysexin_new() { t_midiin *x = (t_midiin *)pd_new(sysexin_class); ! x->out1 = outlet_new(x, &s_float); ! x->out2 = outlet_new(x, &s_float); pd_bind(x, sysexin_sym); return x; } static void midiin_list(t_midiin *x, t_symbol *s, int ac, t_atom *av) { ! outlet_float(x->out2, atom_getfloatarg(1, ac, av) + 1); ! outlet_float(x->out1, atom_getfloatarg(0, ac, av)); } static void midiin_free(t_midiin *x) {pd_unbind(x, midiin_sym);} --- 2127,2138 ---- static void *sysexin_new() { t_midiin *x = (t_midiin *)pd_new(sysexin_class); ! outlet_new(x, &s_float); ! outlet_new(x, &s_float); pd_bind(x, sysexin_sym); return x; } static void midiin_list(t_midiin *x, t_symbol *s, int ac, t_atom *av) { ! outlet_float(x->out(1), atom_getfloatarg(1, ac, av) + 1); ! outlet_float(x->out(0), atom_getfloatarg(0, ac, av)); } static void midiin_free(t_midiin *x) {pd_unbind(x, midiin_sym);} *************** *** 2214,2227 **** struct t_notein : t_object { t_float ch; - t_outlet *out1; - t_outlet *out2; - t_outlet *out3; }; static void *notein_new(t_floatarg f) { t_notein *x = (t_notein *)pd_new(notein_class); x->ch = f; ! x->out1 = outlet_new(x, &s_float); ! x->out2 = outlet_new(x, &s_float); ! if (f == 0) x->out3 = outlet_new(x, &s_float); pd_bind(x, notein_sym); return x; --- 2165,2175 ---- struct t_notein : t_object { t_float ch; }; static void *notein_new(t_floatarg f) { t_notein *x = (t_notein *)pd_new(notein_class); x->ch = f; ! outlet_new(x, &s_float); ! outlet_new(x, &s_float); ! if (f == 0) outlet_new(x, &s_float); pd_bind(x, notein_sym); return x; *************** *** 2231,2237 **** float velo = atom_getfloatarg(1, argc, argv); float channel = atom_getfloatarg(2, argc, argv); ! if (x->ch) {if (channel != x->ch) return;} else outlet_float(x->out3, channel); ! outlet_float(x->out2, velo); ! outlet_float(x->out1, pitch); } static void notein_free(t_notein *x) {pd_unbind(x, notein_sym);} --- 2179,2185 ---- float velo = atom_getfloatarg(1, argc, argv); float channel = atom_getfloatarg(2, argc, argv); ! if (x->ch) {if (channel != x->ch) return;} else outlet_float(x->out(2), channel); ! outlet_float(x->out(1), velo); ! outlet_float(x->out(0), pitch); } static void notein_free(t_notein *x) {pd_unbind(x, notein_sym);} *************** *** 2257,2263 **** t_float ch; t_float ctlno; - t_outlet *out1; - t_outlet *out2; - t_outlet *out3; }; static void *ctlin_new(t_symbol *s, int argc, t_atom *argv) { --- 2205,2208 ---- *************** *** 2267,2274 **** x->ch = channel; x->ctlno = ctlno; ! x->out1 = outlet_new(x, &s_float); if (!channel) { ! if (x->ctlno < 0) x->out2 = outlet_new(x, &s_float); ! x->out3 = outlet_new(x, &s_float); } pd_bind(x, ctlin_sym); --- 2212,2219 ---- x->ch = channel; x->ctlno = ctlno; ! outlet_new(x, &s_float); if (!channel) { ! if (x->ctlno < 0) outlet_new(x, &s_float); ! outlet_new(x, &s_float); } pd_bind(x, ctlin_sym); *************** *** 2281,2287 **** if (x->ctlno >= 0 && x->ctlno != ctlnumber) return; if (x->ch > 0 && x->ch != channel) return; ! if (x->ch == 0) outlet_float(x->out3, channel); ! if (x->ctlno < 0) outlet_float(x->out2, ctlnumber); ! outlet_float(x->out1, value); } static void ctlin_free(t_ctlin *x) {pd_unbind(x, ctlin_sym);} --- 2226,2232 ---- if (x->ctlno >= 0 && x->ctlno != ctlnumber) return; if (x->ch > 0 && x->ch != channel) return; ! if (x->ch == 0) outlet_float(x->out(2), channel); ! if (x->ctlno < 0) outlet_float(x->out(1), ctlnumber); ! outlet_float(x->out(0), value); } static void ctlin_free(t_ctlin *x) {pd_unbind(x, ctlin_sym);} *************** *** 2304,2315 **** struct t_midi2 : t_object { t_float ch; - t_outlet *out1; - t_outlet *out2; }; static void *midi2_new(t_class *cl, t_floatarg ch) { t_midi2 *x = (t_midi2 *)pd_new(cl); x->ch = ch; ! x->out1 = outlet_new(x, &s_float); ! if (!ch) x->out2 = outlet_new(x, &s_float); return x; } --- 2249,2258 ---- struct t_midi2 : t_object { t_float ch; }; static void *midi2_new(t_class *cl, t_floatarg ch) { t_midi2 *x = (t_midi2 *)pd_new(cl); x->ch = ch; ! outlet_new(x, &s_float); ! if (!ch) outlet_new(x, &s_float); return x; } *************** *** 2317,2322 **** float value = atom_getfloatarg(0, argc, argv); float channel = atom_getfloatarg(1, argc, argv); ! if (x->ch) {if (channel != x->ch) return;} else outlet_float(x->out2, channel); ! outlet_float(x->out1, value); } static t_symbol *pgmin_sym, *bendin_sym, *touchin_sym; --- 2260,2265 ---- float value = atom_getfloatarg(0, argc, argv); float channel = atom_getfloatarg(1, argc, argv); ! if (x->ch) {if (channel != x->ch) return;} else outlet_float(x->out(1), channel); ! outlet_float(x->out(0), value); } static t_symbol *pgmin_sym, *bendin_sym, *touchin_sym; *************** *** 2372,2385 **** struct t_polytouchin : t_object { t_float ch; - t_outlet *out1; - t_outlet *out2; - t_outlet *out3; }; static void *polytouchin_new(t_floatarg f) { t_polytouchin *x = (t_polytouchin *)pd_new(polytouchin_class); x->ch = f; ! x->out1 = outlet_new(x, &s_float); ! x->out2 = outlet_new(x, &s_float); ! if (f == 0) x->out3 = outlet_new(x, &s_float); pd_bind(x, polytouchin_sym); return x; --- 2315,2325 ---- struct t_polytouchin : t_object { t_float ch; }; static void *polytouchin_new(t_floatarg f) { t_polytouchin *x = (t_polytouchin *)pd_new(polytouchin_class); x->ch = f; ! outlet_new(x, &s_float); ! outlet_new(x, &s_float); ! if (f == 0) outlet_new(x, &s_float); pd_bind(x, polytouchin_sym); return x; *************** *** 2387,2393 **** static void polytouchin_list(t_polytouchin *x, t_symbol *s, int argc, t_atom *argv) { t_float channel = atom_getfloatarg(2, argc, argv); ! if (x->ch) {if (channel != x->ch) return;} else outlet_float(x->out3, channel); ! outlet_float(x->out2, atom_getfloatarg(0, argc, argv)); /*pitch*/ ! outlet_float(x->out1, atom_getfloatarg(1, argc, argv)); /*value*/ } static void polytouchin_free(t_polytouchin *x) {pd_unbind(x, polytouchin_sym);} --- 2327,2333 ---- static void polytouchin_list(t_polytouchin *x, t_symbol *s, int argc, t_atom *argv) { t_float channel = atom_getfloatarg(2, argc, argv); ! if (x->ch) {if (channel != x->ch) return;} else outlet_float(x->out(2), channel); ! outlet_float(x->out(1), atom_getfloatarg(0, argc, argv)); /*pitch*/ ! outlet_float(x->out(0), atom_getfloatarg(1, argc, argv)); /*value*/ } static void polytouchin_free(t_polytouchin *x) {pd_unbind(x, polytouchin_sym);} *************** *** 2412,2429 **** static t_symbol *midiclkin_sym; static t_class *midiclkin_class; ! struct t_midiclkin : t_object { ! t_outlet *out1; ! t_outlet *out2; ! }; static void *midiclkin_new(t_floatarg f) { t_midiclkin *x = (t_midiclkin *)pd_new(midiclkin_class); ! x->out1 = outlet_new(x, &s_float); ! x->out2 = outlet_new(x, &s_float); pd_bind(x, midiclkin_sym); return x; } static void midiclkin_list(t_midiclkin *x, t_symbol *s, int argc, t_atom *argv) { ! outlet_float(x->out2, atom_getfloatarg(1, argc, argv)); /*count*/ ! outlet_float(x->out1, atom_getfloatarg(0, argc, argv)); /*value*/ } static void midiclkin_free(t_midiclkin *x) {pd_unbind(x, midiclkin_sym);} --- 2352,2366 ---- static t_symbol *midiclkin_sym; static t_class *midiclkin_class; ! struct t_midiclkin : t_object {}; static void *midiclkin_new(t_floatarg f) { t_midiclkin *x = (t_midiclkin *)pd_new(midiclkin_class); ! outlet_new(x, &s_float); ! outlet_new(x, &s_float); pd_bind(x, midiclkin_sym); return x; } static void midiclkin_list(t_midiclkin *x, t_symbol *s, int argc, t_atom *argv) { ! outlet_float(x->out(1), atom_getfloatarg(1, argc, argv)); /*count*/ ! outlet_float(x->out(0), atom_getfloatarg(0, argc, argv)); /*value*/ } static void midiclkin_free(t_midiclkin *x) {pd_unbind(x, midiclkin_sym);} *************** *** 2452,2469 **** static t_symbol *midirealtimein_sym; static t_class *midirealtimein_class; ! struct t_midirealtimein : t_object { ! t_outlet *out1; ! t_outlet *out2; ! }; static void *midirealtimein_new() { t_midirealtimein *x = (t_midirealtimein *)pd_new(midirealtimein_class); ! x->out1 = outlet_new(x, &s_float); ! x->out2 = outlet_new(x, &s_float); pd_bind(x, midirealtimein_sym); return x; } static void midirealtimein_list(t_midirealtimein *x, t_symbol *s, int argc, t_atom *argv) { ! outlet_float(x->out2, atom_getfloatarg(0, argc, argv)); /*portno*/ ! outlet_float(x->out1, atom_getfloatarg(1, argc, argv)); /*byte*/ } static void midirealtimein_free(t_midirealtimein *x) {pd_unbind(x, midirealtimein_sym);} --- 2389,2403 ---- static t_symbol *midirealtimein_sym; static t_class *midirealtimein_class; ! struct t_midirealtimein : t_object {}; static void *midirealtimein_new() { t_midirealtimein *x = (t_midirealtimein *)pd_new(midirealtimein_class); ! outlet_new(x, &s_float); ! outlet_new(x, &s_float); pd_bind(x, midirealtimein_sym); return x; } static void midirealtimein_list(t_midirealtimein *x, t_symbol *s, int argc, t_atom *argv) { ! outlet_float(x->out(1), atom_getfloatarg(0, argc, argv)); /*portno*/ ! outlet_float(x->out(0), atom_getfloatarg(1, argc, argv)); /*byte*/ } static void midirealtimein_free(t_midirealtimein *x) {pd_unbind(x, midirealtimein_sym);} *************** *** 2622,2627 **** t_float velo; t_float dur; - t_outlet *pitchout; - t_outlet *velout; t_hang *hang; }; --- 2556,2559 ---- *************** *** 2632,2637 **** floatinlet_new(x, &x->velo); floatinlet_new(x, &x->dur); ! x->pitchout = outlet_new(x, &s_float); ! x->velout = outlet_new(x, &s_float); x->hang = 0; return x; --- 2564,2569 ---- floatinlet_new(x, &x->velo); floatinlet_new(x, &x->dur); ! outlet_new(x, &s_float); ! outlet_new(x, &s_float); x->hang = 0; return x; *************** *** 2640,2645 **** t_makenote *x = hang->owner; t_hang *h2, *h3; ! outlet_float(x->velout, 0); ! outlet_float(x->pitchout, hang->pitch); if (x->hang == hang) x->hang = hang->next; else for (h2 = x->hang; (h3 = h2->next); h2 = h3) { --- 2572,2577 ---- t_makenote *x = hang->owner; t_hang *h2, *h3; ! outlet_float(x->out(1), 0); ! outlet_float(x->out(0), hang->pitch); if (x->hang == hang) x->hang = hang->next; else for (h2 = x->hang; (h3 = h2->next); h2 = h3) { *************** *** 2655,2660 **** t_hang *hang; if (!x->velo) return; ! outlet_float(x->velout, x->velo); ! outlet_float(x->pitchout, f); hang = (t_hang *)getbytes(sizeof *hang); hang->next = x->hang; --- 2587,2592 ---- t_hang *hang; if (!x->velo) return; ! outlet_float(x->out(1), x->velo); ! outlet_float(x->out(0), f); hang = (t_hang *)getbytes(sizeof *hang); hang->next = x->hang; *************** *** 2668,2673 **** t_hang *hang; while ((hang = x->hang)) { ! outlet_float(x->velout, 0); ! outlet_float(x->pitchout, hang->pitch); x->hang = hang->next; clock_free(hang->clock); --- 2600,2605 ---- t_hang *hang; while ((hang = x->hang)) { ! outlet_float(x->out(1), 0); ! outlet_float(x->out(0), hang->pitch); x->hang = hang->next; clock_free(hang->clock); *************** *** 2693,2710 **** struct t_stripnote : t_object { t_float velo; - t_outlet *pitchout; - t_outlet *velout; }; static void *stripnote_new() { t_stripnote *x = (t_stripnote *)pd_new(stripnote_class); floatinlet_new(x, &x->velo); ! x->pitchout = outlet_new(x, &s_float); ! x->velout = outlet_new(x, &s_float); return x; } static void stripnote_float(t_stripnote *x, t_float f) { if (!x->velo) return; ! outlet_float(x->velout, x->velo); ! outlet_float(x->pitchout, f); } static void stripnote_setup() { --- 2625,2640 ---- struct t_stripnote : t_object { t_float velo; }; static void *stripnote_new() { t_stripnote *x = (t_stripnote *)pd_new(stripnote_class); floatinlet_new(x, &x->velo); ! outlet_new(x, &s_float); ! outlet_new(x, &s_float); return x; } static void stripnote_float(t_stripnote *x, t_float f) { if (!x->velo) return; ! outlet_float(x->out(1), x->velo); ! outlet_float(x->out(0), f); } static void stripnote_setup() { *************** *** 2723,2728 **** t_voice *vec; float vel; - t_outlet *pitchout; - t_outlet *velout; unsigned long serial; int steal; --- 2653,2656 ---- *************** *** 2740,2745 **** floatinlet_new(x, &x->vel); outlet_new(x, &s_float); ! x->pitchout = outlet_new(x, &s_float); ! x->velout = outlet_new(x, &s_float); x->serial = 0; return x; --- 2668,2673 ---- floatinlet_new(x, &x->vel); outlet_new(x, &s_float); ! outlet_new(x, &s_float); ! outlet_new(x, &s_float); x->serial = 0; return x; *************** *** 2759,2765 **** } if (firstoff) { ! outlet_float(x->velout, x->vel); ! outlet_float(x->pitchout, firstoff->pitch = f); ! outlet_float(x->outlet, offindex+1); firstoff->used = 1; firstoff->serial = x->serial++; --- 2687,2693 ---- } if (firstoff) { ! outlet_float(x->out(2), x->vel); ! outlet_float(x->out(1), firstoff->pitch = f); ! outlet_float(x->out(0), offindex+1); firstoff->used = 1; firstoff->serial = x->serial++; *************** *** 2767,2776 **** /* if none, steal one */ else if (firston && x->steal) { ! outlet_float(x->velout, 0); ! outlet_float(x->pitchout, firston->pitch); ! outlet_float(x->outlet, onindex+1); ! outlet_float(x->velout, x->vel); ! outlet_float(x->pitchout, firston->pitch = f); ! outlet_float(x->outlet, onindex+1); firston->serial = x->serial++; } --- 2695,2704 ---- /* if none, steal one */ else if (firston && x->steal) { ! outlet_float(x->out(2), 0); ! outlet_float(x->out(1), firston->pitch); ! outlet_float(x->out(0), onindex+1); ! outlet_float(x->out(2), x->vel); ! outlet_float(x->out(1), firston->pitch = f); ! outlet_float(x->out(0), onindex+1); firston->serial = x->serial++; } *************** *** 2782,2788 **** firston->used = 0; firston->serial = x->serial++; ! outlet_float(x->velout, 0); ! outlet_float(x->pitchout, firston->pitch); ! outlet_float(x->outlet, onindex+1); } } --- 2710,2716 ---- firston->used = 0; firston->serial = x->serial++; ! outlet_float(x->out(2), 0); ! outlet_float(x->out(1), firston->pitch); ! outlet_float(x->out(0), onindex+1); } } *************** *** 2791,2797 **** t_voice *v = x->vec; for (int i = 0; i < x->n; i++, v++) if (v->used) { ! outlet_float(x->velout, 0L); ! outlet_float(x->pitchout, v->pitch); ! outlet_float(x->outlet, i+1); v->used = 0; v->serial = x->serial++; --- 2719,2725 ---- t_voice *v = x->vec; for (int i = 0; i < x->n; i++, v++) if (v->used) { ! outlet_float(x->out(2), 0L); ! outlet_float(x->out(1), v->pitch); ! outlet_float(x->out(0), i+1); v->used = 0; v->serial = x->serial++; *************** *** 3061,3067 **** }; struct t_pipeout { ! t_atom p_atom; ! t_outlet *p_outlet; ! } ; struct t_pipe : t_object { int n; --- 2989,2994 ---- }; struct t_pipeout { ! t_atom a; ! }; struct t_pipe : t_object { int n; *************** *** 3104,3128 **** for (i = 0, vp = vec, ap = argv; i < argc; i++, ap++, vp++) { if (ap->a_type == A_FLOAT) { ! vp->p_atom = *ap; ! vp->p_outlet = outlet_new(x, &s_float); ! if (i) floatinlet_new(x, &vp->p_atom.a_w.w_float); } else if (ap->a_type == A_SYMBOL) { char c = *ap->a_w.w_symbol->name; if (c == 's') { ! SETSYMBOL(&vp->p_atom, &s_symbol); ! vp->p_outlet = outlet_new(x, &s_symbol); ! if (i) symbolinlet_new(x, &vp->p_atom.a_w.w_symbol); } else if (c == 'p') { ! vp->p_atom.a_type = A_POINTER; ! vp->p_atom.a_w.w_gpointer = gp; gpointer_init(gp); ! vp->p_outlet = outlet_new(x, &s_pointer); if (i) pointerinlet_new(x, gp); gp++; } else { if (c != 'f') error("pack: %s: bad type", ap->a_w.w_symbol->name); ! SETFLOAT(&vp->p_atom, 0); ! vp->p_outlet = outlet_new(x, &s_float); ! if (i) floatinlet_new(x, &vp->p_atom.a_w.w_float); } } --- 3031,3055 ---- for (i = 0, vp = vec, ap = argv; i < argc; i++, ap++, vp++) { if (ap->a_type == A_FLOAT) { ! vp->a = *ap; ! outlet_new(x, &s_float); ! if (i) floatinlet_new(x, &vp->a.a_w.w_float); } else if (ap->a_type == A_SYMBOL) { char c = *ap->a_w.w_symbol->name; if (c == 's') { ! SETSYMBOL(&vp->a, &s_symbol); ! outlet_new(x, &s_symbol); ! if (i) symbolinlet_new(x, &vp->a.a_w.w_symbol); } else if (c == 'p') { ! vp->a.a_type = A_POINTER; ! vp->a.a_w.w_gpointer = gp; gpointer_init(gp); ! outlet_new(x, &s_pointer); if (i) pointerinlet_new(x, gp); gp++; } else { if (c != 'f') error("pack: %s: bad type", ap->a_w.w_symbol->name); ! SETFLOAT(&vp->a, 0); ! outlet_new(x, &s_float); ! if (i) floatinlet_new(x, &vp->a.a_w.w_float); } } *************** *** 3155,3163 **** } for (i = x->n, p = x->vec + (x->n - 1), w = h->h_vec + (x->n - 1); i--; p--, w--) { ! switch (p->p_atom.a_type) { ! case A_FLOAT: outlet_float(p->p_outlet, w->w_float); break; ! case A_SYMBOL: outlet_symbol(p->p_outlet, w->w_symbol); break; case A_POINTER: ! if (gpointer_check(w->w_gpointer, 1)) outlet_pointer(p->p_outlet, w->w_gpointer); else post("pipe: stale pointer"); break; --- 3082,3090 ---- } for (i = x->n, p = x->vec + (x->n - 1), w = h->h_vec + (x->n - 1); i--; p--, w--) { ! switch (p->a.a_type) { ! case A_FLOAT: outlet_float( x->out(i),w->w_float); break; ! case A_SYMBOL: outlet_symbol(x->out(i),w->w_symbol); break; case A_POINTER: ! if (gpointer_check(w->w_gpointer, 1)) outlet_pointer(x->out(i), w->w_gpointer); else post("pipe: stale pointer"); break; *************** *** 3177,3183 **** if (ac > n) ac = n; for (i = 0, gp = x->gp, p = x->vec, ap = av; i < ac; i++, p++, ap++) { ! switch (p->p_atom.a_type) { ! case A_FLOAT: p->p_atom.a_w.w_float = atom_getfloat(ap); break; ! case A_SYMBOL: p->p_atom.a_w.w_symbol = atom_getsymbol(ap); break; case A_POINTER: gpointer_unset(gp); --- 3104,3110 ---- if (ac > n) ac = n; for (i = 0, gp = x->gp, p = x->vec, ap = av; i < ac; i++, p++, ap++) { ! switch (p->a.a_type) { ! case A_FLOAT: p->a.a_w.w_float = atom_getfloat(ap); break; ! case A_SYMBOL: p->a.a_w.w_symbol = atom_getsymbol(ap); break; case A_POINTER: gpointer_unset(gp); *************** *** 3192,3200 **** } for (i = 0, gp = x->gp, gp2 = h->h_gp, p = x->vec, w = h->h_vec; i < n; i++, p++, w++) { ! if (p->p_atom.a_type == A_POINTER) { if (gp->o) gp->o->refcount++; w->w_gpointer = gp2; *gp2++ = *gp++; ! } else *w = p->p_atom.a_w; } h->h_next = x->hang; --- 3119,3127 ---- } for (i = 0, gp = x->gp, gp2 = h->h_gp, p = x->vec, w = h->h_vec; i < n; i++, p++, w++) { ! if (p->a.a_type == A_POINTER) { if (gp->o) gp->o->refcount++; w->w_gpointer = gp2; *gp2++ = *gp++; ! } else *w = p->a.a_w; } h->h_next = x->hang;

1 0

pd/src m_pd.h, 1.4.4.11.2.33.2.39, 1.4.4.11.2.33.2.40 kernel.c, 1.1.2.33, 1.1.2.34
by Mathieu Bouchard 09 Jan '07

09 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26609 Modified Files: Tag: desiredata m_pd.h kernel.c Log Message: introducing in() out() C++ methods in t_object Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.39 retrieving revision 1.4.4.11.2.33.2.40 diff -C2 -d -r1.4.4.11.2.33.2.39 -r1.4.4.11.2.33.2.40 *** m_pd.h 9 Jan 2007 18:14:28 -0000 1.4.4.11.2.33.2.39 --- m_pd.h 9 Jan 2007 19:39:15 -0000 1.4.4.11.2.33.2.40 *************** *** 4,7 **** --- 4,11 ---- WARRANTIES, see the file, "LICENSE.txt", in this distribution. */ + /* PD_PLUSPLUS_FACE is not considered as part of the main interface for externals, + even though it has become the main interface for internals. please don't rely on + it outside of the desiredata source code */ + #ifndef __m_pd_h_ *************** *** 251,254 **** --- 255,262 ---- short x,y; /* x&y location (within the toplevel) */ int refcount; /* there used to be a bitfield here, which may be a problem with ms-bitfields (?) */ + #ifdef PD_PLUSPLUS_FACE + t_inlet * in(int n); + t_outlet *out(int n); + #endif } t_text, t_object; Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.33 retrieving revision 1.1.2.34 diff -C2 -d -r1.1.2.33 -r1.1.2.34 *** kernel.c 9 Jan 2007 17:06:28 -0000 1.1.2.33 --- kernel.c 9 Jan 2007 19:39:15 -0000 1.1.2.34 *************** *** 688,691 **** --- 688,694 ---- }; + t_inlet *t_object:: in(int n) {t_inlet *i; while(n--) i=i->next; return i;} + t_outlet *t_object::out(int n) {t_outlet *o; while(n--) o=o->o_next; return o;} + t_class *wire_class; t_wire *wire_new (t_symbol *s, int argc, t_atom *argv) {

1 0

pd/src builtins.c,1.1.2.12,1.1.2.13
by Mathieu Bouchard 09 Jan '07

09 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11828 Modified Files: Tag: desiredata builtins.c Log Message: added route_eachr() Index: builtins.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/builtins.c,v retrieving revision 1.1.2.12 retrieving revision 1.1.2.13 diff -C2 -d -r1.1.2.12 -r1.1.2.13 *** builtins.c 9 Jan 2007 18:33:54 -0000 1.1.2.12 --- builtins.c 9 Jan 2007 18:58:26 -0000 1.1.2.13 *************** *** 825,830 **** outlet_list(x->out2, &s_list, argc-n, argv+n); outlet_list(x->out1, &s_list, n, argv); ! } ! else outlet_list(x->out3, &s_list, argc, argv); } static void list_split_anything(t_list_split *x, t_symbol *s, int argc, t_atom *argv) { --- 825,829 ---- outlet_list(x->out2, &s_list, argc-n, argv+n); outlet_list(x->out1, &s_list, n, argv); ! } else outlet_list(x->out3, &s_list, argc, argv); } static void list_split_anything(t_list_split *x, t_symbol *s, int argc, t_atom *argv) { *************** *** 1563,1566 **** --- 1562,1567 ---- outlet_anything(x->rejectout, sel, argc, argv); } + + #define route_eachr(E,L) for (t_routeelement *E = L->vec;E;E=0) for (int ROUTEN = x->n; ROUTEN--; E++) static void route_list(t_route *x, t_symbol *sel, int argc, t_atom *argv) { if (x->type == A_FLOAT) { *************** *** 1574,1579 **** argc -= 1, argv+=1; if (argc > 1) outlet_list(e->e_outlet, 0, argc, argv); ! else if (argc == 0) /* bang */ ! outlet_bang(e->e_outlet); else if (argv[0].a_type == A_FLOAT) outlet_float( e->e_outlet, argv[0].a_w.w_float); else if (argv[0].a_type == A_SYMBOL) outlet_symbol( e->e_outlet, argv[0].a_w.w_symbol); --- 1575,1579 ---- argc -= 1, argv+=1; if (argc > 1) outlet_list(e->e_outlet, 0, argc, argv); ! else if (argc == 0) outlet_bang(e->e_outlet); else if (argv[0].a_type == A_FLOAT) outlet_float( e->e_outlet, argv[0].a_w.w_float); else if (argv[0].a_type == A_SYMBOL) outlet_symbol( e->e_outlet, argv[0].a_w.w_symbol); *************** *** 1584,1589 **** } else { /* symbol arguments */ if (argc > 1) { /* 2 or more args: treat as "list" */ ! t_routeelement *e = x->vec; ! for (int n = x->n; n--; e++) { if (e->e_w.w_symbol == &s_list) { if (argv[0].a_type==A_SYMBOL) outlet_anything(e->e_outlet, argv[0].a_w.w_symbol, argc-1, argv+1); --- 1584,1588 ---- } else { /* symbol arguments */ if (argc > 1) { /* 2 or more args: treat as "list" */ ! route_eachr(e,x) { if (e->e_w.w_symbol == &s_list) { if (argv[0].a_type==A_SYMBOL) outlet_anything(e->e_outlet, argv[0].a_w.w_symbol, argc-1, argv+1); *************** *** 1592,1618 **** } } ! } else if (argc == 0) { /* no args: treat as "bang" */ ! t_routeelement *e = x->vec; ! for (int n = x->n; n--; e++) { ! if (e->e_w.w_symbol == &s_bang) { ! outlet_bang(e->e_outlet); ! return; ! } } } else if (argv[0].a_type == A_FLOAT) { ! t_routeelement *e = x->vec; ! for (int n = x->n; n--; e++) { ! if (e->e_w.w_symbol == &s_float) { ! outlet_float(e->e_outlet, argv[0].a_w.w_float); ! return; ! } } } else { ! t_routeelement *e = x->vec; ! for (int n = x->n; n--; e++) { ! if (e->e_w.w_symbol == &s_symbol) { ! outlet_symbol(e->e_outlet, argv[0].a_w.w_symbol); ! return; ! } } } --- 1591,1605 ---- } } ! } else if (argc == 0) { ! route_eachr(e,x) { ! if (e->e_w.w_symbol == &s_bang) {outlet_bang(e->e_outlet); return;} } } else if (argv[0].a_type == A_FLOAT) { ! route_eachr(e,x) { ! if (e->e_w.w_symbol == &s_float) {outlet_float(e->e_outlet, argv[0].a_w.w_float); return;} } } else { ! route_eachr(e,x) { ! if (e->e_w.w_symbol == &s_symbol) {outlet_symbol(e->e_outlet, argv[0].a_w.w_symbol); return;} } }

1 0

pd/src builtins.c,1.1.2.11,1.1.2.12
by Mathieu Bouchard 09 Jan '07

09 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2360 Modified Files: Tag: desiredata builtins.c Log Message: remove useless t_listelem. Index: builtins.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/builtins.c,v retrieving revision 1.1.2.11 retrieving revision 1.1.2.12 diff -C2 -d -r1.1.2.11 -r1.1.2.12 *** builtins.c 9 Jan 2007 15:07:39 -0000 1.1.2.11 --- builtins.c 9 Jan 2007 18:33:54 -0000 1.1.2.12 *************** *** 668,699 **** /* -------------- utility functions: storage, copying -------------- */ - /* List element for storage. Keep an atom and, in case it's a pointer, - an associated 'gpointer' to protect against stale pointers. */ - struct t_listelem { - t_atom a; - t_gpointer l_p; - }; typedef struct t_alist : t_pd { int n; /* number of items */ ! t_listelem *l_vec; /* pointer to items */ }; - #if 0 /* probably won't use this version... */ - #ifdef HAVE_ALLOCA - #define LIST_ALLOCA(x, n) ( \ - (x).n = (n), \ - (x).l_vec = (t_listelem *)((n) < LIST_NGETBYTE ? \ - alloca((n) * sizeof(t_listelem)) : getbytes((n) * sizeof(t_listelem)))) \ - #define LIST_FREEA(x) (((x).n < LIST_NGETBYTE || (free((x).l_vec), 0))) - - #else - #define LIST_ALLOCA(x, n) ( \ - (x).n = (n), \ - (x).l_vec = (t_listelem *)getbytes((n) * sizeof(t_listelem))) - #define LIST_FREEA(x) (free((x).l_vec)) - #endif - #endif - #if HAVE_ALLOCA #define ATOMS_ALLOCA(x, n) ((x) = (t_atom *)((n) < LIST_NGETBYTE ? \ --- 668,678 ---- /* -------------- utility functions: storage, copying -------------- */ + /* damn like binbuf */ typedef struct t_alist : t_pd { int n; /* number of items */ ! t_atom *v; /* pointer to items */ }; #if HAVE_ALLOCA #define ATOMS_ALLOCA(x, n) ((x) = (t_atom *)((n) < LIST_NGETBYTE ? \ *************** *** 715,756 **** x->_class = alist_class; x->n = 0; ! x->l_vec = 0; } static void alist_clear(t_alist *x) { for (int i = 0; i < x->n; i++) ! if (x->l_vec[i].a.a_type == A_POINTER) gpointer_unset(x->l_vec[i].a.a_w.w_gpointer); ! if (x->l_vec) free(x->l_vec); } static void alist_list(t_alist *x, t_symbol *s, int argc, t_atom *argv) { alist_clear(x); ! if (!(x->l_vec = (t_listelem *)getbytes(argc * sizeof(*x->l_vec)))) { ! x->n = 0; ! error("list_alloc: out of memory"); ! return; ! } x->n = argc; ! for (int i = 0; i < argc; i++) { ! x->l_vec[i].a = argv[i]; ! if (x->l_vec[i].a.a_type == A_POINTER) ! gpointer_copy(x->l_vec[i].a.a_w.w_gpointer, &x->l_vec[i].l_p); ! } } static void alist_anything(t_alist *x, t_symbol *s, int argc, t_atom *argv) { alist_clear(x); ! if (!(x->l_vec = (t_listelem *)getbytes((argc+1) * sizeof(*x->l_vec)))) { ! x->n = 0; ! error("list_alloc: out of memory"); ! return; ! } x->n = argc+1; ! SETSYMBOL(&x->l_vec[0].a, s); ! for (int i = 0; i < argc; i++) { ! x->l_vec[i+1].a = argv[i]; ! if (x->l_vec[i+1].a.a_type == A_POINTER) ! gpointer_copy(x->l_vec[i+1].a.a_w.w_gpointer, &x->l_vec[i+1].l_p); ! } } static void alist_toatoms(t_alist *x, t_atom *to) { ! for (int i = 0; i < x->n; i++) to[i] = x->l_vec[i].a; } static void alist_setup() { --- 694,721 ---- x->_class = alist_class; x->n = 0; ! x->v = 0; } static void alist_clear(t_alist *x) { for (int i = 0; i < x->n; i++) ! if (x->v[i].a_type == A_POINTER) gpointer_unset(x->v[i].a_w.w_gpointer); ! if (x->v) free(x->v); } static void alist_list(t_alist *x, t_symbol *s, int argc, t_atom *argv) { alist_clear(x); ! x->v = (t_atom *)getbytes(argc * sizeof(*x->v)); ! if (!x->v) {x->n = 0; error("list_alloc: out of memory"); return;} x->n = argc; ! for (int i = 0; i < argc; i++) x->v[i] = argv[i]; } static void alist_anything(t_alist *x, t_symbol *s, int argc, t_atom *argv) { alist_clear(x); ! x->v = (t_atom *)getbytes((argc+1) * sizeof(*x->v)); ! if (!x->v) {x->n = 0; error("list_alloc: out of memory"); return;} x->n = argc+1; ! SETSYMBOL(&x->v[0], s); ! for (int i = 0; i < argc; i++) x->v[i+1] = argv[i]; } static void alist_toatoms(t_alist *x, t_atom *to) { ! for (int i = 0; i < x->n; i++) to[i] = x->v[i]; } static void alist_setup() {

1 0

pd/src m_pd.h, 1.4.4.11.2.33.2.38, 1.4.4.11.2.33.2.39 s_inter.c, 1.5.4.10.2.25.2.12, 1.5.4.10.2.25.2.13
by Mathieu Bouchard 09 Jan '07

09 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28602 Modified Files: Tag: desiredata m_pd.h s_inter.c Log Message: no freebytes Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.10.2.25.2.12 retrieving revision 1.5.4.10.2.25.2.13 diff -C2 -d -r1.5.4.10.2.25.2.12 -r1.5.4.10.2.25.2.13 *** s_inter.c 20 Dec 2006 04:02:40 -0000 1.5.4.10.2.25.2.12 --- s_inter.c 9 Jan 2007 18:14:28 -0000 1.5.4.10.2.25.2.13 *************** *** 412,420 **** } ! void socketreceiver_free(t_socketreceiver *x) ! { ! free(x->inbuf); ! freebytes(x, sizeof(*x)); ! } /* this is in a separately called subroutine so that the buffer isn't --- 412,416 ---- } ! void socketreceiver_free(t_socketreceiver *x) {free(x->inbuf); free(x);} /* this is in a separately called subroutine so that the buffer isn't Index: m_pd.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_pd.h,v retrieving revision 1.4.4.11.2.33.2.38 retrieving revision 1.4.4.11.2.33.2.39 diff -C2 -d -r1.4.4.11.2.33.2.38 -r1.4.4.11.2.33.2.39 *** m_pd.h 5 Jan 2007 00:02:58 -0000 1.4.4.11.2.33.2.38 --- m_pd.h 9 Jan 2007 18:14:28 -0000 1.4.4.11.2.33.2.39 *************** *** 303,310 **** /* --------------- memory management -------------------- */ ! EXTERN void *getbytes(size_t nbytes); EXTERN void *copybytes(void *src, size_t nbytes); ! EXTERN void freebytes(void *x, size_t nbytes); ! EXTERN void *resizebytes(void *x, size_t oldsize, size_t newsize); /* T.Grill - functions for aligned memory (according to CPU SIMD architecture) */ --- 303,310 ---- /* --------------- memory management -------------------- */ ! EXTERN void *getbytes(size_t nbytes); /* deprecated, use malloc() */ EXTERN void *copybytes(void *src, size_t nbytes); ! EXTERN void freebytes(void *x, size_t nbytes); /* deprecated, use free() */ ! EXTERN void *resizebytes(void *x, size_t oldsize, size_t newsize); /* deprecated, use realloc() */ /* T.Grill - functions for aligned memory (according to CPU SIMD architecture) */

1 0

pd/src m_sched.c,1.5.4.35.2.21.2.3,1.5.4.35.2.21.2.4
by Mathieu Bouchard 09 Jan '07

09 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6508 Modified Files: Tag: desiredata m_sched.c Log Message: freebytes,resizebytes -> free,realloc Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.35.2.21.2.3 retrieving revision 1.5.4.35.2.21.2.4 diff -C2 -d -r1.5.4.35.2.21.2.3 -r1.5.4.35.2.21.2.4 *** m_sched.c 20 Dec 2006 08:28:13 -0000 1.5.4.35.2.21.2.3 --- m_sched.c 9 Jan 2007 17:14:09 -0000 1.5.4.35.2.21.2.4 *************** *** 7,10 **** --- 7,11 ---- #include "desire.h" #include "m_fifo.h" + #include <stdlib.h> /* for timeval */ *************** *** 21,29 **** #include "assert.h" ! /* LATER consider making this variable. It's now the LCM of all sample ! rates we expect to see: 32000, 44100, 48000, 88200, 96000. */ #define TIMEUNITPERSEC (32.*441000.) - /* T.Grill - enable PD global thread locking - sys_lock, sys_unlock, sys_trylock functions */ #define THREAD_LOCKING --- 22,29 ---- #include "assert.h" ! /* LATER consider making this variable. It's now the LCM of all sample ! rates we expect to see: 32000, 44100, 48000, 88200, 96000. */ #define TIMEUNITPERSEC (32.*441000.) /* T.Grill - enable PD global thread locking - sys_lock, sys_unlock, sys_trylock functions */ #define THREAD_LOCKING *************** *** 38,47 **** int sys_keepsched = 1; /* if 0: change scheduler mode */ int sys_callbackscheduler = 0; /* if 1: change scheduler to callback based dsp */ - - static void run_idle_callbacks(int microsec); t_fifo * callback_fifo = NULL; - - /* tb: }*/ --- 38,43 ---- *************** *** 55,60 **** #endif ! struct _clock ! { double c_settime; void *c_owner; --- 51,55 ---- #endif ! struct _clock { double c_settime; void *c_owner; *************** *** 64,85 **** t_clock *clock_setlist; ! t_clock *clock_new(void *owner, t_method fn) ! { ! t_clock *x = (t_clock *)getbytes(sizeof *x); x->c_settime = -1; x->c_owner = owner; x->c_fn = (t_clockmethod)fn; x->c_next = 0; ! return (x); } ! ! void clock_unset(t_clock *x) ! { ! if (x->c_settime >= 0) ! { if (x == clock_setlist) clock_setlist = x->c_next; ! else ! { t_clock *x2 = clock_setlist; while (x2->c_next != x) x2 = x2->c_next; --- 59,75 ---- t_clock *clock_setlist; ! t_clock *clock_new(void *owner, t_method fn) { ! t_clock *x = (t_clock *)malloc(sizeof(*x)); x->c_settime = -1; x->c_owner = owner; x->c_fn = (t_clockmethod)fn; x->c_next = 0; ! return x; } ! void clock_unset(t_clock *x) { ! if (x->c_settime >= 0) { if (x == clock_setlist) clock_setlist = x->c_next; ! else { t_clock *x2 = clock_setlist; while (x2->c_next != x) x2 = x2->c_next; *************** *** 91,107 **** /* set the clock to call back at an absolute system time */ ! void clock_set(t_clock *x, double setticks) ! { if (setticks < sys_time) setticks = sys_time; clock_unset(x); x->c_settime = setticks; ! if (clock_setlist && clock_setlist->c_settime <= setticks) ! { t_clock *cbefore, *cafter; for (cbefore = clock_setlist, cafter = clock_setlist->c_next; cbefore; cbefore = cafter, cafter = cbefore->c_next) { ! if (!cafter || cafter->c_settime > setticks) ! { cbefore->c_next = x; x->c_next = cafter; --- 81,94 ---- /* set the clock to call back at an absolute system time */ ! void clock_set(t_clock *x, double setticks) { if (setticks < sys_time) setticks = sys_time; clock_unset(x); x->c_settime = setticks; ! if (clock_setlist && clock_setlist->c_settime <= setticks) { t_clock *cbefore, *cafter; for (cbefore = clock_setlist, cafter = clock_setlist->c_next; cbefore; cbefore = cafter, cafter = cbefore->c_next) { ! if (!cafter || cafter->c_settime > setticks) { cbefore->c_next = x; x->c_next = cafter; *************** *** 109,150 **** } } ! } ! else x->c_next = clock_setlist, clock_setlist = x; } ! /* set the clock to call back after a delay in msec */ ! void clock_delay(t_clock *x, double delaytime) ! { clock_set(x, sys_time + sys_time_per_msec * delaytime); } ! ! /* get current logical time. We don't specify what units this is in; ! use clock_gettimesince() to measure intervals from time of this call. ! This was previously, incorrectly named "clock_getsystime"; the old ! name is aliased to the new one in m_pd.h. */ ! double clock_getlogicaltime( void) ! { ! return (sys_time); } - /* OBSOLETE NAME */ - double clock_getsystime( void) { return (sys_time); } ! /* elapsed time in milliseconds since the given system time */ ! double clock_gettimesince(double prevsystime) ! { ! return ((sys_time - prevsystime)/sys_time_per_msec); } ! /* what value the system clock will have after a delay */ ! double clock_getsystimeafter(double delaytime) ! { ! return (sys_time + sys_time_per_msec * delaytime); } ! void clock_free(t_clock *x) ! { clock_unset(x); ! freebytes(x, sizeof *x); } --- 96,131 ---- } } ! } else x->c_next = clock_setlist, clock_setlist = x; } ! /* set the clock to call back after a delay in msec */ ! void clock_delay(t_clock *x, double delaytime) { clock_set(x, sys_time + sys_time_per_msec * delaytime); } ! /* get current logical time. We don't specify what units this is in; ! use clock_gettimesince() to measure intervals from time of this call. ! This was previously, incorrectly named "clock_getsystime"; the old ! name is aliased to the new one in m_pd.h. */ ! double clock_getlogicaltime( void) { ! return sys_time; } ! /* OBSOLETE NAME */ ! double clock_getsystime(void) {return sys_time;} ! ! /* elapsed time in milliseconds since the given system time */ ! double clock_gettimesince(double prevsystime) { ! return (sys_time - prevsystime)/sys_time_per_msec; } ! /* what value the system clock will have after a delay */ ! double clock_getsystimeafter(double delaytime) { ! return sys_time + sys_time_per_msec * delaytime; } ! void clock_free(t_clock *x) { clock_unset(x); ! free(x); } *************** *** 159,193 **** static int sched_diddsp, sched_didpoll, sched_didnothing; ! void sys_clearhist( void) ! { ! unsigned int i, j; ! for (i = 0; i < NHIST; i++) ! for (j = 0; j < NBIN; j++) sys_histogram[i][j] = 0; sys_histtime = sys_getrealtime(); sched_diddsp = sched_didpoll = sched_didnothing = 0; } ! void sys_printhist( void) ! { ! unsigned int i, j; ! for (i = 0; i < NHIST; i++) ! { int doit = 0; ! for (j = 0; j < NBIN; j++) if (sys_histogram[i][j]) doit = 1; ! if (doit) ! { post("%2d %8d %8d %8d %8d %8d %8d %8d %8d", i, ! sys_histogram[i][0], ! sys_histogram[i][1], ! sys_histogram[i][2], ! sys_histogram[i][3], ! sys_histogram[i][4], ! sys_histogram[i][5], ! sys_histogram[i][6], ! sys_histogram[i][7]); } } ! post("dsp %d, pollgui %d, nothing %d", ! sched_diddsp, sched_didpoll, sched_didnothing); } --- 140,162 ---- static int sched_diddsp, sched_didpoll, sched_didnothing; ! void sys_clearhist(void) { ! unsigned i,j; ! for (i=0; i<NHIST; i++) for (j=0; j<NBIN; j++) sys_histogram[i][j] = 0; sys_histtime = sys_getrealtime(); sched_diddsp = sched_didpoll = sched_didnothing = 0; } ! void sys_printhist(void) { ! unsigned i,j; ! for (i=0; i<NHIST; i++) { int doit = 0; ! for (j=0; j<NBIN; j++) if (sys_histogram[i][j]) doit = 1; ! if (doit) { post("%2d %8d %8d %8d %8d %8d %8d %8d %8d", i, ! sys_histogram[i][0], sys_histogram[i][1], sys_histogram[i][2], sys_histogram[i][3], ! sys_histogram[i][4], sys_histogram[i][5], sys_histogram[i][6], sys_histogram[i][7]); } } ! post("dsp %d, pollgui %d, nothing %d", sched_diddsp, sched_didpoll, sched_didnothing); } *************** *** 669,767 **** /* linked list of callbacks * callback will be freed after returning 0 */ ! typedef struct _sched_callback ! { ! struct _sched_callback* next; /* next callback in ringbuffer / in fifo */ ! t_int (*function) (t_int* argv); ! t_int* argv; t_int argc; } t_sched_callback; ! ! void sys_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) ! { ! t_sched_callback* noo = (t_sched_callback*) getbytes ! (sizeof(t_sched_callback)); ! noo->function = callback; ! if (argv && argc) ! { noo->argv = (t_int*) copybytes (argv, argc * sizeof (t_int)); noo->argc = argc; ! } ! else ! { noo->argc = 0; ! noo->argv = NULL; } ! noo->next = NULL; ! ! if (callback_fifo == NULL) ! callback_fifo = fifo_init(); ! fifo_put(callback_fifo, noo); } ! ! void sys_init_idle_callbacks(void) ! { callback_fifo = fifo_init(); /* tb: initialize fifo for idle callbacks */ ! } static t_sched_callback *ringbuffer_head = NULL; ! void run_all_idle_callbacks(void) ! { t_sched_callback * new_callback; /* append idle callback to ringbuffer */ ! while (new_callback = (t_sched_callback*) fifo_get(callback_fifo)) ! { ! t_sched_callback * next; ! ! /* set the next field to NULL ... it might be set in the fifo */ ! new_callback->next = NULL; ! if (ringbuffer_head == NULL) ! { ringbuffer_head = new_callback; ! } ! else ! { next = ringbuffer_head; ! while (next->next != 0) ! next = next->next; next->next = new_callback; } } ! ! if (ringbuffer_head != NULL) ! { ! t_sched_callback * idle_callback = ringbuffer_head; ! t_sched_callback * last = NULL; ! t_sched_callback * next; ! ! do ! { int status; status = (idle_callback->function)(idle_callback->argv); ! ! switch (status) ! { /* callbacks returning 0 will be deleted */ case 0: next = idle_callback->next; ! if (idle_callback->argv) ! freebytes (idle_callback->argv, idle_callback->argc*sizeof (t_int)); ! freebytes ((void*)idle_callback, sizeof(t_sched_callback)); ! ! if (last == NULL) ! ringbuffer_head = next; ! else ! last->next = next; ! idle_callback = next; - /* callbacks returning 1 will be run again */ case 1: break; - /* callbacks returning 2 will be run during the next idle callback */ case 2: --- 638,702 ---- /* linked list of callbacks * callback will be freed after returning 0 */ ! typedef struct _sched_callback { ! struct _sched_callback *next; /* next callback in ringbuffer / in fifo */ ! t_int (*function) (t_int *argv); ! t_int *argv; t_int argc; } t_sched_callback; ! void sys_callback(t_int (*callback) (t_int* argv), t_int* argv, t_int argc) { ! t_sched_callback* noo = (t_sched_callback *)malloc(sizeof(t_sched_callback)); noo->function = callback; ! if (argv && argc) { noo->argv = (t_int*) copybytes (argv, argc * sizeof (t_int)); noo->argc = argc; ! } else { noo->argc = 0; ! noo->argv = 0; } ! noo->next = 0; ! if (!callback_fifo) callback_fifo = fifo_init(); fifo_put(callback_fifo, noo); } ! void sys_init_idle_callbacks(void) { callback_fifo = fifo_init(); /* tb: initialize fifo for idle callbacks */ ! } static t_sched_callback *ringbuffer_head = NULL; ! void run_all_idle_callbacks(void) { t_sched_callback * new_callback; /* append idle callback to ringbuffer */ ! while (new_callback = (t_sched_callback*) fifo_get(callback_fifo)) { ! t_sched_callback *next; ! /* set the next field to 0 ... it might be set in the fifo */ ! new_callback->next = 0; ! if (!ringbuffer_head) { ringbuffer_head = new_callback; ! } else { next = ringbuffer_head; ! while (next->next) next = next->next; next->next = new_callback; } } ! if (ringbuffer_head) { ! t_sched_callback *idle_callback = ringbuffer_head; ! t_sched_callback *last = 0; ! t_sched_callback *next; ! do { int status; status = (idle_callback->function)(idle_callback->argv); ! switch (status) { /* callbacks returning 0 will be deleted */ case 0: next = idle_callback->next; ! if (idle_callback->argv) free(idle_callback->argv); ! free((void*)idle_callback); ! if (!last) ringbuffer_head = next; else last->next = next; idle_callback = next; /* callbacks returning 1 will be run again */ case 1: break; /* callbacks returning 2 will be run during the next idle callback */ case 2: *************** *** 769,799 **** idle_callback = idle_callback->next; } ! ! } ! while ((idle_callback != NULL)); } } ! static void run_idle_callbacks(int microsec) ! { ! t_sched_callback * new_callback; double stop; - stop = sys_getrealtime()*1.e6 + (double)microsec; - /* append idle callback to ringbuffer */ ! while (new_callback = (t_sched_callback*) fifo_get(callback_fifo)) ! { ! t_sched_callback * next; ! /* set the next field to NULL ... it might be set in the fifo */ ! new_callback->next = NULL; ! if (ringbuffer_head == NULL) ! { ringbuffer_head = new_callback; ! } ! else ! { ! next = ringbuffer_head; while (next->next != 0) next = next->next; --- 704,723 ---- idle_callback = idle_callback->next; } ! } while (idle_callback); } } ! static void run_idle_callbacks(int microsec) { ! t_sched_callback *new_callback; double stop; stop = sys_getrealtime()*1.e6 + (double)microsec; /* append idle callback to ringbuffer */ ! while (new_callback = (t_sched_callback*) fifo_get(callback_fifo)) { /* set the next field to NULL ... it might be set in the fifo */ ! new_callback->next = 0; ! if (!ringbuffer_head) { ringbuffer_head = new_callback; ! } else { ! t_sched_callback *next = ringbuffer_head; while (next->next != 0) next = next->next; *************** *** 801,839 **** } } ! ! if (ringbuffer_head != NULL) ! { double remain = stop - sys_getrealtime() * 1.e6; ! t_sched_callback * idle_callback = ringbuffer_head; ! t_sched_callback * last = NULL; ! t_sched_callback * next; ! ! do ! { int status; // sys_lock(); status = (idle_callback->function)(idle_callback->argv); // sys_unlock(); ! ! switch (status) ! { /* callbacks returning 0 will be deleted */ case 0: next = idle_callback->next; ! if (idle_callback->argc) ! freebytes (idle_callback->argv, idle_callback->argc*sizeof (t_int)); ! freebytes ((void*)idle_callback, sizeof(t_sched_callback)); ! ! if (last == NULL) ! ringbuffer_head = next; ! else ! last->next = next; ! idle_callback = next; - /* callbacks returning 1 will be run again */ case 1: break; - /* callbacks returning 2 will be run during the next idle callback */ case 2: --- 725,749 ---- } } ! if (ringbuffer_head) { double remain = stop - sys_getrealtime() * 1.e6; ! t_sched_callback *idle_callback = ringbuffer_head; ! t_sched_callback *last = 0; ! t_sched_callback *next; ! do { int status; // sys_lock(); status = (idle_callback->function)(idle_callback->argv); // sys_unlock(); ! switch (status) { /* callbacks returning 0 will be deleted */ case 0: next = idle_callback->next; ! if (idle_callback->argc) free(idle_callback->argv); ! free((void*)idle_callback); ! if (!last) ringbuffer_head = next; else last->next = next; idle_callback = next; /* callbacks returning 1 will be run again */ case 1: break; /* callbacks returning 2 will be run during the next idle callback */ case 2: *************** *** 841,866 **** idle_callback = idle_callback->next; } - remain = stop-sys_getrealtime()*1.e6; } while ((idle_callback != NULL) && (remain > 0)); - /* sleep for the rest of the time */ if(remain > 0) { - sys_unlock(); - sys_microsleep(remain); - sys_lock(); - } - } - else { sys_unlock(); ! sys_microsleep(microsec); sys_lock(); } } /* } tb */ ! void sys_setscheduler(int scheduler) ! { sys_keepsched = 0; sys_callbackscheduler = scheduler; --- 751,772 ---- idle_callback = idle_callback->next; } remain = stop-sys_getrealtime()*1.e6; } while ((idle_callback != NULL) && (remain > 0)); /* sleep for the rest of the time */ if(remain > 0) { sys_unlock(); ! sys_microsleep(remain); sys_lock(); } + } else { + sys_unlock(); + sys_microsleep(microsec); + sys_lock(); + } } /* } tb */ ! void sys_setscheduler(int scheduler) { sys_keepsched = 0; sys_callbackscheduler = scheduler; *************** *** 868,906 **** } ! int sys_getscheduler(void) ! { return sys_callbackscheduler; } ! static t_int sys_xrun_notification_callback(t_int * dummy) ! { ! t_symbol * pd = gensym("pd"); ! t_symbol * xrun = gensym("xrun"); ! typedmess(pd->s_thing, xrun, 0, 0); - return 0; } ! ! void sys_xrun_notification(void) ! { sys_callback(sys_xrun_notification_callback, 0, 0); } ! ! static t_int sys_lock_timeout_notification_callback(t_int * dummy) ! { ! t_symbol * pd = gensym("pd"); ! t_symbol * timeout = gensym("sys_lock_timeout"); ! typedmess(pd->s_thing, timeout, 0, 0); - return 0; } ! ! void sys_lock_timeout_notification(void) ! { sys_callback(sys_lock_timeout_notification_callback, 0, 0); } --- 774,800 ---- } ! int sys_getscheduler(void) { return sys_callbackscheduler; } ! static t_int sys_xrun_notification_callback(t_int *dummy) { ! t_symbol *pd = gensym("pd"); ! t_symbol *xrun = gensym("xrun"); typedmess(pd->s_thing, xrun, 0, 0); return 0; } ! void sys_xrun_notification(void) { sys_callback(sys_xrun_notification_callback, 0, 0); } ! static t_int sys_lock_timeout_notification_callback(t_int *dummy) { ! t_symbol *pd = gensym("pd"); ! t_symbol *timeout = gensym("sys_lock_timeout"); typedmess(pd->s_thing, timeout, 0, 0); return 0; } ! void sys_lock_timeout_notification(void) { sys_callback(sys_lock_timeout_notification_callback, 0, 0); }

1 0

pd/src desire.tk,1.1.2.600.2.158,1.1.2.600.2.159
by chunlee 09 Jan '07

09 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4920 Modified Files: Tag: desiredata desire.tk Log Message: fix {\} in abstraction Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.158 retrieving revision 1.1.2.600.2.159 diff -C2 -d -r1.1.2.600.2.158 -r1.1.2.600.2.159 *** desire.tk 9 Jan 2007 15:21:14 -0000 1.1.2.600.2.158 --- desire.tk 9 Jan 2007 17:11:20 -0000 1.1.2.600.2.159 *************** *** 2106,2110 **** } ! def TextBox text= {text} {set @text $text} def TextBox text {} {return $@text} def TextBox filter_text {{for_edit 0}} {return $@text} --- 2106,2110 ---- } ! def TextBox text= {text} {set @text [$self remove_braces [join $text]]} def TextBox text {} {return $@text} def TextBox filter_text {{for_edit 0}} {return $@text}

1 0

pd/src m_fifo.c,1.1.2.14.2.6.2.1,1.1.2.14.2.6.2.2
by Mathieu Bouchard 09 Jan '07

09 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867 Modified Files: Tag: desiredata m_fifo.c Log Message: freebytes,getbytes -> free,malloc Index: m_fifo.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/m_fifo.c,v retrieving revision 1.1.2.14.2.6.2.1 retrieving revision 1.1.2.14.2.6.2.2 diff -C2 -d -r1.1.2.14.2.6.2.1 -r1.1.2.14.2.6.2.2 *** m_fifo.c 8 Dec 2006 06:35:17 -0000 1.1.2.14.2.6.2.1 --- m_fifo.c 9 Jan 2007 17:09:44 -0000 1.1.2.14.2.6.2.2 *************** *** 5,10 **** ! #include "stddef.h" ! #include "m_pd.h" #include "m_fifo.h" --- 5,10 ---- ! #include <stddef.h> ! #include <stdlib.h> #include "m_pd.h" #include "m_fifo.h" *************** *** 23,28 **** } t_fifocell; ! struct _fifo ! { t_fifocell * head; t_fifocell * tail; --- 23,27 ---- } t_fifocell; ! struct _fifo { t_fifocell * head; t_fifocell * tail; *************** *** 30,84 **** }; ! ! 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); } --- 29,62 ---- }; ! t_fifo *fifo_init(void) { ! t_fifo* ret = (t_fifo*)malloc(sizeof(t_fifo)); ! t_fifocell * fifo_begin = (t_fifocell*)malloc(sizeof(t_fifocell)); ! fifo_begin->data = 0; ! fifo_begin->next = 0; ret->head = fifo_begin; ret->tail = fifo_begin; ! pthread_mutex_init(&ret->mutex, 0); pthread_mutex_unlock(&ret->mutex); return ret; } ! void fifo_destroy(t_fifo* fifo) { ! void *data; ! do data = fifo_get(fifo); while (data); pthread_mutex_lock(&fifo->mutex); pthread_mutex_destroy(&fifo->mutex); ! free(fifo); return; } /* fifo_put and fifo_get are the only threadsafe functions!!! */ ! void fifo_put(t_fifo* fifo, void* data) { ! if (data) { ! t_fifocell * cell = (t_fifocell*)malloc(sizeof(t_fifocell)); cell->data = data; ! cell->next = 0; pthread_mutex_lock(&fifo->mutex); fifo->tail->next = cell; fifo->tail = cell; pthread_mutex_unlock(&fifo->mutex); } *************** *** 86,117 **** } ! ! /* 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; } --- 64,82 ---- } ! /* this fifo_get returns 0 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) { fifo->head->next = cell->next; if(cell == fifo->tail) fifo->tail = fifo->head; data = cell->data; ! free(cell); ! } else data = 0; pthread_mutex_unlock(&fifo->mutex); ! } else data = 0; return data; } *************** *** 125,149 **** */ ! ! ! typedef struct _fifocell ! { ! struct _fifocell* next; ! void* data; /* pointer to our data */ } t_fifocell; ! typedef struct _lifo ! { unsigned long ic; /* operation counter */ t_fifocell* top; /* stack pointer */ unsigned long oc; /* operation counter */ #ifdef __POWERPC__ ! long unused [5]; /* lifo size must be at least 32 bytes */ ! /* to avoid livelock in multiprocessor */ #endif } t_lifo; ! struct _fifo ! { t_lifo in; t_lifo out; --- 90,109 ---- */ ! typedef struct _fifocell { ! struct _fifocell *next; ! void *data; /* pointer to our data */ } t_fifocell; ! typedef struct _lifo { unsigned long ic; /* operation counter */ t_fifocell* top; /* stack pointer */ unsigned long oc; /* operation counter */ #ifdef __POWERPC__ ! long unused [5]; /* lifo size must be at least 32 bytes */ ! /* to avoid livelock in multiprocessor */ #endif } t_lifo; ! struct _fifo { t_lifo in; t_lifo out; *************** *** 160,165 **** #if defined(__GNUC__) && (defined(__POWERPC__) || defined(__PPC__)) ! static void* lifo_pop(t_lifo* lifo) ! { register void * data; register volatile long a, b; --- 120,124 ---- #if defined(__GNUC__) && (defined(__POWERPC__) || defined(__PPC__)) ! static void* lifo_pop(t_lifo* lifo) { register void * data; register volatile long a, b; *************** *** 193,198 **** } ! static void* lifo_push(register t_lifo* lifo, register void* data) ! { register volatile long t1; register long t2=0; --- 152,156 ---- } ! static void* lifo_push(register t_lifo *lifo, register void *data) { register volatile long t1; register long t2=0; *************** *** 221,227 **** #elif defined(__ppc__) && defined(__APPLE__) ! static void* lifo_pop(t_lifo* lifo) ! { ! register void * data; register long a, b; asm { --- 179,184 ---- #elif defined(__ppc__) && defined(__APPLE__) ! static void *lifo_pop(t_lifo *lifo) { ! register void *data; register long a, b; asm { *************** *** 444,502 **** #endif ! ! ! static void lifo_init(t_lifo* lifo) ! { lifo->ic = 0; ! lifo->top = NULL; lifo->oc = 0; } ! t_fifo* fifo_init(void) ! { ! t_fifo* ret = (t_fifo*) getbytes(sizeof(t_fifo)); ! lifo_init(&ret->in); lifo_init(&ret->out); - return ret; } ! ! void fifo_destroy(t_fifo* fifo) ! { ! void * data; ! do ! { ! data = fifo_get(fifo); ! } ! while (data != NULL); ! ! freebytes(fifo, sizeof(t_fifo)); return; } ! void fifo_put(t_fifo* fifo, void* data) ! { ! lifo_push(&fifo->in, data); ! } ! void* fifo_get(t_fifo* fifo) ! { ! void * data; t_lifo *out = &fifo->out; - data = lifo_pop(out); ! ! if (!data) ! { ! void * tmp; t_lifo *in = &fifo->in; data = lifo_pop(in); ! ! if (data) ! { ! while((tmp = lifo_pop(in))) ! { lifo_push(out, data); data = tmp; --- 401,436 ---- #endif ! static void lifo_init(t_lifo* lifo) { lifo->ic = 0; ! lifo->top = 0; lifo->oc = 0; } ! t_fifo *fifo_init(void) { ! t_fifo *ret = (t_fifo *)malloc(sizeof(t_fifo)); lifo_init(&ret->in); lifo_init(&ret->out); return ret; } ! void fifo_destroy(t_fifo *fifo) { ! void *data; ! do data = fifo_get(fifo); while (data); ! free(fifo); return; } ! void fifo_put(t_fifo *fifo, void *data) {lifo_push(&fifo->in, data);} ! void* fifo_get(t_fifo *fifo) { ! void *data; t_lifo *out = &fifo->out; data = lifo_pop(out); ! if (!data) { ! void *tmp; t_lifo *in = &fifo->in; data = lifo_pop(in); ! if (data) { ! while((tmp = lifo_pop(in))) { lifo_push(out, data); data = tmp; *************** *** 508,512 **** } - - #endif --- 442,444 ----

1 0

[PD-cvs] pd/src desire.c, 1.1.2.217.2.116, 1.1.2.217.2.117 kernel.c, 1.1.2.32, 1.1.2.33
by Mathieu Bouchard 09 Jan '07

09 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3718 Modified Files: Tag: desiredata desire.c kernel.c Log Message: resizebytes -> realloc Index: kernel.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/kernel.c,v retrieving revision 1.1.2.32 retrieving revision 1.1.2.33 diff -C2 -d -r1.1.2.32 -r1.1.2.33 *** kernel.c 9 Jan 2007 15:03:38 -0000 1.1.2.32 --- kernel.c 9 Jan 2007 17:06:28 -0000 1.1.2.33 *************** *** 54,61 **** void *resizebytes(void *old, size_t oldsize, size_t newsize) { - void *ret; if (newsize < 1) newsize = 1; if (oldsize < 1) oldsize = 1; ! ret = (void *)realloc((char *)old, newsize); if (newsize > oldsize && ret) memset(((char *)ret) + oldsize, 0, newsize - oldsize); if (!ret) post("pd: resizebytes() failed -- out of memory"); --- 54,60 ---- void *resizebytes(void *old, size_t oldsize, size_t newsize) { if (newsize < 1) newsize = 1; if (oldsize < 1) oldsize = 1; ! void *ret = (void *)realloc((char *)old, newsize); if (newsize > oldsize && ret) memset(((char *)ret) + oldsize, 0, newsize - oldsize); if (!ret) post("pd: resizebytes() failed -- out of memory"); *************** *** 69,106 **** /* T.Grill - get aligned memory */ void *getalignedbytes(size_t nbytes) { ! /* to align the region we also need some extra memory to save the original pointer location ! it is saved immediately before the aligned vector memory */ ! void *vec = getbytes(nbytes+ (VECTORALIGNMENT/8-1)+sizeof(void *)); ! if (vec != NULL) { ! /* get alignment of first possible signal vector byte */ ! t_int alignment = ((t_int)vec+sizeof(void *))&(VECTORALIGNMENT/8-1); ! /* calculate aligned pointer */ ! void *ret = (unsigned char *)vec+sizeof(void *)+(alignment == 0?0:VECTORALIGNMENT/8-alignment); ! /* save original memory location */ ! *(void **)((unsigned char *)ret-sizeof(void *)) = vec; ! return ret; ! } ! return 0; ! } /* T.Grill - free aligned vector memory */ void freealignedbytes(void *ptr,size_t nbytes) { ! /* get original memory location */ ! void *ori = *(void **)((unsigned char *)ptr-sizeof(void *)); ! free(ori); } /* T.Grill - resize aligned vector memory */ void *resizealignedbytes(void *ptr,size_t oldsize, size_t newsize) { ! /* get original memory location */ void *ori = *(void **)((unsigned char *)ptr-sizeof(void *)); ! void *vec = resizebytes(ori,oldsize+(VECTORALIGNMENT/8-1)+sizeof(void *), ! newsize+(VECTORALIGNMENT/8-1)+sizeof(void *)); ! /* get alignment of first possible signal vector byte */ t_int alignment = ((t_int)vec+sizeof(void *))&(VECTORALIGNMENT/8-1); - /* calculate aligned pointer */ void *ret = (unsigned char *)vec+sizeof(void *)+(alignment == 0?0:VECTORALIGNMENT/8-alignment); - /* save original memory location */ *(void **)((unsigned char *)ret-sizeof(void *)) = vec; return ret; --- 68,93 ---- /* T.Grill - get aligned memory */ void *getalignedbytes(size_t nbytes) { ! /* to align the region we also need some extra memory to save the original pointer location ! it is saved immediately before the aligned vector memory */ ! void *vec = getbytes(nbytes+(VECTORALIGNMENT/8-1)+sizeof(void *)); ! if (!vec) return 0; ! t_int alignment = ((t_int)vec+sizeof(void *))&(VECTORALIGNMENT/8-1); ! void *ret = (unsigned char *)vec+sizeof(void *)+(alignment == 0?0:VECTORALIGNMENT/8-alignment); ! *(void **)((unsigned char *)ret-sizeof(void *)) = vec; ! return ret; } /* T.Grill - free aligned vector memory */ void freealignedbytes(void *ptr,size_t nbytes) { ! free(*(void **)((unsigned char *)ptr-sizeof(void *))); } /* T.Grill - resize aligned vector memory */ void *resizealignedbytes(void *ptr,size_t oldsize, size_t newsize) { ! if (newsize<1) newsize=1; void *ori = *(void **)((unsigned char *)ptr-sizeof(void *)); ! void *vec = realloc(ori,newsize+(VECTORALIGNMENT/8-1)+sizeof(void *)); t_int alignment = ((t_int)vec+sizeof(void *))&(VECTORALIGNMENT/8-1); void *ret = (unsigned char *)vec+sizeof(void *)+(alignment == 0?0:VECTORALIGNMENT/8-alignment); *(void **)((unsigned char *)ret-sizeof(void *)) = vec; return ret; *************** *** 310,314 **** t_pd *pd_new(t_class *c) { if (!c) bug("pd_new: apparently called before setup routine"); ! t_pd *x = (t_pd *)t_getbytes(c->size); x->_class = c; hash_set(object_table,x,(void*)0); --- 297,301 ---- t_pd *pd_new(t_class *c) { if (!c) bug("pd_new: apparently called before setup routine"); ! t_pd *x = (t_pd *)getbytes(c->size); x->_class = c; hash_set(object_table,x,(void*)0); *************** *** 371,375 **** static t_bindelem *bindelem_new(t_pd *who, t_bindelem *next) { ! t_bindelem *self = (t_bindelem *)getbytes(sizeof(t_bindelem)); self->who = who; self->next = next; --- 358,362 ---- static t_bindelem *bindelem_new(t_pd *who, t_bindelem *next) { ! t_bindelem *self = (t_bindelem *)malloc(sizeof(t_bindelem)); self->who = who; self->next = next; *************** *** 451,455 **** void pd_pushsym(t_pd *x) { ! t_gstack *y = (t_gstack *)t_getbytes(sizeof(*y)); y->g_what = s__X.thing; y->g_next = gstack_head; --- 438,442 ---- void pd_pushsym(t_pd *x) { ! t_gstack *y = (t_gstack *)malloc(sizeof(*y)); y->g_what = s__X.thing; y->g_next = gstack_head; *************** *** 718,722 **** t_outlet *outlet_new(t_object *owner, t_symbol *s) { ! t_outlet *x = (t_outlet *)getbytes(sizeof(*x)), *y, *y2; x->o_owner = owner; x->o_next = 0; --- 705,709 ---- t_outlet *outlet_new(t_object *owner, t_symbol *s) { ! t_outlet *x = (t_outlet *)malloc(sizeof(*x)), *y, *y2; x->o_owner = owner; x->o_next = 0; *************** *** 1062,1069 **** } } ! t_class *c = (t_class *)t_getbytes(sizeof(*c)); c->name = c->helpname = s; c->size = size; ! c->methods = (t_methodentry *)t_getbytes(0); c->nmethod = 0; c->freemethod = (t_method)freemethod; --- 1049,1056 ---- } } ! t_class *c = (t_class *)malloc(sizeof(*c)); c->name = c->helpname = s; c->size = size; ! c->methods = (t_methodentry *)malloc(1); c->nmethod = 0; c->freemethod = (t_method)freemethod; *************** *** 1127,1132 **** else if (sel==&s_anything) {if (argtype!='*') goto phooey; class_addanything(c,fn);} else { ! c->methods = (t_methodentry *)t_resizebytes(c->methods, ! c->nmethod * sizeof(*c->methods), (c->nmethod+1) * sizeof(*c->methods)); m = c->methods + c->nmethod; c->nmethod++; --- 1114,1119 ---- else if (sel==&s_anything) {if (argtype!='*') goto phooey; class_addanything(c,fn);} else { ! /* SLOW, especially for [objectmaker] */ ! c->methods = (t_methodentry *)realloc(c->methods, (c->nmethod+1) * sizeof(*c->methods)); m = c->methods + c->nmethod; c->nmethod++; *************** *** 1304,1309 **** if (oldsym) sym2 = oldsym; else { ! sym2 = (t_symbol *)t_getbytes(sizeof(*sym2)); ! sym2->name = (char *)t_getbytes(n+1); sym2->next = 0; sym2->thing = 0; --- 1291,1296 ---- if (oldsym) sym2 = oldsym; else { ! sym2 = (t_symbol *)malloc(sizeof(*sym2)); ! sym2->name = (char *)malloc(n+1); sym2->next = 0; sym2->thing = 0; *************** *** 1332,1337 **** /* replace everything but [a-zA-Z0-9_] by "0x%x" */ ! static char *alternative_classname(char*classname) { ! char *altname=(char*)getbytes(sizeof(char)*MAXPDSTRING); int count=0; int i=0; --- 1319,1324 ---- /* replace everything but [a-zA-Z0-9_] by "0x%x" */ ! static char *alternative_classname(char *classname) { ! char *altname=(char*)malloc(sizeof(char)*MAXPDSTRING); int count=0; int i=0; *************** *** 1643,1656 **** t_binbuf *binbuf_new(void) { ! t_binbuf *x = (t_binbuf *)t_getbytes(sizeof(*x)); x->n = 0; ! x->capa = 0; ! x->vec = (t_atom *)t_getbytes(0); return x; } ! /* caution: capa >= x->n */ static void binbuf_capa(t_binbuf *x, int capa) { ! x->vec = (t_atom *)t_resizebytes(x->vec, x->capa*sizeof(*x->vec), capa*sizeof(*x->vec)); x->capa = capa; } --- 1630,1643 ---- t_binbuf *binbuf_new(void) { ! t_binbuf *x = (t_binbuf *)malloc(sizeof(*x)); x->n = 0; ! x->capa = 1; ! x->vec = (t_atom *)malloc(1*sizeof(t_atom)); return x; } ! /* caution: capa >= x->n and capa >= 1 too */ static void binbuf_capa(t_binbuf *x, int capa) { ! x->vec = (t_atom *)realloc(x->vec, capa*sizeof(*x->vec)); x->capa = capa; } *************** *** 1659,1665 **** t_binbuf *binbuf_duplicate(t_binbuf *y) { ! t_binbuf *x = (t_binbuf *)t_getbytes(sizeof(*x)); x->capa = x->n = y->n; ! x->vec = (t_atom *)t_getbytes(x->n * sizeof(*x->vec)); memcpy(x->vec, y->vec, x->n * sizeof(*x->vec)); return x; --- 1646,1652 ---- t_binbuf *binbuf_duplicate(t_binbuf *y) { ! t_binbuf *x = (t_binbuf *)malloc(sizeof(*x)); x->capa = x->n = y->n; ! x->vec = (t_atom *)malloc(x->n * sizeof(*x->vec)); memcpy(x->vec, y->vec, x->n * sizeof(*x->vec)); return x; *************** *** 1668,1673 **** void binbuf_clear(t_binbuf *x) { x->n = 0; ! x->vec = (t_atom *)t_resizebytes(x->vec, x->n * sizeof(*x->vec), 0); ! x->capa = 0; } --- 1655,1660 ---- void binbuf_clear(t_binbuf *x) { x->n = 0; ! x->vec = (t_atom *)realloc(x->vec, 4); ! x->capa = 4; } *************** *** 1797,1819 **** /* convert a binbuf to text; no null termination. */ void binbuf_gettext(t_binbuf *x, char **bufp, int *lengthp) { ! char *buf = (char *)getbytes(0), *newbuf; int length = 0; char string[MAXPDSTRING]; ! t_atom *ap; int indx; ! for (ap = x->vec, indx = x->n; indx--; ap++) { ! int newlength; if ((ap->a_type == A_SEMI || ap->a_type == A_COMMA) && length && buf[length-1] == ' ') length--; atom_string(ap, string, MAXPDSTRING); ! newlength = length + strlen(string) + 1; ! if (!(newbuf = (char *)resizebytes(buf, length, newlength))) break; buf = newbuf; strcpy(buf + length, string); length = newlength; ! if (ap->a_type == A_SEMI) buf[length-1] = '\n'; ! else buf[length-1] = ' '; } if (length && buf[length-1] == ' ') { ! newbuf = (char *)t_resizebytes(buf, length, length-1); if (newbuf) { buf = newbuf; --- 1784,1804 ---- /* convert a binbuf to text; no null termination. */ void binbuf_gettext(t_binbuf *x, char **bufp, int *lengthp) { ! char *buf = (char *)malloc(1), *newbuf; int length = 0; char string[MAXPDSTRING]; ! t_atom *ap = x->vec; int indx; ! for (indx = x->n; indx--; ap++) { if ((ap->a_type == A_SEMI || ap->a_type == A_COMMA) && length && buf[length-1] == ' ') length--; atom_string(ap, string, MAXPDSTRING); ! int newlength = length + strlen(string) + 1; ! if (!(newbuf = (char *)realloc(buf,newlength))) break; buf = newbuf; strcpy(buf + length, string); length = newlength; ! buf[length-1] = ap->a_type == A_SEMI ? '\n' : ' '; } if (length && buf[length-1] == ' ') { ! newbuf = (char *)realloc(buf,length+1); if (newbuf) { buf = newbuf; *************** *** 1828,1835 **** /* matju said: make this use vector size doubling as it used to be in binbuf_text */ void binbuf_add(t_binbuf *x, int argc, t_atom *argv) { ! int newsize = x->n + argc, i; ! t_atom *ap = (t_atom *)t_resizebytes(x->vec, x->n * sizeof(*x->vec), newsize * sizeof(*x->vec)); x->vec = ap; ! for (ap = x->vec + x->n, i = argc; i--; ap++) *ap = *(argv++); x->capa = x->n = newsize; } --- 1813,1821 ---- /* matju said: make this use vector size doubling as it used to be in binbuf_text */ void binbuf_add(t_binbuf *x, int argc, t_atom *argv) { ! int newsize = x->n + argc; ! t_atom *ap = (t_atom *)realloc(x->vec, newsize * sizeof(*x->vec)); x->vec = ap; ! ap += x->n; ! for (int i = argc; i--; ap++) *ap = *(argv++); x->capa = x->n = newsize; } *************** *** 1907,1911 **** int newsize = x->n + argc, i; t_atom *ap; ! ap = (t_atom *)t_resizebytes(x->vec, x->n * sizeof(*x->vec), newsize * sizeof(*x->vec)); if (!ap) { error("binbuf_addmessage: out of space"); --- 1893,1897 ---- int newsize = x->n + argc, i; t_atom *ap; ! ap = (t_atom *)realloc(x->vec, newsize * sizeof(*x->vec)); if (!ap) { error("binbuf_addmessage: out of space"); *************** *** 2196,2200 **** if (fd < 0) {error("open: %s: %s",namebuf,strerror(errno)); return 1;} if ((length = lseek(fd, 0, SEEK_END)) < 0 || lseek(fd, 0, SEEK_SET) < 0 ! || !(buf = (char *)t_getbytes(length))) { error("lseek: %s: %s",namebuf,strerror(errno)); close(fd); --- 2182,2186 ---- if (fd < 0) {error("open: %s: %s",namebuf,strerror(errno)); return 1;} if ((length = lseek(fd, 0, SEEK_END)) < 0 || lseek(fd, 0, SEEK_SET) < 0 ! || !(buf = (char *)malloc(length))) { error("lseek: %s: %s",namebuf,strerror(errno)); close(fd); Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.116 retrieving revision 1.1.2.217.2.117 diff -C2 -d -r1.1.2.217.2.116 -r1.1.2.217.2.117 *** desire.c 9 Jan 2007 15:07:40 -0000 1.1.2.217.2.116 --- desire.c 9 Jan 2007 17:06:26 -0000 1.1.2.217.2.117 *************** *** 2402,2406 **** if (argc < 1) {pd_error(x,"graph_xlabel: no y value given"); return;} x->xlabely = atom_getfloatarg(0,argc--,argv++); ! x->xlabel = (t_symbol **)t_resizebytes(x->xlabel, x->nxlabels*sizeof(void*), argc*sizeof(void*)); x->nxlabels = argc; for (int i=0; i < argc; i++) x->xlabel[i] = atom_gensym(&argv[i]); --- 2402,2406 ---- if (argc < 1) {pd_error(x,"graph_xlabel: no y value given"); return;} x->xlabely = atom_getfloatarg(0,argc--,argv++); ! x->xlabel = (t_symbol **)realloc(x->xlabel,argc*sizeof(void*)); x->nxlabels = argc; for (int i=0; i < argc; i++) x->xlabel[i] = atom_gensym(&argv[i]); *************** *** 2410,2414 **** if (argc < 1) {pd_error(x,"graph_ylabel: no x value given"); return;} x->ylabelx = atom_getfloatarg(0,argc--,argv++); ! x->ylabel = (t_symbol **)t_resizebytes(x->ylabel, x->nylabels*sizeof(void*), argc*sizeof(void*)); x->nylabels = argc; for (int i=0; i < argc; i++) x->ylabel[i] = atom_gensym(&argv[i]); --- 2410,2414 ---- if (argc < 1) {pd_error(x,"graph_ylabel: no x value given"); return;} x->ylabelx = atom_getfloatarg(0,argc--,argv++); ! x->ylabel = (t_symbol **)realloc(x->ylabel,argc*sizeof(void*)); x->nylabels = argc; for (int i=0; i < argc; i++) x->ylabel[i] = atom_gensym(&argv[i]); *************** *** 2725,2731 **** if (nline != 2 && nline != 3) break; int newnargs = ntemplateargs + nline; ! templateargs = (t_atom *)t_resizebytes(templateargs, ! sizeof(*templateargs) * ntemplateargs, ! sizeof(*templateargs) * newnargs); templateargs[ntemplateargs] = vec[message]; templateargs[ntemplateargs + 1] = vec[message + 1]; --- 2725,2729 ---- if (nline != 2 && nline != 3) break; int newnargs = ntemplateargs + nline; ! templateargs = (t_atom *)realloc(templateargs, sizeof(*templateargs) * newnargs); templateargs[ntemplateargs] = vec[message]; templateargs[ntemplateargs + 1] = vec[message + 1]; *************** *** 2828,2833 **** t_symbol **templatevec = *p_templatevec; for (int i=0; i < n; i++) if (templatevec[i] == templatesym) return; ! templatevec = (t_symbol **)t_resizebytes(templatevec, ! n * sizeof(*templatevec), (n+1) * sizeof(*templatevec)); templatevec[n] = templatesym; *p_templatevec = templatevec; --- 2826,2830 ---- t_symbol **templatevec = *p_templatevec; for (int i=0; i < n; i++) if (templatevec[i] == templatesym) return; ! templatevec = (t_symbol **)realloc(templatevec, (n+1)*sizeof(*templatevec)); templatevec[n] = templatesym; *p_templatevec = templatevec; *************** *** 2851,2855 **** int ty = t->vec[i].type; if (ty==DT_FLOAT || ty==DT_SYMBOL) { ! a = (t_atom *)t_resizebytes(a, natom*sizeof(*a), (natom+1)*sizeof(*a)); if (t->vec[i].type == DT_FLOAT) SETFLOAT( a + natom, w[i].w_float); else SETSYMBOL(a + natom, w[i].w_symbol); --- 2848,2852 ---- int ty = t->vec[i].type; if (ty==DT_FLOAT || ty==DT_SYMBOL) { ! a = (t_atom *)realloc(a, (natom+1)*sizeof(*a)); if (t->vec[i].type == DT_FLOAT) SETFLOAT( a + natom, w[i].w_float); else SETSYMBOL(a + natom, w[i].w_symbol); *************** *** 3759,3763 **** binbuf_gettext(b, &buf, &bufsize); binbuf_free(b); ! buf = (char *)t_resizebytes(buf, bufsize, bufsize+1); buf[bufsize] = 0; sprintf(buf2, "pdtk_data_dialog %%s {"); --- 3756,3760 ---- binbuf_gettext(b, &buf, &bufsize); binbuf_free(b); ! buf = (char *)realloc(buf, bufsize+1); buf[bufsize] = 0; sprintf(buf2, "pdtk_data_dialog %%s {"); *************** *** 3853,3857 **** } newn = (oldn = x->n) + 1; ! x->vec = (t_dataslot *)t_resizebytes(x->vec, oldn*sizeof(*x->vec), newn*sizeof(*x->vec)); x->n = newn; x->vec[oldn].type = newtype; --- 3850,3854 ---- } newn = (oldn = x->n) + 1; ! x->vec = (t_dataslot *)realloc(x->vec, newn*sizeof(*x->vec)); x->n = newn; x->vec[oldn].type = newtype;

1 0

pd/src d_ugen.c,1.3.4.1.2.5.2.4,1.3.4.1.2.5.2.5
by Mathieu Bouchard 09 Jan '07

09 Jan '07

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv600 Modified Files: Tag: desiredata d_ugen.c Log Message: freebytes -> free Index: d_ugen.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_ugen.c,v retrieving revision 1.3.4.1.2.5.2.4 retrieving revision 1.3.4.1.2.5.2.5 diff -C2 -d -r1.3.4.1.2.5.2.4 -r1.3.4.1.2.5.2.5 *** d_ugen.c 20 Dec 2006 10:10:37 -0000 1.3.4.1.2.5.2.4 --- d_ugen.c 9 Jan 2007 16:59:00 -0000 1.3.4.1.2.5.2.5 *************** *** 388,397 **** { #ifndef VECTORALIGNMENT ! t_freebytes(sig->s_vec, sig->s_vecsize * sizeof (*sig->s_vec)); #else freealignedbytes(sig->s_vec, sig->s_vecsize * sizeof (*sig->s_vec)); #endif } ! t_freebytes(sig, sizeof *sig); } for (i = 0; i <= MAXLOGSIG; i++) --- 388,397 ---- { #ifndef VECTORALIGNMENT ! free(sig->s_vec); #else freealignedbytes(sig->s_vec, sig->s_vecsize * sizeof (*sig->s_vec)); #endif } ! free(sig); } for (i = 0; i <= MAXLOGSIG; i++) *************** *** 581,597 **** static t_dspcontext *ugen_currentcontext; ! void ugen_stop(void) ! { ! if (dsp_chain) ! { ! freebytes(dsp_chain, dsp_chainsize * sizeof (t_int)); dsp_chain = 0; } signal_cleanup(); - } ! void ugen_start(void) ! { ugen_stop(); ugen_sortno++; --- 581,593 ---- static t_dspcontext *ugen_currentcontext; ! void ugen_stop(void) { ! if (dsp_chain) { ! free(dsp_chain); dsp_chain = 0; } signal_cleanup(); } ! void ugen_start(void) { ugen_stop(); ugen_sortno++; *************** *** 870,874 **** } } ! t_freebytes(insig,(u->u_nin + u->u_nout) * sizeof(t_signal *)); u->u_done = 1; } --- 866,870 ---- } } ! free(insig); u->u_done = 1; } *************** *** 1118,1162 **** chainafterall = dsp_chainsize; ! if (blk) ! { blk->x_blocklength = chainblockend - chainblockbegin; blk->x_epiloglength = chainafterall - chainblockend; blk->x_reblock = reblock; } ! ! if (ugen_loud) ! { t_int *ip; if (!dc->dc_parentcontext) ! for (i = dsp_chainsize, ip = dsp_chain; i--; ip++) ! post("chain %lx", *ip); post("... ugen_done_graph done."); } ! /* now delete everything. */ ! while (dc->dc_ugenlist) ! { ! for (uout = dc->dc_ugenlist->u_out, n = dc->dc_ugenlist->u_nout; ! n--; uout++) ! { oc = uout->o_connections; ! while (oc) ! { oc2 = oc->oc_next; ! freebytes(oc, sizeof *oc); oc = oc2; } } ! freebytes(dc->dc_ugenlist->u_out, dc->dc_ugenlist->u_nout * ! sizeof (*dc->dc_ugenlist->u_out)); ! freebytes(dc->dc_ugenlist->u_in, dc->dc_ugenlist->u_nin * ! sizeof(*dc->dc_ugenlist->u_in)); u = dc->dc_ugenlist; dc->dc_ugenlist = u->u_next; ! freebytes(u, sizeof *u); } if (ugen_currentcontext == dc) ugen_currentcontext = dc->dc_parentcontext; else bug("ugen_currentcontext"); ! freebytes(dc, sizeof(*dc)); } --- 1114,1148 ---- chainafterall = dsp_chainsize; ! if (blk) { blk->x_blocklength = chainblockend - chainblockbegin; blk->x_epiloglength = chainafterall - chainblockend; blk->x_reblock = reblock; } ! if (ugen_loud) { t_int *ip; if (!dc->dc_parentcontext) ! for (i = dsp_chainsize, ip = dsp_chain; i--; ip++) post("chain %lx", *ip); post("... ugen_done_graph done."); } ! /* now delete everything. */ ! while (dc->dc_ugenlist) { ! for (uout = dc->dc_ugenlist->u_out, n = dc->dc_ugenlist->u_nout; n--; uout++) { oc = uout->o_connections; ! while (oc) { oc2 = oc->oc_next; ! free(oc); oc = oc2; } } ! free(dc->dc_ugenlist->u_out); ! free(dc->dc_ugenlist->u_in); u = dc->dc_ugenlist; dc->dc_ugenlist = u->u_next; ! free(u); } if (ugen_currentcontext == dc) ugen_currentcontext = dc->dc_parentcontext; else bug("ugen_currentcontext"); ! free(dc); }

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
54
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 January 2007