forked from len0rd/rockbox
puzzles: enable fallback to audiobuf when smalloc() fails
- upon a failed smalloc(), the audio buffer will be used for further allocations - should fix things on low-memory targets (c100 and c200v2), but breaks playback - playback should still be intact on other targets Change-Id: Ic239f1316efadc957050afacf5c614dbbca3f805
This commit is contained in:
parent
954d934ad2
commit
637c7414a9
2 changed files with 55 additions and 7 deletions
|
@ -14,12 +14,40 @@
|
|||
int allocs = 0;
|
||||
int frees = 0;
|
||||
|
||||
bool audiobuf_available =
|
||||
#ifndef COMBINED
|
||||
true;
|
||||
#else
|
||||
false;
|
||||
#endif
|
||||
|
||||
static bool grab_audiobuf(void)
|
||||
{
|
||||
if(!audiobuf_available)
|
||||
return false;
|
||||
|
||||
if(rb->audio_status())
|
||||
rb->audio_stop();
|
||||
|
||||
size_t sz, junk;
|
||||
void *audiobuf = rb->plugin_get_audio_buffer(&sz);
|
||||
extern char *giant_buffer;
|
||||
|
||||
add_new_area(audiobuf, sz, giant_buffer);
|
||||
audiobuf_available = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
void *smalloc(size_t size) {
|
||||
void *p;
|
||||
p = malloc(size);
|
||||
LOGF("allocs: %d", ++allocs);
|
||||
if (!p)
|
||||
fatal("out of memory");
|
||||
{
|
||||
if(grab_audiobuf())
|
||||
return smalloc(size);
|
||||
fatal("out of memory");
|
||||
}
|
||||
return p;
|
||||
}
|
||||
|
||||
|
@ -30,7 +58,7 @@ void sfree(void *p) {
|
|||
if (p) {
|
||||
++frees;
|
||||
LOGF("frees: %d, total outstanding: %d", frees, allocs - frees);
|
||||
free(p);
|
||||
free(p);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -46,7 +74,11 @@ void *srealloc(void *p, size_t size) {
|
|||
q = malloc(size);
|
||||
}
|
||||
if (!q)
|
||||
fatal("out of memory");
|
||||
{
|
||||
if(grab_audiobuf())
|
||||
return srealloc(p, size);
|
||||
fatal("out of memory");
|
||||
}
|
||||
return q;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue