diff options
| author | Sverker Eriksson <[email protected]> | 2016-11-22 14:52:52 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-11-22 14:52:52 +0100 |
| commit | b62020124b3294be021d0d62073ba34cda1ae742 (patch) | |
| tree | 4c68c8100bcc1d9275bf5cade63bf80286e55b4a /erts/emulator/sys/common/erl_mmap.c | |
| parent | 4683b5c227a238ee27f658bdfe2981c4b69acf09 (diff) | |
| parent | 491cd4c0c0a534ab89c3ebb4c413301c91c7167d (diff) | |
| download | otp-b62020124b3294be021d0d62073ba34cda1ae742.tar.gz otp-b62020124b3294be021d0d62073ba34cda1ae742.tar.bz2 otp-b62020124b3294be021d0d62073ba34cda1ae742.zip | |
Merge branch 'sverker/erts/crash-dump-limit/OTP-14046' into maint
* sverker/erts/crash-dump-limit:
erts: Add env variable ERL_CRASH_DUMP_BYTES
erts: Add ErtsStrToSint64
erts: Refactor crash dumping with cbprintf
erts: Add cbprintf for Callback Printing
erts: Remove unused erl_crash_dump()
Diffstat (limited to 'erts/emulator/sys/common/erl_mmap.c')
| -rw-r--r-- | erts/emulator/sys/common/erl_mmap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/sys/common/erl_mmap.c b/erts/emulator/sys/common/erl_mmap.c index 7bbb406f29..a5714f8325 100644 --- a/erts/emulator/sys/common/erl_mmap.c +++ b/erts/emulator/sys/common/erl_mmap.c @@ -2390,7 +2390,7 @@ add_2tup(Uint **hpp, Uint *szp, Eterm *lp, Eterm el1, Eterm el2) } Eterm erts_mmap_info(ErtsMemMapper* mm, - int *print_to_p, + fmtfn_t *print_to_p, void *print_to_arg, Eterm** hpp, Uint* szp, struct erts_mmap_info_struct* emis) @@ -2431,7 +2431,7 @@ Eterm erts_mmap_info(ErtsMemMapper* mm, if (print_to_p) { - int to = *print_to_p; + fmtfn_t to = *print_to_p; void *arg = print_to_arg; if (mm->supercarrier) { const char* prefix = "supercarrier "; @@ -2485,7 +2485,7 @@ Eterm erts_mmap_info(ErtsMemMapper* mm, Eterm erts_mmap_info_options(ErtsMemMapper* mm, char *prefix, - int *print_to_p, + fmtfn_t *print_to_p, void *print_to_arg, Uint **hpp, Uint *szp) @@ -2496,7 +2496,7 @@ Eterm erts_mmap_info_options(ErtsMemMapper* mm, Eterm res = THE_NON_VALUE; if (print_to_p) { - int to = *print_to_p; + fmtfn_t to = *print_to_p; void *arg = print_to_arg; erts_print(to, arg, "%sscs: %bpu\n", prefix, scs); if (mm->supercarrier) { |