diff options
| author | Micael Karlberg <[email protected]> | 2011-02-28 19:07:16 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-02-28 19:07:16 +0100 |
| commit | 7c1117fd0e509115fb17a1a101233f19be555991 (patch) | |
| tree | f0eeb2636a879bf37120b7b976ddf3979be8890d /erts/emulator/beam/erl_process.c | |
| parent | 2c13b770cf24be58db1862afc38143d889ac2600 (diff) | |
| parent | 98d3b0c86ff3d99a4d175291df54c5ed48357fce (diff) | |
| download | otp-7c1117fd0e509115fb17a1a101233f19be555991.tar.gz otp-7c1117fd0e509115fb17a1a101233f19be555991.tar.bz2 otp-7c1117fd0e509115fb17a1a101233f19be555991.zip | |
Merge branch 'dev' into bmk/snmp/snmp419_integration/OTP-9068
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", |