Skip to content

Stop spawning new threads #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Stop spawning new threads #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 36 additions & 33 deletions src/main/java/org/usb4java/javax/AbstractIrpQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ public void run()
this.processor.setDaemon(true);
this.processor.setName("usb4java IRP Queue Processor");
this.processor.start();
} else {
synchronized(processor) {
processor.notify();
}
}
}

Expand All @@ -87,39 +91,35 @@ final void process()
// Get the next IRP
T irp = this.irps.poll();

// If there are no IRPs to process then mark the thread as closing
// right away. Otherwise process the IRP (and more IRPs from the queue
// if present).
if (irp == null)
while (irp != null)
{
this.processor = null;
}
else
{
while (irp != null)
// Process the IRP
try
{
// Process the IRP
try
{
processIrp(irp);
}
catch (final UsbException e)
{
irp.setUsbException(e);
}

// Get next IRP and mark the thread as closing before sending
// the events for the previous IRP
final T nextIrp = this.irps.poll();
if (nextIrp == null) this.processor = null;

// Finish the previous IRP
irp.complete();
finishIrp(irp);

// Process next IRP (if present)
irp = nextIrp;
processIrp(irp);
}
catch (final UsbException e)
{
irp.setUsbException(e);
}

// Finish the IRP
irp.complete();
finishIrp(irp);

// Check if there are more Irps, if not, wait for more.
if (this.irps.peek() == null) {
synchronized (processor) {
try {
processor.wait();
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}

// Get the next Irp
irp = this.irps.poll();
}

// No more IRPs are present in the queue so terminate the thread.
Expand Down Expand Up @@ -151,7 +151,7 @@ final void process()
/**
* Aborts all queued IRPs. The IRP which is currently processed can't be
* aborted. This method returns as soon as no more IRPs are in the queue and
* no more are processed.
* no more are processed. Also kills the processor thread.
*/
public final void abort()
{
Expand All @@ -163,7 +163,10 @@ public final void abort()
{
synchronized (this.irps)
{
if (isBusy()) this.irps.wait();
if (isBusy()) {
this.irps.wait();
this.processor.notify();
}
}
}
catch (final InterruptedException e)
Expand All @@ -182,7 +185,7 @@ public final void abort()
*/
public final boolean isBusy()
{
return !this.irps.isEmpty() || this.processor != null;
return !this.irps.isEmpty() || (this.processor != null && this.processor.isAlive());
}

/**
Expand Down