diff options
| author | Rickard Green <[email protected]> | 2012-02-20 12:20:26 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-02-20 12:20:26 +0100 |
| commit | 3735ecf0815925950db313e56e8d2371afe2207a (patch) | |
| tree | b7df2e64c662b0dac3a00bfadf5e8bfa67c97a60 /erts/emulator/beam/break.c | |
| parent | 5abac56e443827f755d079873623f42aa74b551e (diff) | |
| parent | 520ddbc83ec87bcec262680bd915184182e3998e (diff) | |
| download | otp-3735ecf0815925950db313e56e8d2371afe2207a.tar.gz otp-3735ecf0815925950db313e56e8d2371afe2207a.tar.bz2 otp-3735ecf0815925950db313e56e8d2371afe2207a.zip | |
Merge branch 'maint'
* maint:
Reduce thread progress read operations in handle_aux_work()
Misc memory barrier fixes
Diffstat (limited to 'erts/emulator/beam/break.c')
| -rw-r--r-- | erts/emulator/beam/break.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c index 0d3b6a4dba..6f5020dc14 100644 --- a/erts/emulator/beam/break.c +++ b/erts/emulator/beam/break.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2011. All Rights Reserved. + * Copyright Ericsson AB 1996-2012. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -646,6 +646,9 @@ bin_check(void) void erl_crash_dump_v(char *file, int line, char* fmt, va_list args) { +#ifdef ERTS_SMP + ErtsThrPrgrData tpd_buf; /* in case we aren't a managed thread... */ +#endif int fd; time_t now; size_t dumpnamebufsize = MAXPATHLEN; @@ -663,7 +666,7 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args) * We do not release system again. We expect an exit() or abort() after * dump has been written. */ - erts_thr_progress_fatal_error_block(60000); + erts_thr_progress_fatal_error_block(60000, &tpd_buf); /* Either worked or not... */ /* Allow us to pass certain places without locking... */ |