Fix handling of memory limit #385
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
saghul
commented
Apr 16, 2024
chqrlie
reviewed
Apr 16, 2024
qjs.c
Outdated
Comment on lines
417
to
448
| // TODO(chqrlie): accept kmg suffixes | ||
| stack_size = (size_t)strtod(opt_arg, NULL); | ||
| stack_size = (int)atoi(opt_arg); | ||
| break; |
|
I'll give it another shot. |
Default to 0, which is "disabled", just like the stack limit.
saghul
force-pushed
the
fix-memory-limit
branch
2 times, most recently
from
55ecf9d
to
4b83dd2
Compare
|
@chqrlie PTAL and let me know what you think! |
|
@saghul : as you changed the default unit, you should update the This will fix the |
|
Good one! I got a bit busy and hadn't dug deep enough, thanks for the pointer! |
|
@chqrlie Updated, PTAL! |
chqrlie
reviewed
May 5, 2024
qjs.c
Outdated
Comment on lines
496
to
499
| if (memory_limit >= 0) | ||
| JS_SetMemoryLimit(rt, (size_t)memory_limit * 1024 /* QuickJS needs bytes. */); | ||
| if (stack_size >= 0) | ||
| JS_SetMaxStackSize(rt, (size_t)stack_size * 1024 /* QuickJS needs bytes. */); |
There was a problem hiding this comment.
Do not multiply by 1024 if you use my proposed version for parse_imit.
Switch the default in the CLI to kilobytes too.
|
@chqrlie Thanks a lot for the remark on |
chqrlie
approved these changes
May 6, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Default to 0, which is "disabled", just like the stack limit.