diff options
| author | Lukas Larsson <[email protected]> | 2014-08-21 16:29:28 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-08-21 16:29:28 +0200 |
| commit | a499a783bd7edbba856e61e490137dea4dab67e3 (patch) | |
| tree | 0f3ac0850702d3f2882787c62419c0ea6c613d50 /erts/emulator/beam/bif.c | |
| parent | 958d0dd98b571f3dd148c764c374babac3d53057 (diff) | |
| parent | cffe162d9ddce58b2aaf71a102f3b6c6738a2029 (diff) | |
| download | otp-a499a783bd7edbba856e61e490137dea4dab67e3.tar.gz otp-a499a783bd7edbba856e61e490137dea4dab67e3.tar.bz2 otp-a499a783bd7edbba856e61e490137dea4dab67e3.zip | |
Merge branch 'maint'
* maint:
Add number of entries to mnesia copy debug message
Add thread index to allocator enomem dump slogan
Add run queue index to process dump info
Add missing error string to syslog logging in epmd
Demote rare debug slogan of message discarding to debug build
Diffstat (limited to 'erts/emulator/beam/bif.c')
| -rw-r--r-- | erts/emulator/beam/bif.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c index 4a84dcfe34..bc56143def 100644 --- a/erts/emulator/beam/bif.c +++ b/erts/emulator/beam/bif.c @@ -1869,6 +1869,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend, Eterm *refp) { } else if (is_external_pid(to)) { dep = external_pid_dist_entry(to); if(dep == erts_this_dist_entry) { +#if DEBUG erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf(); erts_dsprintf(dsbufp, "Discarding message %T from %T to %T in an old " @@ -1879,6 +1880,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend, Eterm *refp) { external_pid_creation(to), erts_this_node->creation); erts_send_error_to_logger(p->group_leader, dsbufp); +#endif return 0; } return remote_send(p, dep, to, to, msg, suspend); @@ -1912,6 +1914,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend, Eterm *refp) { } else if (is_external_port(to) && (external_port_dist_entry(to) == erts_this_dist_entry)) { +#if DEBUG erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf(); erts_dsprintf(dsbufp, "Discarding message %T from %T to %T in an old " @@ -1922,6 +1925,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend, Eterm *refp) { external_port_creation(to), erts_this_node->creation); erts_send_error_to_logger(p->group_leader, dsbufp); +#endif return 0; } else if (is_internal_port(to)) { int ret_val; |