Browse Source

Update to next GL version (#4325)

Nathan Tippy 6 years ago
parent
commit
9993f751ab

+ 2 - 2
frameworks/Java/greenlightning/pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>com.ociweb.gl.benchmark</groupId>
 	<artifactId>benchmark-test</artifactId>
-	<version>1.0.23</version>
+	<version>1.0.24</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -14,7 +14,7 @@
 		<dependency>
 			<groupId>com.ociweb</groupId>
 			<artifactId>greenlightning</artifactId>
-			<version>1.0.23</version> <!-- must be a fixed version for techempower releases -->
+			<version>1.0.24</version> <!-- must be a fixed version for techempower releases -->
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>

+ 13 - 14
frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/FrameworkTest.java

@@ -40,7 +40,7 @@ public class FrameworkTest implements GreenApp {
     
     private int maxQueueOut;
     private int maxConnectionBits;
-    private int requestBlockSize;
+    private int maxRequestSize;
     
     private int connectionsPerTrack;
     private int connectionPort;
@@ -58,10 +58,10 @@ public class FrameworkTest implements GreenApp {
     	
     	//this server works best with  -XX:+UseNUMA    	
     	this(System.getProperty("host","0.0.0.0"), 
-    		 8080,    //default port for test 
-    		 7,       //default concurrency per track
-    		 256,     //default max blocks from network, each contains multiple calls 
-    		 1<<22,   //default total size of network buffer used by blocks
+    		 8080,    	//default port for test 
+    		 7,       	//default concurrency per track
+    		 2*(1<<14), //request queue length 
+    		 1<<22,     //default total size of network buffer used by blocks
     		 Integer.parseInt(System.getProperty("telemetry.port", "-1")),
     		 "tfb-database", // jdbc:postgresql://tfb-database:5432/hello_world
     		 "hello_world",
@@ -80,7 +80,7 @@ public class FrameworkTest implements GreenApp {
     		             String dbUser,
     		             String dbPass) {
     	
-    	this.connectionsPerTrack = 4;
+    	this.connectionsPerTrack = 2;
     	this.connectionPort = 5432;
     	this.bindPort = port;
     	this.host = host;
@@ -88,19 +88,18 @@ public class FrameworkTest implements GreenApp {
     	this.queueLengthOfPendingRequests = queueLengthOfPendingRequests;
     	this.minMemoryOfInputPipes = minMemoryOfInputPipes;
     	this.telemetryPort = telemetryPort;
-    	this.pipelineBits = 16;//max concurrent in flight database requests 1<<pipelineBits
+    	this.pipelineBits = 15;//max concurrent in flight database requests 1<<pipelineBits
     	
-    	this.dbCallMaxResponseCount = 1<<6;
-    	this.jsonMaxResponseCount = 1<<16;
+    	this.dbCallMaxResponseCount = 1<<9;
+    	this.jsonMaxResponseCount = 3*(1<<14);
     	
     	this.dbCallMaxResponseSize = 20_000; //for 500 mult db call in JSON format
-    	this.jsonMaxResponseSize = 1<<9;
+    	this.jsonMaxResponseSize = 1<<8;
 
     	this.maxQueueOut = 256;
     	this.maxConnectionBits = 13;
-    	this.requestBlockSize = 1<<12;
-    	
-    	
+    	this.maxRequestSize = 1<<9;
+    	    	
     	if (!"127.0.0.1".equals(System.getProperty("host",null))) { 
     		    		
 	    	if (null!=dbHost) {
@@ -160,7 +159,7 @@ public class FrameworkTest implements GreenApp {
     			 .setConcurrentChannelsPerEncryptUnit(concurrentWritesPerChannel)
     			 
     			 .setMaxQueueIn(queueLengthOfPendingRequests)
-    			 .setMaxRequestSize(requestBlockSize)
+    			 .setMaxRequestSize(maxRequestSize)
     	
     			 .setMinimumInputPipeMemory(minMemoryOfInputPipes)
     			 .setMaxQueueOut(maxQueueOut)

+ 4 - 1
frameworks/Java/greenlightning/src/main/java/com/ociweb/gl/benchmark/SimpleRest.java

@@ -14,9 +14,12 @@ public class SimpleRest implements RestMethodListener {
 	private final HTTPResponseService responseService;
 	
 	public SimpleRest(GreenRuntime runtime, int maxResponseCount, int maxResponseSize) {
-		responseService = runtime.newCommandChannel().newHTTPResponseService(maxResponseCount, maxResponseSize);		
+		responseService = runtime
+				.newCommandChannel()
+				.newHTTPResponseService(maxResponseCount, maxResponseSize);		
 	}
 	
+
 	public boolean jsonRestRequest(HTTPRequestReader request) {
 	
 		//this check is to postpone the work if the network has become saturated