diff --git a/CMake/variants/variants.cbm206 b/CMake/variants/variants.cbm206 index 75b51fb5fec037c6b10f57bd67b226075ea31122..13b95d875c4f57fbd9cf1b52aaa133b9e04fa076 100644 --- a/CMake/variants/variants.cbm206 +++ b/CMake/variants/variants.cbm206 @@ -11,7 +11,7 @@ option(USE_LOG4CPLUS "Use Log4Cplus" ON) option(USE_MPI "Use MPI" ON) set(CASACORE_ROOT_DIR /opt/casacore/3.0.0) -set(DAL_ROOT_DIR /opt/DAL/3.3.1) +set(DAL_ROOT_DIR /opt/DAL/3.3.2) set(BLITZ_ROOT_DIR /opt/blitz/1.0.1) # MPI_ROOT_DIR does not need to be specified, because it can just be found thanks to the usage of mpi-selector diff --git a/CMake/variants/variants.head01 b/CMake/variants/variants.head01 index 891fc9269fc6156b6b67d2063c5e66d7ecd0e23f..8e14b09865dafd8b7f1b3cc0510e54ff84e25c3f 100644 --- a/CMake/variants/variants.head01 +++ b/CMake/variants/variants.head01 @@ -1,2 +1,2 @@ set(CASACORE_ROOT_DIR /opt/casacore-v3.0.0) -set(DAL_ROOT_DIR /opt/DAL-v3.3.1) +set(DAL_ROOT_DIR /opt/DAL-v3.3.2) diff --git a/RTCP/Cobalt/CoInterface/src/Allocator.cc b/RTCP/Cobalt/CoInterface/src/Allocator.cc index a6b80b9a1d7f8b28f812a2103fa353039df5c72e..2b15c4eccc503f9aabd6da17df32c9950410656f 100644 --- a/RTCP/Cobalt/CoInterface/src/Allocator.cc +++ b/RTCP/Cobalt/CoInterface/src/Allocator.cc @@ -120,6 +120,10 @@ namespace LOFAR { ScopedLock sl(mutex); + // if we allocate 0 bytes, we could end up returning the same pointer for a subsequent allocation. + // since allocations with 0 bytes shouldn't be dereferenced anyway, we return NULL. + if (size == 0) return 0; + // look for a free range large enough for (SparseSet<void *>::const_iterator it = freeList.getRanges().begin(); it != freeList.getRanges().end(); it++) { void *begin = align(it->begin, alignment); diff --git a/RTCP/Cobalt/GPUProc/src/Station/StationInput.cc b/RTCP/Cobalt/GPUProc/src/Station/StationInput.cc index 7a96bc727e347f7a8517865a90acd95780fd4df5..f412199b2a69e33b41ff8b2d5b9101b64fd848ec 100644 --- a/RTCP/Cobalt/GPUProc/src/Station/StationInput.cc +++ b/RTCP/Cobalt/GPUProc/src/Station/StationInput.cc @@ -454,6 +454,7 @@ namespace LOFAR { //copyRSPTimer.stop(); outputQueue.append(rspData); + rspData.reset(); ASSERT(!rspData); } }