Multithreaded decoder improvements (java viewer)
diff --git a/java/com/tigervnc/rfb/DecodeManager.java b/java/com/tigervnc/rfb/DecodeManager.java
index 7e2aedf..c155746 100644
--- a/java/com/tigervnc/rfb/DecodeManager.java
+++ b/java/com/tigervnc/rfb/DecodeManager.java
@@ -43,7 +43,6 @@
producerCond = queueMutex.newCondition();
consumerCond = queueMutex.newCondition();
- //cpuCount = 1;
cpuCount = Runtime.getRuntime().availableProcessors();
if (cpuCount == 0) {
vlog.error("Unable to determine the number of CPU cores on this system");
@@ -151,12 +150,12 @@
bufferStream.length(), conn.cp,
entry.affectedRegion);
+ queueMutex.lock();
+
// The workers add buffers to the end so it's safe to assume
// the front is still the same buffer
freeBuffers.removeFirst();
- queueMutex.lock();
-
workQueue.addLast(entry);
// We only put a single entry on the queue so waking a single
@@ -249,6 +248,7 @@
public void run()
{
manager.queueMutex.lock();
+
while (!stopRequested) {
QueueEntry entry;
@@ -257,7 +257,7 @@
if (entry == null) {
// Wait and try again
try {
- manager.consumerCond.await();
+ manager.consumerCond.await();
} catch (InterruptedException e) { }
continue;
}
@@ -281,7 +281,7 @@
manager.queueMutex.lock();
// Remove the entry from the queue and give back the memory buffer
- manager.freeBuffers.add(entry.bufferStream);
+ manager.freeBuffers.addLast(entry.bufferStream);
manager.workQueue.remove(entry);
entry = null;
@@ -307,7 +307,7 @@
if (!manager.workQueue.peek().active)
return manager.workQueue.peek();
- for (iter = manager.workQueue.iterator(); iter.hasNext();) {
+ next:for (iter = manager.workQueue.iterator(); iter.hasNext();) {
QueueEntry entry;
Iterator<QueueEntry> iter2;
@@ -317,7 +317,7 @@
// Another thread working on this?
if (entry.active) {
lockedRegion.assign_union(entry.affectedRegion);
- continue;
+ continue next;
}
// If this is an ordered decoder then make sure this is the first
@@ -326,7 +326,7 @@
for (iter2 = manager.workQueue.iterator(); iter2.hasNext() && iter2 != iter;) {
if (entry.encoding == (iter2.next()).encoding) {
lockedRegion.assign_union(entry.affectedRegion);
- continue;
+ continue next;
}
}
}
@@ -346,14 +346,14 @@
entry2.bufferStream.length(),
entry.cp))
lockedRegion.assign_union(entry.affectedRegion);
- continue;
+ continue next;
}
}
// Check overlap with earlier rectangles
if (!lockedRegion.intersect(entry.affectedRegion).is_empty()) {
lockedRegion.assign_union(entry.affectedRegion);
- continue;
+ continue next;
}
return entry;
diff --git a/java/com/tigervnc/rfb/JpegDecompressor.java b/java/com/tigervnc/rfb/JpegDecompressor.java
index 3154294..23c6f65 100644
--- a/java/com/tigervnc/rfb/JpegDecompressor.java
+++ b/java/com/tigervnc/rfb/JpegDecompressor.java
@@ -39,11 +39,11 @@
ImageIO.setUseCache(false);
BufferedImage jpeg =
ImageIO.read(new MemoryCacheImageInputStream(new ByteArrayInputStream(src)));
+ jpeg.setAccelerationPriority(1);
BufferedImage image = (BufferedImage)pb.getImage();
Graphics2D g2 = image.createGraphics();
g2.drawImage(jpeg, r.tl.x, r.tl.y, r.width(), r.height(), null);
g2.dispose();
- image.flush();
jpeg.flush();
} catch (IOException e) {
throw new Exception(e.getMessage());
diff --git a/java/com/tigervnc/vncviewer/JavaPixelBuffer.java b/java/com/tigervnc/vncviewer/JavaPixelBuffer.java
index 89c42fe..16242d0 100644
--- a/java/com/tigervnc/vncviewer/JavaPixelBuffer.java
+++ b/java/com/tigervnc/vncviewer/JavaPixelBuffer.java
@@ -33,6 +33,7 @@
getPreferredPF().getColorModel().createCompatibleWritableRaster(w,h));
image = new BufferedImage(getPreferredPF().getColorModel(),
getBufferRW(new Rect(0, 0, w, h)), true, null);
+ image.setAccelerationPriority(1);
}
public synchronized void fillRect(Rect r, byte[] pix)