Browse Source

* [ci fw-only Java/firenio] update to 1.1.0, try nodelay (#4675)

Kai Wang 6 years ago
parent
commit
cfee55a70e

+ 2 - 1
frameworks/Java/firenio/firenio-http-lite.dockerfile

@@ -19,6 +19,7 @@ CMD java                       \
     -Dlevel=1                  \
     -Dread=false               \
     -Depoll=true               \
-    -Dnodelay=false            \
+    -Dnodelay=true             \
+    -Dcachedurl=false          \
     -DunsafeBuf=true           \
     -jar /firenio/target/firenio-example-0.1-jar-with-dependencies.jar

+ 2 - 1
frameworks/Java/firenio/firenio.dockerfile

@@ -19,6 +19,7 @@ CMD java                       \
     -Dlevel=1                  \
     -Dread=false               \
     -Depoll=true               \
-    -Dnodelay=false            \
+    -Dnodelay=true             \
+    -Dcachedurl=false          \
     -DunsafeBuf=true           \
     -jar /firenio/target/firenio-example-0.1-jar-with-dependencies.jar

+ 1 - 1
frameworks/Java/firenio/pom.xml

@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.firenio</groupId>
             <artifactId>firenio-all</artifactId>
-            <version>1.0.0</version>
+            <version>1.1.0</version>
         </dependency>
 
         <dependency>

+ 10 - 3
frameworks/Java/firenio/src/main/java/hello/TestHttpLoadServer.java

@@ -51,6 +51,7 @@ public class TestHttpLoadServer {
         boolean direct    = Util.getBooleanProperty("direct");
         boolean inline    = Util.getBooleanProperty("inline");
         boolean nodelay   = Util.getBooleanProperty("nodelay");
+        boolean cachedurl = Util.getBooleanProperty("cachedurl");
         boolean unsafeBuf = Util.getBooleanProperty("unsafeBuf");
         int     core      = Util.getIntProperty("core", 1);
         int     frame     = Util.getIntProperty("frame", 16);
@@ -67,12 +68,15 @@ public class TestHttpLoadServer {
         DebugUtil.info("read: {}", read);
         DebugUtil.info("pool: {}", pool);
         DebugUtil.info("core: {}", core);
+        DebugUtil.info("epoll: {}", epoll);
         DebugUtil.info("frame: {}", frame);
         DebugUtil.info("level: {}", level);
         DebugUtil.info("direct: {}", direct);
         DebugUtil.info("inline: {}", inline);
         DebugUtil.info("readBuf: {}", readBuf);
         DebugUtil.info("nodelay: {}", nodelay);
+        DebugUtil.info("cachedurl: {}", cachedurl);
+        DebugUtil.info("unsafeBuf: {}", unsafeBuf);
 
         IoEventHandle eventHandle = new IoEventHandle() {
 
@@ -108,9 +112,6 @@ public class TestHttpLoadServer {
             pool_cap = 1024 * 8;
             pool_unit = 256 * 16;
         }
-        ByteTree<String> cachedUrls = new ByteTree<>();
-        cachedUrls.add("/plaintext");
-        cachedUrls.add("/json");
         HttpDateUtil.start();
         NioEventLoopGroup group   = new NioEventLoopGroup();
         ChannelAcceptor   context = new ChannelAcceptor(group, 8080);
@@ -133,6 +134,12 @@ public class TestHttpLoadServer {
                 }
             });
         }
+        ByteTree cachedUrls = null;
+        if (cachedurl){
+            cachedUrls = new ByteTree();
+            cachedUrls.add("/plaintext");
+            cachedUrls.add("/json");
+        }
         context.addProtocolCodec(new HttpCodec("firenio", fcache, lite, inline, cachedUrls));
         context.setIoEventHandle(eventHandle);
         context.bind();