andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use simple volatile read for SingleThreadEventExecutor#state instead of UNSAFE(AtomicIntegerFieldUpdater#get), CAS operation still to use AtomicIntegerFieldUpdater

Browse Source 
Motivation:

AtomicIntegerFieldUpdater#get is unnecessary, I think use simple volatile read is cleaner

Modifications:

Replace code STATE_UPDATER.get(this) to state in SingleThreadEventExecutor

Result:

Cleaner code
This commit is contained in:
jiachun.fjc 2017-05-07 23:56:32 +08:00 committed by Norman Maurer
parent cf26227c6c
commit cd80b6c2d8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/src/main/java/io/netty/util/concurrent/SingleThreadEventExecutor.java
View File

@ -466,7 +466,7 @@ public abstract class SingleThreadEventExecutor extends AbstractScheduledEventEx
} }
protected void wakeup(boolean inEventLoop) { protected void wakeup(boolean inEventLoop) {
if (!inEventLoop || STATE_UPDATER.get(this) == ST_SHUTTING_DOWN) { if (!inEventLoop || state == ST_SHUTTING_DOWN) {
// Use offer as we actually only need this to unblock the thread and if offer fails we do not care as there // Use offer as we actually only need this to unblock the thread and if offer fails we do not care as there
// is already something in the queue. // is already something in the queue.
taskQueue.offer(WAKEUP_TASK); taskQueue.offer(WAKEUP_TASK);
@ -560,7 +560,7 @@ public abstract class SingleThreadEventExecutor extends AbstractScheduledEventEx
} }
int newState; int newState;
wakeup = true; wakeup = true;
oldState = STATE_UPDATER.get(this); oldState = state;
if (inEventLoop) { if (inEventLoop) {
newState = ST_SHUTTING_DOWN; newState = ST_SHUTTING_DOWN;
} else { } else {
@ -613,7 +613,7 @@ public abstract class SingleThreadEventExecutor extends AbstractScheduledEventEx
} }
int newState; int newState;
wakeup = true; wakeup = true;
oldState = STATE_UPDATER.get(this); oldState = state;
if (inEventLoop) { if (inEventLoop) {
newState = ST_SHUTDOWN; newState = ST_SHUTDOWN;
} else { } else {
@ -644,17 +644,17 @@ public abstract class SingleThreadEventExecutor extends AbstractScheduledEventEx
@Override @Override
public boolean isShuttingDown() { public boolean isShuttingDown() {
return STATE_UPDATER.get(this) >= ST_SHUTTING_DOWN; return state >= ST_SHUTTING_DOWN;
} }
@Override @Override
public boolean isShutdown() { public boolean isShutdown() {
return STATE_UPDATER.get(this) >= ST_SHUTDOWN; return state >= ST_SHUTDOWN;
} }
@Override @Override
public boolean isTerminated() { public boolean isTerminated() {
return STATE_UPDATER.get(this) == ST_TERMINATED; return state == ST_TERMINATED;
} }
/** /**
@ -835,7 +835,7 @@ public abstract class SingleThreadEventExecutor extends AbstractScheduledEventEx
private static final long SCHEDULE_PURGE_INTERVAL = TimeUnit.SECONDS.toNanos(1); private static final long SCHEDULE_PURGE_INTERVAL = TimeUnit.SECONDS.toNanos(1);
private void startThread() { private void startThread() {
if (STATE_UPDATER.get(this) == ST_NOT_STARTED) { if (state == ST_NOT_STARTED) {
if (STATE_UPDATER.compareAndSet(this, ST_NOT_STARTED, ST_STARTED)) { if (STATE_UPDATER.compareAndSet(this, ST_NOT_STARTED, ST_STARTED)) {
doStartThread(); doStartThread();
} }
@ -861,7 +861,7 @@ public abstract class SingleThreadEventExecutor extends AbstractScheduledEventEx
logger.warn("Unexpected exception from an event executor: ", t); logger.warn("Unexpected exception from an event executor: ", t);
} finally { } finally {
for (;;) { for (;;) {
int oldState = STATE_UPDATER.get(SingleThreadEventExecutor.this); int oldState = state;
if (oldState >= ST_SHUTTING_DOWN || STATE_UPDATER.compareAndSet( if (oldState >= ST_SHUTTING_DOWN || STATE_UPDATER.compareAndSet(
SingleThreadEventExecutor.this, oldState, ST_SHUTTING_DOWN)) { SingleThreadEventExecutor.this, oldState, ST_SHUTTING_DOWN)) {
break; break;