diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2014-08-30 11:28:50 -0400 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2014-08-30 14:01:21 -0400 |
| commit | 5b08f1a5b99136ef052b6f430b62bc618cd44946 (patch) | |
| tree | 257d405d78e871e6b944db987ffaf5c40f862fce /apps | |
| parent | 5d31d3c3bc0358eeed08e2a5242dc2b065110aad (diff) | |
| download | rockbox-5b08f1a5b99136ef052b6f430b62bc618cd44946.zip rockbox-5b08f1a5b99136ef052b6f430b62bc618cd44946.tar.gz rockbox-5b08f1a5b99136ef052b6f430b62bc618cd44946.tar.bz2 rockbox-5b08f1a5b99136ef052b6f430b62bc618cd44946.tar.xz | |
Remove I/O priority. It is harmful when used with the new file code.
HAVE_IO_PRIORITY was defined for native targets with dircache.
It is already effectively disabled for the most part since dircache no
longer lowers its thread's I/O priority. It existed primarily for the
aforementioned configuration.
Change-Id: Ia04935305397ba14df34647c8ea29c2acaea92aa
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/buffering.c | 9 | ||||
| -rw-r--r-- | apps/buffering.h | 3 | ||||
| -rw-r--r-- | apps/codec_thread.c | 8 | ||||
| -rw-r--r-- | apps/playback.c | 13 |
4 files changed, 0 insertions, 33 deletions
diff --git a/apps/buffering.c b/apps/buffering.c index 1826fa1..96ec922 100644 --- a/apps/buffering.c +++ b/apps/buffering.c @@ -1572,15 +1572,6 @@ size_t buf_get_watermark(void) return BUF_WATERMARK; } -#ifdef HAVE_IO_PRIORITY -void buf_back_off_storage(bool back_off) -{ - int priority = back_off ? - IO_PRIORITY_BACKGROUND : IO_PRIORITY_IMMEDIATE; - thread_set_io_priority(buffering_thread_id, priority); -} -#endif - /** -- buffer thread helpers -- **/ static void shrink_buffer_inner(struct memory_handle *h) { diff --git a/apps/buffering.h b/apps/buffering.h index 218f77e..5a1369a 100644 --- a/apps/buffering.h +++ b/apps/buffering.h @@ -111,9 +111,6 @@ size_t buf_length(void); size_t buf_used(void); bool buf_pin_handle(int handle_id, bool pin); bool buf_signal_handle(int handle_id, bool signal); -#ifdef HAVE_IO_PRIORITY -void buf_back_off_storage(bool back_off); -#endif /* Settings */ void buf_set_watermark(size_t bytes); diff --git a/apps/codec_thread.c b/apps/codec_thread.c index f2039d1..a1fa96d 100644 --- a/apps/codec_thread.c +++ b/apps/codec_thread.c @@ -470,15 +470,7 @@ static void load_codec(const struct codec_load_info *ev_data) /* Either not a valid handle or the buffer method failed */ const char *codec_fn = get_codec_filename(data.afmt); if (codec_fn) - { -#ifdef HAVE_IO_PRIORITY - buf_back_off_storage(true); -#endif status = codec_load_file(codec_fn, &ci); -#ifdef HAVE_IO_PRIORITY - buf_back_off_storage(false); -#endif - } } /* Types must agree */ diff --git a/apps/playback.c b/apps/playback.c index efc2330..5c2fc7f 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -1560,9 +1560,6 @@ static bool audio_load_cuesheet(struct track_info *info, int hid = ERR_UNSUPPORTED_TYPE; struct cuesheet_file cue_file; -#ifdef HAVE_IO_PRIORITY - buf_back_off_storage(true); -#endif if (look_for_cuesheet_file(track_id3, &cue_file)) { hid = bufalloc(NULL, sizeof (struct cuesheet), TYPE_CUESHEET); @@ -1586,9 +1583,6 @@ static bool audio_load_cuesheet(struct track_info *info, } } -#ifdef HAVE_IO_PRIORITY - buf_back_off_storage(false); -#endif if (hid == ERR_BUFFER_FULL) { logf("buffer is full for now (%s)", __func__); @@ -1627,10 +1621,6 @@ static bool audio_load_albumart(struct track_info *info, memset(&user_data, 0, sizeof(user_data)); user_data.dim = &albumart_slots[i].dim; -#ifdef HAVE_IO_PRIORITY - buf_back_off_storage(true); -#endif - /* We can only decode jpeg for embedded AA */ if (track_id3->has_embedded_albumart && track_id3->albumart.type == AA_TYPE_JPG) { @@ -1651,9 +1641,6 @@ static bool audio_load_albumart(struct track_info *info, } } -#ifdef HAVE_IO_PRIORITY - buf_back_off_storage(false); -#endif if (hid == ERR_BUFFER_FULL) { logf("buffer is full for now (%s)", __func__); |