Merge pull request #18 from shapeblue/nio-fix-cpu

Rohit Yadav · Rohit Yadav · commit f12254ef9262 · 2016-05-16T08:51:14.000+05:30
utils: Fix NioConnection aggressive usage
diff --git a/utils/pom.xml b/utils/pom.xml
@@ -178,6 +178,7 @@
           <excludes>
             <exclude>com/cloud/utils/testcase/*TestCase*</exclude>
             <exclude>com/cloud/utils/db/*Test*</exclude>
+            <exclude>com/cloud/utils/testcase/NioTest.java</exclude>
           </excludes>
         </configuration>
       </plugin>
diff --git a/utils/src/com/cloud/utils/nio/Link.java b/utils/src/com/cloud/utils/nio/Link.java
@@ -617,7 +617,7 @@ public static boolean doHandshake(final SocketChannel socketChannel, final SSLEn
                 case NEED_TASK:
                     Runnable task;
                     while ((task = sslEngine.getDelegatedTask()) != null) {
-                        new Thread(task).run();
+                        task.run();
                     }
                     break;
                 case FINISHED:
diff --git a/utils/src/com/cloud/utils/nio/NioConnection.java b/utils/src/com/cloud/utils/nio/NioConnection.java
@@ -170,8 +170,6 @@ public void run() {
                 processTodos();
             } catch (Throwable e) {
                 s_logger.warn("Caught an exception but continuing on.", e);
-            } finally {
-                _selector.wakeup();
             }
         }
         synchronized (_thread) {

Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ public static boolean doHandshake(final SocketChannel socketChannel, final SSLEn`
`617`	`617`	`case NEED_TASK:`
`618`	`618`	`Runnable task;`
`619`	`619`	`while ((task = sslEngine.getDelegatedTask()) != null) {`
`620`		`- new Thread(task).run();`
	`620`	`+ task.run();`
`621`	`621`	`}`
`622`	`622`	`break;`
`623`	`623`	`case FINISHED:`
Original file line number	Diff line number	Diff line change
`@@ -170,8 +170,6 @@ public void run() {`
`170`	`170`	`processTodos();`
`171`	`171`	`} catch (Throwable e) {`
`172`	`172`	`s_logger.warn("Caught an exception but continuing on.", e);`
`173`		`- } finally {`
`174`		`- _selector.wakeup();`
`175`	`173`	`}`
`176`	`174`	`}`
`177`	`175`	`synchronized (_thread) {`