# HG changeset patch # User Yasumasa Suenaga # Date 1522634122 -32400 # Node ID ef2f9bc6aecb388d60f92be322c423266b9939a6 # Parent 37a36a477911f70505d07b2811a9d9262da58f28 Bug 3527: Remove unused code for deadlock detector Reviewed-by: ykubota https://github.com/HeapStats/heapstats/pull/132 diff -r 37a36a477911 -r ef2f9bc6aecb ChangeLog --- a/ChangeLog Mon Mar 12 15:21:57 2018 +0900 +++ b/ChangeLog Mon Apr 02 10:55:22 2018 +0900 @@ -1,3 +1,7 @@ +2018-04-02 Yasumasa Suenaga + + * Bug 3527: Remove unused code for deadlock detector + 2018-03-12 KUBOTA Yuji * Bug 3536: Cannot kill Java process on error diff -r 37a36a477911 -r ef2f9bc6aecb agent/src/heapstats-engines/vmFunctions.cpp --- a/agent/src/heapstats-engines/vmFunctions.cpp Mon Mar 12 15:21:57 2018 +0900 +++ b/agent/src/heapstats-engines/vmFunctions.cpp Mon Apr 02 10:55:22 2018 +0900 @@ -1,7 +1,7 @@ /*! * \file vmFunctions.cpp * \brief This file includes functions in HotSpot VM.
- * Copyright (C) 2014-2017 Yasumasa Suenaga + * Copyright (C) 2014-2018 Yasumasa Suenaga * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -198,14 +198,6 @@ } } - /* Search "ObjectSynchronizer::get_lock_owner()" function symbol. */ - getLockOwner = (TGetLockOwner) this->symFinder->findSymbol( - GETLOCKOWNER_SYMBOL); - if (unlikely(getLockOwner == NULL)) { - logger->printWarnMsg("ObjectSynchronizer::get_lock_owner() not found."); - return false; - } - /* Search "ThreadSafepointState::create()" function symbol. */ threadSafepointStateCreate = (TVMThreadFunction) this->symFinder->findSymbol( THREADSAFEPOINTSTATE_CREATE_SYMBOL); diff -r 37a36a477911 -r ef2f9bc6aecb agent/src/heapstats-engines/vmFunctions.hpp --- a/agent/src/heapstats-engines/vmFunctions.hpp Mon Mar 12 15:21:57 2018 +0900 +++ b/agent/src/heapstats-engines/vmFunctions.hpp Mon Apr 02 10:55:22 2018 +0900 @@ -1,7 +1,7 @@ /*! * \file vmFunctions.hpp * \brief This file includes functions in HotSpot VM. - * Copyright (C) 2014-2017 Yasumasa Suenaga + * Copyright (C) 2014-2018 Yasumasa Suenaga * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -136,11 +136,6 @@ /*! - * \brief Symbol of ObjectSynchronizer::get_lock_owner(). - */ -#define GETLOCKOWNER_SYMBOL "_ZN18ObjectSynchronizer14get_lock_ownerE6Handleb" - -/*! * \brief Symbol of ThreadSafepointState::create(). */ #define THREADSAFEPOINTSTATE_CREATE_SYMBOL \ @@ -271,16 +266,6 @@ typedef void (*TSR_Handler)(int sig, siginfo_t *siginfo, ucontext_t *context); /*! - * \brief function type of - * "JavaThread* ObjectSynchronizer::get_lock_owner(Handle h_obj, bool doLock)". - * \param monitor_oop [in] Target monitor oop. - * \param doLock [in] Enable oop lock. - * \return Monitor owner thread oop.
- * Value is NULL, if owner is none. - */ -typedef void *(*TGetLockOwner)(void *monitor_oop, bool doLock); - -/*! * \brief function type of common thread operation. * \param thread [in] Target thread object is inner JVM class instance. */ @@ -364,11 +349,6 @@ TSR_Handler sr_handler; /*! - * \brief Function pointer for "ObjectSynchronizer::get_lock_owner()". - */ - TGetLockOwner getLockOwner; - - /*! * \brief Function pointer for "ThreadSafepointState::create()". */ TVMThreadFunction threadSafepointStateCreate; @@ -476,10 +456,6 @@ inline void *GetSRHandlerPointer(void) { return (void *)sr_handler; } - inline void *GetLockOwner(void *monitor_oop, bool doLock) { - return getLockOwner(monitor_oop, doLock); - } - inline void ThreadSafepointStateCreate(void *thread) { threadSafepointStateCreate(thread); }