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

fixed ThreadSanitizer data race warnings in winwork.c/sdlwork.c (nw)

Browse Source
This commit is contained in:
Oliver Stöneberg 2014-12-31 10:24:17 +01:00
parent a36d8f2fc0
commit 23d9d7a00b
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/osd/sdl/sdlwork.c
View File

@ -412,10 +412,12 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call
osd_work_item *item; osd_work_item *item;
// first allocate a new work item; try the free list first // first allocate a new work item; try the free list first
INT32 lockslot = osd_scalable_lock_acquire(queue->lock);
do do
{ {
item = (osd_work_item *)queue->free; item = (osd_work_item *)queue->free;
} while (item != NULL && compare_exchange_ptr((PVOID volatile *)&queue->free, item, item->next) != item); } while (item != NULL && compare_exchange_ptr((PVOID volatile *)&queue->free, item, item->next) != item);
osd_scalable_lock_release(queue->lock, lockslot);
// if nothing, allocate something new // if nothing, allocate something new
if (item == NULL) if (item == NULL)
@ -546,11 +548,13 @@ void osd_work_item_release(osd_work_item *item)
osd_work_item_wait(item, 100 * osd_ticks_per_second()); osd_work_item_wait(item, 100 * osd_ticks_per_second());
// add us to the free list on our queue // add us to the free list on our queue
INT32 lockslot = osd_scalable_lock_acquire(item->queue->lock);
do do
{ {
next = (osd_work_item *)item->queue->free; next = (osd_work_item *)item->queue->free;
item->next = next; item->next = next;
} while (compare_exchange_ptr((PVOID volatile *)&item->queue->free, next, item) != next); } while (compare_exchange_ptr((PVOID volatile *)&item->queue->free, next, item) != next);
osd_scalable_lock_release(item->queue->lock, lockslot);
} }
@ -602,12 +606,22 @@ static void *worker_thread_entry(void *param)
{ {
// block waiting for work or exit // block waiting for work or exit
// bail on exit, and only wait if there are no pending items in queue // bail on exit, and only wait if there are no pending items in queue
if (!queue->exiting && queue->list == NULL) if (queue->exiting)
break;
{ {
begin_timing(thread->waittime); INT32 lockslot = osd_scalable_lock_acquire(queue->lock);
osd_event_wait(thread->wakeevent, INFINITE); bool wait_for_event = (queue->list == NULL);
end_timing(thread->waittime); osd_scalable_lock_release(queue->lock, lockslot);
if (wait_for_event)
{
begin_timing(thread->waittime);
osd_event_wait(thread->wakeevent, INFINITE);
end_timing(thread->waittime);
}
} }
if (queue->exiting) if (queue->exiting)
break; break;

22
src/osd/windows/winwork.c
View File

@ -422,10 +422,12 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call
osd_work_item *item; osd_work_item *item;
// first allocate a new work item; try the free list first // first allocate a new work item; try the free list first
INT32 lockslot = osd_scalable_lock_acquire(queue->lock);
do do
{ {
item = (osd_work_item *)queue->free; item = (osd_work_item *)queue->free;
} while (item != NULL && compare_exchange_ptr((PVOID volatile *)&queue->free, item, item->next) != item); } while (item != NULL && compare_exchange_ptr((PVOID volatile *)&queue->free, item, item->next) != item);
osd_scalable_lock_release(queue->lock, lockslot);
// if nothing, allocate something new // if nothing, allocate something new
if (item == NULL) if (item == NULL)
@ -550,11 +552,13 @@ void osd_work_item_release(osd_work_item *item)
osd_work_item_wait(item, 100 * osd_ticks_per_second()); osd_work_item_wait(item, 100 * osd_ticks_per_second());
// add us to the free list on our queue // add us to the free list on our queue
INT32 lockslot = osd_scalable_lock_acquire(item->queue->lock);
do do
{ {
next = (osd_work_item *)item->queue->free; next = (osd_work_item *)item->queue->free;
item->next = next; item->next = next;
} while (compare_exchange_ptr((PVOID volatile *)&item->queue->free, next, item) != next); } while (compare_exchange_ptr((PVOID volatile *)&item->queue->free, next, item) != next);
osd_scalable_lock_release(item->queue->lock, lockslot);
} }
@ -602,12 +606,22 @@ static void *worker_thread_entry(void *param)
{ {
// block waiting for work or exit // block waiting for work or exit
// bail on exit, and only wait if there are no pending items in queue // bail on exit, and only wait if there are no pending items in queue
if (!queue->exiting && queue->list == NULL) if (queue->exiting)
break;
{ {
begin_timing(thread->waittime); INT32 lockslot = osd_scalable_lock_acquire(queue->lock);
osd_event_wait(thread->wakeevent, INFINITE); bool wait_for_event = (queue->list == NULL);
end_timing(thread->waittime); osd_scalable_lock_release(queue->lock, lockslot);
if (wait_for_event)
{
begin_timing(thread->waittime);
osd_event_wait(thread->wakeevent, INFINITE);
end_timing(thread->waittime);
}
} }
if (queue->exiting) if (queue->exiting)
break; break;