From 043d3f868291d158f7e24a8a2d9f3ed629aa737b Mon Sep 17 00:00:00 2001 From: Dean Michael Berris Date: Mon, 19 Jun 2017 01:30:04 +0000 Subject: [PATCH] [XRay][compiler-rt][NFC] Add a name for argument to __xray_set_handler_arg1(...) Just makes the interface consistent with the other functions in include/xray/xray_interface.h. llvm-svn: 305658 --- compiler-rt/include/xray/xray_interface.h | 3 ++- compiler-rt/lib/xray/xray_interface.cc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/compiler-rt/include/xray/xray_interface.h b/compiler-rt/include/xray/xray_interface.h index dc0c277aa841..564613417069 100644 --- a/compiler-rt/include/xray/xray_interface.h +++ b/compiler-rt/include/xray/xray_interface.h @@ -60,7 +60,8 @@ extern int __xray_remove_handler(); /// start logging their subsequent affected function calls (if patched). /// /// Returns 1 on success, 0 on error. -extern int __xray_set_handler_arg1(void (*)(int32_t, XRayEntryType, uint64_t)); +extern int __xray_set_handler_arg1(void (*entry)(int32_t, XRayEntryType, + uint64_t)); /// Disables the XRay handler used to log first arguments of function calls. /// Returns 1 on success, 0 on error. diff --git a/compiler-rt/lib/xray/xray_interface.cc b/compiler-rt/lib/xray/xray_interface.cc index e912b6e478a3..694d34c0102b 100644 --- a/compiler-rt/lib/xray/xray_interface.cc +++ b/compiler-rt/lib/xray/xray_interface.cc @@ -312,7 +312,7 @@ __xray_unpatch_function(int32_t FuncId) XRAY_NEVER_INSTRUMENT { return patchFunction(FuncId, false); } -int __xray_set_handler_arg1(void (*Handler)(int32_t, XRayEntryType, uint64_t)) { +int __xray_set_handler_arg1(void (*entry)(int32_t, XRayEntryType, uint64_t)) { if (!__sanitizer::atomic_load(&XRayInitialized, __sanitizer::memory_order_acquire)) return 0; @@ -320,7 +320,7 @@ int __xray_set_handler_arg1(void (*Handler)(int32_t, XRayEntryType, uint64_t)) { // A relaxed write might not be visible even if the current thread gets // scheduled on a different CPU/NUMA node. We need to wait for everyone to // have this handler installed for consistency of collected data across CPUs. - __sanitizer::atomic_store(&XRayArgLogger, reinterpret_cast(Handler), + __sanitizer::atomic_store(&XRayArgLogger, reinterpret_cast(entry), __sanitizer::memory_order_release); return 1; }