This commit was generated by cvs2svn to compensate for changes in r2456,

which included commits to RCS files with non-trunk default branches.

svn path=/trunk/externals/tb/; revision=2457

6 files changed, 605 insertions, 0 deletions

diff --git a/detach/README b/detach/README
new file mode 100644
index 0000000..1cdc041
--- /dev/null
+++ b/detach/README
@@ -0,0 +1,4 @@
+the message to the inlet will be sent to the outlet, but all
+functions called as result of this message run in a helper thread.
+
+requirement: pd>=devel_0_38
\ No newline at end of file
diff --git a/detach/detach.c b/detach/detach.c
new file mode 100644
index 0000000..67c4b1e
--- /dev/null
+++ b/detach/detach.c
@@ -0,0 +1,252 @@
+/* 
+* 
+* detatch
+* Copyright (C) 2005  Tim Blechmann
+* 
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program; see the file COPYING.  If not, write to
+* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*/
+
+#include "m_pd.h"
+#include "m_fifo.h"
+
+#include "pthread.h"
+
+
+static t_class *detatch_class;
+
+typedef t_fifo fifo_t; /* for emacs syntax highlighting */
+
+typedef struct _detatch
+{
+    t_object x_obj;
+
+	t_outlet * x_outlet;
+
+	pthread_t x_thread;
+	pthread_mutex_t x_mutex;
+    pthread_cond_t x_cond;
+
+	fifo_t * x_fifo;
+
+} detatch_t;
+
+typedef struct _detatch_content
+{
+	enum { BANG, 
+		   POINTER,
+		   FLOAT,
+		   SYMBOL,
+		   LIST,
+		   ANYTHING,
+		   CANCEL} type;
+	int argc;
+	t_atom * argv;
+} detatch_content_t;
+
+
+static void detatch_thread(detatch_t* x)
+{
+	detatch_content_t * me;
+	while(1)
+	{
+		pthread_cond_wait(&x->x_cond, &x->x_mutex);
+		
+		me = (detatch_content_t*) fifo_get(x->x_fifo);
+		
+		while (me != NULL)
+		{
+			/* run function */
+			switch (me->type)
+			{
+			case BANG:
+				outlet_bang(x->x_outlet);
+				break;
+			case FLOAT:
+				outlet_float(x->x_outlet, atom_getfloat(me->argv));
+				break;
+			case SYMBOL:
+				outlet_symbol(x->x_outlet, atom_getsymbol(me->argv));
+				break;
+			case LIST:
+				outlet_list(x->x_outlet, 0, me->argc, me->argv);
+				freebytes(me->argv, me->argc * sizeof(t_atom));
+				break;
+			case ANYTHING:
+				outlet_anything(x->x_outlet, 0, me->argc, me->argv);
+				freebytes(me->argv, me->argc * sizeof(t_atom));
+				break;
+			case CANCEL:
+				goto done;
+				
+			}
+			
+			/* free */
+			if (me->argc)
+				freebytes(me->argv, me->argc * sizeof (t_atom));
+			freebytes (me, sizeof(detatch_content_t));
+			
+			me = (detatch_content_t*) fifo_get(x->x_fifo);
+		}
+	}
+	
+ done: /* free the fifo and exit */
+
+	do 
+	{
+		if (me->argc)
+			freebytes(me->argv, me->argc * sizeof (t_atom));
+		freebytes (me, sizeof(detatch_content_t));
+	}
+	while (me = (detatch_content_t*) fifo_get(x->x_fifo));
+
+	fifo_destroy(x->x_fifo);
+	return;
+}
+
+/* todo: take argument for thread priority */
+static detatch_t * detatch_new(void)
+{
+	detatch_t *x = (detatch_t*) pd_new(detatch_class);
+	pthread_attr_t thread_attr;
+	struct sched_param thread_sched;
+	int status;
+
+	x->x_outlet = outlet_new(&x->x_obj, NULL);
+	x->x_fifo = fifo_init();
+
+	/* thread initialisation */
+	pthread_mutex_init (&x->x_mutex,NULL);
+	pthread_mutex_unlock (&x->x_mutex);
+	pthread_cond_init (&x->x_cond,NULL);
+
+	pthread_attr_init(&thread_attr);
+#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
+    thread_sched.sched_priority=sched_get_priority_min(SCHED_OTHER);
+    pthread_attr_setschedparam(&thread_attr,&thread_sched);
+#endif
+	status = pthread_create(&x->x_thread, &thread_attr,
+							(void*)detatch_thread, x);
+
+#if 1
+	if (status == 0)
+		post("detatching thread");
+#endif
+	return x;
+}
+
+
+static void detatch_free(detatch_t * x)
+{
+	detatch_content_t * me = getbytes(sizeof(detatch_content_t));
+	
+	me->type = CANCEL;
+	me->argc = 0;
+	fifo_put(x->x_fifo, me);
+	pthread_cond_broadcast(&x->x_cond);
+}
+
+
+static void detatch_bang(detatch_t * x)
+{
+	detatch_content_t * me = getbytes(sizeof(detatch_content_t));
+	
+	me->type = BANG;
+	me->argc = 0;
+	fifo_put(x->x_fifo, me);
+	
+	pthread_cond_broadcast(&x->x_cond);
+}
+
+
+static void detatch_float(detatch_t * x, t_float f)
+{
+	detatch_content_t * me = getbytes(sizeof(detatch_content_t));
+	
+	me->type = FLOAT;
+	me->argc = 1;
+	me->argv = getbytes(sizeof(t_atom));
+	SETFLOAT(me->argv, f);
+	fifo_put(x->x_fifo, me);
+	
+	pthread_cond_broadcast(&x->x_cond);
+}
+
+static void detatch_pointer(detatch_t * x, t_gpointer* gp)
+{
+	detatch_content_t * me = getbytes(sizeof(detatch_content_t));
+	
+	me->type = POINTER;
+	me->argc = 1;
+	me->argv = getbytes(sizeof(t_atom));
+	SETPOINTER(me->argv, gp);
+	fifo_put(x->x_fifo, me);
+	
+	pthread_cond_broadcast(&x->x_cond);
+}
+
+static void detatch_symbol(detatch_t * x, t_symbol * s)
+{
+	detatch_content_t * me = getbytes(sizeof(detatch_content_t));
+	
+	me->type = SYMBOL;
+	me->argc = 1;
+	me->argv = getbytes(sizeof(t_atom));
+	SETSYMBOL(me->argv, s);
+	fifo_put(x->x_fifo, me);
+	
+	pthread_cond_broadcast(&x->x_cond);
+}
+
+
+static void detatch_list(detatch_t * x, t_symbol * s, 
+						 int argc, t_atom* argv)
+{
+	detatch_content_t * me = getbytes(sizeof(detatch_content_t));
+	
+	me->type = LIST;
+	me->argc = argc;
+	me->argv = copybytes(argv, argc * sizeof(t_atom));
+	fifo_put(x->x_fifo, me);
+	
+	pthread_cond_broadcast(&x->x_cond);
+}
+
+static void detatch_anything(detatch_t * x, t_symbol * s, 
+							 int argc, t_atom* argv)
+{
+	detatch_content_t * me = getbytes(sizeof(detatch_content_t));
+	
+	me->type = ANYTHING;
+	me->argc = argc;
+	me->argv = copybytes(argv, argc * sizeof(t_atom));
+	fifo_put(x->x_fifo, me);
+	
+	pthread_cond_broadcast(&x->x_cond);
+}
+
+
+void detatch_setup(void)
+{
+	detatch_class = class_new(gensym("detatch"), (t_newmethod)detatch_new,
+							  (t_method)detatch_free, sizeof(detatch_t),
+							  CLASS_DEFAULT, 0);
+	class_addbang(detatch_class, detatch_bang);
+    class_addfloat(detatch_class, detatch_float);
+    class_addpointer(detatch_class, detatch_pointer);
+    class_addsymbol(detatch_class, detatch_symbol);
+    class_addlist(detatch_class, detatch_list);
+    class_addanything(detatch_class, detatch_anything);
+}
diff --git a/detach/makefile b/detach/makefile
new file mode 100644
index 0000000..7a578d6
--- /dev/null
+++ b/detach/makefile
@@ -0,0 +1,94 @@
+NAME=detatch
+CSYM=detatch
+
+current: pd_linux
+
+# ----------------------- NT -----------------------
+
+pd_nt: $(NAME).dll
+
+.SUFFIXES: .dll
+
+PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo
+VC="C:\Program Files\Microsoft Visual Studio\Vc98"
+
+PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include
+
+PDNTLDIR = $(VC)\lib
+PDNTLIB = $(PDNTLDIR)\libc.lib \
+	$(PDNTLDIR)\oldnames.lib \
+	$(PDNTLDIR)\kernel32.lib \
+	..\..\bin\pd.lib 
+
+.c.dll:
+	cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c
+	link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB)
+
+# ----------------------- IRIX 5.x -----------------------
+
+pd_irix5: $(NAME).pd_irix5
+
+.SUFFIXES: .pd_irix5
+
+SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2
+
+SGIINCLUDE =  -I../../src
+
+.c.pd_irix5:
+	$(CC) $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c
+	ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o
+	rm $*.o
+
+# ----------------------- IRIX 6.x -----------------------
+
+pd_irix6: $(NAME).pd_irix6
+
+.SUFFIXES: .pd_irix6
+
+SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+	-OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
+	-Ofast=ip32
+
+.c.pd_irix6:
+	$(CC) $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c
+	ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $*.o
+	rm $*.o
+
+# ----------------------- LINUX i386 -----------------------
+
+pd_linux: $(NAME).pd_linux
+
+.SUFFIXES: .pd_linux
+
+LINUXCFLAGS = -DPD -O3 -fPIC -funroll-loops -fomit-frame-pointer \
+    -Wall -W -Wshadow -Wstrict-prototypes -Werror \
+    -Wno-unused -Wno-parentheses -Wno-switch
+
+LINUXINCLUDE =  -I../../../src
+
+LSTRIP = strip --strip-unneeded -R .note -R .comment
+
+.c.pd_linux:
+	cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
+	cc -Wl,-export_dynamic --shared -o $*.pd_linux $*.o -lm
+	$(LSTRIP) $*.pd_linux
+	rm -f $*.o
+
+# ----------------------- Mac OSX -----------------------
+
+pd_darwin: $(NAME).pd_darwin
+
+.SUFFIXES: .pd_darwin
+
+DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \
+    -Wno-unused -Wno-parentheses -Wno-switch
+
+.c.pd_darwin:
+	$(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
+	$(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o 
+	rm -f $*.o
+
+# ----------------------------------------------------------
+
+clean:
+	rm -f *.o *.pd_* so_locations
diff --git a/join/README b/join/README
new file mode 100644
index 0000000..5175792
--- /dev/null
+++ b/join/README
@@ -0,0 +1,6 @@
+the message to the inlet will be sent to the outlet during the
+next idle callback of the scheduler. it doesn't matter, which thread the
+message was coming from. messages from the main pd thread will be
+rescheduled.
+
+requirement: pd>=devel_0_38
\ No newline at end of file
diff --git a/join/join.c b/join/join.c
new file mode 100644
index 0000000..fd7b5ad
--- /dev/null
+++ b/join/join.c
@@ -0,0 +1,155 @@
+/* 
+* 
+* detatch
+* Copyright (C) 2005  Tim Blechmann
+* 
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program; see the file COPYING.  If not, write to
+* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+* Boston, MA 02111-1307, USA.
+*/
+
+#include "m_pd.h"
+
+static t_class *join_class;
+
+typedef struct _join
+{
+    t_object x_obj;
+	t_outlet * x_outlet;
+} join_t;
+
+
+static join_t * join_new(void)
+{
+	join_t *x = (join_t*) pd_new(join_class);
+
+	x->x_outlet = outlet_new(&x->x_obj, NULL);
+	return x;
+}
+
+
+static t_int join_bang_callback(t_int * argv)
+{
+	outlet_bang((t_outlet*)argv[0]);
+	return 0;
+}
+
+static void join_bang(join_t * x)
+{
+	t_int* argv = getbytes(sizeof(t_int*));
+	argv[0] = (t_int)x->x_outlet;
+	set_callback(join_bang_callback, argv, 1);
+}
+
+
+static t_int join_pointer_callback(t_int * argv)
+{
+	outlet_pointer((t_outlet*)argv[0], (t_gpointer*)argv[1]);
+	return 0;
+}
+
+static void join_pointer(join_t * x, t_gpointer * gp)
+{
+	t_int* argv = getbytes(2*sizeof(t_int*));
+	argv[0] = (t_int)x->x_outlet;
+	argv[1] = (t_int)gp;
+
+	set_callback(join_pointer_callback, argv, 2);
+}
+
+
+static t_int join_float_callback(t_int * argv)
+{
+	outlet_float((t_outlet*)argv[0], (t_float)argv[1]);
+	return 0;
+}
+
+static void join_float(join_t * x, t_float f)
+{
+	t_int* argv = getbytes(2*sizeof(t_int*));
+	argv[0] = (t_int)x->x_outlet;
+	argv[1] = (t_int)f;
+
+	set_callback(join_float_callback, argv, 2);
+}
+
+
+static t_int join_symbol_callback(t_int * argv)
+{
+	outlet_symbol((t_outlet*)argv[0], (t_symbol*)argv[1]);
+	return 0;
+}
+
+static void join_symbol(join_t * x, t_symbol * s)
+{
+	t_int* argv = getbytes(2*sizeof(t_int*));
+	argv[0] = (t_int)x->x_outlet;
+	argv[1] = (t_int)s;
+
+	set_callback(join_symbol_callback, argv, 2);
+}
+
+static t_int join_list_callback(t_int * argv)
+{
+	outlet_list((t_outlet*)argv[0], 0, (int)argv[1], (t_atom*)argv[2]);
+	freebytes ((t_atom*)argv[2], (int)argv[1] * sizeof(t_atom));
+	return 0;
+}
+
+static void join_list(join_t * x, t_symbol * s, int argc, t_atom* largv)
+{
+	t_int* argv = getbytes(3*sizeof(t_int*));
+	t_atom* copied_argv = copybytes(largv, argc * sizeof(t_atom));
+
+	argv[0] = (t_int)x->x_outlet;
+	argv[1] = (t_int)argc;
+	argv[2] = (t_int)copied_argv;
+
+	set_callback(join_list_callback, argv, 3);
+}
+
+
+static t_int join_anything_callback(t_int * argv)
+{
+	outlet_anything((t_outlet*)argv[0], &s_list, 
+					(int)argv[1], (t_atom*)argv[2]);
+	freebytes ((t_atom*)argv[2], (int)argv[1] * sizeof(t_atom));
+	return 0;
+}
+
+static void join_anything(join_t * x, t_symbol * s, int argc, t_atom* largv)
+{
+	t_int* argv = getbytes(3*sizeof(t_int*));
+	t_atom* copied_argv = copybytes(largv, argc * sizeof(t_atom));
+
+	argv[0] = (t_int)x->x_outlet;
+	argv[1] = (t_int)argc;
+	argv[2] = (t_int)copied_argv;
+
+	set_callback(join_anything_callback, argv, 3);
+}
+
+
+void join_setup(void)
+{
+	join_class = class_new(gensym("join"), (t_newmethod)join_new,
+						   NULL, sizeof(join_t),
+						   CLASS_DEFAULT, 0);
+	class_addbang(join_class, join_bang);
+    class_addfloat(join_class, join_float);
+    class_addpointer(join_class, join_pointer);
+    class_addsymbol(join_class, join_symbol);
+    class_addlist(join_class, join_list);
+    class_addanything(join_class, join_anything);
+}
diff --git a/join/makefile b/join/makefile
new file mode 100644
index 0000000..bcad613
--- /dev/null
+++ b/join/makefile
@@ -0,0 +1,94 @@
+NAME=join
+CSYM=join
+
+current: pd_linux
+
+# ----------------------- NT -----------------------
+
+pd_nt: $(NAME).dll
+
+.SUFFIXES: .dll
+
+PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo
+VC="C:\Program Files\Microsoft Visual Studio\Vc98"
+
+PDNTINCLUDE = /I. /I..\..\src /I$(VC)\include
+
+PDNTLDIR = $(VC)\lib
+PDNTLIB = $(PDNTLDIR)\libc.lib \
+	$(PDNTLDIR)\oldnames.lib \
+	$(PDNTLDIR)\kernel32.lib \
+	..\..\bin\pd.lib 
+
+.c.dll:
+	cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c
+	link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB)
+
+# ----------------------- IRIX 5.x -----------------------
+
+pd_irix5: $(NAME).pd_irix5
+
+.SUFFIXES: .pd_irix5
+
+SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2
+
+SGIINCLUDE =  -I../../src
+
+.c.pd_irix5:
+	$(CC) $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c
+	ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o
+	rm $*.o
+
+# ----------------------- IRIX 6.x -----------------------
+
+pd_irix6: $(NAME).pd_irix6
+
+.SUFFIXES: .pd_irix6
+
+SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+	-OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
+	-Ofast=ip32
+
+.c.pd_irix6:
+	$(CC) $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c
+	ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $*.o
+	rm $*.o
+
+# ----------------------- LINUX i386 -----------------------
+
+pd_linux: $(NAME).pd_linux
+
+.SUFFIXES: .pd_linux
+
+LINUXCFLAGS = -DPD -O3 -fPIC -funroll-loops -fomit-frame-pointer \
+    -Wall -W -Wshadow -Wstrict-prototypes -Werror \
+    -Wno-unused -Wno-parentheses -Wno-switch
+
+LINUXINCLUDE =  -I../../../src
+
+LSTRIP = strip --strip-unneeded -R .note -R .comment
+
+.c.pd_linux:
+	cc $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
+	cc -Wl,-export_dynamic --shared -o $*.pd_linux $*.o -lm
+	$(LSTRIP) $*.pd_linux
+	rm -f $*.o
+
+# ----------------------- Mac OSX -----------------------
+
+pd_darwin: $(NAME).pd_darwin
+
+.SUFFIXES: .pd_darwin
+
+DARWINCFLAGS = -DPD -O2 -Wall -W -Wshadow -Wstrict-prototypes \
+    -Wno-unused -Wno-parentheses -Wno-switch
+
+.c.pd_darwin:
+	$(CC) $(DARWINCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
+	$(CC) -bundle -undefined suppress -flat_namespace -o $*.pd_darwin $*.o 
+	rm -f $*.o
+
+# ----------------------------------------------------------
+
+clean:
+	rm -f *.o *.pd_* so_locations