summaryrefslogtreecommitdiff
path: root/apps/plugins/puzzles/malloc.c
diff options
context:
space:
mode:
authorFranklin Wei <git@fwei.tk>2017-01-13 18:45:04 -0500
committerFranklin Wei <git@fwei.tk>2017-01-13 19:00:09 -0500
commit637c7414a91c33e2627f99fee7b4c9cbf04abdb4 (patch)
treeba34a8782405c936fc1ed735e95eec2bbded87e7 /apps/plugins/puzzles/malloc.c
parent954d934ad2b4ba2a26ba20e6000a3ed1856dc194 (diff)
downloadrockbox-637c7414a91c33e2627f99fee7b4c9cbf04abdb4.zip
rockbox-637c7414a91c33e2627f99fee7b4c9cbf04abdb4.tar.gz
rockbox-637c7414a91c33e2627f99fee7b4c9cbf04abdb4.tar.bz2
rockbox-637c7414a91c33e2627f99fee7b4c9cbf04abdb4.tar.xz
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
Diffstat (limited to 'apps/plugins/puzzles/malloc.c')
-rw-r--r--apps/plugins/puzzles/malloc.c38
1 files changed, 35 insertions, 3 deletions
diff --git a/apps/plugins/puzzles/malloc.c b/apps/plugins/puzzles/malloc.c
index d9943c6..47a7137 100644
--- a/apps/plugins/puzzles/malloc.c
+++ b/apps/plugins/puzzles/malloc.c
@@ -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;
}