xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1855 fix python threading in GFE procedures and smart tools" into omaha_13.3.1

Browse source 
Former-commit-id: 492587b91c [formerly b880af3c48] [formerly de856db77a] [formerly c82968c1e6 [formerly de856db77a [formerly 53ace4843058424627c3b670caa77972ddbe01be]]]
Former-commit-id: c82968c1e6
Former-commit-id: d6c6f95496edc22dcabb64db1fe0138d9b9dfabb [formerly 237e414b5d]
Former-commit-id: a633b96fdf
This commit is contained in:
Ron Anderson 2013-04-03 15:25:52 -05:00 • committed by Gerrit Code Review
commit 0acc778948
2 changed files with 38 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureJob.java
View file

@ -58,6 +58,8 @@ import com.raytheon.viz.gfe.jobs.AsyncProgressJob;
* Oct 8, 2009 njensen Initial creation
* Jan 8, 2013 1486 dgilling Support changes to BaseGfePyController.
* Jan 18, 2013 1509 njensen Garbage collect after running procedure
* Apr 03, 2013 1855 njensen Never dispose interpreters until shutdown and
* reuse interpreter if called from procedure
*
* </pre>
*
@ -69,12 +71,7 @@ public class ProcedureJob extends AbstractQueueJob<ProcedureRequest> {
/**
* Maximum number of jobs to keep for a given Data Manager.
*/
private final static int maxJobs = 3;
/**
* Amount of time to keep inactive jobs servers around.
*/
private final static long expireTime = 5L * 60L * 1000L;
private final static int maxJobs = 4;
/**
* Index of job with the queue. Will break code if not zero.
@ -121,14 +118,12 @@ public class ProcedureJob extends AbstractQueueJob<ProcedureRequest> {
*/
@Override
protected IStatus run(IProgressMonitor monitor) {
long starTime = System.currentTimeMillis();
boolean expireJob = instanceMap.get(dataMgr).get(QUEUE_JOB_INDEX) != this;
try {
python = ProcedureFactory.buildController(dataMgr);
} catch (JepException e) {
ProcedureJob.removeJob(dataMgr, this);
return new Status(IStatus.ERROR, StatusConstants.PLUGIN_ID,
"Error initializing guidance python", e);
"Error initializing procedure python", e);
}
try {
@ -151,15 +146,10 @@ public class ProcedureJob extends AbstractQueueJob<ProcedureRequest> {
if (request != null) {
request.requestComplete(null);
}
} else if (expireJob
&& ((instanceMap.get(dataMgr).size() > maxJobs) || (System
.currentTimeMillis() - starTime) > expireTime)) {
ProcedureJob.removeJob(dataMgr, this);
break;
}
} catch (Throwable t) {
statusHandler.handle(Priority.PROBLEM,
"Error running tool ", t);
"Error running procedure ", t);
if (request != null) {
request.requestComplete(t);
}
@ -229,6 +219,7 @@ public class ProcedureJob extends AbstractQueueJob<ProcedureRequest> {
instanceMap = new HashMap<DataManager, List<ProcedureJob>>();
}
Thread currentThread = Thread.currentThread();
List<ProcedureJob> jobList = instanceMap.get(dataMgr);
if (jobList == null) {
jobList = new ArrayList<ProcedureJob>();
@ -241,17 +232,26 @@ public class ProcedureJob extends AbstractQueueJob<ProcedureRequest> {
job.schedule();
}
boolean jobAvailable = false;
ProcedureJob alreadyOnThread = null;
for (ProcedureJob job : jobList) {
if (job.request == null) {
Thread jobThread = job.getThread();
if (currentThread == jobThread) {
// this occurs when a running procedure uses
// SmartScript.callProcedure()
// for efficiency we want to just stay on this thread
alreadyOnThread = job;
jobAvailable = true;
break;
} else if (job.request == null) {
jobAvailable = true;
break;
}
}
// All jobs for data manager are busy add another.
// To mimic AWIPS I allow any number of jobs.
// The check in the run will reduce the number to maxJobs.
if (jobAvailable == false) {
// All jobs for data manager are busy, add another if we haven't
// reached the limit.
if (alreadyOnThread == null && !jobAvailable
&& jobList.size() < maxJobs) {
ProcedureJob job = new ProcedureJob(dataMgr);
job.setSystem(true);
jobList.add(job);
@ -261,7 +261,18 @@ public class ProcedureJob extends AbstractQueueJob<ProcedureRequest> {
jobAvailable = true;
}
jobList.get(QUEUE_JOB_INDEX).enqueue(request);
if (alreadyOnThread != null) {
try {
alreadyOnThread.processRequest(request);
request.requestComplete(null);
} catch (Throwable t) {
statusHandler.handle(Priority.PROBLEM,
"Error running procedure ", t);
request.requestComplete(t);
}
} else {
jobList.get(QUEUE_JOB_INDEX).enqueue(request);
}
return jobAvailable;
}

27
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/script/SmartToolJob.java
View file

@ -54,6 +54,7 @@ import com.raytheon.viz.gfe.smarttool.Tool;
* ------------ ---------- ----------- --------------------------
* Jan 19, 2010 njensen Initial creation
* Jan 18, 2013 1509 njensen Garbage collect after running tool
* Apr 03, 2013 1855 njensen Never dispose interpreters until shutdown
*
* </pre>
*
@ -68,11 +69,6 @@ public class SmartToolJob extends AbstractQueueJob<SmartToolRequest> {
*/
private final static int maxJobs = 3;
/**
* Amount of time to keep inactive jobs servers around.
*/
private final static long expireTime = 5L * 60L * 1000L;
/**
* Index of job with the queue. Will break code if not zero.
*/
@ -114,14 +110,12 @@ public class SmartToolJob extends AbstractQueueJob<SmartToolRequest> {
@Override
protected IStatus run(IProgressMonitor monitor) {
SmartToolController python = null;
long starTime = System.currentTimeMillis();
boolean expireJob = instanceMap.get(dataMgr).get(QUEUE_JOB_INDEX) != this;
try {
python = SmartToolFactory.buildController(dataMgr);
} catch (JepException e) {
SmartToolJob.removeJob(dataMgr, this);
return new Status(IStatus.ERROR, StatusConstants.PLUGIN_ID,
"Error initializing guidance python", e);
"Error initializing smart tool python", e);
}
try {
@ -139,7 +133,6 @@ public class SmartToolJob extends AbstractQueueJob<SmartToolRequest> {
synchronized (this) {
if (request != null) {
starTime = System.currentTimeMillis();
python.processFileUpdates();
EditAction ea = request.getPreview()
.getEditAction();
@ -170,11 +163,6 @@ public class SmartToolJob extends AbstractQueueJob<SmartToolRequest> {
req = request;
request = null;
}
} else if (expireJob
&& ((instanceMap.get(dataMgr).size() > maxJobs) || (System
.currentTimeMillis() - starTime) > expireTime)) {
SmartToolJob.removeJob(dataMgr, this);
break;
}
}
} catch (InterruptedException e) {
@ -201,10 +189,8 @@ public class SmartToolJob extends AbstractQueueJob<SmartToolRequest> {
req = null;
}
}
System.err.println("SmartToolJob exit loop: "
+ monitor.isCanceled());
} finally {
System.err.println("shutdown instance of SmartToolJob");
System.err.println("Shutdown instance of SmartToolJob");
if (python != null) {
python.dispose();
python = null;
@ -277,10 +263,9 @@ public class SmartToolJob extends AbstractQueueJob<SmartToolRequest> {
}
}
// All jobs for data manager are busy add another.
// To mimic AWIPS I allow any number of jobs.
// The check in the run will reduce the number to maxJobs.
if (jobAvailable == false) {
// All jobs for data manager are busy, add another if we haven't reached
// the limit
if (!jobAvailable && jobList.size() < maxJobs) {
SmartToolJob job = new SmartToolJob(dataMgr);
job.setSystem(true);
jobList.add(job);