Pd-cvs March 2005

pd-cvs@lists.iem.at

10 participants
138 discussions

externals/build/src popen.c,NONE,1.1
by carmen rocco 08 Mar '05

08 Mar '05

Update of /cvsroot/pure-data/externals/build/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3803 Added Files: popen.c Log Message: popen() --- NEW FILE: popen.c --- #include "../../control/popen/popen.c"

1 0

externals/build/doc popen-help.pd,NONE,1.1
by carmen rocco 08 Mar '05

08 Mar '05

Update of /cvsroot/pure-data/externals/build/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3115 Added Files: popen-help.pd Log Message: popen() --- NEW FILE: popen-help.pd --- #N canvas 458 385 649 268 10; #X msg 121 28 echo lol; #X obj 121 48 popen; #X symbolatom 111 85 10 0 0 0 - - -; #X obj 168 75 bng 15 163840 50 0 empty empty empty 0 0 0 8 -62784 -237312 -237312; #X obj 168 93 tgl 15 0 empty empty empty 0 0 0 8 -62784 -237312 -237312 0 1; #X msg 170 29 echo roffl | sed s/fl/lmao/; #X obj 111 114 select roflmao; #X obj 189 88 tgl 42 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X text 16 10 popen(); #X text 41 159 so simple it should work on most any platform; #X text 39 176 always outputs a symbol; #X text 42 199 non-threaded to maintain right to left execution order ; #X text 41 218 always executes in a real shell (sh on linux \, cmd on win (add a bash -c if you want it to run in a minGW/cygwin bash)) so stuff like || and < can be used..; #X obj 258 97 popen; #X msg 258 117 add2 \$1; #X msg 303 103 Linux a 2.6.11-gentoo-r1 #4 Sun Mar 6 16:43:59 GMT 2005 x86_64 AMD Athlon(tm) 64 Processor 3000+ AuthenticAMD GNU/Linux ; #X msg 303 65 cat /proc/cpuinfo; #X msg 303 82 set; #X msg 253 65 uname -a; #X connect 0 0 1 0; #X connect 1 0 2 0; #X connect 1 1 3 0; #X connect 2 0 6 0; #X connect 3 0 4 0; #X connect 5 0 1 0; #X connect 6 0 7 0; #X connect 13 0 14 0; #X connect 14 0 15 0; #X connect 16 0 17 0; #X connect 16 0 13 0; #X connect 17 0 15 0; #X connect 18 0 17 0; #X connect 18 0 13 0;

1 0

externals/control/popen Makefile,NONE,1.1 Makefilewin,NONE,1.1 popen-help.pd,NONE,1.1 popen.PNG,NONE,1.1 popen.c,NONE,1.1
by carmen rocco 08 Mar '05

08 Mar '05

Update of /cvsroot/pure-data/externals/control/popen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1381 Added Files: Makefile Makefilewin popen-help.pd popen.PNG popen.c Log Message: popen() --- NEW FILE: popen-help.pd --- #N canvas 458 385 649 268 10; #X msg 121 28 echo lol; #X obj 121 48 popen; #X symbolatom 111 85 10 0 0 0 - - -; #X obj 168 75 bng 15 163840 50 0 empty empty empty 0 0 0 8 -62784 -237312 -237312; #X obj 168 93 tgl 15 0 empty empty empty 0 0 0 8 -62784 -237312 -237312 0 1; #X msg 170 29 echo roffl | sed s/fl/lmao/; #X obj 111 114 select roflmao; #X obj 189 88 tgl 42 0 empty empty empty 0 -6 0 8 -262144 -1 -1 0 1 ; #X text 16 10 popen(); #X text 41 159 so simple it should work on most any platform; #X text 39 176 always outputs a symbol; #X text 42 199 non-threaded to maintain right to left execution order ; #X text 41 218 always executes in a real shell (sh on linux \, cmd on win (add a bash -c if you want it to run in a minGW/cygwin bash)) so stuff like || and < can be used..; #X obj 258 97 popen; #X msg 258 117 add2 \$1; #X msg 303 103 Linux a 2.6.11-gentoo-r1 #4 Sun Mar 6 16:43:59 GMT 2005 x86_64 AMD Athlon(tm) 64 Processor 3000+ AuthenticAMD GNU/Linux ; #X msg 303 65 cat /proc/cpuinfo; #X msg 303 82 set; #X msg 253 65 uname -a; #X connect 0 0 1 0; #X connect 1 0 2 0; #X connect 1 1 3 0; #X connect 2 0 6 0; #X connect 3 0 4 0; #X connect 5 0 1 0; #X connect 6 0 7 0; #X connect 13 0 14 0; #X connect 14 0 15 0; #X connect 16 0 17 0; #X connect 16 0 13 0; #X connect 17 0 15 0; #X connect 18 0 17 0; #X connect 18 0 13 0; --- NEW FILE: Makefile --- prefix=/usr/lib/pd EXTERNALS = popen.c all: $(EXTERNALS:.c=.pd_linux) .SUFFIXES: .pd_linux CFLAGS = -g -DUNIX -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch -fPIC INCLUDE = -I. -I.. -I$(prefix)/src %.pd_linux: %.c $(CC) $(CFLAGS) $(INCLUDE) -o "$*.o" -c "$*.c" gcc -shared -o "$*.pd_linux" "$*.o" clean: -rm *.pd_linux *.o install-doc: @test -d $(prefix)/doc/5.reference || mkdir -p $(prefix)/doc/5.reference install *.pd $(prefix)/doc/5.reference install: install-doc @test -d $(prefix)/extra || mkdir -p $(prefix)/extra install *.pd_linux $(prefix)/extra --- NEW FILE: popen.PNG --- (This appears to be a binary file; contents omitted.) --- NEW FILE: popen.c --- /* :popen: for PD - windows + linux + (probably mac) - carmen rocco */ #include <m_pd.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #define INBUFSIZE 1024 static t_class *popen_class; typedef struct _popen { t_object x_obj; char buffer[128]; t_symbol *x_s; t_outlet* x_done; } t_popen; static void popen_out(t_popen* x) { int i; int size = 0; size = strlen(x->buffer); for (i=0;i<size;i++) if (x->buffer[i] == '\n' || x->buffer[i] == '\r') x->buffer[i] = '\0'; fprintf(stderr, "%s",x->buffer); x->x_s = gensym(x->buffer); outlet_symbol(x->x_obj.ob_outlet, x->x_s); } static void popen_anything(t_popen *x, t_symbol *s, int argc, t_atom *argv) { int i; char arg[MAXPDSTRING]; char cmd[20] = ""; FILE *pPipe; int size = 0; for (i=0;i<argc;i++) { atom_string(argv,arg+size,MAXPDSTRING - size); argv++; size=strlen(arg); arg[size++] = ' '; } arg[size-1] = '\0'; strcat(cmd, s->s_name); strcat(cmd, " "); strcat(cmd, arg); post("sending %s",cmd); #ifdef NT if( (pPipe = _popen( cmd, "rt" )) == NULL ) #else if( (pPipe = popen( cmd, "r" )) == NULL ) #endif return; while( !feof( pPipe ) ) { if( fgets( x->buffer, 128, pPipe ) != NULL ) popen_out(x); } #ifdef NT _pclose( pPipe ); #else pclose( pPipe ); #endif outlet_bang(x->x_done); } void popen_free(t_popen* x) { } static void *popen_new(void) { t_popen *x = (t_popen *)pd_new(popen_class); outlet_new(&x->x_obj, &s_symbol); x->x_done = outlet_new(&x->x_obj, &s_bang); return (x); } void popen_setup(void) { popen_class = class_new(gensym("popen"), (t_newmethod)popen_new, (t_method)popen_free,sizeof(t_popen), 0,0); class_addbang(popen_class,popen_out); class_addanything(popen_class, popen_anything); } --- NEW FILE: Makefilewin --- prefix=../.. EXTERNALS = popen.c all: $(EXTERNALS:.c=.dll) .SUFFIXES: .dll CFLAGS = -g -DPD -DNT -Wall -W -Wshadow -Wstrict-prototypes \ -Wno-unused -Wno-parentheses -Wno-switch INCLUDE = -I. -I.. -I$(prefix)/src %.dll: %.c $(CC) $(CFLAGS) $(INCLUDE) -o "$*.o" -c "$*.c" gcc -shared -o "$*.dll" "$*.o" $(prefix)/bin/pd.dll \ `test -f $*.libs && cat $*.libs` clean: -rm *.dll *.o install-doc: @test -d $(prefix)/doc/5.reference || mkdir -p $(prefix)/doc/5.reference install *.pd $(prefix)/doc/5.reference install: install-doc @test -d $(prefix)/extra || mkdir -p $(prefix)/extra install *.dll $(prefix)/extra

1 0

externals/control/popen - New directory
by carmen rocco 08 Mar '05

08 Mar '05

Update of /cvsroot/pure-data/externals/control/popen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32565/popen Log Message: Directory /cvsroot/pure-data/externals/control/popen added to the repository

1 0

externals/grill/py/source clmeth.cpp,1.14,1.15 main.cpp,1.26,1.27 main.h,1.33,1.34 modmeth.cpp,1.14,1.15
by Thomas Grill 08 Mar '05

08 Mar '05

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8086/source Modified Files: clmeth.cpp main.cpp main.h modmeth.cpp Log Message: pass timeout argument to stop method fixes for detached mode fixes for detached operation and single-threaded version use lock count instead of message queuing to avoid py->py messaging deadlock use new flext fifo Index: modmeth.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/modmeth.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** modmeth.cpp 11 Jan 2005 04:59:27 -0000 1.14 --- modmeth.cpp 8 Mar 2005 04:59:25 -0000 1.15 *************** *** 46,50 **** ! void py::tick(void *) { --- 46,50 ---- ! #ifdef FLEXT_THREADS void py::tick(void *) { *************** *** 69,75 **** --- 69,77 ---- Unlock(); } + #endif void py::m_stop(int argc,const t_atom *argv) { + #ifdef FLEXT_THREADS if(thrcount) { Lock(); *************** *** 90,94 **** Unlock(); } ! } --- 92,96 ---- Unlock(); } ! #endif } Index: clmeth.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/clmeth.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** clmeth.cpp 27 Feb 2005 04:57:30 -0000 1.14 --- clmeth.cpp 8 Mar 2005 04:59:23 -0000 1.15 *************** *** 114,117 **** --- 114,118 ---- } + #ifdef FLEXT_THREADS if(PyString_Check(name)) { char* sname = PyString_AS_STRING(name); *************** *** 125,128 **** --- 126,130 ---- } } + #endif if(!ret) { *************** *** 232,238 **** else { pyext *ext = GetThis(self); ! int cnt = 0; t_atom at; ! if(val >= 0) flext::SetInt(at,val); ext->m_stop(cnt,&at); } --- 234,241 ---- else { pyext *ext = GetThis(self); ! int cnt; t_atom at; ! if(val >= 0) cnt = 1,flext::SetInt(at,val); ! else cnt = 0; ext->m_stop(cnt,&at); } Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** main.cpp 6 Mar 2005 04:57:32 -0000 1.26 --- main.cpp 8 Mar 2005 04:59:25 -0000 1.27 *************** *** 158,165 **** } ! py::py(): ! module(NULL), ! detach(0),shouldexit(false),thrcount(0), ! stoptick(0) { PyThreadState *state = PyLock(); --- 158,166 ---- } ! py::py() ! : module(NULL),detach(0) ! #ifdef FLEXT_THREADS ! , shouldexit(false),thrcount(0),stoptick(0) ! #endif { PyThreadState *state = PyLock(); *************** *** 167,173 **** PyUnlock(state); FLEXT_ADDTIMER(stoptmr,tick); - #ifdef FLEXT_THREADS // launch thread worker FLEXT_CALLMETHOD(threadworker); --- 168,174 ---- PyUnlock(state); + #ifdef FLEXT_THREADS FLEXT_ADDTIMER(stoptmr,tick); // launch thread worker FLEXT_CALLMETHOD(threadworker); *************** *** 177,201 **** py::~py() { ! shouldexit = true; #ifdef FLEXT_THREADS qucond.Signal(); - if(thrcount) { // Wait for a certain time ! for(int i = 0; i < (PY_STOP_WAIT/PY_STOP_TICK) && thrcount; ++i) Sleep((float)(PY_STOP_TICK/1000.)); // Wait forever post("%s - Waiting for thread termination!",thisName()); ! while(thrcount) Sleep(0.01f); post("%s - Okay, all threads have terminated",thisName()); } #endif ! PyThreadState *state = PyLock(); ! Py_XDECREF(module_obj); ! PyUnlock(state); } - void py::GetDir(PyObject *obj,AtomList &lst) { --- 178,204 ---- py::~py() { ! PyThreadState *state = PyLock(); ! Py_XDECREF(module_obj); ! PyUnlock(state); ! } + void py::Exit() + { #ifdef FLEXT_THREADS + shouldexit = true; qucond.Signal(); if(thrcount) { // Wait for a certain time ! for(int i = 0; i < (PY_STOP_WAIT/PY_STOP_TICK) && thrcount; ++i) Sleep(PY_STOP_TICK/1000.f); // Wait forever post("%s - Waiting for thread termination!",thisName()); ! while(thrcount) Sleep(PY_STOP_TICK/1000.f); post("%s - Okay, all threads have terminated",thisName()); } #endif ! flext_base::Exit(); } void py::GetDir(PyObject *obj,AtomList &lst) { *************** *** 476,480 **** ret = qucall(pmeth,pargs); break; - #endif case 2: // each call a new thread --- 479,482 ---- *************** *** 484,489 **** } break; default: ! FLEXT_ASSERT(false); } return ret; --- 486,492 ---- } break; + #endif default: ! post("%s - Unknown detach mode",thisName()); } return ret; *************** *** 494,498 **** --- 497,503 ---- FLEXT_ASSERT(data); + #ifdef FLEXT_THREADS ++thrcount; + #endif PyThreadState *state = PyLock(); *************** *** 505,509 **** --- 510,516 ---- PyUnlock(state); + #ifdef FLEXT_THREADS --thrcount; + #endif } *************** *** 523,528 **** PyThreadState *state; ! while(!shouldexit) { while(el = qufifo.Get()) { state = PyLock(); callpy(el->fun,el->args); --- 530,537 ---- PyThreadState *state; ! ++thrcount; ! for(;;) { while(el = qufifo.Get()) { + ++thrcount; state = PyLock(); callpy(el->fun,el->args); *************** *** 531,536 **** PyUnlock(state); qufifo.Free(el); } ! qucond.Wait(); } --- 540,549 ---- PyUnlock(state); qufifo.Free(el); + --thrcount; } ! if(shouldexit) ! break; ! else ! qucond.Wait(); } *************** *** 543,546 **** --- 556,560 ---- } PyUnlock(state); + --thrcount; } #endif Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.h,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** main.h 6 Mar 2005 04:57:32 -0000 1.33 --- main.h 8 Mar 2005 04:59:25 -0000 1.34 *************** *** 26,31 **** #define PYEXT_CLASS "_class" // name for base class ! #define PY_STOP_WAIT 1000 // ms ! #define PY_STOP_TICK 10 // ms --- 26,31 ---- #define PYEXT_CLASS "_class" // name for base class ! #define PY_STOP_WAIT 100 // ms ! #define PY_STOP_TICK 1 // ms *************** *** 51,54 **** --- 51,56 ---- static void lib_setup(); + virtual void Exit(); + static PyObject *MakePyArgs(const t_symbol *s,int argc,const t_atom *argv,int inlet = -1,bool withself = false); static AtomList *GetPyArgs(PyObject *pValue,PyObject **self = NULL); *************** *** 110,121 **** virtual void m_stop(int argc,const t_atom *argv); ! bool shouldexit,respond; int thrcount; int stoptick; Timer stoptmr; - int detach; void tick(void *); ! bool gencall(PyObject *fun,PyObject *args); virtual bool callpy(PyObject *fun,PyObject *args) = 0; --- 112,127 ---- virtual void m_stop(int argc,const t_atom *argv); ! bool respond; ! #ifdef FLEXT_THREADS ! bool shouldexit; int thrcount; int stoptick; Timer stoptmr; void tick(void *); ! #endif ! ! int detach; ! bool gencall(PyObject *fun,PyObject *args); virtual bool callpy(PyObject *fun,PyObject *args) = 0; *************** *** 154,162 **** // this is respecially needed when one py/pyext object calls another one // we don't want the message to be queued, but otoh we have to avoid deadlock static int lockcount; inline PyThreadState *PyLock() { ! if(!lockcount++) PyEval_AcquireLock(); return PyThreadState_Swap(FindThreadState()); } --- 160,169 ---- // this is respecially needed when one py/pyext object calls another one // we don't want the message to be queued, but otoh we have to avoid deadlock + // (recursive calls can only happen in the system thread) static int lockcount; inline PyThreadState *PyLock() { ! if(!IsSystemThread() || !lockcount++) PyEval_AcquireLock(); return PyThreadState_Swap(FindThreadState()); } *************** *** 165,169 **** { PyThreadState_Swap(st); ! if(!--lockcount) PyEval_ReleaseLock(); } #else --- 172,176 ---- { PyThreadState_Swap(st); ! if(!IsSystemThread() || !--lockcount) PyEval_ReleaseLock(); } #else *************** *** 190,196 **** FLEXT_CALLGET_V(mg_dir) FLEXT_CALLBACK(m_doc) - FLEXT_CALLBACK_T(tick) #ifdef FLEXT_THREADS FLEXT_THREAD(threadworker) #endif --- 197,203 ---- FLEXT_CALLGET_V(mg_dir) FLEXT_CALLBACK(m_doc) #ifdef FLEXT_THREADS + FLEXT_CALLBACK_T(tick) FLEXT_THREAD(threadworker) #endif

1 0

externals/grill/flext/source flcontainers.h,1.3,1.4 flqueue.cpp,1.29,1.30
by Thomas Grill 08 Mar '05

08 Mar '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7399/source Modified Files: flcontainers.h flqueue.cpp Log Message: updated flext lock-free containers install flcontainers.h Lifos and Fifos with reservoir forgot about void... Index: flqueue.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flqueue.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** flqueue.cpp 27 Feb 2005 04:56:10 -0000 1.29 --- flqueue.cpp 8 Mar 2005 04:57:17 -0000 1.30 *************** *** 28,31 **** --- 28,33 ---- + static void Trigger(); + class qmsg: public flext, *************** *** 33,50 **** { public: ! qmsg(flext_base *t,int o,const t_symbol *s,int ac,const t_atom *av) ! : msg(s,ac,av) ! , th(t),out(o) ! {} ! ! void Set(flext_base *t,int o,const t_symbol *s,int ac,const t_atom *av) { th = t; out = o; msg(s,ac,av); } // \note PD sys lock must already be held by caller ! void Send() const { if(out < 0) --- 35,48 ---- { public: ! inline qmsg &Set(flext_base *t,int o,const t_symbol *s,int ac,const t_atom *av) { th = t; out = o; msg(s,ac,av); + return *this; } // \note PD sys lock must already be held by caller ! inline void Send() const { if(out < 0) *************** *** 62,80 **** }; ! /* \TODO This is only thread-safe if called from one thread which need NOT be the case. ! Reimplement in a thread-safe manner!!! ! */ class Queue: public flext, ! public TypedFifo<qmsg> { public: inline bool Empty() const { return Size() == 0; } ! void New(flext_base *t,int o,const t_symbol *s,int ac,const t_atom *av); inline void Push(flext_base *th,int o) // bang { ! New(th,o,sym_bang,0,NULL); } --- 60,86 ---- }; ! ! ! typedef PooledFifo<qmsg> QueueFifo; ! class Queue: public flext, ! public QueueFifo { public: inline bool Empty() const { return Size() == 0; } ! inline void Push(flext_base *t,int o,const t_symbol *s,int ac,const t_atom *av) ! { ! qmsg *m = QueueFifo::New(); ! FLEXT_ASSERT(m); ! m->Set(t,o,s,ac,av); ! Put(m); ! Trigger(); ! } inline void Push(flext_base *th,int o) // bang { ! Push(th,o,sym_bang,0,NULL); } *************** *** 83,87 **** t_atom at; SetFloat(at,dt); ! New(th,o,sym_float,1,&at); } --- 89,93 ---- t_atom at; SetFloat(at,dt); ! Push(th,o,sym_float,1,&at); } *************** *** 98,102 **** #error Not implemented! #endif ! New(th,o,sym,1,&at); } --- 104,108 ---- #error Not implemented! #endif ! Push(th,o,sym,1,&at); } *************** *** 105,109 **** t_atom at; SetSymbol(at,dt); ! New(th,o,sym_symbol,1,&at); } --- 111,115 ---- t_atom at; SetSymbol(at,dt); ! Push(th,o,sym_symbol,1,&at); } *************** *** 127,155 **** return; } ! New(th,o,sym,1,&a); } inline void Push(flext_base *th,int o,int argc,const t_atom *argv) { ! New(th,o,sym_list,argc,argv); ! } ! ! inline void Push(flext_base *th,int o,const t_symbol *sym,int argc,const t_atom *argv) ! { ! New(th,o,sym,argc,argv); } }; ! static Queue queue,requeue; ! ! void Queue::New(flext_base *t,int o,const t_symbol *s,int ac,const t_atom *av) ! { ! qmsg *m = requeue.Get(); ! if(m) ! m->Set(t,o,s,ac,av); ! else ! m = new qmsg(t,o,s,ac,av); ! Put(m); ! } --- 133,146 ---- return; } ! Push(th,o,sym,1,&a); } inline void Push(flext_base *th,int o,int argc,const t_atom *argv) { ! Push(th,o,sym_list,argc,argv); } }; ! static Queue queue; *************** *** 181,185 **** while((q = queue.Get()) != NULL) { q->Send(); ! requeue.Put(q); } --- 172,176 ---- while((q = queue.Get()) != NULL) { q->Send(); ! queue.Free(q); } *************** *** 306,310 **** { queue.Push(const_cast<flext_base *>(this),o); - Trigger(); } --- 297,300 ---- *************** *** 312,316 **** { queue.Push(const_cast<flext_base *>(this),o,f); - Trigger(); } --- 302,305 ---- *************** *** 318,322 **** { queue.Push(const_cast<flext_base *>(this),o,f); - Trigger(); } --- 307,310 ---- *************** *** 324,328 **** { queue.Push(const_cast<flext_base *>(this),o,s); - Trigger(); } --- 312,315 ---- *************** *** 330,334 **** { queue.Push(const_cast<flext_base *>(this),o,at); - Trigger(); } --- 317,320 ---- *************** *** 336,340 **** { queue.Push(const_cast<flext_base *>(this),o,argc,argv); - Trigger(); } --- 322,325 ---- *************** *** 342,345 **** { queue.Push(const_cast<flext_base *>(this),o,s,argc,argv); - Trigger(); } --- 327,329 ---- Index: flcontainers.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flcontainers.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** flcontainers.h 6 Mar 2005 04:56:00 -0000 1.3 --- flcontainers.h 8 Mar 2005 04:57:01 -0000 1.4 *************** *** 271,275 **** }; ! template <typename T> class PooledLifo : public TypedLifo<T> --- 271,275 ---- }; ! template <typename T,int M = 2,int O = 1> class PooledLifo : public TypedLifo<T> *************** *** 277,281 **** public: inline T *New() { T *n = reuse.Pop(); return n?n:new T; } ! inline Free(T *p) { if(reuse.Size() < Size()) reuse.Push(p); else delete p; } private: TypedLifo<T> reuse; --- 277,282 ---- public: inline T *New() { T *n = reuse.Pop(); return n?n:new T; } ! inline size_t Size() const { return TypedLifo<T>::Size(); } ! inline void Free(T *p) { if(reuse.Size() < Size()*M+O) reuse.Push(p); else delete p; } private: TypedLifo<T> reuse; *************** *** 348,352 **** }; ! template <typename T> class PooledFifo : public TypedFifo<T> --- 349,353 ---- }; ! template <typename T,int M = 2,int O = 1> class PooledFifo : public TypedFifo<T> *************** *** 354,358 **** public: inline T *New() { T *n = reuse.Pop(); return n?n:new T; } ! inline Free(T *p) { if(reuse.Size() < Size()) reuse.Push(p); else delete p; } private: TypedLifo<T> reuse; --- 355,360 ---- public: inline T *New() { T *n = reuse.Pop(); return n?n:new T; } ! inline size_t Size() const { return TypedFifo<T>::Size(); } ! inline void Free(T *p) { if(reuse.Size() < Size()*M+O) reuse.Push(p); else delete p; } private: TypedLifo<T> reuse;

1 0

externals/grill/flext package.txt,1.6,1.7
by Thomas Grill 08 Mar '05

08 Mar '05

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7399 Modified Files: package.txt Log Message: updated flext lock-free containers install flcontainers.h Lifos and Fifos with reservoir forgot about void... Index: package.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/package.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** package.txt 4 Mar 2005 04:56:16 -0000 1.6 --- package.txt 8 Mar 2005 04:57:00 -0000 1.7 *************** *** 36,40 **** flproxy.cpp flqueue.cpp flbind.cpp HDRS= \ ! flprefix.h flstdc.h flbase.h flclass.h flext.h flsupport.h flmap.h fldsp.h flinternal.h \ fldefs.h fldefs_hdr.h fldefs_setup.h \ fldefs_methcb.h fldefs_meththr.h fldefs_methadd.h fldefs_methbind.h fldefs_methcall.h \ --- 36,40 ---- flproxy.cpp flqueue.cpp flbind.cpp HDRS= \ ! flprefix.h flstdc.h flbase.h flclass.h flext.h flsupport.h flmap.h fldsp.h flinternal.h flcontainers.h \ fldefs.h fldefs_hdr.h fldefs_setup.h \ fldefs_methcb.h fldefs_meththr.h fldefs_methadd.h fldefs_methbind.h fldefs_methcall.h \

1 0

CVSROOT avail,1.11,1.12
by Hans-Christoph Steiner 07 Mar '05

07 Mar '05

Update of /cvsroot/pure-data/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9485/CVSROOT Modified Files: avail Log Message: allowed branching on ACLed sections Index: avail =================================================================== RCS file: /cvsroot/pure-data/CVSROOT/avail,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** avail 2 Mar 2005 17:36:14 -0000 1.11 --- avail 7 Mar 2005 07:26:36 -0000 1.12 *************** *** 9,14 **** # ACLs at Yves Degoyon's request ! unavail | | externals/gem2pdp,externals/pidip,externals/unauthorized ! avail | sevyves,eighthave | externals/gem2pdp,externals/pidip,externals/unauthorized # T. Grill's cvs automatically syncs with the SourceForge --- 9,14 ---- # ACLs at Yves Degoyon's request ! unavail | | externals/gem2pdp,externals/pidip,externals/unauthorized | MAIN ! avail | sevyves,eighthave | externals/gem2pdp,externals/pidip,externals/unauthorized | MAIN # T. Grill's cvs automatically syncs with the SourceForge *************** *** 19,28 **** # this code was imported by Hans and not maintained in CVS # so changes here would have to be merged ! unavail | | externals/maxlib ! avail | eighthave,olafmatt | externals/maxlib # Thomas joined the SourceForge project and is maintaining this now (yay!) ! unavail | | externals/iemlib ! avail | tmusil | externals/iemlib # restrict the MAIN branch of "pd" to prevent accidental --- 19,28 ---- # this code was imported by Hans and not maintained in CVS # so changes here would have to be merged ! unavail | | externals/maxlib | MAIN ! avail | eighthave,olafmatt | externals/maxlib | MAIN # Thomas joined the SourceForge project and is maintaining this now (yay!) ! unavail | | externals/iemlib | MAIN ! avail | tmusil,zmoelnig | externals/iemlib | MAIN # restrict the MAIN branch of "pd" to prevent accidental

1 0

externals/grill/py/source main.cpp,1.25,1.26 main.h,1.32,1.33
by Thomas Grill 06 Mar '05

06 Mar '05

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11209/source Modified Files: main.cpp main.h Log Message: use new flext fifo use lock count instead of message queuing to avoid py->py messaging deadlock Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** main.cpp 27 Feb 2005 04:57:47 -0000 1.25 --- main.cpp 6 Mar 2005 04:57:32 -0000 1.26 *************** *** 511,535 **** bool py::qucall(PyObject *fun,PyObject *args) { ! if(qufifo.Push(fun,args)) { ! qucond.Signal(); ! return true; ! } ! else ! return false; } void py::threadworker() { ! PyObject *fun,*args; PyThreadState *state; while(!shouldexit) { ! state = PyLock(); ! while(qufifo.Pop(fun,args)) { ! callpy(fun,args); ! Py_XDECREF(fun); ! Py_XDECREF(args); } - PyUnlock(state); qucond.Wait(); } --- 511,535 ---- bool py::qucall(PyObject *fun,PyObject *args) { ! FifoEl *el = qufifo.New(); ! el->Set(fun,args); ! qufifo.Put(el); ! qucond.Signal(); ! return true; } void py::threadworker() { ! FifoEl *el; PyThreadState *state; while(!shouldexit) { ! while(el = qufifo.Get()) { ! state = PyLock(); ! callpy(el->fun,el->args); ! Py_XDECREF(el->fun); ! Py_XDECREF(el->args); ! PyUnlock(state); ! qufifo.Free(el); } qucond.Wait(); } *************** *** 537,545 **** state = PyLock(); // unref remaining Python objects ! while(qufifo.Pop(fun,args)) { ! Py_XDECREF(fun); ! Py_XDECREF(args); } - PyUnlock(state); } --- 537,545 ---- state = PyLock(); // unref remaining Python objects ! while(el = qufifo.Get()) { ! Py_XDECREF(el->fun); ! Py_XDECREF(el->args); ! qufifo.Free(el); } PyUnlock(state); } *************** *** 576,611 **** return true; } - - Fifo::~Fifo() - { - FifoEl *el = head; - head = tail = NULL; // reset it, in case there's a thread wanting to Pop - while(el) { - FifoEl *n = el->nxt; - delete el; - el = n; - } - } - - bool Fifo::Push(PyObject *f,PyObject *a) - { - FifoEl *el = new FifoEl; - el->fun = f; - el->args = a; - if(tail) tail->nxt = el; - else head = el; - tail = el; - return true; - } - - bool Fifo::Pop(PyObject *&f,PyObject *&a) - { - if(!head) return false; - FifoEl *el = head; - head = el->nxt; - f = el->fun; - a = el->args; - if(tail == el) tail = NULL; - delete el; - return true; - } --- 576,577 ---- Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** main.h 27 Feb 2005 04:57:47 -0000 1.32 --- main.h 6 Mar 2005 04:57:32 -0000 1.33 *************** *** 14,17 **** --- 14,18 ---- #include "pyprefix.h" #include "pysymbol.h" + #include <flcontainers.h> #if FLEXT_OS == FLEXT_LINUX || FLEXT_OS == FLEXT_IRIX *************** *** 29,51 **** ! class Fifo { - protected: - struct FifoEl { - PyObject *fun; - PyObject *args; - FifoEl *nxt; - }; public: ! Fifo(): head(NULL),tail(NULL) {} ! ~Fifo(); ! ! bool Push(PyObject *f,PyObject *a); ! bool Pop(PyObject *&f,PyObject *&a); ! ! protected: ! FifoEl *head,*tail; }; class py: --- 30,43 ---- ! ! class FifoEl ! : public Fifo::Cell { public: ! void Set(PyObject *f,PyObject *a) { fun = f,args = a; } ! PyObject *fun,*args; }; + typedef PooledFifo<FifoEl> PyFifo; class py: *************** *** 142,146 **** bool qucall(PyObject *fun,PyObject *args); void threadworker(); ! Fifo qufifo; ThrCond qucond; --- 134,138 ---- bool qucall(PyObject *fun,PyObject *args); void threadworker(); ! PyFifo qufifo; ThrCond qucond;

1 0

externals/grill/flext/source flcontainers.h,1.2,1.3
by Thomas Grill 06 Mar '05

06 Mar '05

Update of /cvsroot/pure-data/externals/grill/flext/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10955/source Modified Files: flcontainers.h Log Message: introduce compile time error reporting for architectures not supported Lifos and Fifos with reservoir Index: flcontainers.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/source/flcontainers.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** flcontainers.h 27 Feb 2005 04:56:10 -0000 1.2 --- flcontainers.h 6 Mar 2005 04:56:00 -0000 1.3 *************** *** 13,16 **** --- 13,17 ---- This code has been adapted from the MidiShare project (c)Grame + http://midishare.sourceforge.net */ *************** *** 22,31 **** ! #if 1 //def __Pentium__ ! #define VTYPE volatile ! #else ! #define VTYPE ! #endif ! #define __SMP__ --- 23,28 ---- ! // define that precautiously... ! // it's faster without that but we can't really know... #define __SMP__ *************** *** 48,52 **** inline Cell *Avail() { return (Cell *)top; } ! #if defined(_WIN32) && defined(_MSC_VER) #ifdef __SMP__ #define LOCK lock --- 45,49 ---- inline Cell *Avail() { return (Cell *)top; } ! #if defined(_MSC_VER) && (defined(_WIN32)) #ifdef __SMP__ #define LOCK lock *************** *** 113,117 **** inline size_t Size() const { return ic-oc; } ! #elif defined(__GNUC__) && (defined(_X86_) || defined(__i386__) || defined(__i586__) || defined(__i686__)) #ifndef SMPLOCK # ifdef __SMP__ --- 110,114 ---- inline size_t Size() const { return ic-oc; } ! #elif defined(__GNUC__) && (defined(_X86_) || defined(__i386__)) #ifndef SMPLOCK # ifdef __SMP__ *************** *** 184,187 **** --- 181,188 ---- return n; } + #elif defined(__GNUC__) && defined(__x86_64__) + + #error x86-64 architecture not supported yet + #elif defined(__GNUC__) && defined(__POWERPC__) inline void Push(register Cell *cl) *************** *** 245,255 **** inline size_t Size() const { return oc; } #endif private: // don't change order! ! VTYPE size_t ic; // input (push) count ! VTYPE Cell *top; // top of the stack ! VTYPE size_t oc; // output (pop) count #ifdef __POWERPC__ size_t unused[5]; // lifo size must be at least 32 bytes --- 246,258 ---- inline size_t Size() const { return oc; } + #else + #error Platform not supported #endif private: // don't change order! ! volatile size_t ic; // input (push) count ! volatile Cell *top; // top of the stack ! volatile size_t oc; // output (pop) count #ifdef __POWERPC__ size_t unused[5]; // lifo size must be at least 32 bytes *************** *** 268,271 **** --- 271,285 ---- }; + template <typename T> + class PooledLifo + : public TypedLifo<T> + { + public: + inline T *New() { T *n = reuse.Pop(); return n?n:new T; } + inline Free(T *p) { if(reuse.Size() < Size()) reuse.Push(p); else delete p; } + private: + TypedLifo<T> reuse; + }; + class FLEXT_SHARE Fifo *************** *** 334,337 **** --- 348,361 ---- }; + template <typename T> + class PooledFifo + : public TypedFifo<T> + { + public: + inline T *New() { T *n = reuse.Pop(); return n?n:new T; } + inline Free(T *p) { if(reuse.Size() < Size()) reuse.Push(p); else delete p; } + private: + TypedLifo<T> reuse; + }; #endif

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs March 2005