hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 19:24:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Rename struct threadqueue_queue to threadqueue_queue_t.

Browse source
This commit is contained in:
Ari Koivula 2015-03-04 16:30:20 +02:00
parent b7fcb800b2
commit 3d135324da
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/encoder.c
View file

@ -50,7 +50,7 @@ int encoder_control_init(encoder_control_t * const encoder, const config_t * con
return 0;
}
encoder->threadqueue = MALLOC(threadqueue_queue, 1);
encoder->threadqueue = MALLOC(threadqueue_queue_t, 1);
encoder->owf = cfg->owf;

2
src/encoder.h
View file

@ -133,7 +133,7 @@ typedef struct encoder_control_t
int slice_count;
const int* slice_addresses_in_ts;
threadqueue_queue *threadqueue;
threadqueue_queue_t *threadqueue;
struct {
uint8_t min;

22
src/threadqueue.c
View file

@ -33,7 +33,7 @@
#include "threads.h"
typedef struct {
threadqueue_queue * threadqueue;
threadqueue_queue_t * threadqueue;
int worker_id;
} threadqueue_worker_spec;
@ -78,7 +78,7 @@ const struct timespec time_to_wait = {1, 0};
static void* threadqueue_worker(void* threadqueue_worker_spec_opaque) {
threadqueue_worker_spec * const threadqueue_worker_spec = threadqueue_worker_spec_opaque;
threadqueue_queue * const threadqueue = threadqueue_worker_spec->threadqueue;
threadqueue_queue_t * const threadqueue = threadqueue_worker_spec->threadqueue;
threadqueue_job_t * next_job = NULL;
#ifdef _DEBUG
@ -233,7 +233,7 @@ static void* threadqueue_worker(void* threadqueue_worker_spec_opaque) {
return NULL;
}
int threadqueue_init(threadqueue_queue * const threadqueue, int thread_count, int fifo) {
int threadqueue_init(threadqueue_queue_t * const threadqueue, int thread_count, int fifo) {
int i;
if (pthread_mutex_init(&threadqueue->lock, NULL) != 0) {
fprintf(stderr, "pthread_mutex_init failed!\n");
@ -306,7 +306,7 @@ int threadqueue_init(threadqueue_queue * const threadqueue, int thread_count, in
/**
* \brief Free a single job from the threadqueue index i, destroying it.
*/
static void threadqueue_free_job(threadqueue_queue * const threadqueue, int i)
static void threadqueue_free_job(threadqueue_queue_t * const threadqueue, int i)
{
#ifdef _DEBUG
#if _DEBUG & _DEBUG_PERF_JOB
@ -328,7 +328,7 @@ static void threadqueue_free_job(threadqueue_queue * const threadqueue, int i)
FREE_POINTER(threadqueue->queue[i]);
}
static void threadqueue_free_jobs(threadqueue_queue * const threadqueue) {
static void threadqueue_free_jobs(threadqueue_queue_t * const threadqueue) {
int i;
for (i=0; i < threadqueue->queue_count; ++i) {
threadqueue_free_job(threadqueue, i);
@ -347,7 +347,7 @@ static void threadqueue_free_jobs(threadqueue_queue * const threadqueue) {
#endif
}
int threadqueue_finalize(threadqueue_queue * const threadqueue) {
int threadqueue_finalize(threadqueue_queue_t * const threadqueue) {
int i;
//Flush the queue
@ -428,7 +428,7 @@ int threadqueue_finalize(threadqueue_queue * const threadqueue) {
return 1;
}
int threadqueue_flush(threadqueue_queue * const threadqueue) {
int threadqueue_flush(threadqueue_queue_t * const threadqueue) {
int notdone = 1;
//Lock the queue
@ -461,7 +461,7 @@ int threadqueue_flush(threadqueue_queue * const threadqueue) {
return 1;
}
int threadqueue_waitfor(threadqueue_queue * const threadqueue, threadqueue_job_t * const job) {
int threadqueue_waitfor(threadqueue_queue_t * const threadqueue, threadqueue_job_t * const job) {
int job_done = 0;
//NULL job is clearly OK :-)
@ -509,7 +509,7 @@ int threadqueue_waitfor(threadqueue_queue * const threadqueue, threadqueue_job_t
return 1;
}
threadqueue_job_t * threadqueue_submit(threadqueue_queue * const threadqueue, void (*fptr)(void *arg), void *arg, int wait, const char* const debug_description) {
threadqueue_job_t * threadqueue_submit(threadqueue_queue_t * const threadqueue, void (*fptr)(void *arg), void *arg, int wait, const char* const debug_description) {
threadqueue_job_t *job;
//No lock here... this should be constant
if (threadqueue->threads_count == 0) {
@ -624,7 +624,7 @@ int threadqueue_job_dep_add(threadqueue_job_t *job, threadqueue_job_t *depends_o
return 1;
}
int threadqueue_job_unwait_job(threadqueue_queue * const threadqueue, threadqueue_job_t *job) {
int threadqueue_job_unwait_job(threadqueue_queue_t * const threadqueue, threadqueue_job_t *job) {
int ndepends = 0;
//NULL job => no threads, nothing to do
@ -649,7 +649,7 @@ int threadqueue_job_unwait_job(threadqueue_queue * const threadqueue, threadqueu
}
#ifdef _DEBUG
int threadqueue_log(threadqueue_queue * threadqueue, const CLOCK_T *start, const CLOCK_T *stop, const char* debug_description) {
int threadqueue_log(threadqueue_queue_t * threadqueue, const CLOCK_T *start, const CLOCK_T *stop, const char* debug_description) {
int i, thread_id = -1;
FILE* output;

16
src/threadqueue.h
View file

@ -94,30 +94,30 @@ typedef struct {
CLOCK_T *debug_clock_thread_start;
CLOCK_T *debug_clock_thread_end;
#endif
} threadqueue_queue;
} threadqueue_queue_t;
//Init a threadqueue (if fifo, then behave as a FIFO with dependencies, otherwise as a LIFO with dependencies)
int threadqueue_init(threadqueue_queue * threadqueue, int thread_count, int fifo);
int threadqueue_init(threadqueue_queue_t * threadqueue, int thread_count, int fifo);
//Add a job to the queue, and returs a threadqueue_job handle. If wait == 1, one has to run threadqueue_job_unwait_job in order to have it run
threadqueue_job_t * threadqueue_submit(threadqueue_queue * threadqueue, void (*fptr)(void *arg), void *arg, int wait, const char* debug_description);
threadqueue_job_t * threadqueue_submit(threadqueue_queue_t * threadqueue, void (*fptr)(void *arg), void *arg, int wait, const char* debug_description);
int threadqueue_job_unwait_job(threadqueue_queue * threadqueue, threadqueue_job_t *job);
int threadqueue_job_unwait_job(threadqueue_queue_t * threadqueue, threadqueue_job_t *job);
//Add a dependency between two jobs.
int threadqueue_job_dep_add(threadqueue_job_t *job, threadqueue_job_t *depends_on);
//Blocking call until the queue is empty. Previously set threadqueue_job handles should not be used anymore
int threadqueue_flush(threadqueue_queue * threadqueue);
int threadqueue_flush(threadqueue_queue_t * threadqueue);
//Blocking call until job is executed. Job handles submitted before job should not be used any more as they are removed from the queue.
int threadqueue_waitfor(threadqueue_queue * threadqueue, threadqueue_job_t * job);
int threadqueue_waitfor(threadqueue_queue_t * threadqueue, threadqueue_job_t * job);
//Free ressources in a threadqueue
int threadqueue_finalize(threadqueue_queue * threadqueue);
int threadqueue_finalize(threadqueue_queue_t * threadqueue);
#ifdef _DEBUG
int threadqueue_log(threadqueue_queue * threadqueue, const CLOCK_T *start, const CLOCK_T *stop, const char* debug_description);
int threadqueue_log(threadqueue_queue_t * threadqueue, const CLOCK_T *start, const CLOCK_T *stop, const char* debug_description);
//This macro HAS TO BE at the beginning of a block
#define PERFORMANCE_MEASURE_START(mask) CLOCK_T start, stop; if (_DEBUG & mask) GET_TIME(&start)