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

Browse Source
This commit is contained in:
Redkale
2021-01-19 17:40:08 +08:00
parent b83f6867f3
commit 7d1770da8a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/redkale/net/TcpNioAsyncConnection.java
View File

@@ -372,7 +372,7 @@ public class TcpNioAsyncConnection extends AsyncConnection {
public void doRead() { public void doRead() {
try { try {
final boolean invokeDirect = this.ioThread.inSameThread(); final boolean invokeDirect = this.ioThread.inCurrThread();
int totalCount = 0; int totalCount = 0;
boolean hasRemain = true; boolean hasRemain = true;
if (invokeDirect && this.readByteBuffer == null) { if (invokeDirect && this.readByteBuffer == null) {
@@ -439,7 +439,7 @@ public class TcpNioAsyncConnection extends AsyncConnection {
public void doWrite() { public void doWrite() {
try { try {
final boolean invokeDirect = this.ioThread.inSameThread(); final boolean invokeDirect = this.ioThread.inCurrThread();
int totalCount = 0; int totalCount = 0;
boolean hasRemain = true; boolean hasRemain = true;
while (invokeDirect && hasRemain) { while (invokeDirect && hasRemain) {

2
src/org/redkale/net/nio/NioThread.java
View File

@@ -84,7 +84,7 @@ public class NioThread extends Thread {
} }
} }
public boolean inSameThread() { public boolean inCurrThread() {
return this.localThread == Thread.currentThread(); return this.localThread == Thread.currentThread();
} }

2
src/org/redkale/net/nio/NioThreadGroup.java
View File

@@ -72,7 +72,7 @@ public class NioThreadGroup {
if (key.selector() != thread.selector) throw new RuntimeException("NioThread.selector not the same to SelectionKey.selector"); if (key.selector() != thread.selector) throw new RuntimeException("NioThread.selector not the same to SelectionKey.selector");
if ((key.interestOps() & opt) != 0) return; if ((key.interestOps() & opt) != 0) return;
key.interestOps(key.interestOps() | opt); key.interestOps(key.interestOps() | opt);
if (thread.inSameThread()) return; if (thread.inCurrThread()) return;
//非IO线程中 //非IO线程中
key.selector().wakeup(); key.selector().wakeup();
} }