From 33a89aa4f00d86b54f49e04d5f8159456ddc3943 Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier <Benjamin.P.Steffensmeier@raytheon.com> Date: Mon, 26 Aug 2013 10:43:23 -0500 Subject: [PATCH] Issue #2289 Make number of deriv param threads configurable. Change-Id: I1b1b9e6c7f601ada75058605ced77a2f4352da36 Former-commit-id: 25ff751b2c6164a073498ddd6b44f91c170df6cf [formerly 4622eba4a735df93ad3519306b4ba4a51f538271] [formerly 57dd2e680e7c70af08743c228761bb58b7dd9ef5] [formerly 25ff751b2c6164a073498ddd6b44f91c170df6cf [formerly 4622eba4a735df93ad3519306b4ba4a51f538271] [formerly 57dd2e680e7c70af08743c228761bb58b7dd9ef5] [formerly de00fc8d8210f25b43b71f032741cd5e0c4e005c [formerly 57dd2e680e7c70af08743c228761bb58b7dd9ef5 [formerly 717be4f747d2bf08a82fe682ce47ce853e163e41]]]] Former-commit-id: de00fc8d8210f25b43b71f032741cd5e0c4e005c Former-commit-id: 7e1f0c59826e94fed26eab9ad374a0ac5af71a31 [formerly afdfa17441229352bf698e7e02cae716ff2f030c] [formerly 1da79eba99ca31d3072ca069359a1fad520a3a05 [formerly 9a76667cb0008931238d1f91b29fbbbebe6bf55e]] Former-commit-id: e664b672b09fe8a5359a9e764703536e0fcbe37f [formerly 43112b8b27da1816363a6a46676a3aff8b95421e] Former-commit-id: a9069e87373c8863bbcc4e12444cb96273aabbc6 --- .../derivparam/python/MasterDerivScriptFactory.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cave/com.raytheon.uf.viz.derivparam.python/src/com/raytheon/uf/viz/derivparam/python/MasterDerivScriptFactory.java b/cave/com.raytheon.uf.viz.derivparam.python/src/com/raytheon/uf/viz/derivparam/python/MasterDerivScriptFactory.java index e03fbcf7a9..bb1ac55a2d 100644 --- a/cave/com.raytheon.uf.viz.derivparam.python/src/com/raytheon/uf/viz/derivparam/python/MasterDerivScriptFactory.java +++ b/cave/com.raytheon.uf.viz.derivparam.python/src/com/raytheon/uf/viz/derivparam/python/MasterDerivScriptFactory.java @@ -45,6 +45,8 @@ import com.raytheon.uf.viz.derivparam.library.DerivedParameterGenerator; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jun 04, 2013 2041 bsteffen Initial creation + * Aug 26, 2013 2289 bsteffen Make number of deriv param threads + * configurable. * * </pre> * @@ -55,7 +57,7 @@ import com.raytheon.uf.viz.derivparam.library.DerivedParameterGenerator; public class MasterDerivScriptFactory extends AbstractPythonScriptFactory<MasterDerivScript> { - private static final int MAX_THREADS = 2; + private static final int DEFAULT_MAX_THREADS = 3; public static final String NAME = "DerivedParameterPython"; @@ -66,7 +68,7 @@ public class MasterDerivScriptFactory extends + "DerivParamImporter.py"; public MasterDerivScriptFactory() { - super(NAME, MAX_THREADS); + super(NAME, getMaxThreadsProperty()); } @Override @@ -117,4 +119,9 @@ public class MasterDerivScriptFactory extends MasterDerivScript.class.getClassLoader(), preEvals); } + private static int getMaxThreadsProperty() { + return Integer.getInteger( + "com.raytheon.uf.viz.derivparam.python.threads", + DEFAULT_MAX_THREADS); + } }