diff options
| author | Björn Gustavsson <[email protected]> | 2011-11-29 09:37:03 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-11-29 09:37:03 +0100 |
| commit | 7a6249a44c80546f13d95732a0fb92e629913263 (patch) | |
| tree | 7b98806f00f66acf700cca2a0984722ebfcb9351 | |
| parent | 061132c9a061b9eb28d6f840d2d2ec6f8722bb76 (diff) | |
| parent | 531fd80c80e5fd6d7f649515e97ea5a68d8e6f9b (diff) | |
| download | otp-7a6249a44c80546f13d95732a0fb92e629913263.tar.gz otp-7a6249a44c80546f13d95732a0fb92e629913263.tar.bz2 otp-7a6249a44c80546f13d95732a0fb92e629913263.zip | |
Merge branch 'bjorn/erts/remove-useless-variable'
* bjorn/erts/remove-useless-variable:
erl_process.c: Remove the redundant variable 'processes_busy'
Update primary bootstrap
otp_internal: Deprecate ssl:pid/1
| -rw-r--r-- | bootstrap/lib/stdlib/ebin/otp_internal.beam | bin | 6928 -> 6968 bytes | |||
| -rw-r--r-- | erts/emulator/beam/erl_process.c | 11 | ||||
| -rw-r--r-- | lib/stdlib/src/otp_internal.erl | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/bootstrap/lib/stdlib/ebin/otp_internal.beam b/bootstrap/lib/stdlib/ebin/otp_internal.beam Binary files differindex 6f21db8a48..e69809b2b6 100644 --- a/bootstrap/lib/stdlib/ebin/otp_internal.beam +++ b/bootstrap/lib/stdlib/ebin/otp_internal.beam diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c index 84c0ded016..6657fe6efa 100644 --- a/erts/emulator/beam/erl_process.c +++ b/erts/emulator/beam/erl_process.c @@ -225,10 +225,6 @@ typedef union { static ErtsAlignedSchedulerSleepInfo *aligned_sched_sleep_info; -#ifndef BM_COUNTERS -static int processes_busy; -#endif - Process** process_tab; static Uint last_reductions; static Uint last_exact_reductions; @@ -497,9 +493,6 @@ erts_init_process(int ncpu) p_serial_shift = erts_fit_in_bits(erts_max_processes - 1); p_serial_mask = ((~(~((Uint) 0) << proc_bits)) >> p_serial_shift); erts_process_tab_index_mask = ~(~((Uint) 0) << p_serial_shift); -#ifndef BM_COUNTERS - processes_busy = 0; -#endif last_reductions = 0; last_exact_reductions = 0; erts_default_process_flags = 0; @@ -6892,7 +6885,9 @@ erl_create_process(Process* parent, /* Parent of process (default group leader). goto error; } +#ifdef BM_COUNTERS processes_busy++; +#endif BM_COUNT(processes_spawned); #ifndef HYBRID @@ -8415,7 +8410,9 @@ continue_exit_process(Process *p pbt = ERTS_PROC_SET_CALL_TIME(p, ERTS_PROC_LOCKS_ALL, NULL); erts_smp_proc_unlock(p, ERTS_PROC_LOCKS_ALL); +#ifdef BM_COUNTERS processes_busy--; +#endif if (dep) { erts_do_net_exits(dep, reason); diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl index e88d0ff194..ade79e710a 100644 --- a/lib/stdlib/src/otp_internal.erl +++ b/lib/stdlib/src/otp_internal.erl @@ -346,6 +346,8 @@ obsolete_1(docb_xml_check, _, _) -> %% Added in R15B obsolete_1(asn1rt, F, _) when F == load_driver; F == unload_driver -> {deprecated,"deprecated (will be removed in R16A); has no effect as drivers are no longer used."}; +obsolete_1(ssl, pid, 1) -> + {deprecated,"deprecated (will be removed in R17); is no longer needed"}; obsolete_1(_, _, _) -> no. |