devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Finish putting all the code and data that depends upon HAVE_PRIORITY_SCHEDULING into the #ifdef blocks

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12163 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2007-01-31 06:43:31 +00:00
parent e50cc6c369
commit 0d094bd86d
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
firmware/pcm_record.c
View file

@ -189,8 +189,10 @@ static bool wav_queue_empty; /* all wav chunks processed? */
/** file flushing **/ /** file flushing **/
static int write_threshold; /* max chunk limit for data flush */ static int write_threshold; /* max chunk limit for data flush */
static int panic_threshold; /* boost thread prio when here */
static int spinup_time = -1;/* last ata_spinup_time */ static int spinup_time = -1;/* last ata_spinup_time */
#ifdef HAVE_PRIORITY_SCHEDULING
static int panic_threshold; /* boost thread prio when here */
#endif
/** encoder events **/ /** encoder events **/
static void (*enc_events_callback)(enum enc_events event, void *data); static void (*enc_events_callback)(enum enc_events event, void *data);
@ -798,19 +800,22 @@ static void pcmrec_end_file(void)
*/ */
static void pcmrec_flush(unsigned flush_num) static void pcmrec_flush(unsigned flush_num)
{ {
#ifdef HAVE_PRIORITY_SCHEDULING
static unsigned long last_flush_tick = 0; static unsigned long last_flush_tick = 0;
unsigned long start_tick; unsigned long start_tick;
int num_ready, num; int num;
#ifdef HAVE_PRIORITY_SCHEDULING
int prio; int prio;
#endif #endif
int num_ready;
int i; int i;
num_ready = enc_wr_index - enc_rd_index; num_ready = enc_wr_index - enc_rd_index;
if (num_ready < 0) if (num_ready < 0)
num_ready += enc_num_chunks; num_ready += enc_num_chunks;
#ifdef HAVE_PRIORITY_SCHEDULING
num = num_ready; num = num_ready;
#endif
if (flush_num == 0) if (flush_num == 0)
{ {
@ -835,23 +840,26 @@ static void pcmrec_flush(unsigned flush_num)
if (write_threshold < 0) if (write_threshold < 0)
write_threshold = 0; write_threshold = 0;
#ifdef HAVE_PRIORITY_SCHEDULING
else if (write_threshold > panic_threshold) else if (write_threshold > panic_threshold)
write_threshold = panic_threshold; write_threshold = panic_threshold;
#endif
logf("new wr thresh: %d", write_threshold); logf("new wr thresh: %d", write_threshold);
} }
if (num_ready < write_threshold) if (num_ready < write_threshold)
return; return;
#ifdef HAVE_PRIORITY_SCHEDULING
/* if we're getting called too much and this isn't forced, /* if we're getting called too much and this isn't forced,
boost stat */ boost stat */
if (current_tick - last_flush_tick < HZ/2) if (current_tick - last_flush_tick < HZ/2)
num = panic_threshold; num = panic_threshold;
#endif
} }
start_tick = current_tick;
#ifdef HAVE_PRIORITY_SCHEDULING #ifdef HAVE_PRIORITY_SCHEDULING
start_tick = current_tick;
prio = -1; prio = -1;
#endif #endif
@ -897,17 +905,16 @@ static void pcmrec_flush(unsigned flush_num)
#ifdef HAVE_PRIORITY_SCHEDULING #ifdef HAVE_PRIORITY_SCHEDULING
if (prio == -1) if (prio == -1)
#endif
{ {
num = enc_wr_index - enc_rd_index; num = enc_wr_index - enc_rd_index;
if (num < 0) if (num < 0)
num += enc_num_chunks; num += enc_num_chunks;
} }
#endif
/* no yielding, the file apis called in the codecs do that */ /* no yielding, the file apis called in the codecs do that */
} /* end for */ } /* end for */
/* sync file */ /* sync file */
if (rec_fdata.rec_file >= 0) if (rec_fdata.rec_file >= 0)
fsync(rec_fdata.rec_file); fsync(rec_fdata.rec_file);
@ -920,9 +927,10 @@ static void pcmrec_flush(unsigned flush_num)
logf("pcmrec: unboost priority"); logf("pcmrec: unboost priority");
thread_set_priority(NULL, prio); thread_set_priority(NULL, prio);
} }
#endif
last_flush_tick = current_tick; /* save tick when we left */ last_flush_tick = current_tick; /* save tick when we left */
#endif
logf("done"); logf("done");
} /* pcmrec_flush */ } /* pcmrec_flush */
@ -1560,6 +1568,7 @@ void enc_set_parameters(struct enc_parameters *params)
*wrap_id_p = ENC_CHUNK_MAGIC; *wrap_id_p = ENC_CHUNK_MAGIC;
#endif /* PCMREC_PARANOID */ #endif /* PCMREC_PARANOID */
#ifdef HAVE_PRIORITY_SCHEDULING
/* panic boost thread priority at 1 second remaining */ /* panic boost thread priority at 1 second remaining */
panic_threshold = enc_num_chunks - panic_threshold = enc_num_chunks -
(4*sample_rate + (enc_chunk_size-1)) / enc_chunk_size; (4*sample_rate + (enc_chunk_size-1)) / enc_chunk_size;
@ -1567,6 +1576,7 @@ void enc_set_parameters(struct enc_parameters *params)
panic_threshold = 0; panic_threshold = 0;
logf("panic thr:%d", panic_threshold); logf("panic thr:%d", panic_threshold);
#endif
/** set OUT parameters **/ /** set OUT parameters **/
params->enc_buffer = enc_buffer; params->enc_buffer = enc_buffer;