aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/global.h
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-07-12 14:02:16 +0200
committerRickard Green <[email protected]>2013-07-12 14:02:16 +0200
commit712f2cad96a941d68a2f9ad092badd5bc60e8cdd (patch)
tree06bd3a8a13eaeeb3c4ff62187ec0eaa9e7a31e21 /erts/emulator/beam/global.h
parent257f41f238503043aaf92e709f5fc3e7e188a1ac (diff)
parentbc30159f5eac936fa9c8ea97d2ab11564448ba7b (diff)
downloadotp-712f2cad96a941d68a2f9ad092badd5bc60e8cdd.tar.gz
otp-712f2cad96a941d68a2f9ad092badd5bc60e8cdd.tar.bz2
otp-712f2cad96a941d68a2f9ad092badd5bc60e8cdd.zip
Merge branch 'maint'
* maint: Fix variable ‘rp_had_locks’ set but not used warning Fix ‘ethr_native_rwlock_destroy’ defined but not used warning Fix 'no previous prototype' warning for dtrace functions Conditionally skip process_SUITE tests that consume large amount of memory
Diffstat (limited to 'erts/emulator/beam/global.h')
-rwxr-xr-xerts/emulator/beam/global.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h
index aa296ca8c2..8fc05c085e 100755
--- a/erts/emulator/beam/global.h
+++ b/erts/emulator/beam/global.h
@@ -1225,6 +1225,13 @@ erts_alloc_message_heap(Uint size,
# define UnUseTmpHeapNoproc(Size) /* Nothing */
#endif /* HEAP_ON_C_STACK */
+ERTS_GLB_INLINE void dtrace_pid_str(Eterm pid, char *process_buf);
+ERTS_GLB_INLINE void dtrace_proc_str(Process *process, char *process_buf);
+ERTS_GLB_INLINE void dtrace_port_str(Port *port, char *port_buf);
+ERTS_GLB_INLINE void dtrace_fun_decode(Process *process,
+ Eterm module, Eterm function, int arity,
+ char *process_buf, char *mfa_buf);
+
#if ERTS_GLB_INLINE_INCL_FUNC_DEF
#include "dtrace-wrapper.h"