Author: kpreisser
Date: Tue Oct 15 17:10:59 2013
New Revision: 1532441
URL: http://svn.apache.org/r1532441
Log:
Merged revision(s) 1532437 from tomcat/trunk:
- Do not use a extra Thread for the room as synchronizing access to the Room's
internals should suffice.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1532437
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java?rev=1532441&r1=1532440&r2=1532441&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java
Tue Oct 15 17:10:59 2013
@@ -72,7 +72,7 @@ public final class DrawboardEndpoint ext
session.addMessageHandler(stringHandler);
final Client client = new Client(session);
- room.invoke(new Runnable() {
+ room.invokeAndWait(new Runnable() {
@Override
public void run() {
try {
@@ -100,7 +100,7 @@ public final class DrawboardEndpoint ext
@Override
public void onClose(Session session, CloseReason closeReason) {
- room.invoke(new Runnable() {
+ room.invokeAndWait(new Runnable() {
@Override
public void run() {
try {
@@ -148,7 +148,7 @@ public final class DrawboardEndpoint ext
@Override
public void onMessage(final String message) {
// Invoke handling of the message in the room.
- room.invoke(new Runnable() {
+ room.invokeAndWait(new Runnable() {
@Override
public void run() {
try {
Modified:
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java?rev=1532441&r1=1532440&r2=1532441&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
(original)
+++
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java
Tue Oct 15 17:10:59 2013
@@ -27,10 +27,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
import javax.imageio.ImageIO;
@@ -41,10 +37,8 @@ import websocket.drawboard.wsmessages.St
* A Room represents a drawboard where a number of
* users participate.<br><br>
*
- * Each Room has its own "Room Thread" which manages all the actions
- * to be done in this Room. Instance methods should only be invoked
- * from this Room's thread by calling {@link #invoke(Runnable)} or
- * {@link #invokeAndWait(Runnable)}.
+ * Note: Instance methods should only be invoked by calling
+ * {@link #invokeAndWait(Runnable)} to ensure access is correctly synchronized.
*/
public final class Room {
@@ -90,6 +84,15 @@ public final class Room {
}
+ /**
+ * An object used to synchronize access to this Room.
+ */
+ private final Object syncObj = new Object();
+
+ /**
+ * Indicates if this room has already been shutdown.
+ */
+ private volatile boolean closed = false;
/**
* If <code>true</code>, outgoing DrawMessages will be buffered until the
@@ -99,13 +102,6 @@ public final class Room {
private static final boolean BUFFER_DRAW_MESSAGES = true;
/**
- * A single-threaded ExecutorService where tasks
- * are scheduled that are to be run in the Room Thread.
- */
- private final ExecutorService roomExecutor =
- Executors.newSingleThreadExecutor();
-
- /**
* A timer which sends buffered drawmessages to the client at once
* at a regular interval, to avoid sending a lot of very small
* messages which would cause TCP overhead and high CPU usage.
@@ -147,18 +143,12 @@ public final class Room {
drawmessageBroadcastTimer.schedule(new TimerTask() {
@Override
public void run() {
- try {
- invokeAndWait(new Runnable() {
- @Override
- public void run() {
- broadcastTimerTick();
- }
- });
- } catch (InterruptedException e) {
- // TODO
- } catch (ExecutionException e) {
- // TODO
- }
+ invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ broadcastTimerTick();
+ }
+ });
}
}, 30, 30);
}
@@ -304,34 +294,31 @@ public final class Room {
/**
- * Submits the given Runnable to the Room Executor.
- * @param task
- */
- public void invoke(Runnable task) {
- roomExecutor.submit(task);
- }
-
- /**
* Submits the given Runnable to the Room Executor and waits until it
- * has been executed.
+ * has been executed. Currently, this simply means that the Runnable
+ * will be run directly inside of a synchronized() block.
* @param task
- * @throws InterruptedException if the current thread was interrupted
- * while waiting
- * @throws ExecutionException if the computation threw an exception
- */
- public void invokeAndWait(Runnable task)
- throws InterruptedException, ExecutionException {
- Future<?> f = roomExecutor.submit(task);
- f.get();
+ */
+ public void invokeAndWait(Runnable task) {
+ synchronized (syncObj) {
+ if (!closed) {
+ task.run();
+ }
+ }
}
/**
* Shuts down the roomExecutor and the drawmessageBroadcastTimer.
*/
public void shutdown() {
- roomExecutor.shutdown();
- drawmessageBroadcastTimer.cancel();
- // TODO: Dispose of BufferedImage and Graphics2D
+ invokeAndWait(new Runnable() {
+ @Override
+ public void run() {
+ closed = true;
+ drawmessageBroadcastTimer.cancel();
+ roomGraphics.dispose();
+ }
+ });
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
