Log memory usage when ingest pipelines start and complete

This commit is contained in:
adam-m 2013-03-13 14:48:41 -04:00
parent 41a1d32bdb
commit 66d74cf819
2 changed files with 9 additions and 1 deletions

View File

@ -28,6 +28,7 @@ import javax.swing.SwingWorker;
import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.progress.ProgressHandleFactory;
import org.openide.util.Cancellable; import org.openide.util.Cancellable;
import org.sleuthkit.autopsy.coreutils.PlatformUtil;
import org.sleuthkit.autopsy.coreutils.StopWatch; import org.sleuthkit.autopsy.coreutils.StopWatch;
import org.sleuthkit.autopsy.ingest.IngestManager.IngestModuleEvent; import org.sleuthkit.autopsy.ingest.IngestManager.IngestModuleEvent;
import org.sleuthkit.datamodel.Image; import org.sleuthkit.datamodel.Image;
@ -98,6 +99,7 @@ public class IngestImageThread extends SwingWorker<Void, Void> {
return Void.TYPE.newInstance(); return Void.TYPE.newInstance();
} }
logger.log(Level.INFO, "Starting module: " + module.getName()); logger.log(Level.INFO, "Starting module: " + module.getName());
logger.log(Level.INFO, PlatformUtil.getAllMemUsageInfo());
progress.setDisplayName(displayName); progress.setDisplayName(displayName);
logger.log(Level.INFO, "Initializing module: " + module.getName()); logger.log(Level.INFO, "Initializing module: " + module.getName());
@ -162,6 +164,7 @@ public class IngestImageThread extends SwingWorker<Void, Void> {
} }
}); });
logger.log(Level.INFO, "Done running module: " + module.getName()); logger.log(Level.INFO, "Done running module: " + module.getName());
logger.log(Level.INFO, PlatformUtil.getAllMemUsageInfo());
} }
} }
} }

View File

@ -37,6 +37,7 @@ import javax.swing.SwingWorker;
import org.netbeans.api.progress.ProgressHandle; import org.netbeans.api.progress.ProgressHandle;
import org.netbeans.api.progress.ProgressHandleFactory; import org.netbeans.api.progress.ProgressHandleFactory;
import org.openide.util.Cancellable; import org.openide.util.Cancellable;
import org.sleuthkit.autopsy.coreutils.PlatformUtil;
import org.sleuthkit.autopsy.coreutils.StopWatch; import org.sleuthkit.autopsy.coreutils.StopWatch;
import org.sleuthkit.autopsy.ingest.IngestMessage.MessageType; import org.sleuthkit.autopsy.ingest.IngestMessage.MessageType;
import org.sleuthkit.autopsy.ingest.IngestScheduler.FileScheduler.ProcessTask; import org.sleuthkit.autopsy.ingest.IngestScheduler.FileScheduler.ProcessTask;
@ -828,7 +829,9 @@ public class IngestManager {
@Override @Override
protected Object doInBackground() throws Exception { protected Object doInBackground() throws Exception {
logger.log(Level.INFO, "Starting background processing"); logger.log(Level.INFO, "Starting background ingest file processor");
logger.log(Level.INFO, PlatformUtil.getAllMemUsageInfo());
stats.start(); stats.start();
//notify main thread modules started //notify main thread modules started
@ -926,6 +929,8 @@ public class IngestManager {
} }
} }
logger.log(Level.INFO, PlatformUtil.getAllMemUsageInfo());
} catch (CancellationException e) { } catch (CancellationException e) {
//task was cancelled //task was cancelled
handleInterruption(); handleInterruption();