Skip to content

Commit

Permalink
refactor: rename package threadpool to executor
Browse files Browse the repository at this point in the history
  • Loading branch information
oldratlee committed Sep 23, 2022
1 parent 638f45d commit 72c6b69
Show file tree
Hide file tree
Showing 39 changed files with 122 additions and 122 deletions.
4 changes: 2 additions & 2 deletions ttl-agent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
JAR Manifest - JAR File Specification
- https://docs.oracle.com/javase/10/docs/specs/jar/jar.html#jar-manifest
-->
<Premain-Class>com.alibaba.ttl3.threadpool.agent.TtlAgent</Premain-Class>
<Premain-Class>com.alibaba.ttl3.executor.agent.TtlAgent</Premain-Class>
<Boot-Class-Path>${project.build.finalName}.jar</Boot-Class-Path>
<Can-Redefine-Classes>false</Can-Redefine-Classes>
<Can-Retransform-Classes>true</Can-Retransform-Classes>
Expand All @@ -116,7 +116,7 @@
<relocations>
<relocation>
<pattern>javassist</pattern>
<shadedPattern>com.alibaba.ttl3.threadpool.agent.transformlet.javassist</shadedPattern>
<shadedPattern>com.alibaba.ttl3.executor.agent.transformlet.javassist</shadedPattern>
</relocation>
</relocations>
<artifactSet>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.alibaba.ttl3.threadpool.agent;

import com.alibaba.ttl3.threadpool.agent.logging.Logger;
import com.alibaba.ttl3.threadpool.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.threadpool.agent.transformlet.internal.ForkJoinTtlTransformlet;
import com.alibaba.ttl3.threadpool.agent.transformlet.internal.JdkExecutorTtlTransformlet;
import com.alibaba.ttl3.threadpool.agent.transformlet.internal.PriorityBlockingQueueTtlTransformlet;
import com.alibaba.ttl3.threadpool.agent.transformlet.internal.TimerTaskTtlTransformlet;
import com.alibaba.ttl3.threadpool.DisableInheritableForkJoinWorkerThreadFactory;
import com.alibaba.ttl3.threadpool.DisableInheritableThreadFactory;
import com.alibaba.ttl3.threadpool.TtlExecutors;
package com.alibaba.ttl3.executor.agent;

import com.alibaba.ttl3.executor.agent.logging.Logger;
import com.alibaba.ttl3.executor.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.executor.agent.transformlet.internal.ForkJoinTtlTransformlet;
import com.alibaba.ttl3.executor.agent.transformlet.internal.JdkExecutorTtlTransformlet;
import com.alibaba.ttl3.executor.agent.transformlet.internal.PriorityBlockingQueueTtlTransformlet;
import com.alibaba.ttl3.executor.agent.transformlet.internal.TimerTaskTtlTransformlet;
import com.alibaba.ttl3.executor.DisableInheritableForkJoinWorkerThreadFactory;
import com.alibaba.ttl3.executor.DisableInheritableThreadFactory;
import com.alibaba.ttl3.executor.TtlExecutors;
import edu.umd.cs.findbugs.annotations.NonNull;

import java.lang.instrument.ClassFileTransformer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.alibaba.ttl3.threadpool.agent;
package com.alibaba.ttl3.executor.agent;

import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.alibaba.ttl3.threadpool.agent;
package com.alibaba.ttl3.executor.agent;

import com.alibaba.ttl3.threadpool.agent.logging.Logger;
import com.alibaba.ttl3.threadpool.agent.transformlet.ClassInfo;
import com.alibaba.ttl3.threadpool.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.executor.agent.logging.Logger;
import com.alibaba.ttl3.executor.agent.transformlet.ClassInfo;
import com.alibaba.ttl3.executor.agent.transformlet.TtlTransformlet;
import edu.umd.cs.findbugs.annotations.NonNull;
import javassist.CannotCompileException;
import javassist.NotFoundException;
Expand All @@ -15,7 +15,7 @@
import java.net.URL;
import java.util.*;

import static com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper.getLocationUrlOfClass;
import static com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper.getLocationUrlOfClass;
import static java.nio.charset.StandardCharsets.UTF_8;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.alibaba.ttl3.threadpool.agent;
package com.alibaba.ttl3.executor.agent;

import com.alibaba.ttl3.threadpool.agent.logging.Logger;
import com.alibaba.ttl3.threadpool.agent.transformlet.ClassInfo;
import com.alibaba.ttl3.threadpool.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.executor.agent.logging.Logger;
import com.alibaba.ttl3.executor.agent.transformlet.ClassInfo;
import com.alibaba.ttl3.executor.agent.transformlet.TtlTransformlet;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
Expand All @@ -12,7 +12,7 @@
import java.util.ArrayList;
import java.util.List;

import static com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper.isClassUnderPackage;
import static com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper.isClassUnderPackage;

/**
* TTL {@link ClassFileTransformer} of Java Agent
Expand All @@ -29,7 +29,7 @@ public class TtlTransformer implements ClassFileTransformer {
* see {@code @return} of {@link ClassFileTransformer#transform(ClassLoader, String, Class, ProtectionDomain, byte[])}
*/
@SuppressFBWarnings({"EI_EXPOSE_REP"})
// [ERROR] com.alibaba.ttl3.threadpool.agent.TtlTransformer.transform(ClassLoader, String, Class, ProtectionDomain, byte[])
// [ERROR] com.alibaba.ttl3.executor.agent.TtlTransformer.transform(ClassLoader, String, Class, ProtectionDomain, byte[])
// may expose internal representation by returning TtlTransformer.NO_TRANSFORM
// the value is null, so there is NO "EI_EXPOSE_REP" problem actually.
private static final byte[] NO_TRANSFORM = null;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.alibaba.ttl3.threadpool.agent.logging;
package com.alibaba.ttl3.executor.agent.logging;

import com.alibaba.ttl3.threadpool.agent.TtlAgent;
import com.alibaba.ttl3.threadpool.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.executor.agent.TtlAgent;
import com.alibaba.ttl3.executor.agent.transformlet.TtlTransformlet;

import java.text.SimpleDateFormat;
import java.util.Date;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
* TTL Agent Logger. <b>Only</b> use for TTL agent/transformlet.
*
* @author Jerry Lee (oldratlee at gmail dot com)
* @see com.alibaba.ttl3.threadpool.agent.logging.Logger
* @see com.alibaba.ttl3.executor.agent.logging.Logger
*/
package com.alibaba.ttl3.threadpool.agent.logging;
package com.alibaba.ttl3.executor.agent.logging;
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* TTL Agent.
*
* @author Jerry Lee (oldratlee at gmail dot com)
* @see com.alibaba.ttl3.threadpool.agent.TtlAgent
* @see com.alibaba.ttl3.executor.agent.TtlAgent
* @see <a href="https://docs.oracle.com/javase/10/docs/api/java/lang/instrument/package-summary.html">The mechanism for instrumentation</a>
*/
package com.alibaba.ttl3.threadpool.agent;
package com.alibaba.ttl3.executor.agent;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.alibaba.ttl3.threadpool.agent.transformlet;
package com.alibaba.ttl3.executor.agent.transformlet;

import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
Expand All @@ -11,7 +11,7 @@
import java.io.IOException;
import java.net.URL;

import static com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper.getLocationUrlOfClass;
import static com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper.getLocationUrlOfClass;

/**
* Class Info for {@link TtlTransformlet}.
Expand All @@ -28,7 +28,7 @@ public class ClassInfo {
private final ClassLoader loader;

// SuppressFBWarnings for classFileBuffer/loader parameter:
// [ERROR] new com.alibaba.ttl3.threadpool.agent.transformlet.ClassInfo(String, byte[], ClassLoader)
// [ERROR] new com.alibaba.ttl3.executor.agent.transformlet.ClassInfo(String, byte[], ClassLoader)
// may expose internal representation by storing an externally mutable object
// into ClassInfo.classFileBuffer/loader
public ClassInfo(@NonNull String transformerClassFile,
Expand All @@ -53,9 +53,9 @@ public URL getLocationUrl() throws IOException {

@NonNull
@SuppressFBWarnings({"EI_EXPOSE_REP"})
// [ERROR] Medium: com.alibaba.ttl3.threadpool.agent.transformlet.ClassInfo.getCtClass()
// [ERROR] Medium: com.alibaba.ttl3.executor.agent.transformlet.ClassInfo.getCtClass()
// may expose internal representation
// by returning ClassInfo.ctClass [com.alibaba.ttl3.threadpool.agent.transformlet.ClassInfo]
// by returning ClassInfo.ctClass [com.alibaba.ttl3.executor.agent.transformlet.ClassInfo]
public CtClass getCtClass() throws IOException {
if (ctClass != null) return ctClass;

Expand Down Expand Up @@ -84,9 +84,9 @@ public void setModified() {
}

@SuppressFBWarnings({"EI_EXPOSE_REP"})
// [ERROR] Medium: com.alibaba.ttl3.threadpool.agent.transformlet.ClassInfo.getClassLoader()
// [ERROR] Medium: com.alibaba.ttl3.executor.agent.transformlet.ClassInfo.getClassLoader()
// may expose internal representation
// by returning ClassInfo.loader [com.alibaba.ttl3.threadpool.agent.transformlet.ClassInfo]
// by returning ClassInfo.loader [com.alibaba.ttl3.executor.agent.transformlet.ClassInfo]
public ClassLoader getClassLoader() {
return loader;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.alibaba.ttl3.threadpool.agent.transformlet;
package com.alibaba.ttl3.executor.agent.transformlet;

import com.alibaba.ttl3.threadpool.agent.TtlTransformer;
import com.alibaba.ttl3.executor.agent.TtlTransformer;
import edu.umd.cs.findbugs.annotations.NonNull;
import javassist.CannotCompileException;
import javassist.NotFoundException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.alibaba.ttl3.threadpool.agent.transformlet.helper;
package com.alibaba.ttl3.executor.agent.transformlet.helper;

import com.alibaba.ttl3.threadpool.agent.logging.Logger;
import com.alibaba.ttl3.threadpool.agent.transformlet.ClassInfo;
import com.alibaba.ttl3.threadpool.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.executor.agent.logging.Logger;
import com.alibaba.ttl3.executor.agent.transformlet.ClassInfo;
import com.alibaba.ttl3.executor.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.spi.TtlAttachmentsDelegate;
import com.alibaba.ttl3.threadpool.agent.transformlet.internal.PriorityBlockingQueueTtlTransformlet;
import com.alibaba.ttl3.executor.agent.transformlet.internal.PriorityBlockingQueueTtlTransformlet;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import javassist.*;
Expand All @@ -17,8 +17,8 @@
import java.util.Set;
import java.util.concurrent.Callable;

import static com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper.isClassAtPackageJavaUtil;
import static com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper.signatureOfMethod;
import static com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper.isClassAtPackageJavaUtil;
import static com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper.signatureOfMethod;

/**
* Abstract {@link TtlTransformlet} for {@link java.util.concurrent.Executor} and its subclass.
Expand Down Expand Up @@ -105,7 +105,7 @@ private void updateSubmitMethodsOfExecutorClass_decorateToTtlWrapperAndSetAutoWr
if (paramTypeNameToDecorateMethodClass.containsKey(paramTypeName)) {
String code = String.format(
// auto decorate to TTL wrapper
"$%d = com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper.doAutoWrap($%<d);",
"$%d = com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper.doAutoWrap($%<d);",
i + 1);
logger.info("insert code before method " + signatureOfMethod(method) + " of class " + method.getDeclaringClass().getName() + ":\n" + code);
insertCode.append(code);
Expand All @@ -119,7 +119,7 @@ private void updateSubmitMethodsOfExecutorClass_decorateToTtlWrapperAndSetAutoWr
}

/**
* @see com.alibaba.ttl3.threadpool.TtlExecutors#getDisableInheritableThreadFactory(java.util.concurrent.ThreadFactory)
* @see com.alibaba.ttl3.executor.TtlExecutors#getDisableInheritableThreadFactory(java.util.concurrent.ThreadFactory)
*/
private void updateConstructorDisableInheritable(@NonNull final CtClass clazz) throws NotFoundException, CannotCompileException {
for (CtConstructor constructor : clazz.getDeclaredConstructors()) {
Expand All @@ -128,7 +128,7 @@ private void updateConstructorDisableInheritable(@NonNull final CtClass clazz) t
for (int i = 0; i < parameterTypes.length; i++) {
final String paramTypeName = parameterTypes[i].getName();
if (THREAD_FACTORY_CLASS_NAME.equals(paramTypeName)) {
String code = String.format("$%d = com.alibaba.ttl3.threadpool.TtlExecutors.getDisableInheritableThreadFactory($%<d);", i + 1);
String code = String.format("$%d = com.alibaba.ttl3.executor.TtlExecutors.getDisableInheritableThreadFactory($%<d);", i + 1);
insertCode.append(code);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.alibaba.ttl3.threadpool.agent.transformlet.helper;
package com.alibaba.ttl3.executor.agent.transformlet.helper;

import com.alibaba.ttl3.TtlCallable;
import com.alibaba.ttl3.TtlRunnable;
import com.alibaba.ttl3.spi.TtlEnhanced;
import com.alibaba.ttl3.threadpool.agent.logging.Logger;
import com.alibaba.ttl3.threadpool.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.executor.agent.logging.Logger;
import com.alibaba.ttl3.executor.agent.transformlet.TtlTransformlet;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import javassist.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Helper API for TTL Agent extension {@code Transformlet} development.
*
* @author Jerry Lee (oldratlee at gmail dot com)
* @see com.alibaba.ttl3.executor.agent.transformlet.TtlTransformlet
*/
package com.alibaba.ttl3.executor.agent.transformlet.helper;
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package com.alibaba.ttl3.threadpool.agent.transformlet.internal;
package com.alibaba.ttl3.executor.agent.transformlet.internal;

import com.alibaba.ttl3.spi.TtlEnhanced;
import com.alibaba.ttl3.threadpool.agent.TtlAgent;
import com.alibaba.ttl3.threadpool.agent.logging.Logger;
import com.alibaba.ttl3.threadpool.agent.transformlet.ClassInfo;
import com.alibaba.ttl3.threadpool.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper;
import com.alibaba.ttl3.executor.agent.TtlAgent;
import com.alibaba.ttl3.executor.agent.logging.Logger;
import com.alibaba.ttl3.executor.agent.transformlet.ClassInfo;
import com.alibaba.ttl3.executor.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper;
import edu.umd.cs.findbugs.annotations.NonNull;
import javassist.*;

import java.io.IOException;

import static com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper.*;
import static com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper.*;

/**
* {@link TtlTransformlet} for {@link java.util.concurrent.ForkJoinTask}.
Expand Down Expand Up @@ -54,7 +54,7 @@ private void updateForkJoinTaskClass(@NonNull final CtClass clazz) throws Cannot
// add new field
final String capturedFieldName = "captured$field$added$by$ttl";
final CtField capturedField = CtField.make("private final Object " + capturedFieldName + ";", clazz);
clazz.addField(capturedField, "com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper.doCaptureIfNotTtlEnhanced(this);");
clazz.addField(capturedField, "com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper.doCaptureIfNotTtlEnhanced(this);");
logger.info("add new field " + capturedFieldName + " to class " + className);

final CtMethod doExecMethod = clazz.getDeclaredMethod("doExec", new CtClass[0]);
Expand All @@ -78,7 +78,7 @@ private void updateConstructorDisableInheritable(@NonNull final CtClass clazz) t
for (int i = 0; i < parameterTypes.length; i++) {
final String paramTypeName = parameterTypes[i].getName();
if (FORK_JOIN_WORKER_THREAD_FACTORY_CLASS_NAME.equals(paramTypeName)) {
String code = String.format("$%d = com.alibaba.ttl3.threadpool.TtlForkJoinPoolHelper.getDisableInheritableForkJoinWorkerThreadFactory($%<d);", i + 1);
String code = String.format("$%d = com.alibaba.ttl3.executor.TtlForkJoinPoolHelper.getDisableInheritableForkJoinWorkerThreadFactory($%<d);", i + 1);
insertCode.append(code);
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.alibaba.ttl3.threadpool.agent.transformlet.internal;
package com.alibaba.ttl3.executor.agent.transformlet.internal;

import com.alibaba.ttl3.threadpool.agent.TtlAgent;
import com.alibaba.ttl3.threadpool.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.threadpool.agent.transformlet.helper.AbstractExecutorTtlTransformlet;
import com.alibaba.ttl3.executor.agent.TtlAgent;
import com.alibaba.ttl3.executor.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.executor.agent.transformlet.helper.AbstractExecutorTtlTransformlet;

import java.util.HashSet;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.alibaba.ttl3.threadpool.agent.transformlet.internal;
package com.alibaba.ttl3.executor.agent.transformlet.internal;

import com.alibaba.ttl3.threadpool.TtlExecutors;
import com.alibaba.ttl3.threadpool.agent.logging.Logger;
import com.alibaba.ttl3.threadpool.agent.transformlet.ClassInfo;
import com.alibaba.ttl3.threadpool.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.executor.TtlExecutors;
import com.alibaba.ttl3.executor.agent.logging.Logger;
import com.alibaba.ttl3.executor.agent.transformlet.ClassInfo;
import com.alibaba.ttl3.executor.agent.transformlet.TtlTransformlet;
import edu.umd.cs.findbugs.annotations.NonNull;
import javassist.CannotCompileException;
import javassist.CtClass;
Expand All @@ -13,7 +13,7 @@
import java.io.IOException;
import java.util.Comparator;

import static com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper.signatureOfMethod;
import static com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper.signatureOfMethod;

/**
* TTL {@link TtlTransformlet} for {@link java.util.concurrent.PriorityBlockingQueue PriorityBlockingQueue}.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.alibaba.ttl3.threadpool.agent.transformlet.internal;
package com.alibaba.ttl3.executor.agent.transformlet.internal;

import com.alibaba.ttl3.threadpool.agent.logging.Logger;
import com.alibaba.ttl3.threadpool.agent.transformlet.ClassInfo;
import com.alibaba.ttl3.threadpool.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper;
import com.alibaba.ttl3.executor.agent.logging.Logger;
import com.alibaba.ttl3.executor.agent.transformlet.ClassInfo;
import com.alibaba.ttl3.executor.agent.transformlet.TtlTransformlet;
import com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper;
import edu.umd.cs.findbugs.annotations.NonNull;
import javassist.*;

import java.io.IOException;

import static com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper.*;
import static com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper.*;

/**
* {@link TtlTransformlet} for {@link java.util.TimerTask}.
Expand Down Expand Up @@ -63,7 +63,7 @@ private void updateTimerTaskClass(@NonNull final CtClass clazz) throws CannotCom
// add new field
final String capturedFieldName = "captured$field$added$by$ttl";
final CtField capturedField = CtField.make("private final Object " + capturedFieldName + ";", clazz);
clazz.addField(capturedField, "com.alibaba.ttl3.threadpool.agent.transformlet.helper.TtlTransformletHelper.doCaptureIfNotTtlEnhanced(this);");
clazz.addField(capturedField, "com.alibaba.ttl3.executor.agent.transformlet.helper.TtlTransformletHelper.doCaptureIfNotTtlEnhanced(this);");
logger.info("add new field " + capturedFieldName + " to class " + className);

final CtMethod runMethod = clazz.getDeclaredMethod(RUN_METHOD_NAME, new CtClass[0]);
Expand Down
Loading

0 comments on commit 72c6b69

Please sign in to comment.