msb-public
/
hippo4j
mirror of https://github.com/longtai-cn/hippo4j
1
0
Code Issues Projects Releases Wiki Activity

Refactor ThreadPoolInstanceRegistry to ThreadPoolRegistry. (#1339)

Browse Source 
* Refactor ThreadPoolRegistry.

* Refactor ThreadPoolInstance Registry to ThreadPoolRegistry.

---------

Co-authored-by: lucca <luccasuen.dev@gmail.com>
pull/1342/head
lucca suen 2 years ago committed by GitHub
parent 618b382401
commit f46da2b3d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File

8
agent/hippo4j-agent-plugin/spring-plugins/spring-plugin-common/src/main/java/cn/hippo4j/agent/plugin/spring/common/support/SpringThreadPoolRegisterSupport.java
Unescape View File

@ -18,7 +18,7 @@
package cn.hippo4j.agent.plugin.spring.common.support;
import cn.hippo4j.agent.core.util.ReflectUtil;
import cn.hippo4j.common.executor.ThreadPoolInstanceRegistry;
import cn.hippo4j.common.executor.ThreadPoolRegistry;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum;
import cn.hippo4j.common.model.executor.ExecutorProperties;
@ -41,8 +41,8 @@ public class SpringThreadPoolRegisterSupport {
private static final Logger LOGGER = LoggerFactory.getLogger(SpringThreadPoolRegisterSupport.class);
public static void registerThreadPoolInstances(ApplicationContext context) {
Map<ThreadPoolExecutor, Class<?>> earlyConstructMap = ThreadPoolInstanceRegistry.getInstance().earlyConstructMap;
for (Map.Entry<ThreadPoolExecutor, Class<?>> entry : earlyConstructMap.entrySet()) {
Map<ThreadPoolExecutor, Class<?>> referencedClassMap = ThreadPoolRegistry.REFERENCED_CLASS_MAP;
for (Map.Entry<ThreadPoolExecutor, Class<?>> entry : referencedClassMap.entrySet()) {
ThreadPoolExecutor enhancedInstance = entry.getKey();
Class<?> declaredClass = entry.getValue();
List<Field> declaredFields = ReflectUtil.getStaticFieldsFromType(declaredClass, ThreadPoolExecutor.class);
@ -93,6 +93,6 @@ public class SpringThreadPoolRegisterSupport {
.queueCapacity(executor.getQueue().remainingCapacity())
.rejectedHandler(RejectedPolicyTypeEnum.getRejectedPolicyTypeEnumByName(executor.getRejectedExecutionHandler().getClass().getSimpleName()).getName())
.build();
ThreadPoolInstanceRegistry.getInstance().putHolder(threadPoolId, executor, executorProperties);
ThreadPoolRegistry.putHolder(threadPoolId, executor, executorProperties);
}
}

4
agent/hippo4j-agent-plugin/threadpool-plugin/src/main/java/cn/hippo4j/agent/plugin/thread/pool/interceptor/ThreadPoolExecutorConstructorMethodInterceptor.java
Unescape View File

@ -22,7 +22,7 @@ import cn.hippo4j.agent.core.logging.api.ILog;
import cn.hippo4j.agent.core.logging.api.LogManager;
import cn.hippo4j.agent.core.plugin.interceptor.enhance.EnhancedInstance;
import cn.hippo4j.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
import cn.hippo4j.common.executor.ThreadPoolInstanceRegistry;
import cn.hippo4j.common.executor.ThreadPoolRegistry;
import cn.hippo4j.agent.core.util.CollectionUtil;
import cn.hippo4j.agent.core.util.StringUtil;
import java.util.ArrayList;
@ -52,7 +52,7 @@ public class ThreadPoolExecutorConstructorMethodInterceptor implements InstanceC
StackTraceElement declaredClassStackTraceElement = stackTraceElements.get(0);
String declaredClassName = declaredClassStackTraceElement.getClassName();
Class<?> declaredClass = Thread.currentThread().getContextClassLoader().loadClass(declaredClassName);
ThreadPoolInstanceRegistry.getInstance().earlyConstructMap.put((ThreadPoolExecutor) objInst, declaredClass);
ThreadPoolRegistry.REFERENCED_CLASS_MAP.put((ThreadPoolExecutor) objInst, declaredClass);
}
private List<StackTraceElement> getStackTraceElements() {

33
infra/common/src/main/java/cn/hippo4j/common/executor/ThreadPoolInstanceRegistry.java → infra/common/src/main/java/cn/hippo4j/common/executor/ThreadPoolRegistry.java
Unescape View File

@ -27,35 +27,26 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadPoolExecutor;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class ThreadPoolInstanceRegistry {
public class ThreadPoolRegistry {
private final Map<String, ThreadPoolExecutorHolder> holderMap = new ConcurrentHashMap<>();
private static final Map<String, ThreadPoolExecutorHolder> HOLDER_MAP = new ConcurrentHashMap<>();
public final Map<ThreadPoolExecutor, Class<?>> earlyConstructMap = new ConcurrentHashMap<>();
public static final Map<ThreadPoolExecutor, Class<?>> REFERENCED_CLASS_MAP = new ConcurrentHashMap<>();
private volatile static ThreadPoolInstanceRegistry INSTANCE;
public static ThreadPoolInstanceRegistry getInstance() {
if (INSTANCE == null) {
synchronized (ThreadPoolInstanceRegistry.class) {
if (INSTANCE == null) {
INSTANCE = new ThreadPoolInstanceRegistry();
}
}
}
return INSTANCE;
public static Map<String, ThreadPoolExecutorHolder> getHolderMap() {
return HOLDER_MAP;
}
public Map<String, ThreadPoolExecutorHolder> getHolderMap() {
return holderMap;
public static void putHolder(String executorName, ThreadPoolExecutor executor, ExecutorProperties executorProperties) {
ThreadPoolExecutorHolder holder = new ThreadPoolExecutorHolder(executorName, executor, executorProperties);
HOLDER_MAP.put(executorName, holder);
}
public void putHolder(String executorName, ThreadPoolExecutor executor, ExecutorProperties executorProperties) {
ThreadPoolExecutorHolder holder = new ThreadPoolExecutorHolder(executorName, executor, executorProperties);
holderMap.put(executorName, holder);
public static ThreadPoolExecutorHolder getHolder(String executorName) {
return Optional.ofNullable(HOLDER_MAP.get(executorName)).orElse(ThreadPoolExecutorHolder.EMPTY);
}
public ThreadPoolExecutorHolder getHolder(String executorName) {
return Optional.ofNullable(holderMap.get(executorName)).orElse(ThreadPoolExecutorHolder.EMPTY);
public static Map<ThreadPoolExecutor, Class<?>> getReferencedClassMap() {
return REFERENCED_CLASS_MAP;
}
}

4
kernel/dynamic/mode/config/src/main/java/cn/hippo4j/threadpool/dynamic/mode/config/refresher/event/DynamicThreadPoolRefreshListener.java
Unescape View File

@ -18,7 +18,7 @@
package cn.hippo4j.threadpool.dynamic.mode.config.refresher.event;
import cn.hippo4j.common.executor.ThreadPoolExecutorHolder;
import cn.hippo4j.common.executor.ThreadPoolInstanceRegistry;
import cn.hippo4j.common.executor.ThreadPoolRegistry;
import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum;
import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum;
import cn.hippo4j.common.executor.support.ResizableCapacityLinkedBlockingQueue;
@ -55,7 +55,7 @@ public class DynamicThreadPoolRefreshListener implements Observer<BootstrapConfi
for (ExecutorProperties properties : executors) {
String threadPoolId = properties.getThreadPoolId();
// Check whether the thread pool configuration is empty and whether the parameters have changed
ThreadPoolExecutorHolder executorHolder = ThreadPoolInstanceRegistry.getInstance().getHolder(threadPoolId);
ThreadPoolExecutorHolder executorHolder = ThreadPoolRegistry.getHolder(threadPoolId);
if (executorHolder.isEmpty() || !checkPropertiesConsistency(executorHolder, properties)) {
continue;
}

Write Preview
Loading…
Cancel
Save