Commit d830af82 authored by Jack Moffitt's avatar Jack Moffitt
Browse files

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.

svn path=/trunk/ices/; revision=2220
parent 031fdf27
/* 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@labyrinth.net.au>
*
......@@ -14,6 +14,8 @@
#ifndef __CONFIG_H__
#define __CONFIG_H__
#define ICES_DEFAULT_STACKSIZE 32768
#include "stream.h"
#include "inputmodule.h"
......
/* 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@labyrinth.net.au>
*
......@@ -244,9 +244,9 @@ input_module_t *oss_open_module(module_param_t *params)
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");
}
......
/* 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@rd.bbc.co.uk>, based
* on im_oss.c which is...
......@@ -232,9 +232,9 @@ input_module_t *sun_open_module(module_param_t *params)
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");
}
......
......@@ -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@labyrinth.net.au>
*
......@@ -250,9 +250,9 @@ void input_loop(void)
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;
}
......
/* 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@labyrinth.net.au>
*
......@@ -11,7 +11,6 @@
* with this source.
*/
#include <shout/shout.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
......@@ -19,6 +18,8 @@
#include <pthread.h>
#include <unistd.h>
#include <shout/shout.h>
#include "config.h"
#include "input.h"
#include "im_playlist.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment