lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化Rest.createRestServlet减少preInit的耗时

Browse Source
This commit is contained in:
Redkale
2018-09-07 09:20:52 +08:00
parent 35b708b01d
commit b1b979c0b5
3 changed files with 136 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/org/redkale/net/http/HttpPrepareServlet.java
View File

@@ -380,7 +380,6 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
servlet._prefix = prefix.toString(); servlet._prefix = prefix.toString();
putServlet(servlet); putServlet(servlet);
} }
if (!(servlet instanceof WebSocketServlet)) servlet.preInit(null, conf); //WebSocketServlet初始化必须要有context
} }
/** /**

4
src/org/redkale/net/http/HttpServlet.java
View File

@@ -34,6 +34,8 @@ public class HttpServlet extends Servlet<HttpContext, HttpRequest, HttpResponse>
String _prefix = ""; //当前HttpServlet的path前缀 String _prefix = ""; //当前HttpServlet的path前缀
HashMap<String, InnerActionEntry> _tmpentrys; //Rest生成时赋值, 字段名Rest有用到
private Map.Entry<String, InnerActionEntry>[] mappings; //字段名Rest有用到 private Map.Entry<String, InnerActionEntry>[] mappings; //字段名Rest有用到
//这里不能直接使用HttpServlet，会造成死循环初始化HttpServlet //这里不能直接使用HttpServlet，会造成死循环初始化HttpServlet
@@ -88,7 +90,7 @@ public class HttpServlet extends Servlet<HttpContext, HttpRequest, HttpResponse>
String path = _prefix == null ? "" : _prefix; String path = _prefix == null ? "" : _prefix;
WebServlet ws = this.getClass().getAnnotation(WebServlet.class); WebServlet ws = this.getClass().getAnnotation(WebServlet.class);
if (ws != null && !ws.repair()) path = ""; if (ws != null && !ws.repair()) path = "";
HashMap<String, InnerActionEntry> map = loadActionEntry(); HashMap<String, InnerActionEntry> map = this._tmpentrys != null ? this._tmpentrys : loadActionEntry();
this.mappings = new Map.Entry[map.size()]; this.mappings = new Map.Entry[map.size()];
int i = -1; int i = -1;
for (Map.Entry<String, InnerActionEntry> en : map.entrySet()) { for (Map.Entry<String, InnerActionEntry> en : map.entrySet()) {

139
src/org/redkale/net/http/Rest.java
View File

@@ -702,7 +702,8 @@ public final class Rest {
final String retDesc = Type.getDescriptor(RetResult.class); final String retDesc = Type.getDescriptor(RetResult.class);
final String futureDesc = Type.getDescriptor(CompletableFuture.class); final String futureDesc = Type.getDescriptor(CompletableFuture.class);
final String flipperDesc = Type.getDescriptor(Flipper.class); final String flipperDesc = Type.getDescriptor(Flipper.class);
final String httprsDesc = Type.getDescriptor(HttpResult.class); final String httpServletName = HttpServlet.class.getName().replace('.', '/');
final String innerEntryName = HttpServlet.InnerActionEntry.class.getName().replace('.', '/');
final String attrDesc = Type.getDescriptor(org.redkale.util.Attribute.class); final String attrDesc = Type.getDescriptor(org.redkale.util.Attribute.class);
final String multiContextDesc = Type.getDescriptor(MultiContext.class); final String multiContextDesc = Type.getDescriptor(MultiContext.class);
final String multiContextName = MultiContext.class.getName().replace('.', '/'); final String multiContextName = MultiContext.class.getName().replace('.', '/');
@@ -802,9 +803,10 @@ public final class Rest {
} }
if (entrys.isEmpty()) return null; //没有可HttpMapping的方法 if (entrys.isEmpty()) return null; //没有可HttpMapping的方法
RestClassLoader newLoader = new RestClassLoader(loader);
final int moduleid = controller == null ? 0 : controller.moduleid();
{ //注入 @WebServlet 注解 { //注入 @WebServlet 注解
String urlpath = ""; String urlpath = "";
int moduleid = controller == null ? 0 : controller.moduleid();
boolean repair = controller == null ? true : controller.repair(); boolean repair = controller == null ? true : controller.repair();
String comment = controller == null ? "" : controller.comment(); String comment = controller == null ? "" : controller.comment();
av0 = cw.visitAnnotation(webServletDesc, true); av0 = cw.visitAnnotation(webServletDesc, true);
@@ -840,7 +842,13 @@ public final class Rest {
classMap.put("repair", repair); classMap.put("repair", repair);
//classMap.put("comment", comment); //不显示太多信息 //classMap.put("comment", comment); //不显示太多信息
} }
{ //内部类
cw.visitInnerClass(innerEntryName, httpServletName, HttpServlet.InnerActionEntry.class.getSimpleName(), ACC_PROTECTED + ACC_FINAL + ACC_STATIC);
for (final MappingEntry entry : entrys) {
cw.visitInnerClass(newDynName + "$" + entry.newActionClassName, newDynName, entry.newActionClassName, ACC_PRIVATE + ACC_STATIC);
}
}
{ //注入 @Resource private XXXService _service; { //注入 @Resource private XXXService _service;
fv = cw.visitField(ACC_PRIVATE, REST_SERVICE_FIELD_NAME, serviceDesc, null, null); fv = cw.visitField(ACC_PRIVATE, REST_SERVICE_FIELD_NAME, serviceDesc, null, null);
av0 = fv.visitAnnotation(resDesc, true); av0 = fv.visitAnnotation(resDesc, true);
@@ -908,7 +916,7 @@ public final class Rest {
restConverts.add(new Object[]{rcs, rcc}); restConverts.add(new Object[]{rcs, rcc});
} }
mv = new MethodDebugVisitor(cw.visitMethod(ACC_PUBLIC, entry.name.replace('/', '$').replace('.', '_'), "(" + reqDesc + respDesc + ")V", null, new String[]{"java/io/IOException"})); mv = new MethodDebugVisitor(cw.visitMethod(ACC_PUBLIC, entry.newMethodName, "(" + reqDesc + respDesc + ")V", null, new String[]{"java/io/IOException"}));
//mv.setDebug(true); //mv.setDebug(true);
mv.debugLine(); mv.debugLine();
@@ -1089,6 +1097,7 @@ public final class Rest {
mappingMap.put("comment", entry.comment); mappingMap.put("comment", entry.comment);
mappingMap.put("methods", entry.methods); mappingMap.put("methods", entry.methods);
mappingMap.put("result", grt == returnType ? returnType.getName() : String.valueOf(grt)); mappingMap.put("result", grt == returnType ? returnType.getName() : String.valueOf(grt));
entry.mappingurl = url;
} }
{ // 设置 Annotation { // 设置 Annotation
@@ -1742,8 +1751,99 @@ public final class Rest {
mv.visitMaxs(maxStack, maxLocals); mv.visitMaxs(maxStack, maxLocals);
mappingMap.put("params", paramMaps); mappingMap.put("params", paramMaps);
mappingMaps.add(mappingMap); mappingMaps.add(mappingMap);
{ //_Dync_XXX__HttpServlet.class
ClassWriter cw2 = new ClassWriter(COMPUTE_FRAMES);
cw2.visit(V1_8, ACC_SUPER, newDynName + "$" + entry.newActionClassName, null, httpServletName, null);
cw2.visitInnerClass(newDynName + "$" + entry.newActionClassName, newDynName, entry.newActionClassName, ACC_PRIVATE + ACC_STATIC);
{
fv = cw2.visitField(0, "servlet", "L" + newDynName + ";", null, null);
fv.visitEnd();
}
{
mv = new MethodDebugVisitor(cw2.visitMethod(0, "<init>", "(L" + newDynName + ";)V", null, null));
mv.visitVarInsn(ALOAD, 0);
mv.visitMethodInsn(INVOKESPECIAL, httpServletName, "<init>", "()V", false);
mv.visitVarInsn(ALOAD, 0);
mv.visitVarInsn(ALOAD, 1);
mv.visitFieldInsn(PUTFIELD, newDynName + "$" + entry.newActionClassName, "servlet", "L" + newDynName + ";");
mv.visitInsn(RETURN);
mv.visitMaxs(2, 2);
mv.visitEnd();
}
if (false) {
mv = new MethodDebugVisitor(cw2.visitMethod(ACC_SYNTHETIC, "<init>", "(L" + newDynName + ";L" + newDynName + "$" + entry.newActionClassName + ";)V", null, null));
mv.visitVarInsn(ALOAD, 0);
mv.visitVarInsn(ALOAD, 1);
mv.visitMethodInsn(INVOKESPECIAL, newDynName + "$" + entry.newActionClassName, "<init>", "L" + newDynName + ";", false);
mv.visitInsn(RETURN);
mv.visitMaxs(2, 3);
mv.visitEnd();
}
{
mv = new MethodDebugVisitor(cw2.visitMethod(ACC_PUBLIC, "execute", "(" + reqDesc + respDesc + ")V", null, new String[]{"java/io/IOException"}));
mv.visitVarInsn(ALOAD, 0);
mv.visitFieldInsn(GETFIELD, newDynName + "$" + entry.newActionClassName, "servlet", "L" + newDynName + ";");
mv.visitVarInsn(ALOAD, 1);
mv.visitVarInsn(ALOAD, 2);
mv.visitMethodInsn(INVOKEVIRTUAL, newDynName, entry.newMethodName, "(" + reqDesc + respDesc + ")V", false);
mv.visitInsn(RETURN);
mv.visitMaxs(3, 3);
mv.visitEnd();
}
cw2.visitEnd();
newLoader.addClass((newDynName + "$" + entry.newActionClassName).replace('/', '.'), cw2.toByteArray());
}
} // end for each } // end for each
// HashMap<String, InnerActionEntry> _createRestInnerActionEntry() {
// HashMap<String, InnerActionEntry> map = new HashMap<>();
// map.put("asyncfind3", new InnerActionEntry(100000,200000,"asyncfind3", new String[]{},null,false,0, new _Dync_asyncfind3_HttpServlet()));
// map.put("asyncfind3", new InnerActionEntry(1,2,"asyncfind2", new String[]{"GET", "POST"},null,true,0, new _Dync_asyncfind2_HttpServlet()));
// return map;
// }
{ //_createRestInnerActionEntry 方法
mv = new MethodDebugVisitor(cw.visitMethod(0, "_createRestInnerActionEntry", "()Ljava/util/HashMap;", "()Ljava/util/HashMap<Ljava/lang/String;L" + innerEntryName + ";>;", null));
//mv.setDebug(true);
mv.visitTypeInsn(NEW, "java/util/HashMap");
mv.visitInsn(DUP);
mv.visitMethodInsn(INVOKESPECIAL, "java/util/HashMap", "<init>", "()V", false);
mv.visitVarInsn(ASTORE, 1);
for (final MappingEntry entry : entrys) {
mv.visitVarInsn(ALOAD, 1);
mv.visitLdcInsn(entry.mappingurl); //name
mv.visitTypeInsn(NEW, innerEntryName); //new InnerActionEntry
mv.visitInsn(DUP);
pushInt(mv, moduleid); //moduleid
pushInt(mv, entry.actionid); //actionid
mv.visitLdcInsn(entry.mappingurl); //name
pushInt(mv, entry.methods.length); //methods
mv.visitTypeInsn(ANEWARRAY, "java/lang/String");
for (int i = 0; i < entry.methods.length; i++) {
mv.visitInsn(DUP);
pushInt(mv, i);
mv.visitLdcInsn(entry.methods[i]);
mv.visitInsn(AASTORE);
}
mv.visitInsn(ACONST_NULL); //method
mv.visitInsn(entry.auth ? ICONST_1 : ICONST_0); //auth
pushInt(mv, entry.cacheseconds); //cacheseconds
mv.visitTypeInsn(NEW, newDynName + "$" + entry.newActionClassName);
mv.visitInsn(DUP);
mv.visitVarInsn(ALOAD, 0);
mv.visitMethodInsn(INVOKESPECIAL, newDynName + "$" + entry.newActionClassName, "<init>", "(L" + newDynName + ";)V", false);
mv.visitMethodInsn(INVOKESPECIAL, innerEntryName, "<init>", "(IILjava/lang/String;[Ljava/lang/String;Ljava/lang/reflect/Method;ZILorg/redkale/net/http/HttpServlet;)V", false);
mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/HashMap", "put", "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", false);
mv.visitInsn(POP);
}
mv.visitVarInsn(ALOAD, 1);
mv.visitInsn(ARETURN);
mv.visitMaxs(2, 2);
mv.visitEnd();
}
for (Map.Entry<String, java.lang.reflect.Type> en : bodyTypes.entrySet()) { for (Map.Entry<String, java.lang.reflect.Type> en : bodyTypes.entrySet()) {
fv = cw.visitField(ACC_PRIVATE, en.getKey(), "Ljava/lang/reflect/Type;", null, null); fv = cw.visitField(ACC_PRIVATE, en.getKey(), "Ljava/lang/reflect/Type;", null, null);
fv.visitEnd(); fv.visitEnd();
@@ -1773,9 +1873,10 @@ public final class Rest {
} }
cw.visitEnd(); cw.visitEnd();
newLoader.addClass(newDynName.replace('/', '.'), cw.toByteArray());
Class<?> newClazz = new RestClassLoader(loader).loadClass(newDynName.replace('/', '.'), cw.toByteArray());
try { try {
Class<?> newClazz = newLoader.findClass(newDynName.replace('/', '.'));
T obj = ((Class<T>) newClazz).getDeclaredConstructor().newInstance(); T obj = ((Class<T>) newClazz).getDeclaredConstructor().newInstance();
for (Map.Entry<String, org.redkale.util.Attribute> en : restAttributes.entrySet()) { for (Map.Entry<String, org.redkale.util.Attribute> en : restAttributes.entrySet()) {
Field attrField = newClazz.getDeclaredField(en.getKey()); Field attrField = newClazz.getDeclaredField(en.getKey());
@@ -1805,8 +1906,13 @@ public final class Rest {
java.util.function.Supplier<String> sSupplier = () -> JsonConvert.root().convertTo(classMap); java.util.function.Supplier<String> sSupplier = () -> JsonConvert.root().convertTo(classMap);
tostringfield.set(obj, sSupplier); tostringfield.set(obj, sSupplier);
Method restactMethod = newClazz.getDeclaredMethod("_createRestInnerActionEntry");
restactMethod.setAccessible(true);
Field tmpentrysfield = HttpServlet.class.getDeclaredField("_tmpentrys");
tmpentrysfield.setAccessible(true);
tmpentrysfield.set(obj, restactMethod.invoke(obj));
return obj; return obj;
} catch (Exception e) { } catch (Throwable e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
@@ -1848,13 +1954,26 @@ public final class Rest {
private static class RestClassLoader extends ClassLoader { private static class RestClassLoader extends ClassLoader {
private Map<String, byte[]> classes = new HashMap<>();
public RestClassLoader(ClassLoader parent) { public RestClassLoader(ClassLoader parent) {
super(parent); super(parent);
} }
@Override
protected Class<?> findClass(String name) throws ClassNotFoundException {
byte[] classData = classes.get(name);
if (classData == null) return super.findClass(name);
return super.defineClass(name, classData, 0, classData.length);
}
public final Class<?> loadClass(String name, byte[] b) { public final Class<?> loadClass(String name, byte[] b) {
return defineClass(name, b, 0, b.length); return defineClass(name, b, 0, b.length);
} }
public final void addClass(String name, byte[] b) {
classes.put(name, b);
}
} }
private static class MappingEntry { private static class MappingEntry {
@@ -1896,6 +2015,8 @@ public final class Rest {
} }
} }
this.existsPound = pound; this.existsPound = pound;
this.newMethodName = this.name.replace('/', '$').replace('.', '_');
this.newActionClassName = "_Dyn_" + this.newMethodName + "_ActionHttpServlet";
} }
public final int methodidx; // _paramtypes 的下标，从0开始 public final int methodidx; // _paramtypes 的下标，从0开始
@@ -1904,6 +2025,10 @@ public final class Rest {
public final boolean ignore; public final boolean ignore;
public final String newMethodName;
public final String newActionClassName;
public final String name; public final String name;
public final String comment; public final String comment;
@@ -1918,6 +2043,8 @@ public final class Rest {
public final boolean existsPound; //是否包含#的参数 public final boolean existsPound; //是否包含#的参数
String mappingurl; //在生成方法时赋值， 供_createRestInnerActionEntry使用
@RestMapping() @RestMapping()
void mapping() { //用于获取Mapping 默认值 void mapping() { //用于获取Mapping 默认值
} }