int work_error;
hb_thread_t * work_thread;
- int cpu_count;
-
hb_lock_t * state_lock;
hb_state_t state;
*/
hb_buffer_pool_init();
- /* CPU count detection */
- hb_log( "hb_init: checking cpu count" );
- h->cpu_count = hb_get_cpu_count();
-
h->list_title = hb_list_init();
h->jobs = hb_list_init();
}
}
- /* CPU count detection */
- hb_log( "hb_init: checking cpu count" );
- h->cpu_count = hb_get_cpu_count();
-
h->list_title = hb_list_init();
h->jobs = hb_list_init();
h->current_job = NULL;
h->paused = 0;
h->work_die = 0;
- h->work_thread = hb_work_init( h->jobs, h->cpu_count,
- &h->work_die, &h->work_error, &h->current_job );
+ h->work_thread = hb_work_init( h->jobs, &h->work_die, &h->work_error, &h->current_job );
}
/**
const char * path, int title_index,
hb_list_t * list_title, int preview_count,
int store_previews, uint64_t min_duration );
-hb_thread_t * hb_work_init( hb_list_t * jobs, int cpu_count,
+hb_thread_t * hb_work_init( hb_list_t * jobs,
volatile int * die, int * error, hb_job_t ** job );
hb_thread_t * hb_reader_init( hb_job_t * );
hb_work_object_t * hb_muxer_init( hb_job_t * );
{
hb_list_t * jobs;
hb_job_t ** current_job;
- int cpu_count;
int * error;
volatile int * die;
} hb_work_t;
static void work_func();
-static void do_job( hb_job_t *, int cpu_count );
+static void do_job( hb_job_t *);
static void work_loop( void * );
#define FIFO_UNBOUNDED 65536
/**
* Allocates work object and launches work thread with work_func.
* @param jobs Handle to hb_list_t.
- * @param cpu_count Humber of CPUs found in system.
* @param die Handle to user inititated exit indicator.
* @param error Handle to error indicator.
*/
-hb_thread_t * hb_work_init( hb_list_t * jobs, int cpu_count,
- volatile int * die, int * error, hb_job_t ** job )
+hb_thread_t * hb_work_init( hb_list_t * jobs, volatile int * die, int * error, hb_job_t ** job )
{
hb_work_t * work = calloc( sizeof( hb_work_t ), 1 );
work->jobs = jobs;
work->current_job = job;
- work->cpu_count = cpu_count;
work->die = die;
work->error = error;
job->die = work->die;
*(work->current_job) = job;
InitWorkState( job->h );
- do_job( job, work->cpu_count );
+ do_job( job );
*(work->current_job) = NULL;
}
* Exits loop when conversion is done and fifos are empty.
* Closes threads and frees fifos.
* @param job Handle work hb_job_t.
- * @param cpu_count number of CPUs found in system.
*/
-static void do_job( hb_job_t * job, int cpu_count )
+static void do_job( hb_job_t * job )
{
hb_title_t * title;
int i, j;