fixed cothread locking and set_arg/get_arg safety, and switched to 64 cothreads of...

Original commit message from CVS:
fixed cothread locking and set_arg/get_arg safety, and switched to 64 cothreads of 32KB

diff --git a/gst/cothreads.c b/gst/cothreads.c
index 478dba0d35b2f27332567a3e988e28a2f4b72f07..855df5f148dddf250765f566502cb8178d5adc73 100644 (file)
--- a/gst/cothreads.c
+++ b/gst/cothreads.c
@@ -36,8 +36,8 @@
 #include "gstarch.h"
 
 
-#define COTHREAD_STACKSIZE 16384
-#define COTHREAD_MAXTHREADS 128
+#define COTHREAD_STACKSIZE 32768
+#define COTHREAD_MAXTHREADS 64
 #define STACK_SIZE 0x200000
 
 
@@ -385,7 +385,8 @@ cothread_lock (cothread_state *thread)
 #ifdef COTHREAD_ATOMIC
   // do something to lock the cothread
 #else
-  g_mutex_lock(thread->lock);
+  if (thread->lock)
+    g_mutex_lock(thread->lock);
 #endif
 }
 
@@ -395,7 +396,10 @@ cothread_trylock (cothread_state *thread)
 #ifdef COTHREAD_ATOMIC
   // do something to try to lock the cothread
 #else
-  return g_mutex_trylock(thread->lock);
+  if (thread->lock)
+    return g_mutex_trylock(thread->lock);
+  else
+    return FALSE;
 #endif
 }
 
@@ -405,7 +409,8 @@ cothread_unlock (cothread_state *thread)
 #ifdef COTHREAD_ATOMIC
   // do something to unlock the cothread
 #else
-  g_mutex_unlock(thread->lock);
+  if (thread->lock)
+    g_mutex_unlock(thread->lock);
 #endif
 }
 

diff --git a/gst/gstelement.c b/gst/gstelement.c
index d728d588a49414a9c983a6cff3186d37487adaa9..f7a16ff38d7722ff4fee1a350ac2892da3e5b906 100644 (file)
--- a/gst/gstelement.c
+++ b/gst/gstelement.c
@@ -49,6 +49,7 @@ enum {
 
 static void                    gst_element_class_init          (GstElementClass *klass);
 static void                    gst_element_init                (GstElement *element);
+static void                    gst_element_base_class_init     (GstElementClass *klass);
 
 static void                    gst_element_set_arg             (GtkObject *object, GtkArg *arg, guint id);
 static void                    gst_element_get_arg             (GtkObject *object, GtkArg *arg, guint id);
@@ -75,7 +76,7 @@ GtkType gst_element_get_type(void) {
       (GtkObjectInitFunc)gst_element_init,
       (GtkArgSetFunc)gst_element_set_arg,
       (GtkArgGetFunc)gst_element_get_arg,
-      (GtkClassInitFunc)NULL,
+      (GtkClassInitFunc)gst_element_base_class_init,
     };
     element_type = gtk_type_unique(GST_TYPE_OBJECT,&element_info);
   }
@@ -143,6 +144,17 @@ gst_element_class_init (GstElementClass *klass)
   klass->elementfactory = NULL;
 }
 
+static void
+gst_element_base_class_init (GstElementClass *klass)
+{
+  GtkObjectClass *gtkobject_class;
+
+  gtkobject_class = (GtkObjectClass*) klass;
+
+  gtkobject_class->set_arg =           GST_DEBUG_FUNCPTR(gst_element_set_arg);
+  gtkobject_class->get_arg =           GST_DEBUG_FUNCPTR(gst_element_get_arg);
+}
+
 static void
 gst_element_init (GstElement *element)
 {

diff --git a/gst/gstscheduler.c b/gst/gstscheduler.c
index 0795c18cd07822eae893dddc280149a93aa66c20..44392d9847f95b3f64d000f10e639d33ba9bea55 100644 (file)
--- a/gst/gstscheduler.c
+++ b/gst/gstscheduler.c
@@ -778,13 +778,15 @@ void gst_bin_schedule_func(GstBin *bin) {
 static void 
 gst_schedule_lock_element (GstSchedule *sched,GstElement *element)
 {
-  cothread_lock(element->threadstate);
+  if (element->threadstate)
+    cothread_lock(element->threadstate);
 }
 
 static void
 gst_schedule_unlock_element (GstSchedule *sched,GstElement *element)
 {
-  cothread_unlock(element->threadstate);
+  if (element->threadstate)
+    cothread_unlock(element->threadstate);
 }