zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 23:51:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

js: Load save files into the C side incrementally

Browse Source 
Before this commit, JavaScript Puzzles loaded a save file by pushing the
entire file onto the Emscripten stack and then reading it from there.
This worked tolerably for typical save files, but Emscripten's stack
defaults to only having 64 kiB of space.  That meant that trying to load
something that wasn't a real save file tended to cause a stack overflow.
I expect that at least some real save files would suffer from the same
problem.

The stack overflow would generally cause a JavaScript exception and then
leave the stack pointer outside the stack, so that any future attempt to
call into C would fail as well.

To fix this, arrange that the C function for reading data from the save
file calls out to JavaScript.  The JavaScript can then copy just the
requested data into the caller's buffer.  We can't pass a JavaScript
function pointer to C, but since only one file can be loaded at a time,
we can just have a global variable that's the current loading callback.

There might still be a problem if you try to load a stupendously large
file, since I think FileReader.readAsArrayBuffer() reads the whole file
into the browser's RAM.  It works on my laptop with files up to a few
hundred megabytes, though.
This commit is contained in:
Ben Harris
2023-04-03 15:16:35 +01:00
parent 8d3a93ce47
commit 36c282aaa9
3 changed files with 37 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
emcc.c
View File

@ -99,6 +99,8 @@ extern void js_dialog_launch(void);
extern void js_dialog_cleanup(void);
extern void js_focus_canvas(void);
extern bool js_savefile_read(void *buf, int len);
/*
* These functions are called from JavaScript, so their prototypes
* need to be kept in sync with emccpre.js.
@ -112,7 +114,7 @@ void timer_callback(double tplus);
void command(int n);
char *get_save_file(void);
void free_save_file(char *buffer);
void load_game(const char *buffer, int len);
void load_game(void);
void dlg_return_sval(int index, const char *val);
void dlg_return_ival(int index, int val);
void resize_puzzle(int w, int h);
@ -904,23 +906,18 @@ struct savefile_read_ctx {
static bool savefile_read(void *vctx, void *buf, int len)
{
struct savefile_read_ctx *ctx = (struct savefile_read_ctx *)vctx;
if (ctx->len_remaining < len)
return false;
memcpy(buf, ctx->buffer, len);
ctx->len_remaining -= len;
ctx->buffer += len;
return true;
return js_savefile_read(buf, len);
}
void load_game(const char *buffer, int len)
void load_game()
{
struct savefile_read_ctx ctx;
const char *err;
ctx.buffer = buffer;
ctx.len_remaining = len;
err = midend_deserialise(me, savefile_read, &ctx);
/*
* savefile_read_callback in JavaScript was set up by our caller
* as a closure that knows what file we're loading.
*/
err = midend_deserialise(me, savefile_read, NULL);
if (err) {
js_error_box(err);