[xiph-cvs] cvs commit: ices/src config.h im_oss.c im_sun.c input.c stream.c

[Jack Moffitt]

jack        01/10/20 15:42:48

  Modified:    src      config.h im_oss.c im_sun.c input.c stream.c
  Log:
  Fix stacksize for ices.  Sixxie reports that this must be at least 32k.
  Values of 8k, 16k, 24k, 32k and 64k were all tested.  Only 32 and 64
  resulted in a non-segfaulting ices.

Revision  Changes    Path
1.6       +3 -1      ices/src/config.h

Index: config.h
===================================================================
RCS file: /usr/local/cvsroot/ices/src/config.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config.h	2001/09/25 12:04:21	1.5
+++ config.h	2001/10/20 22:42:47	1.6
@@ -1,7 +1,7 @@
 /* config.h
  * - configuration, and global structures built from config
  *
- * $Id: config.h,v 1.5 2001/09/25 12:04:21 msmith Exp $
+ * $Id: config.h,v 1.6 2001/10/20 22:42:47 jack Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -13,6 +13,8 @@
 
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
+
+#define ICES_DEFAULT_STACKSIZE 32768
 
 #include "stream.h"
 #include "inputmodule.h"

1.4       +3 -3      ices/src/im_oss.c

Index: im_oss.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_oss.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im_oss.c	2001/09/25 12:04:21	1.3
+++ im_oss.c	2001/10/20 22:42:47	1.4
@@ -1,7 +1,7 @@
 /* im_oss.c
  * - Raw PCM input from OSS devices
  *
- * $Id: im_oss.c,v 1.3 2001/09/25 12:04:21 msmith Exp $
+ * $Id: im_oss.c,v 1.4 2001/10/20 22:42:47 jack Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -244,9 +244,9 @@
         if(use_metadata)
         {
         if(ices_config->metadata_filename)
-            thread_create("im_oss-metadata", metadata_thread_signal, mod, 1);
+            thread_create("im_oss-metadata", metadata_thread_signal, mod, ICES_DEFAULT_STACKSIZE, 1);
         else
-		    thread_create("im_oss-metadata", metadata_thread_stdin, mod, 1);
+		    thread_create("im_oss-metadata", metadata_thread_stdin, mod, ICES_DEFAULT_STACKSIZE, 1);
                 LOG_INFO0("Started metadata update thread");
         }
 

1.4       +3 -3      ices/src/im_sun.c

Index: im_sun.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/im_sun.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im_sun.c	2001/09/25 12:04:21	1.3
+++ im_sun.c	2001/10/20 22:42:47	1.4
@@ -1,7 +1,7 @@
 /* im_sun.c
  * - Raw PCM input from Solaris audio devices
  *
- * $Id: im_sun.c,v 1.3 2001/09/25 12:04:21 msmith Exp $
+ * $Id: im_sun.c,v 1.4 2001/10/20 22:42:47 jack Exp $
  *
  * by Ciaran Anscomb <ciarana at rd.bbc.co.uk>, based
  * on im_oss.c which is...
@@ -232,9 +232,9 @@
         if(use_metadata)
         {
         if(ices_config->metadata_filename)
-            thread_create("im_sun-metadata", metadata_thread_signal, mod, 1);
+            thread_create("im_sun-metadata", metadata_thread_signal, mod, ICES_DEFAULT_STACK_SIZE, 1);
         else
-		    thread_create("im_sun-metadata", metadata_thread_stdin, mod, 1);
+		    thread_create("im_sun-metadata", metadata_thread_stdin, mod, ICES_DEFAULT_STACKSIZE, 1);
                 LOG_INFO0("Started metadata update thread");
         }
 

1.9       +3 -3      ices/src/input.c

Index: input.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/input.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- input.c	2001/10/20 21:55:54	1.8
+++ input.c	2001/10/20 22:42:47	1.9
@@ -2,7 +2,7 @@
  *  - Main producer control loop. Fetches data from input modules, and controls
  *    submission of these to the instance threads. Timing control happens here.
  *
- * $Id: input.c,v 1.8 2001/10/20 21:55:54 jack Exp $
+ * $Id: input.c,v 1.9 2001/10/20 22:42:47 jack Exp $
  * 
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -250,9 +250,9 @@
                 arg->input = inmod;
         /*
                 if(instance->savefilename != NULL)
-			thread_create("savefile", savefile_stream, arg, 1);
+			thread_create("savefile", savefile_stream, arg, ICES_DEFAULT_STACKSIZE, 1);
          */
-		thread_create("stream", ices_instance_stream, arg, 1);
+		thread_create("stream", ices_instance_stream, arg, ICES_DEFAULT_STACKSIZE, 1);
 
                 instance = instance->next;
         }

1.7       +3 -2      ices/src/stream.c

Index: stream.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/stream.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- stream.c	2001/10/20 22:07:16	1.6
+++ stream.c	2001/10/20 22:42:47	1.7
@@ -1,7 +1,7 @@
 /* stream.c
  * - Core streaming functions/main loop.
  *
- * $Id: stream.c,v 1.6 2001/10/20 22:07:16 jack Exp $
+ * $Id: stream.c,v 1.7 2001/10/20 22:42:47 jack Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -11,13 +11,14 @@
  * with this source.
  */
 
-#include <shout/shout.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <pthread.h>
 #include <unistd.h>
+
+#include <shout/shout.h>
 
 #include "config.h"
 #include "input.h"

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.