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

12.10.1-6 baseline

Browse source 
Former-commit-id: dd922048c0 [formerly 81d91a8289] [formerly cebe6534ae] [formerly dd922048c0 [formerly 81d91a8289] [formerly cebe6534ae] [formerly ba648f8e72 [formerly cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]]
Former-commit-id: ba648f8e72
Former-commit-id: d5ec4edea1 [formerly 0e77eb2fe2] [formerly e2eff41ad429447d5c80be0157ac1ea818d306fa [formerly 5d5a61bd75]]
Former-commit-id: ca8586dbe32865ad7ca07ad5a47da5d57ccd01ad [formerly e39023bb85]
Former-commit-id: 20732fcbd5
This commit is contained in:
Steve Harris 2012-09-25 10:14:23 -05:00
parent 277255717d
commit 60ef7d29e0
13 changed files with 41 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
View file

@ -73,8 +73,7 @@ import com.raytheon.uf.viz.d2d.core.D2DLoadProperties;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 10, 2009 chammack Initial creation
* 2012-04-20 DR 14699 D. Friedman Work around race conditions
* 2012-08-14 DR 15160 D. Friedman Reduce chance of UI blocking
* 2012-04-20 DR 14699 D. Friedman Work around race conditions
*
* </pre>
*
@ -95,7 +94,9 @@ public class D2DTimeMatcher extends AbstractTimeMatcher implements
@Override
public void disposed(AbstractVizResource<?, ?> resource) {
if ((resource == timeMatchBasis)) {
internalSetTimeMatchBasis(null);
synchronized (D2DTimeMatcher.this) {
timeMatchBasis = null;
}
}
}
@ -127,11 +128,6 @@ public class D2DTimeMatcher extends AbstractTimeMatcher implements
private boolean needRetry;
private int nRetries;
// DR 15160 state
private transient boolean pendingTmbChange = false;
private transient boolean inTimeMatch = false;
private transient AbstractVizResource<?, ?> pendingTimeMatchBasis;
/**
* Default Constructor.
*/
@ -162,15 +158,8 @@ public class D2DTimeMatcher extends AbstractTimeMatcher implements
public void redoTimeMatching(IDescriptor descriptor) throws VizException {
synchronized (this) {
if (inTimeMatch) {
needRetry = true;
return;
}
pendingTmbChange = false;
inTimeMatch = true;
needRetry = false;
}
try {
if (timeMatchBasis != null) {
IDescriptor tmDescriptor = timeMatchBasis.getDescriptor();
if (tmDescriptor != null && tmDescriptor != descriptor) {
@ -216,27 +205,13 @@ public class D2DTimeMatcher extends AbstractTimeMatcher implements
}
}
} finally {
boolean scheduleRetry = false;
synchronized (this) {
inTimeMatch = false;
if (pendingTmbChange) {
pendingTmbChange = false;
changeTimeMatchBasis(pendingTimeMatchBasis);
pendingTimeMatchBasis = null;
scheduleRetry = true;
}
if (needRetry) {
if (nRetries < 200) {
++nRetries;
scheduleRetry = true;
}
} else
nRetries = 0;
}
if (scheduleRetry)
TimeMatchingJob.scheduleTimeMatch(descriptor);
if (needRetry) {
if (nRetries < 200) {
++nRetries;
TimeMatchingJob.scheduleTimeMatch(descriptor);
}
} else
nRetries = 0;
}
}
@ -733,7 +708,9 @@ public class D2DTimeMatcher extends AbstractTimeMatcher implements
IDescriptor descriptor) {
if ((resource == timeMatchBasis)
&& (descriptor instanceof AbstractDescriptor)) {
internalSetTimeMatchBasis(null);
synchronized (this) {
timeMatchBasis = null;
}
}
}
@ -1027,17 +1004,4 @@ public class D2DTimeMatcher extends AbstractTimeMatcher implements
configFactory.resetMultiload();
}
// For DR 15160
protected void internalSetTimeMatchBasis(AbstractVizResource<?, ?> timeMatchBasis) {
synchronized (this) {
if (inTimeMatch) {
pendingTmbChange = true;
pendingTimeMatchBasis = timeMatchBasis;
} else {
pendingTmbChange = false;
pendingTimeMatchBasis = null;
changeTimeMatchBasis(timeMatchBasis);
}
}
}
}

13
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/VCParm.java
View file

@ -25,6 +25,9 @@ import java.util.Collection;
import java.util.Date;
import java.util.List;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import com.raytheon.uf.common.dataplugin.gfe.GridDataHistory;
import com.raytheon.uf.common.dataplugin.gfe.db.objects.ParmID;
import com.raytheon.uf.common.dataplugin.gfe.slice.DiscreteGridSlice;
@ -37,6 +40,7 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.common.util.RWLArrayList;
import com.raytheon.viz.gfe.Activator;
import com.raytheon.viz.gfe.core.DataManager;
import com.raytheon.viz.gfe.core.griddata.AbstractGridData;
import com.raytheon.viz.gfe.core.griddata.IGridData;
@ -107,8 +111,13 @@ public class VCParm extends VParm implements IParmListChangedListener,
// Need to check that the above call to mod.getGpi() did not fail
if (!mod.isValid()) {
statusHandler.handle(Priority.EVENTB, "Can't get GPI: ",
this.mod.getErrorString());
//statusHandler.handle(Priority.EVENTB, "Can't get GPI: ",
// this.mod.getErrorString());
Activator
.getDefault()
.getLog()
.log(new Status(IStatus.WARNING, Activator.PLUGIN_ID,
"Can't get GPI: " + this.mod.getErrorString()));
}
// set the parm type

7
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
View file

@ -747,9 +747,10 @@
<!--S-R Flow & Suggests Tor Supercells Submenu-->
<contribute xsi:type="toolbarSubMenu" menuText="Thom 5, 5a and 6">
<contribute xsi:type="menuItem" menuText="Thom 5" key="Thom5" indentText="false" />
<contribute xsi:type="menuItem" menuText="Thom 5a" key="Thom5a" indentText="false" />
<contribute xsi:type="menuItem" menuText="Thom 6" key="Thom6" indentText="false" />
<contribute xsi:type="menuItem" menuText="Thom 5" key="Thom5" indentText="false" />
<contribute xsi:type="menuItem" menuText="Thom 5a" key="Thom5a" indentText="false" />
<contribute xsi:type="menuItem" menuText="Thom 6" key="Thom6" indentText="false" />
</contribute>
<contribute xsi:type="menuItem" menuText="Vertical Totals" key="vTOT" indentText="false" />
<contribute xsi:type="menuItem" menuText="Cross Totals" key="cTOT" indentText="false" />

2
nativeLib/rary.cots.jasper/jasper-1.900.1/configure vendored
View file

@ -20312,7 +20312,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(exit $ac_status); }; }; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; cat >>confdefs.h <<\_ACEOF
#define HAVE_VLA 1
#define HAVE_VLA 0
_ACEOF
else

71
nativeLib/rary.cots.jasper/jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c
View file

@ -313,11 +313,8 @@ void jpc_qmfb_split_row(jpc_fix_t *a, int numcols, int parity)
{
int bufsize = JPC_CEILDIVPOW2(numcols, 1);
#if !defined(HAVE_VLA)
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
#else
jpc_fix_t splitbuf[bufsize];
#endif
jpc_fix_t *buf = splitbuf;
register jpc_fix_t *srcptr;
register jpc_fix_t *dstptr;
@ -325,7 +322,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, int numcols, int parity)
register int m;
int hstartcol;
#if !defined(HAVE_VLA)
/* Get a buffer. */
if (bufsize > QMFB_SPLITBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
@ -333,7 +329,6 @@ void jpc_qmfb_split_row(jpc_fix_t *a, int numcols, int parity)
abort();
}
}
#endif
if (numcols >= 2) {
hstartcol = (numcols + 1 - parity) >> 1;
@ -367,25 +362,18 @@ void jpc_qmfb_split_row(jpc_fix_t *a, int numcols, int parity)
}
}
#if !defined(HAVE_VLA)
/* If the split buffer was allocated on the heap, free this memory. */
if (buf != splitbuf) {
jas_free(buf);
}
#endif
}
void jpc_qmfb_split_col(jpc_fix_t *a, int numrows, int stride,
int parity)
{
int bufsize = JPC_CEILDIVPOW2(numrows, 1);
#if !defined(HAVE_VLA)
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
#else
jpc_fix_t splitbuf[bufsize];
#endif
jpc_fix_t *buf = splitbuf;
register jpc_fix_t *srcptr;
register jpc_fix_t *dstptr;
@ -393,7 +381,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, int numrows, int stride,
register int m;
int hstartcol;
#if !defined(HAVE_VLA)
/* Get a buffer. */
if (bufsize > QMFB_SPLITBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
@ -401,7 +388,6 @@ void jpc_qmfb_split_col(jpc_fix_t *a, int numrows, int stride,
abort();
}
}
#endif
if (numrows >= 2) {
hstartcol = (numrows + 1 - parity) >> 1;
@ -435,25 +421,19 @@ void jpc_qmfb_split_col(jpc_fix_t *a, int numrows, int stride,
}
}
#if !defined(HAVE_VLA)
/* If the split buffer was allocated on the heap, free this memory. */
if (buf != splitbuf) {
jas_free(buf);
}
#endif
}
void jpc_qmfb_split_colgrp(jpc_fix_t *a, int numrows, int stride,
int parity)
{
int bufsize = JPC_CEILDIVPOW2(numrows, 1);
#if !defined(HAVE_VLA)
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE];
#else
jpc_fix_t splitbuf[bufsize * JPC_QMFB_COLGRPSIZE];
#endif
jpc_fix_t *buf = splitbuf;
jpc_fix_t *srcptr;
jpc_fix_t *dstptr;
@ -464,7 +444,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, int numrows, int stride,
int m;
int hstartcol;
#if !defined(HAVE_VLA)
/* Get a buffer. */
if (bufsize > QMFB_SPLITBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
@ -472,7 +451,6 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, int numrows, int stride,
abort();
}
}
#endif
if (numrows >= 2) {
hstartcol = (numrows + 1 - parity) >> 1;
@ -524,25 +502,18 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a, int numrows, int stride,
}
}
#if !defined(HAVE_VLA)
/* If the split buffer was allocated on the heap, free this memory. */
if (buf != splitbuf) {
jas_free(buf);
}
#endif
}
void jpc_qmfb_split_colres(jpc_fix_t *a, int numrows, int numcols,
int stride, int parity)
{
int bufsize = JPC_CEILDIVPOW2(numrows, 1);
#if !defined(HAVE_VLA)
jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE];
#else
jpc_fix_t splitbuf[bufsize * numcols];
#endif
jpc_fix_t *buf = splitbuf;
jpc_fix_t *srcptr;
jpc_fix_t *dstptr;
@ -553,7 +524,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, int numrows, int numcols,
int m;
int hstartcol;
#if !defined(HAVE_VLA)
/* Get a buffer. */
if (bufsize > QMFB_SPLITBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
@ -561,7 +531,6 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, int numrows, int numcols,
abort();
}
}
#endif
if (numrows >= 2) {
hstartcol = (numrows + 1 - parity) >> 1;
@ -613,13 +582,10 @@ void jpc_qmfb_split_colres(jpc_fix_t *a, int numrows, int numcols,
}
}
#if !defined(HAVE_VLA)
/* If the split buffer was allocated on the heap, free this memory. */
if (buf != splitbuf) {
jas_free(buf);
}
#endif
}
void jpc_qmfb_join_row(jpc_fix_t *a, int numcols, int parity)
@ -684,18 +650,14 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int numrows, int stride,
{
int bufsize = JPC_CEILDIVPOW2(numrows, 1);
#if !defined(HAVE_VLA)
jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
#else
jpc_fix_t joinbuf[bufsize];
#endif
jpc_fix_t *buf = joinbuf;
register jpc_fix_t *srcptr;
register jpc_fix_t *dstptr;
register int n;
int hstartcol;
#if !defined(HAVE_VLA)
/* Allocate memory for the join buffer from the heap. */
if (bufsize > QMFB_JOINBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
@ -703,7 +665,6 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int numrows, int stride,
abort();
}
}
#endif
hstartcol = (numrows + 1 - parity) >> 1;
@ -735,12 +696,10 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int numrows, int stride,
++srcptr;
}
#if !defined(HAVE_VLA)
/* If the join buffer was allocated on the heap, free this memory. */
if (buf != joinbuf) {
jas_free(buf);
}
#endif
}
@ -749,11 +708,8 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, int numrows, int stride,
{
int bufsize = JPC_CEILDIVPOW2(numrows, 1);
#if !defined(HAVE_VLA)
jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE];
#else
jpc_fix_t joinbuf[bufsize * JPC_QMFB_COLGRPSIZE];
#endif
jpc_fix_t *buf = joinbuf;
jpc_fix_t *srcptr;
jpc_fix_t *dstptr;
@ -763,7 +719,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, int numrows, int stride,
register int i;
int hstartcol;
#if !defined(HAVE_VLA)
/* Allocate memory for the join buffer from the heap. */
if (bufsize > QMFB_JOINBUFSIZE) {
if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
@ -771,7 +726,6 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, int numrows, int stride,
abort();
}
}
#endif
hstartcol = (numrows + 1 - parity) >> 1;
@ -821,25 +775,19 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, int numrows, int stride,
srcptr += JPC_QMFB_COLGRPSIZE;
}
#if !defined(HAVE_VLA)
/* If the join buffer was allocated on the heap, free this memory. */
if (buf != joinbuf) {
jas_free(buf);
}
#endif
}
void jpc_qmfb_join_colres(jpc_fix_t *a, int numrows, int numcols,
int stride, int parity)
{
int bufsize = JPC_CEILDIVPOW2(numrows, 1);
#if !defined(HAVE_VLA)
jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE];
#else
jpc_fix_t joinbuf[bufsize * numcols];
#endif
jpc_fix_t *buf = joinbuf;
jpc_fix_t *srcptr;
jpc_fix_t *dstptr;
@ -849,7 +797,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, int numrows, int numcols,
register int i;
int hstartcol;
#if !defined(HAVE_VLA)
/* Allocate memory for the join buffer from the heap. */
if (bufsize > QMFB_JOINBUFSIZE) {
if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
@ -857,7 +804,6 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, int numrows, int numcols,
abort();
}
}
#endif
hstartcol = (numrows + 1 - parity) >> 1;
@ -907,13 +853,10 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, int numrows, int numcols,
srcptr += numcols;
}
#if !defined(HAVE_VLA)
/* If the join buffer was allocated on the heap, free this memory. */
if (buf != joinbuf) {
jas_free(buf);
}
#endif
}
/******************************************************************************\

4
rpms/awips2.core/Installer.python/component.spec
View file

@ -7,7 +7,7 @@
Name: awips2-python
Summary: AWIPS II Python Distribution
Version: 2.7.1
Release: 6
Release: 7
Group: AWIPSII
BuildRoot: %{_build_root}
BuildArch: %{_build_arch}
@ -308,4 +308,4 @@ rm -rf %{_build_root}
%dir /awips2/python/include
/awips2/python/include/*
%dir /awips2/python/bin
/awips2/python/bin/*
/awips2/python/bin/*

BIN
rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so
View file

Binary file not shown.

BIN
rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1
View file

Binary file not shown.

BIN
rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
View file

Binary file not shown.

BIN
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so
View file

Binary file not shown.

BIN
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1
View file

Binary file not shown.

BIN
rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
View file

Binary file not shown.

2
rpms/build/i386/build.sh
View file

@ -205,6 +205,7 @@ if [ "${1}" = "-full" ]; then
buildRPM "awips2-python-pygtk"
buildRPM "awips2-python-pycairo"
buildRPM "awips2"
buildRPM "awips2-adapt-native"
buildRPM "awips2-aviation-shared"
buildRPM "awips2-cli"
@ -221,7 +222,6 @@ if [ "${1}" = "-full" ]; then
buildRPM "awips2-notification"
buildRPM "awips2-pypies"
buildRPM "awips2-data.hdf5-topo"
buildRPM "awips2"
buildRPM "awips2-rcm"
buildLocalizationRPMs
if [ $? -ne 0 ]; then