mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-12 07:56:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a util timer set as a daemon, not a swing timer.

Browse Source
This commit is contained in:
Samuel H. Kenyon 2014-04-04 14:59:05 -04:00
parent 92f12e8ce0
commit 341fbfc94e
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SearchRunner.java
View File

@ -19,8 +19,6 @@
package org.sleuthkit.autopsy.keywordsearch; package org.sleuthkit.autopsy.keywordsearch;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
@ -29,12 +27,12 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicLong;
import java.util.logging.Level; import java.util.logging.Level;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.SwingWorker; import javax.swing.SwingWorker;
import javax.swing.Timer; import java.util.Timer;
import java.util.TimerTask;
import org.netbeans.api.progress.aggregate.AggregateProgressFactory; import org.netbeans.api.progress.aggregate.AggregateProgressFactory;
import org.netbeans.api.progress.aggregate.AggregateProgressHandle; import org.netbeans.api.progress.aggregate.AggregateProgressHandle;
import org.netbeans.api.progress.aggregate.ProgressContributor; import org.netbeans.api.progress.aggregate.ProgressContributor;
@ -57,11 +55,11 @@ import org.sleuthkit.datamodel.BlackboardAttribute;
*/ */
public final class SearchRunner { public final class SearchRunner {
private static final Logger logger = Logger.getLogger(SearchRunner.class.getName()); private static final Logger logger = Logger.getLogger(SearchRunner.class.getName());
private AtomicInteger messageID = new AtomicInteger(0);
private static SearchRunner instance = null; private static SearchRunner instance = null;
private IngestServices services = IngestServices.getInstance(); private IngestServices services = IngestServices.getInstance();
private Ingester ingester = null; //guarded by "this" private Ingester ingester = null; //guarded by "this"
private boolean initialized = false; private boolean initialized = false;
private volatile boolean updateTimerRunning = false;
private Timer updateTimer; private Timer updateTimer;
private Map<Long, SearchJobInfo> jobs = new HashMap<>(); //guarded by "this" private Map<Long, SearchJobInfo> jobs = new HashMap<>(); //guarded by "this"
private static final Object finalSearchLock = new Object(); //used for a condition wait private static final Object finalSearchLock = new Object(); //used for a condition wait
@ -69,8 +67,7 @@ public final class SearchRunner {
SearchRunner() { SearchRunner() {
ingester = Server.getIngester(); ingester = Server.getIngester();
final int updateIntervalMs = KeywordSearchSettings.getUpdateFrequency().getTime() * 60 * 1000; updateTimer = new Timer(true); // run as a daemon
updateTimer = new Timer(updateIntervalMs, new SearchRunner.UpdateTimerAction());
initialized = true; initialized = true;
} }
@ -100,9 +97,12 @@ public final class SearchRunner {
jobs.get(jobId).incrementModuleReferenceCount(); jobs.get(jobId).incrementModuleReferenceCount();
if (jobs.size() > 0) { if (jobs.size() > 0) {
if (!updateTimer.isRunning()) { final int updateIntervalMs = KeywordSearchSettings.getUpdateFrequency().getTime() * 60 * 1000;
updateTimer.start(); if (!updateTimerRunning) {
logger.log(Level.INFO, "Scheduling update daemon");
updateTimer.scheduleAtFixedRate(new UpdateTimerTask(), updateIntervalMs, updateIntervalMs);
updateTimerRunning = true;
} }
} }
} }
@ -126,9 +126,9 @@ public final class SearchRunner {
jobs.remove(jobId); jobs.remove(jobId);
readyForFinalSearch = true; readyForFinalSearch = true;
} }
} }
if (readyForFinalSearch) { if (readyForFinalSearch) {
commit(); commit();
doFinalSearch(job); //this will block until it's done doFinalSearch(job); //this will block until it's done
} }
@ -146,8 +146,8 @@ public final class SearchRunner {
job = jobs.get(jobId); job = jobs.get(jobId);
if (job == null) { if (job == null) {
return; return;
} }
//stop currentSearcher //stop currentSearcher
SearchRunner.Searcher currentSearcher = job.getCurrentSearcher(); SearchRunner.Searcher currentSearcher = job.getCurrentSearcher();
if ((currentSearcher != null) && (!currentSearcher.isDone())) { if ((currentSearcher != null) && (!currentSearcher.isDone())) {
@ -178,7 +178,7 @@ public final class SearchRunner {
*/ */
private void commit() { private void commit() {
if (initialized) { if (initialized) {
logger.log(Level.INFO, "Commiting index"); logger.log(Level.INFO, "Committing index");
synchronized(this) { synchronized(this) {
ingester.commit(); ingester.commit();
} }
@ -200,12 +200,6 @@ public final class SearchRunner {
* @param job * @param job
*/ */
private void doFinalSearch(SearchJobInfo job) { private void doFinalSearch(SearchJobInfo job) {
// Cancel timer to ensure unwanted searchers do not start before we
// start the final one
if (updateTimer.isRunning()) {
updateTimer.stop();
}
// Run one last search as there are probably some new files committed // Run one last search as there are probably some new files committed
logger.log(Level.INFO, "Running final search for jobid {0}", job.getJobId()); logger.log(Level.INFO, "Running final search for jobid {0}", job.getJobId());
if (!job.getKeywordListNames().isEmpty()) { if (!job.getKeywordListNames().isEmpty()) {
@ -234,11 +228,17 @@ public final class SearchRunner {
/** /**
* Timer triggered re-search for each job (does a single index commit first) * Timer triggered re-search for each job (does a single index commit first)
*/ */
private class UpdateTimerAction implements ActionListener { private class UpdateTimerTask extends TimerTask {
private final Logger logger = Logger.getLogger(SearchRunner.UpdateTimerAction.class.getName()); private final Logger logger = Logger.getLogger(SearchRunner.UpdateTimerTask.class.getName());
@Override @Override
public void actionPerformed(ActionEvent e) { public void run() {
if (jobs.isEmpty()) {
this.cancel(); //terminate this timer task
updateTimerRunning = false;
return;
}
commit(); commit();
logger.log(Level.INFO, "Launching searchers"); logger.log(Level.INFO, "Launching searchers");