Upstream/ProtocolLib
1
0
Fork 0
mirror of https://github.com/dmulloy2/ProtocolLib.git synced 2024-12-28 03:57:33 +01:00
Code Issues Projects Releases Wiki Activity

Renamed 'synchronizeMain' to 'notThreadSafe'.

Browse Source
This commit is contained in:
Kristian S. Stangeland 2012-11-21 01:42:59 +01:00
parent 0b200472f1
commit 858f9ee02d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ProtocolLib/src/main/java/com/comphenix/protocol/async/PacketSendingQueue.java
View File

@ -43,19 +43,19 @@ abstract class PacketSendingQueue {
// Asynchronous packet sending // Asynchronous packet sending
private Executor asynchronousSender; private Executor asynchronousSender;
// Whether or not packet transmission can only occur on the main thread // Whether or not packet transmission must occur on a specific thread
private final boolean synchronizeMain; private final boolean notThreadSafe;
// Whether or not we've run the cleanup procedure // Whether or not we've run the cleanup procedure
private boolean cleanedUp = false; private boolean cleanedUp = false;
/** /**
* Create a packet sending queue. * Create a packet sending queue.
* @param synchronizeMain - whether or not to synchronize with the main thread. * @param notThreadSafe - whether or not to synchronize with the main thread or a background thread.
*/ */
public PacketSendingQueue(boolean synchronizeMain, Executor asynchronousSender) { public PacketSendingQueue(boolean notThreadSafe, Executor asynchronousSender) {
this.sendingQueue = new PriorityBlockingQueue<PacketEventHolder>(INITIAL_CAPACITY); this.sendingQueue = new PriorityBlockingQueue<PacketEventHolder>(INITIAL_CAPACITY);
this.synchronizeMain = synchronizeMain; this.notThreadSafe = notThreadSafe;
this.asynchronousSender = asynchronousSender; this.asynchronousSender = asynchronousSender;
} }
@ -177,7 +177,7 @@ abstract class PacketSendingQueue {
} }
// Abort if we're not on the main thread // Abort if we're not on the main thread
if (synchronizeMain && !hasExpired) { if (notThreadSafe && !hasExpired) {
try { try {
boolean wantAsync = marker.isMinecraftAsync(current); boolean wantAsync = marker.isMinecraftAsync(current);
boolean wantSync = !wantAsync; boolean wantSync = !wantAsync;
@ -253,7 +253,7 @@ abstract class PacketSendingQueue {
* @return TRUE if it must, FALSE otherwise. * @return TRUE if it must, FALSE otherwise.
*/ */
public boolean isSynchronizeMain() { public boolean isSynchronizeMain() {
return synchronizeMain; return notThreadSafe;
} }
/** /**

2
ProtocolLib/src/main/java/com/comphenix/protocol/async/PlayerSendingHandler.java
View File

@ -44,7 +44,7 @@ class PlayerSendingHandler {
private PacketSendingQueue clientQueue; private PacketSendingQueue clientQueue;
public QueueContainer() { public QueueContainer() {
// Server packets are synchronized already // Server packets can be sent concurrently
serverQueue = new PacketSendingQueue(false, asynchronousSender) { serverQueue = new PacketSendingQueue(false, asynchronousSender) {
@Override @Override
protected void onPacketTimeout(PacketEvent event) { protected void onPacketTimeout(PacketEvent event) {