Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-20 04:39:11 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

More changes in order to create task groups

Browse Source
This commit is contained in:
Couriersud 2009-10-03 13:35:20 +00:00
parent abd2ff0506
commit fbbdb817d7
3 changed files with 64 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/emu/sound/disc_sys.c
View File

@ -36,14 +36,13 @@ struct dso_wavelog_context
*
*************************************/
static DISCRETE_START( dso_task )
static void task_check(discrete_task *task, discrete_task *dest_task)
{
discrete_task *task = (discrete_task *) node->context;
int inputnum;
const linked_list_entry *node_entry;
const linked_list_entry *step_entry;
/* Determine, which nodes in the task are referenced in the main task
/* Determine, which nodes in the task are referenced by nodes in dest_task
* and add them to the list of nodes to be buffered for further processing
*/
for (node_entry = task->list; node_entry != NULL; node_entry = node_entry->next)
@ -51,14 +50,14 @@ static DISCRETE_START( dso_task )
node_description *task_node = (node_description *) node_entry->ptr;
int found = 0;
for (step_entry = task_node->info->main_list; step_entry != NULL; step_entry = step_entry->next)
for (step_entry = dest_task->list; step_entry != NULL; step_entry = step_entry->next)
{
node_description *main_node = (node_description *) step_entry->ptr;
node_description *dest_node = (node_description *) step_entry->ptr;
/* loop over all active inputs */
for (inputnum = 0; inputnum < main_node->active_inputs; inputnum++)
for (inputnum = 0; inputnum < dest_node->active_inputs; inputnum++)
{
int inputnode = main_node->block->input_node[inputnum];
int inputnode = dest_node->block->input_node[inputnum];
if IS_VALUE_A_NODE(inputnode)
{
if (NODE_DEFAULT_NODE(task_node->block->node) == NODE_DEFAULT_NODE(inputnode))
@ -75,21 +74,22 @@ static DISCRETE_START( dso_task )
if (task->numbuffered >= DISCRETE_MAX_TASK_OUTPUTS)
fatalerror("dso_task_start - Number of maximum buffered nodes exceeded");
discrete_log(task_node->info, "dso_task_start - buffering %d(%d) in task %p referenced by %d", NODE_INDEX(inputnode), NODE_CHILD_NODE_NUM(inputnode), task, NODE_BLOCKINDEX(main_node));
discrete_log(task_node->info, "dso_task_start - buffering %d(%d) in task %p referenced by %d", NODE_INDEX(inputnode), NODE_CHILD_NODE_NUM(inputnode), task, NODE_BLOCKINDEX(dest_node));
task->node_buf[task->numbuffered] = auto_alloc_array(task_node->info->device->machine, double, 2048);
task->source[task->numbuffered] = (double *) main_node->input[inputnum];
task->source[task->numbuffered] = (double *) dest_node->input[inputnum];
task->nodes[task->numbuffered] = discrete_find_node(task_node->info, inputnode);
/* register into source list */
source = auto_alloc(task_node->info->device->machine, discrete_source_node);
linked_list_add(task_node->info,
(linked_list_entry **) &task_node->info->source_list,
source = auto_alloc(dest_node->info->device->machine, discrete_source_node);
linked_list_add(dest_node->info,
(linked_list_entry **) &dest_task->source_list,
source);
source->task = task;
source->output_node = task->numbuffered;
/* point the input to a buffered location */
main_node->input[inputnum] = &source->buffer;
dest_node->input[inputnum] = &source->buffer;
task->numbuffered++;
}
}
@ -99,6 +99,27 @@ static DISCRETE_START( dso_task )
}
}
static DISCRETE_START( dso_task )
{
discrete_task *task = (discrete_task *) node->context;
const linked_list_entry *task_entry;
/* dummy task for main */
discrete_task main_task;
for (task_entry = node->info->task_list; task_entry != NULL; task_entry = task_entry->next)
{
discrete_task *dest_task = (discrete_task *) task_entry->ptr;
if (task->task_group < dest_task->task_group)
task_check(task, dest_task);
}
main_task.list = node->info->main_list;
main_task.source_list = node->info->main_source_list;
task_check(task, &main_task);
*((linked_list_entry **) &node->info->main_source_list) = main_task.source_list;
}
static DISCRETE_STEP( dso_task )
{
discrete_task *task = (discrete_task *) node->context;

30
src/emu/sound/discrete.c
View File

@ -506,7 +506,7 @@ static DEVICE_START( discrete )
info->main_list = NULL;
info->output_list = NULL;
info->input_list = NULL;
info->source_list = NULL;
info->main_source_list = NULL;
/* allocate memory to hold pointers to nodes by index */
info->indexed_node = auto_alloc_array_clear(device->machine, node_description *, DISCRETE_MAX_NODES);
@ -666,15 +666,31 @@ static DEVICE_RESET( discrete )
static void *task_callback(void *param, int threadid)
{
task_info *ti = (task_info *) param;
linked_list_entry *entry;
int samples, i;
/* set up task buffers */
for (i = 0; i < ti->task->numbuffered; i++)
ti->task->ptr[i] = ti->task->node_buf[i];
/* initialize sources */
for (entry = ti->task->source_list; entry != 0; entry = entry->next)
{
discrete_source_node *sn = (discrete_source_node *) entry->ptr;
sn->ptr = sn->task->node_buf[sn->output_node];
}
samples = ti->samples;
while (samples-- > 0)
{
/* update source node buffer */
for (entry = ti->task->source_list; entry != 0; entry = entry->next)
{
discrete_source_node *sn = (discrete_source_node *) entry->ptr;
sn->buffer = *sn->ptr++;
}
/* step */
step_nodes_in_list(ti->task->list);
}
@ -687,19 +703,16 @@ INLINE void update_main_nodes(discrete_info *info, int samples)
linked_list_entry *entry;
/* initialize sources */
for (entry = info->source_list; entry != 0; entry = entry->next)
for (entry = info->main_source_list; entry != 0; entry = entry->next)
{
discrete_source_node *sn = (discrete_source_node *) entry->ptr;
sn->ptr = sn->task->node_buf[sn->output_node];
}
if (DISCRETE_PROFILING)
info->total_samples += samples;
while (samples-- > 0)
{
/* update source node buffer */
for (entry = info->source_list; entry != 0; entry = entry->next)
for (entry = info->main_source_list; entry != 0; entry = entry->next)
{
discrete_source_node *sn = (discrete_source_node *) entry->ptr;
sn->buffer = *sn->ptr++;
@ -764,7 +777,10 @@ static STREAM_UPDATE( discrete_stream_update )
update_main_nodes(info, samples);
if (DISCRETE_PROFILING)
{
info->total_samples += samples;
info->total_stream_updates++;
}
}
@ -858,6 +874,8 @@ static void init_nodes(discrete_info *info, linked_list_entry *block_list, const
task = auto_alloc_clear(info->device->machine, discrete_task);
task->numbuffered = 0;
task->list = task_node_list;
task->task_group = 99; /* will be set later */
task->source_list = NULL;
linked_list_tail_add(info, &task_list_ptr, task);
node->context = task;
task = NULL;

7
src/emu/sound/discrete.h
View File

@ -3740,12 +3740,15 @@ struct _discrete_task
{
const linked_list_entry *list;
int task_group;
int numbuffered;
double *ptr[DISCRETE_MAX_TASK_OUTPUTS];
double *node_buf[DISCRETE_MAX_TASK_OUTPUTS];
node_description *nodes[DISCRETE_MAX_TASK_OUTPUTS];
double *source[DISCRETE_MAX_TASK_OUTPUTS];
/* list of source nodes */
linked_list_entry *source_list; /* discrete_source_node */
};
typedef struct _discrete_source_node discrete_source_node;
@ -3777,7 +3780,7 @@ struct _discrete_info
/* list of main source nodes */
linked_list_entry *source_list; /* discrete_source_node */
linked_list_entry *main_source_list; /* discrete_source_node */
/* list of discrete blocks after prescan (IMPORT, DELETE, REPLACE) */
linked_list_entry *block_list; /* discrete_sound_block * */