a bit more work to match sdlwork.c and winwork.c (nw)

This commit is contained in:
Oliver Stöneberg 2014-09-13 10:16:28 +00:00
parent 4d5cd61765
commit f176a45d35

View File

@ -159,7 +159,7 @@ osd_work_queue *osd_work_queue_alloc(int flags)
TCHAR *osdworkqueuemaxthreads = _tgetenv(_T("OSDWORKQUEUEMAXTHREADS"));
// allocate a new queue
queue = (osd_work_queue *)malloc(sizeof(*queue));
queue = (osd_work_queue *)osd_malloc(sizeof(*queue));
if (queue == NULL)
goto error;
memset(queue, 0, sizeof(*queue));
@ -199,7 +199,7 @@ osd_work_queue *osd_work_queue_alloc(int flags)
queue->threads = MIN(queue->threads, WORK_MAX_THREADS);
// allocate memory for thread array (+1 to count the calling thread)
queue->thread = (work_thread_info *)malloc((queue->threads + 1) * sizeof(queue->thread[0]));
queue->thread = (work_thread_info *)osd_malloc_array((queue->threads + 1) * sizeof(queue->thread[0]));
if (queue->thread == NULL)
goto error;
memset(queue->thread, 0, (queue->threads + 1) * sizeof(queue->thread[0]));
@ -364,7 +364,7 @@ void osd_work_queue_free(osd_work_queue *queue)
// free the list
if (queue->thread != NULL)
free(queue->thread);
osd_free(queue->thread);
// free all the events
if (queue->doneevent != NULL)
@ -377,7 +377,7 @@ void osd_work_queue_free(osd_work_queue *queue)
queue->free = item->next;
if (item->event != NULL)
CloseHandle(item->event);
free(item);
osd_free(item);
}
// free all items in the active list
@ -387,7 +387,7 @@ void osd_work_queue_free(osd_work_queue *queue)
queue->list = item->next;
if (item->event != NULL)
CloseHandle(item->event);
free(item);
osd_free(item);
}
#if KEEP_STATISTICS
@ -399,7 +399,7 @@ void osd_work_queue_free(osd_work_queue *queue)
osd_scalable_lock_free(queue->lock);
// free the queue itself
free(queue);
osd_free(queue);
}
@ -429,7 +429,7 @@ osd_work_item *osd_work_item_queue_multiple(osd_work_queue *queue, osd_work_call
if (item == NULL)
{
// allocate the item
item = (osd_work_item *)malloc(sizeof(*item));
item = (osd_work_item *)osd_malloc(sizeof(*item));
if (item == NULL)
return NULL;
item->event = NULL;