ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [48/50] [abbrv] ignite git commit: io test
Date Mon, 10 Oct 2016 14:57:53 GMT
io test


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6f20e2d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6f20e2d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6f20e2d

Branch: refs/heads/ignite-gg-8-io2-park
Commit: f6f20e2d8ff15083201e6b0a06739029210c100b
Parents: e0456f6
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Oct 7 13:46:03 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Oct 7 13:46:03 2016 +0300

----------------------------------------------------------------------
 .../internal/managers/communication/GridIoManager.java       | 2 +-
 .../org/apache/ignite/internal/util/nio/GridNioServer.java   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f6f20e2d/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index c79c7ab..7c8d313 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -975,7 +975,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         if (msg.topicOrdinal() == TOPIC_IO_TEST.ordinal()) {
             IgniteIoTestMessage msg0 = (IgniteIoTestMessage)msg.message();
 
-            if (msg0.processFromNioThread()) {
+            if (!msg0.request()) {
                 c.run();
 
                 return;

http://git-wip-us.apache.org/repos/asf/ignite/blob/f6f20e2d/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
index 9d60135..8006a2c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/GridNioServer.java
@@ -496,7 +496,7 @@ public class GridNioServer<T> {
                     throw new IgniteCheckedException(err);
             }
         }
-        else if (ses.worker.wakeup && !ses.procWrite.get() && ses.procWrite.compareAndSet(false,
true)) {
+        else if (!ses.procWrite.get() && ses.procWrite.compareAndSet(false, true))
{
             ses.worker.offer((SessionChangeRequest) fut);
 
             ses.wakeupCnt.increment();
@@ -1295,7 +1295,7 @@ public class GridNioServer<T> {
                     req = ses.pollFuture();
 
                     if (req == null && buf.position() == 0) {
-                        if (wakeup && ses.procWrite.get()) {
+                        if (ses.procWrite.get()) {
                             boolean set = ses.procWrite.compareAndSet(true, false);
 
                             assert set;
@@ -1410,7 +1410,7 @@ public class GridNioServer<T> {
         /** Worker index. */
         private final int idx;
 
-        public boolean wakeup;
+        public final boolean wakeup;
 
         /**
          * @param idx Index of this worker in server's array.
@@ -1924,7 +1924,7 @@ public class GridNioServer<T> {
                         ses.addMeta(e.getKey(), e.getValue());
                 }
 
-                SelectionKey key = sockCh.register(selector, wakeup ? SelectionKey.OP_READ
: SelectionKey.OP_READ | SelectionKey.OP_WRITE, ses);
+                SelectionKey key = sockCh.register(selector, SelectionKey.OP_READ, ses);
 
                 ses.key(key);
 


Mime
View raw message