diff options
| author | Micael Karlberg <[email protected]> | 2011-02-28 11:44:35 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-02-28 11:44:35 +0100 |
| commit | 26eae94979083f6ae272b76589bce256b792e487 (patch) | |
| tree | 1ac07672c29efd352f2009908c1b441a31b74c24 /erts/emulator/beam/erl_process.c | |
| parent | 9671856faa243ee4567f4059fba28fd85b5d9baa (diff) | |
| parent | e170c7f2ce8e0ac2cd45c922afc138305ca34b79 (diff) | |
| download | otp-26eae94979083f6ae272b76589bce256b792e487.tar.gz otp-26eae94979083f6ae272b76589bce256b792e487.tar.bz2 otp-26eae94979083f6ae272b76589bce256b792e487.zip | |
Merge branch 'dev' into bmk/megaco/miscellaneous_dialyzer/OTP-9075
Had to fix a bunch of CopyRight end-dates (in erts files)...
Diffstat (limited to 'erts/emulator/beam/erl_process.c')
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index ddfc27a93f..e4a871fd7e 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -2752,6 +2752,15 @@ erts_init_scheduling(int mrq, int no_schedulers, int no_schedulers_online) /* init port tasks */ erts_port_task_init(); + +#ifndef ERTS_SMP +#ifdef ERTS_DO_VERIFY_UNUSED_TEMP_ALLOC + erts_scheduler_data->verify_unused_temp_alloc + = erts_alloc_get_verify_unused_temp_alloc( + &erts_scheduler_data->verify_unused_temp_alloc_data); + ERTS_VERIFY_UNUSED_TEMP_ALLOC(NULL); +#endif +#endif } ErtsRunQueue * @@ -3711,6 +3720,13 @@ sched_thread_func(void *vesdp) } erts_smp_mtx_unlock(&schdlr_sspnd.mtx); +#ifdef ERTS_DO_VERIFY_UNUSED_TEMP_ALLOC + ((ErtsSchedulerData *) vesdp)->verify_unused_temp_alloc + = erts_alloc_get_verify_unused_temp_alloc( + &((ErtsSchedulerData *) vesdp)->verify_unused_temp_alloc_data); + ERTS_VERIFY_UNUSED_TEMP_ALLOC(NULL); +#endif + process_main(); /* No schedulers should *ever* terminate */ erl_exit(ERTS_ABORT_EXIT, "Scheduler thread number %bpu terminated\n", |