From 6b16d650f99044eb2e1975f2d954aa07ed8aae35 Mon Sep 17 00:00:00 2001 From: Rickard Green Date: Thu, 11 Jul 2013 16:03:07 +0200 Subject: Fix 'no previous prototype' warning for dtrace functions --- erts/emulator/beam/global.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index 25aedc91c6..c0d66d6cc1 100755 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -1217,6 +1217,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" -- cgit v1.2.3 From 70337ed8457402aebf7087ff04718d828d0c19e3 Mon Sep 17 00:00:00 2001 From: Rickard Green Date: Thu, 11 Jul 2013 16:33:09 +0200 Subject: =?UTF-8?q?Fix=20=E2=80=98ethr=5Fnative=5Frwlock=5Fdestroy?= =?UTF-8?q?=E2=80=99=20defined=20but=20not=20used=20warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erts/include/internal/ethread.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erts/include/internal/ethread.h b/erts/include/internal/ethread.h index ab728c65fa..407097d4b1 100644 --- a/erts/include/internal/ethread.h +++ b/erts/include/internal/ethread.h @@ -411,6 +411,7 @@ extern ethr_runtime_t ethr_runtime__; #ifdef VALGRIND /* mutex as fallback for spinlock for VALGRIND */ # undef ETHR_HAVE_NATIVE_SPINLOCKS +# undef ETHR_HAVE_NATIVE_RWSPINLOCKS #else # include "ethr_optimized_fallbacks.h" #endif @@ -693,7 +694,7 @@ static ETHR_INLINE int ETHR_INLINE_FUNC_NAME_(ethr_rwlock_destroy)(ethr_rwlock_t *lock) { #ifdef ETHR_HAVE_NATIVE_RWSPINLOCKS - return 0; + return ethr_native_rwlock_destroy(lock); #else return ethr_rwmutex_destroy((ethr_rwmutex *) lock); #endif -- cgit v1.2.3 From 54c658c89dc8edae1e420861601eec068bc74676 Mon Sep 17 00:00:00 2001 From: Rickard Green Date: Thu, 11 Jul 2013 16:33:52 +0200 Subject: =?UTF-8?q?Fix=20variable=20=E2=80=98rp=5Fhad=5Flocks=E2=80=99=20s?= =?UTF-8?q?et=20but=20not=20used=20warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erts/emulator/beam/erl_nif.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/erts/emulator/beam/erl_nif.c b/erts/emulator/beam/erl_nif.c index d4c2b5bdcc..48f8be8dd3 100644 --- a/erts/emulator/beam/erl_nif.c +++ b/erts/emulator/beam/erl_nif.c @@ -310,9 +310,6 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid, Process* rp; Process* c_p; ErlHeapFragment* frags; -#if defined(ERTS_ENABLE_LOCK_CHECK) && defined(ERTS_SMP) - ErtsProcLocks rp_had_locks; -#endif Eterm receiver = to_pid->pid; int flush_me = 0; int scheduler = erts_get_scheduler_id() != 0; @@ -332,10 +329,6 @@ int enif_send(ErlNifEnv* env, const ErlNifPid* to_pid, #endif } -#if defined(ERTS_ENABLE_LOCK_CHECK) && defined(ERTS_SMP) - rp_had_locks = rp_locks; -#endif - rp = (scheduler ? erts_proc_lookup(receiver) : erts_pid2proc_opt(c_p, ERTS_PROC_LOCK_MAIN, -- cgit v1.2.3