Pd-cvs February 2005

pd-cvs@lists.iem.at

8 participants
107 discussions

externals/grill/flext/source flqueue.cpp,1.26,1.27
by Thomas Grill 08 Feb '05

08 Feb '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4554/source Modified Files: flqueue.cpp Log Message: Max: use high-priority click instead of qelem for message-posting fixed buggy unbinding of receive symbols added method for clicks into object box Index: flqueue.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flqueue.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** flqueue.cpp 28 Jan 2005 04:57:18 -0000 1.26 --- flqueue.cpp 8 Feb 2005 04:56:22 -0000 1.27 *************** *** 59,63 **** }; ! /* \TODO This is only thread-safe if called fro one thread which need NOT be the case. Reimplement in a thread-safe manner!!! */ --- 59,63 ---- }; ! /* \TODO This is only thread-safe if called from one thread which need NOT be the case. Reimplement in a thread-safe manner!!! */ *************** *** 177,191 **** t_atom *GetAtoms(int argc) { if(atail+argc >= QUEUE_ATOMS) { FLEXT_ASSERT(ahead > argc); atail = argc; - return atoms; } else { FLEXT_ASSERT(ahead <= atail || ahead > atail+argc); ! t_atom *at = atoms+atail; atail += argc; - return at; } } --- 177,192 ---- t_atom *GetAtoms(int argc) { + t_atom *ret; if(atail+argc >= QUEUE_ATOMS) { FLEXT_ASSERT(ahead > argc); + ret = atoms; atail = argc; } else { FLEXT_ASSERT(ahead <= atail || ahead > atail+argc); ! ret = atoms+atail; atail += argc; } + return ret; }

1 0

externals/grill/flext notes.txt,1.3,1.4
by Thomas Grill 08 Feb '05

08 Feb '05

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4554 Modified Files: notes.txt Log Message: Max: use high-priority click instead of qelem for message-posting fixed buggy unbinding of receive symbols added method for clicks into object box Index: notes.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/notes.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** notes.txt 11 Jan 2005 04:58:11 -0000 1.3 --- notes.txt 8 Feb 2005 04:56:22 -0000 1.4 *************** *** 43,47 **** - add signal in/out connection query function - - support creation of buffers - support for Max qelem style --- 43,46 ---- *************** *** 58,63 **** - Max rounding bug ... buffer resize could be one sample less! - - flext_dsp: Max/MSP doesn't correctly report in/out channel counts - - PD: figure out what "pointer" messages do and whether they are correctly implemented in flext --- 57,60 ----

1 0

externals/zexy/src z_tabread4.c,1.2,1.3
by IOhannes m zmölnig 03 Feb '05

03 Feb '05

Update of /cvsroot/pure-data/externals/zexy/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13982 Modified Files: z_tabread4.c Log Message: added range for [tabdump] added [tabminmax] (works also with ranges) Index: z_tabread4.c =================================================================== RCS file: /cvsroot/pure-data/externals/zexy/src/z_tabread4.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** z_tabread4.c 21 Jul 2004 13:20:52 -0000 1.2 --- z_tabread4.c 3 Feb 2005 17:20:09 -0000 1.3 *************** *** 14,20 **** t_object x_obj; t_symbol *x_arrayname; } t_tabdump; ! static void tabdump_bang(t_tabdump *x, t_float findex) { t_garray *A; --- 14,21 ---- t_object x_obj; t_symbol *x_arrayname; + t_int startindex, stopindex; } t_tabdump; ! static void tabdump_bang(t_tabdump *x) { t_garray *A; *************** *** 29,34 **** { int n; ! t_atom *atombuf = (t_atom *)getbytes(sizeof(t_atom)*npoints); ! for (n = 0; n < npoints; n++) SETFLOAT(&atombuf[n], vec[n]); outlet_list(x->x_obj.ob_outlet, &s_list, npoints, atombuf); freebytes(atombuf,sizeof(t_atom)*npoints); --- 30,43 ---- { int n; ! t_atom *atombuf; ! ! int start=x->startindex; ! int stop =x->stopindex; ! if(start<0||start>stop)start=0; ! if(stop<start||stop>npoints)stop=npoints; ! npoints=stop-start; ! ! atombuf = (t_atom *)getbytes(sizeof(t_atom)*npoints); ! for (n = 0; n < npoints; n++) SETFLOAT(&atombuf[n], vec[start+n]); outlet_list(x->x_obj.ob_outlet, &s_list, npoints, atombuf); freebytes(atombuf,sizeof(t_atom)*npoints); *************** *** 36,39 **** --- 45,63 ---- } + static void tabdump_list(t_tabdump *x, t_symbol*s,int argc, t_atom*argv) + { + int a,b; + switch(argc){ + case 2: + a=atom_getint(argv); + b=atom_getint(argv+1); + x->startindex=(a<b)?a:b; + x->stopindex =(a>b)?a:b; + tabdump_bang(x); + break; + default: + error("tabdump: list must be 2 floats (is %d atoms)", argc); + } + } static void tabdump_set(t_tabdump *x, t_symbol *s) *************** *** 46,49 **** --- 70,75 ---- t_tabdump *x = (t_tabdump *)pd_new(tabdump_class); x->x_arrayname = s; + x->startindex=0; + x->stopindex=-1; outlet_new(&x->x_obj, &s_list); *************** *** 66,69 **** --- 92,97 ---- 0, sizeof(t_tabdump), 0, A_DEFSYM, 0); class_addbang(tabdump_class, (t_method)tabdump_bang); + class_addlist(tabdump_class, (t_method)tabdump_list); + class_addmethod(tabdump_class, (t_method)tabdump_set, gensym("set"), A_SYMBOL, 0); *************** *** 73,76 **** --- 101,224 ---- } + /* =================== tabminmax ====================== */ + + static t_class *tabminmax_class; + + typedef struct _tabminmax + { + t_object x_obj; + t_outlet*min_out, *max_out; + t_symbol *x_arrayname; + t_int startindex, stopindex; + } t_tabminmax; + + static void tabminmax_bang(t_tabminmax *x) + { + t_garray *A; + int npoints; + t_float *vec; + + if (!(A = (t_garray *)pd_findbyclass(x->x_arrayname, garray_class))) + error("%s: no such array", x->x_arrayname->s_name); + else if (!garray_getfloatarray(A, &npoints, &vec)) + error("%s: bad template for tabminmax", x->x_arrayname->s_name); + else + { + int n; + t_atom atombuf[2]; + t_float min, max; + int mindex, maxdex; + + int start=x->startindex; + int stop =x->stopindex; + if(start<0||start>stop)start=0; + if(stop<start||stop>npoints)stop=npoints; + npoints=stop-start; + + min=vec[start]; + max=vec[start]; + + mindex=start; + maxdex=start; + + for (n = 1; n < npoints; n++){ + t_float val=vec[start+n]; + if(val<min){ + mindex=start+n; + min=val; + } + if(val>max){ + maxdex=start+n; + max=val; + } + } + + SETFLOAT(atombuf, max); + SETFLOAT(atombuf+1, maxdex); + outlet_list(x->max_out, &s_list, 2, atombuf); + + SETFLOAT(atombuf, min); + SETFLOAT(atombuf+1, mindex); + outlet_list(x->min_out, &s_list, 2, atombuf); + } + } + + static void tabminmax_list(t_tabminmax *x, t_symbol*s,int argc, t_atom*argv) + { + int a,b; + switch(argc){ + case 2: + a=atom_getint(argv); + b=atom_getint(argv+1); + x->startindex=(a<b)?a:b; + x->stopindex =(a>b)?a:b; + tabminmax_bang(x); + break; + default: + error("tabminmax: list must be 2 floats (is %d atoms)", argc); + } + } + + static void tabminmax_set(t_tabminmax *x, t_symbol *s) + { + x->x_arrayname = s; + } + + static void *tabminmax_new(t_symbol *s) + { + t_tabminmax *x = (t_tabminmax *)pd_new(tabminmax_class); + x->x_arrayname = s; + x->startindex=0; + x->stopindex=-1; + x->min_out=outlet_new(&x->x_obj, &s_list); + x->max_out=outlet_new(&x->x_obj, &s_list); + + return (x); + } + + static void tabminmax_helper(void) + { + post("\n%c tabminmax - object : dumps a table as a package of floats", HEARTSYMBOL); + post("'set <table>'\t: read out another table\n" + "'bang'\t\t: get min and max of the table\n" + "outlet\t\t: table-data as package of floats"); + post("creation\t: \"tabminmax <table>\""); + + } + + static void tabminmax_setup(void) + { + tabminmax_class = class_new(gensym("tabminmax"), (t_newmethod)tabminmax_new, + 0, sizeof(t_tabminmax), 0, A_DEFSYM, 0); + class_addbang(tabminmax_class, (t_method)tabminmax_bang); + class_addlist(tabminmax_class, (t_method)tabminmax_list); + + class_addmethod(tabminmax_class, (t_method)tabminmax_set, gensym("set"), + A_SYMBOL, 0); + + class_addmethod(tabminmax_class, (t_method)tabminmax_helper, gensym("help"), 0); + class_sethelpsymbol(tabminmax_class, gensym("zexy/tabminmax")); + } + /* =================== tabset ====================== */ *************** *** 160,163 **** --- 308,312 ---- { tabdump_setup(); + tabminmax_setup(); tabset_setup(); }

1 0

pd/src m_sched.c,1.5.4.17,1.5.4.18
by Tim Blechmann 03 Feb '05

03 Feb '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16836 Modified Files: Tag: devel_0_38 m_sched.c Log Message: correcting function arguments Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.17 retrieving revision 1.5.4.18 diff -C2 -d -r1.5.4.17 -r1.5.4.18 *** m_sched.c 2 Feb 2005 13:51:54 -0000 1.5.4.17 --- m_sched.c 3 Feb 2005 09:21:12 -0000 1.5.4.18 *************** *** 645,649 **** static t_sched_callback * idle_callback = NULL; ! static void run_idle_callbacks(int sleep) { if (idle_callback == NULL) --- 645,649 ---- static t_sched_callback * idle_callback = NULL; ! static void run_idle_callbacks(int microsec) { if (idle_callback == NULL)

1 0

pd/src m_sched.c,1.5.4.16,1.5.4.17
by Thomas Grill 02 Feb '05

02 Feb '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1652/src Modified Files: Tag: devel_0_38 m_sched.c Log Message: enhanced sleeping behavior Index: m_sched.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_sched.c,v retrieving revision 1.5.4.16 retrieving revision 1.5.4.17 diff -C2 -d -r1.5.4.16 -r1.5.4.17 *** m_sched.c 16 Jan 2005 21:51:20 -0000 1.5.4.16 --- m_sched.c 2 Feb 2005 13:51:54 -0000 1.5.4.17 *************** *** 29,33 **** #include "m_fifo.h" ! static t_int run_idle_callbacks(void); t_fifo * callback_fifo = NULL; --- 29,33 ---- #include "m_fifo.h" ! static void run_idle_callbacks(int microsec); t_fifo * callback_fifo = NULL; *************** *** 502,513 **** #endif /* tb: call idle callbacks */ ! if (run_idle_callbacks()) ! { ! /* if even that had nothing to do, sleep. */ ! if (timeforward != SENDDACS_SLEPT) ! { ! sys_microsleep(sys_sleepgrain); ! } ! } #ifdef THREAD_LOCKING /* T.Grill - leave idle phase -> lock thread lock */ --- 502,507 ---- #endif /* tb: call idle callbacks */ ! run_idle_callbacks(timeforward != SENDDACS_SLEPT?sys_sleepgrain:0); ! #ifdef THREAD_LOCKING /* T.Grill - leave idle phase -> lock thread lock */ *************** *** 553,558 **** sys_unlock(); #endif ! if (run_idle_callbacks()) ! sys_microsleep(sys_sleepgrain); #ifdef THREAD_LOCKING --- 547,551 ---- sys_unlock(); #endif ! run_idle_callbacks(sys_sleepgrain); #ifdef THREAD_LOCKING *************** *** 652,656 **** static t_sched_callback * idle_callback = NULL; ! static t_int run_idle_callbacks(void) { if (idle_callback == NULL) --- 645,649 ---- static t_sched_callback * idle_callback = NULL; ! static void run_idle_callbacks(int sleep) { if (idle_callback == NULL) *************** *** 660,668 **** { double remain; ! double stop = sys_getrealtime() + sys_sleepgrain; do { int status = (idle_callback->function)(idle_callback->argv); ! remain = stop-sys_getrealtime(); switch (status) --- 653,661 ---- { double remain; ! double stop = sys_getrealtime()*1.e6 + microsec; do { int status = (idle_callback->function)(idle_callback->argv); ! remain = stop-sys_getrealtime()*1.e6; switch (status) *************** *** 690,697 **** /* sleep for the rest of the time */ if(remain > 100) sys_microsleep(remain); - return 0; } ! else ! return 1; /* sleep */ } --- 683,689 ---- /* sleep for the rest of the time */ if(remain > 100) sys_microsleep(remain); } ! else ! sys_microsleep(microsec); } *************** *** 700,704 **** static t_sched_callback *ringbuffer_head; ! static t_int run_idle_callbacks(void) { t_sched_callback * new_callback; --- 692,696 ---- static t_sched_callback *ringbuffer_head; ! static void run_idle_callbacks(int microsec) { t_sched_callback * new_callback; *************** *** 726,730 **** { double remain; ! double stop = sys_getrealtime() + sys_sleepgrain; t_sched_callback * idle_callback = ringbuffer_head; t_sched_callback * last = NULL; --- 718,722 ---- { double remain; ! double stop = sys_getrealtime()*1.e6 + microsec; t_sched_callback * idle_callback = ringbuffer_head; t_sched_callback * last = NULL; *************** *** 734,738 **** { int status = (idle_callback->function)(idle_callback->argv); - remain = stop-sys_getrealtime(); switch (status) --- 726,729 ---- *************** *** 760,773 **** idle_callback = idle_callback->next; } ! } while ((idle_callback != NULL) && (remain > 0)); - sleep: /* sleep for the rest of the time */ ! if(remain > 100) sys_microsleep(remain); ! return 0; } ! else ! return 1; /* sleep */ } #endif --- 751,765 ---- 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 > 100) ! sys_microsleep(remain); } ! else ! sys_microsleep(microsec); } #endif

1 0

externals/grill/py py.vcproj,1.18,1.19
by Thomas Grill 01 Feb '05

01 Feb '05

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14259 Modified Files: py.vcproj Log Message: fixes for single-threaded compilation little restructuring Index: py.vcproj =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/py.vcproj,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** py.vcproj 19 Jan 2005 04:58:33 -0000 1.18 --- py.vcproj 1 Feb 2005 04:57:05 -0000 1.19 *************** *** 22,26 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;f:\prog\max\flext\source;C:\Programme\prog\Python23\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;FLEXT_SYS=2" BasicRuntimeChecks="3" --- 22,26 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories="c:\programme\audio\pd\src;..\flext\source;C:\Programme\prog\Python24\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;FLEXT_SYS=2" BasicRuntimeChecks="3" *************** *** 41,45 **** LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:/programme/audio/pd/bin;"..\flext\pd-msvc";"F:\prog\packs\Python-2.3.2\PCbuild"" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\pd-msvc\d/py.pdb" --- 41,45 ---- LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories="c:/programme/audio/pd/bin;"c:\data\prog\packs\Python-2.4\PCbuild"" GenerateDebugInformation="TRUE" ProgramDatabaseFile=".\pd-msvc\d/py.pdb" *************** *** 86,90 **** Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\data\prog\pd\pd-cvs\src";c:\data\pdmax\flext\source;"C:\data\prog\packs\Python-2.4\include";"C:\data\prog\packs\Python-2.4\PC"" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;FLEXT_SYS=2;FLEXT_THREADS" BasicRuntimeChecks="3" --- 86,90 ---- Name="VCCLCompilerTool" Optimization="0" ! AdditionalIncludeDirectories=""c:\data\prog\pd\pd-cvs\src";..\flext\source;c:\programme\prog\Python24\include" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;PY_EXPORTS;FLEXT_SYS=2;FLEXT_THREADS" BasicRuntimeChecks="3" *************** *** 106,110 **** LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories=""c:/data/prog/pd/pd-cvs/bin";"c:\data\prog\packs\Python-2.4\PCbuild"" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(outdir)/py.pdb" --- 106,110 ---- LinkIncremental="1" SuppressStartupBanner="TRUE" ! AdditionalLibraryDirectories=""C:\data\prog\packs\Python-2.4\PCbuild";"c:/data/prog/pd/pd-cvs/bin"" GenerateDebugInformation="TRUE" ProgramDatabaseFile="$(outdir)/py.pdb"

1 0

externals/grill/py/source main.cpp,1.21,1.22 main.h,1.28,1.29
by Thomas Grill 01 Feb '05

01 Feb '05

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14259/source Modified Files: main.cpp main.h Log Message: fixes for single-threaded compilation little restructuring Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** main.cpp 11 Jan 2005 04:59:27 -0000 1.21 --- main.cpp 1 Feb 2005 04:57:06 -0000 1.22 *************** *** 159,164 **** --- 159,166 ---- FLEXT_ADDTIMER(stoptmr,tick); + #ifdef FLEXT_THREADS // launch thread worker FLEXT_CALLMETHOD(threadworker); + #endif } *************** *** 166,169 **** --- 168,173 ---- { shouldexit = true; + + #ifdef FLEXT_THREADS qucond.Signal(); *************** *** 177,181 **** post("%s - Okay, all threads have terminated",thisName()); } ! PyThreadState *state = PyLock(); Py_XDECREF(module_obj); --- 181,185 ---- post("%s - Okay, all threads have terminated",thisName()); } ! #endif PyThreadState *state = PyLock(); Py_XDECREF(module_obj); *************** *** 457,464 **** --- 461,470 ---- Py_DECREF(pmeth); break; + #ifdef FLEXT_THREADS case 1: // put call into queue ret = qucall(pmeth,pargs); break; + #endif case 2: // each call a new thread *************** *** 492,495 **** --- 498,502 ---- } + #ifdef FLEXT_THREADS bool py::qucall(PyObject *fun,PyObject *args) { *************** *** 527,530 **** --- 534,538 ---- PyUnlock(state); } + #endif #if FLEXT_SYS == FLEXT_SYS_MAX Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** main.h 11 Jan 2005 04:59:27 -0000 1.28 --- main.h 1 Feb 2005 04:57:06 -0000 1.29 *************** *** 134,137 **** --- 134,141 ---- private: + + void work_wrapper(void *data); + + #ifdef FLEXT_THREADS bool qucall(PyObject *fun,PyObject *args); void threadworker(); *************** *** 139,145 **** ThrCond qucond; - void work_wrapper(void *data); - - #ifdef FLEXT_THREADS FLEXT_THREAD_X(work_wrapper) #else --- 143,146 ---- *************** *** 195,199 **** --- 196,202 ---- FLEXT_CALLBACK_T(tick) + #ifdef FLEXT_THREADS FLEXT_THREAD(threadworker) + #endif };

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs February 2005