diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2014-10-27 16:44:58 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2014-10-27 16:44:58 +0100 |
| commit | 405281de217231b820b4e6106cf7c253415d4aee (patch) | |
| tree | 8fd333e6d657a063543abf4c31f845de657efe6a /erts/emulator/beam/erl_bif_info.c | |
| parent | 229d21e6d143532fb6415203d928652b6fa602e0 (diff) | |
| parent | a5ce823283d36eda4788c55b0b9b645577473983 (diff) | |
| download | otp-405281de217231b820b4e6106cf7c253415d4aee.tar.gz otp-405281de217231b820b4e6106cf7c253415d4aee.tar.bz2 otp-405281de217231b820b4e6106cf7c253415d4aee.zip | |
Merge branch 'egil/fix-instruction-counter'
* egil/fix-instruction-counter:
erts: Fix SMP for ERTS_OPCODE_COUNTER_SUPPORT
erts: Add icount build type for opcode counter
Diffstat (limited to 'erts/emulator/beam/erl_bif_info.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_info.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 61e4469600..e92842c7d1 100644 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -115,6 +115,9 @@ static char erts_system_version[] = ("Erlang/OTP " ERLANG_OTP_RELEASE #ifdef ERTS_ENABLE_LOCK_COUNT " [lock-counting]" #endif +#ifdef ERTS_OPCODE_COUNTER_SUPPORT + " [instruction-counting]" +#endif #ifdef PURIFY " [purify-compiled]" #endif @@ -2300,7 +2303,7 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1) for (i = num_instructions-1; i >= 0; i--) { res = erts_bld_cons(hpp, hszp, erts_bld_tuple(hpp, hszp, 2, - erts_atom_put(opc[i].name, + erts_atom_put((byte *)opc[i].name, strlen(opc[i].name), ERTS_ATOM_ENC_LATIN1, 1), |