#include "AliHLTDataBuffer.h"
#include "AliHLTConsumerDescriptor.h"
#include "AliHLTComponent.h"
+#include "AliHLTTask.h"
#include <cerrno>
#include <cassert>
//#include <string>
//#include "AliHLTSystem.h"
+typedef vector<AliHLTDataBuffer::AliHLTDataSegment> AliHLTDataSegmentList;
+typedef vector<AliHLTDataBuffer::AliHLTRawBuffer*> AliHLTRawBufferPList;
+
/** ROOT macro for the implementation of ROOT specific class methods */
ClassImp(AliHLTDataBuffer)
fActiveConsumers(),
fReleasedConsumers(),
fpBuffer(NULL),
- fFlags(0)
+ fFlags(0),
+ fForwardedSegmentSources(),
+ fForwardedSegments()
{
// see header file for class documentation
// or
}
int AliHLTDataBuffer::fgNofInstances=0;
-vector<AliHLTDataBuffer::AliHLTRawBuffer*> AliHLTDataBuffer::fgFreeBuffers;
-vector<AliHLTDataBuffer::AliHLTRawBuffer*> AliHLTDataBuffer::fgActiveBuffers;
+AliHLTRawBufferPList AliHLTDataBuffer::fgFreeBuffers;
+AliHLTRawBufferPList AliHLTDataBuffer::fgActiveBuffers;
AliHLTUInt32_t AliHLTDataBuffer::fgMargin=1024;
AliHLTLogging AliHLTDataBuffer::fgLogging;
const Int_t AliHLTDataBuffer::fgkSafetyPatternSize=16;
return iResult;
}
-int AliHLTDataBuffer::FindMatchingDataBlocks(const AliHLTComponent* pConsumer, vector<AliHLTComponentDataType>* tgtList)
+int AliHLTDataBuffer::FindMatchingDataBlocks(const AliHLTComponent* pConsumer, AliHLTComponentDataTypeList* tgtList)
{
// see header file for function documentation
int iResult=0;
if (pConsumer) {
- vector<AliHLTDataBuffer::AliHLTDataSegment> segments;
+ AliHLTDataSegmentList segments;
if ((iResult=FindMatchingDataSegments(pConsumer, segments))>=0) {
if (tgtList) {
- vector<AliHLTDataBuffer::AliHLTDataSegment>::iterator segment=segments.begin();
+ AliHLTDataSegmentList::iterator segment=segments.begin();
while (segment!=segments.end()) {
tgtList->push_back((*segment).fDataType);
segment++;
// all blocks are passed to the consumer, which is the policy also in
// PubSub
tgtList.assign(fSegments.begin(), fSegments.end());
+
+ // add all forwarded blocks
+ tgtList.insert(tgtList.begin(), fForwardedSegments.begin(), fForwardedSegments.end());
iResult=tgtList.size();
return iResult;
if (pConsumer) {
- vector<AliHLTComponentDataType> dtlist;
+ AliHLTComponentDataTypeList dtlist;
((AliHLTComponent*)pConsumer)->GetInputDataTypes(dtlist);
- vector<AliHLTDataBuffer::AliHLTDataSegment>::iterator segment=fSegments.begin();
+ AliHLTDataSegmentList::iterator segment=fSegments.begin();
while (segment!=fSegments.end()) {
- vector<AliHLTComponentDataType>::iterator type=dtlist.begin();
+ AliHLTComponentDataTypeList::iterator type=dtlist.begin();
while (type!=dtlist.end()) {
if ((*segment).fDataType==(*type) ||
(*type)==kAliHLTAnyDataType) {
return iResult;
}
-int AliHLTDataBuffer::Subscribe(const AliHLTComponent* pConsumer, AliHLTComponentBlockData* arrayBlockDesc, int iArraySize)
+int AliHLTDataBuffer::Subscribe(const AliHLTComponent* pConsumer, AliHLTComponentBlockDataList& blockDescList)
{
// see header file for function documentation
int iResult=0;
- if (pConsumer && arrayBlockDesc) {
- if (fpBuffer) {
+ if (pConsumer) {
+ if (1/*fpBuffer*/) {
AliHLTConsumerDescriptor* pDesc=FindConsumer(pConsumer, fConsumers);
if (pDesc) {
- vector<AliHLTDataBuffer::AliHLTDataSegment> tgtList;
+ AliHLTDataSegmentList tgtList;
// Matthias 26.07.2007 AliHLTSystem should behave the same way as PubSub
// so it does not matter if there are matching data types or not, unless
// we implement such a check in PubSub
if ((iResult=FindMatchingDataSegments(pConsumer, tgtList))>=0) {
- int i =0;
- vector<AliHLTDataBuffer::AliHLTDataSegment>::iterator segment=tgtList.begin();
- while (segment!=tgtList.end() && i<iArraySize) {
+ AliHLTDataSegmentList::iterator segment=tgtList.begin();
+ while (segment!=tgtList.end()) {
// fill the block data descriptor
- arrayBlockDesc[i].fStructSize=sizeof(AliHLTComponentBlockData);
- // the shared memory key is not used in AliRoot
- arrayBlockDesc[i].fShmKey.fStructSize=sizeof(AliHLTComponentShmData);
- arrayBlockDesc[i].fShmKey.fShmType=gkAliHLTComponentInvalidShmType;
- arrayBlockDesc[i].fShmKey.fShmID=gkAliHLTComponentInvalidShmID;
+ AliHLTComponentBlockData bd;
+ AliHLTComponent::FillBlockData(bd);
// This models the behavior of PubSub.
// For incoming data blocks, fOffset must be ignored by the
// processing component. It is set for bookkeeping in the framework.
// fPtr always points to the beginning of the data.
- arrayBlockDesc[i].fOffset=(*segment).fSegmentOffset;
- AliHLTUInt8_t* pTgt=*fpBuffer;
- pTgt+=(*segment).fSegmentOffset;
- arrayBlockDesc[i].fPtr=reinterpret_cast<void*>(pTgt);
- arrayBlockDesc[i].fSize=(*segment).fSegmentSize;
- arrayBlockDesc[i].fDataType=(*segment).fDataType;
- arrayBlockDesc[i].fSpecification=(*segment).fSpecification;
- pDesc->SetActiveDataSegment(arrayBlockDesc[i].fOffset, arrayBlockDesc[i].fSize);
- HLTDebug("component %p (%s) subscribed to segment #%d offset %d size %d data type %s %#x",
- pConsumer, ((AliHLTComponent*)pConsumer)->GetComponentID(), i, arrayBlockDesc[i].fOffset,
- arrayBlockDesc[i].fSize, (AliHLTComponent::DataType2Text(arrayBlockDesc[i].fDataType)).c_str(),
- arrayBlockDesc[i].fSpecification);
- i++;
+ bd.fOffset=0;
+ AliHLTUInt8_t* pTgt=*segment;
+ bd.fPtr=reinterpret_cast<void*>(pTgt);
+ bd.fSize=(*segment).fSegmentSize;
+ bd.fDataType=(*segment).fDataType;
+ bd.fSpecification=(*segment).fSpecification;
+ blockDescList.push_back(bd);
+ pDesc->SetActiveDataSegment(*segment);
+ HLTDebug("component %p (%s) subscribed to segment offset %d size %d data type %s %#x",
+ pConsumer, ((AliHLTComponent*)pConsumer)->GetComponentID(), bd.fOffset,
+ bd.fSize, (AliHLTComponent::DataType2Text(bd.fDataType)).c_str(),
+ bd.fSpecification);
segment++;
}
- // check whether there was enough space for the segments
- if (i!=(int)tgtList.size()) {
- HLTError("too little space in block descriptor array: required %d, available %d", tgtList.size(), iArraySize);
- iResult=-ENOSPC;
- } else {
// move this consumer to the active list
- if (ChangeConsumerState(pDesc, fConsumers, fActiveConsumers)>=0) {
+ if (tgtList.size()==0) {
+ ChangeConsumerState(pDesc, fConsumers, fReleasedConsumers);
+ HLTDebug("no input data for component %p (%s) available", pConsumer, ((AliHLTComponent*)pConsumer)->GetComponentID());
+ } else if (ChangeConsumerState(pDesc, fConsumers, fActiveConsumers)>=0) {
HLTDebug("component %p (%s) subscribed to data buffer %p", pConsumer, ((AliHLTComponent*)pConsumer)->GetComponentID(), this);
} else {
// TODO: cleanup the consumer descriptor correctly
- memset(arrayBlockDesc, 0, iArraySize*sizeof(AliHLTComponentBlockData));
+ segment=tgtList.begin();
+ while (segment!=tgtList.end()) {
+ blockDescList.pop_back();
+ segment++;
+ }
HLTError("can not activate consumer %p for data buffer %p", pConsumer, this);
iResult=-EACCES;
}
- }
} else {
HLTError("unresolved data segment(s) for component %p (%s)", pConsumer, ((AliHLTComponent*)pConsumer)->GetComponentID());
iResult=-EBADF;
return iResult;
}
-int AliHLTDataBuffer::Release(AliHLTComponentBlockData* pBlockDesc, const AliHLTComponent* pConsumer)
+int AliHLTDataBuffer::Release(AliHLTComponentBlockData* pBlockDesc,
+ const AliHLTComponent* pConsumer,
+ const AliHLTTask* pOwnerTask)
{
// see header file for function documentation
int iResult=0;
if (pBlockDesc && pConsumer) {
AliHLTConsumerDescriptor* pDesc=FindConsumer(pConsumer, fActiveConsumers);
if (pDesc) {
- if ((iResult=pDesc->CheckActiveDataSegment(pBlockDesc->fOffset, pBlockDesc->fSize))!=1) {
+ if ((iResult=pDesc->CheckActiveDataSegment(AliHLTDataSegment(pBlockDesc->fPtr, pBlockDesc->fOffset, pBlockDesc->fSize)))!=1) {
HLTWarning("data segment missmatch, component %p has not subscribed to a segment with offset %#x and size %d", pConsumer, pBlockDesc->fOffset, pBlockDesc->fSize);
// TODO: appropriate error handling, but so far optional
iResult=0;
} else {
- pDesc->ReleaseActiveDataSegment(pBlockDesc->fOffset, pBlockDesc->fSize);
- pBlockDesc->fOffset=0;
- pBlockDesc->fPtr=NULL;
- pBlockDesc->fSize=0;
+ pDesc->ReleaseActiveDataSegment(AliHLTDataSegment(pBlockDesc->fPtr, pBlockDesc->fOffset, pBlockDesc->fSize));
+ }
+ if (GetNofPendingConsumers()==0 && fForwardedSegments.size()>0) {
+ // last consumer, release forwarded segments
+ assert(fForwardedSegments.size()==fForwardedSegmentSources.size());
+ AliHLTDataSegmentList::iterator segment=fForwardedSegments.begin();
+ AliHLTTaskPList::iterator src=fForwardedSegmentSources.begin();
+ //HLTDebug("%p checking forwarded segments", this);
+ for (; segment!=fForwardedSegments.end(); segment++, src++) {
+ //HLTDebug("segment ptr=%p offset=%d size=%d\n"
+ // "block ptr=%p offset=%d size=%d", (*segment).fPtr, (*segment).fSegmentOffset, (*segment).fSegmentSize, pBlockDesc->fPtr, pBlockDesc->fOffset, pBlockDesc->fSize);
+ if ((*segment)==AliHLTDataSegment(pBlockDesc->fPtr, pBlockDesc->fOffset, pBlockDesc->fSize)) {
+ //HLTDebug("release segment of task %p", *src);
+ assert((*src)!=NULL);
+ if ((*src)!=NULL) {
+ if ((*src)->Release(pBlockDesc, pOwnerTask)>=0) {
+ HLTDebug("task %s (%p) released forwarded segment %p size %d of task %s (%p)",
+ pOwnerTask->GetName(), pOwnerTask, (*segment).GetPtr(), (*segment).GetSize(),
+ (*src)->GetName(), *src);
+ } else {
+ HLTError("task %s (%p) failed releasing forwarded segment %p size %d of task %s (%p)",
+ pOwnerTask->GetName(), pOwnerTask, (*segment).GetPtr(), (*segment).GetSize(),
+ (*src)->GetName(), *src);
+ }
+ }
+ fForwardedSegments.erase(segment);
+ fForwardedSegmentSources.erase(src);
+ break;
+ }
+ }
}
+ pBlockDesc->fOffset=0;
+ pBlockDesc->fPtr=NULL;
+ pBlockDesc->fSize=0;
if (pDesc->GetNofActiveSegments()==0) {
if ((iResult=ChangeConsumerState(pDesc, fActiveConsumers, fReleasedConsumers))>=0) {
if (GetNofActiveConsumers()==0 && GetNofPendingConsumers()==0) {
return iResult;
}
+int AliHLTDataBuffer::Forward(AliHLTTask* pSrcTask, AliHLTComponentBlockData* pBlockDesc)
+{
+ // see header file for function documentation
+ if (pSrcTask==NULL || pBlockDesc==NULL) return -EINVAL;
+ assert(fForwardedSegments.size()==fForwardedSegmentSources.size());
+ if (fForwardedSegments.size()!=fForwardedSegmentSources.size()) return -EFAULT;
+ fForwardedSegmentSources.push_back(pSrcTask);
+ fForwardedSegments.push_back(AliHLTDataSegment(pBlockDesc->fPtr, pBlockDesc->fOffset, pBlockDesc->fSize, pBlockDesc->fDataType, pBlockDesc->fSpecification));
+ return 0;
+}
+
AliHLTUInt8_t* AliHLTDataBuffer::GetTargetBuffer(int iMinSize)
{
// see header file for function documentation
// This function has to model the behavior of PubSub
// For output blocks only the fOffset value is used, this must be the offset
// relative to the output pointer. fPtr must be either NULL or the output
- // pointer
+ // pointer. In either case it is 'ignored' and set to the beginning of the
+ // data buffer
if (arrayBlockData[i].fPtr==NULL ||
arrayBlockData[i].fPtr==*fpBuffer) {
- if (arrayBlockData[i].fOffset+arrayBlockData[i].fSize<=reinterpret_cast<AliHLTUInt32_t>(fpBuffer)) {
+ arrayBlockData[i].fPtr=*fpBuffer;
+ if (arrayBlockData[i].fOffset+arrayBlockData[i].fSize<=fpBuffer->GetUsedSize()) {
segment.fSegmentOffset=arrayBlockData[i].fOffset;
+ segment.fPtr=(AliHLTUInt8_t*)arrayBlockData[i].fPtr;
segment.fSegmentSize=arrayBlockData[i].fSize;
segment.fDataType=arrayBlockData[i].fDataType;
segment.fSpecification=arrayBlockData[i].fSpecification;
HLTDebug("set segment %s with size %d at offset %d", AliHLTComponent::DataType2Text(segment.fDataType).data(), segment.fSegmentSize, segment.fSegmentOffset);
} else {
HLTError("block data specification %#d (%s) exceeds size of data buffer", i, AliHLTComponent::DataType2Text(arrayBlockData[i].fDataType).data());
- HLTError("block offset=%d, block size=%d, buffer size=%d", arrayBlockData[i].fOffset, arrayBlockData[i].fSize, reinterpret_cast<AliHLTUInt32_t>(fpBuffer));
+ HLTError("block offset=%d, block size=%d, buffer size=%d", arrayBlockData[i].fOffset, arrayBlockData[i].fSize, fpBuffer->GetUsedSize());
iResult=-E2BIG;
}
} else {
HLTError("invalid pointer (%p) in block data specification (buffer %p size %d)."
"please note: for output blocks only the fOffset value is valid and must "
- "be relative to the output buffer", arrayBlockData[i].fPtr, reinterpret_cast<void*>(fpBuffer), reinterpret_cast<AliHLTUInt32_t>(fpBuffer));
+ "be relative to the output buffer", arrayBlockData[i].fPtr, fpBuffer->GetPointer(), fpBuffer->GetUsedSize());
iResult=-ERANGE;
}
}
} else {
- HLTError("this data buffer (%p) does not match the internal data buffer %p of raw buffer %p", pTgt, reinterpret_cast<void*>(fpBuffer), fpBuffer);
+ HLTError("this data buffer (%p) does not match the internal data buffer %p of raw buffer %p", pTgt, fpBuffer->GetPointer(), fpBuffer);
iResult=-EINVAL;
}
} else {
// see header file for function documentation
AliHLTRawBuffer* pRawBuffer=NULL;
unsigned int reqSize=size+fgkSafetyPatternSize;
- vector<AliHLTRawBuffer*>::iterator buffer=fgFreeBuffers.begin();
+ AliHLTRawBufferPList::iterator buffer=fgFreeBuffers.begin();
while (buffer!=fgFreeBuffers.end() && pRawBuffer==NULL) {
if ((*buffer)->CheckSize(reqSize)) {
// assign this element
pRawBuffer=*buffer;
pRawBuffer->UseBuffer(size);
fgFreeBuffers.erase(buffer);
- fgLogging.Logging(kHLTLogDebug, "AliHLTDataBuffer::CreateRawBuffer", "data buffer handling", "raw buffer container %p provided for request of %d bytes (total %d available in buffer %p)", pRawBuffer, size, pRawBuffer->GetTotalSize(), reinterpret_cast<void*>(pRawBuffer));
+ fgLogging.Logging(kHLTLogDebug, "AliHLTDataBuffer::CreateRawBuffer", "data buffer handling", "raw buffer container %p provided for request of %d bytes (total %d available in buffer %p)", pRawBuffer, size, pRawBuffer->GetTotalSize(), pRawBuffer->GetPointer());
fgActiveBuffers.push_back(pRawBuffer);
break;
}
// no buffer found, create a new one
pRawBuffer=new AliHLTRawBuffer(reqSize);
if (pRawBuffer) {
- if (reinterpret_cast<void*>(pRawBuffer)) {
+ if (pRawBuffer->GetPointer()) {
pRawBuffer->UseBuffer(size);
fgActiveBuffers.push_back(pRawBuffer);
- fgLogging.Logging(kHLTLogDebug, "AliHLTDataBuffer::CreateRawBuffer", "data buffer handling", "new raw buffer %p of size %d created (container %p)", reinterpret_cast<void*>(pRawBuffer), pRawBuffer->GetTotalSize(), pRawBuffer);
+ fgLogging.Logging(kHLTLogDebug, "AliHLTDataBuffer::CreateRawBuffer", "data buffer handling", "new raw buffer %p of size %d created (container %p)", pRawBuffer->GetPointer(), pRawBuffer->GetTotalSize(), pRawBuffer);
} else {
delete pRawBuffer;
pRawBuffer=NULL;
}
}
if (pRawBuffer!=NULL && fgkSafetyPatternSize>0) {
- //fgLogging.Logging(kHLTLogDebug, "AliHLTDataBuffer::CreateRawBuffer", "data buffer handling", "writing safety pattern to %p offset %d", reinterpret_cast<void*>(*buffer), reinterpret_cast<AliHLTUInt32_t>(*buffer));
- int res=pRawBuffer->WritePattern(fgkSafetyPattern, fgkSafetyPatternSize);
- assert(res>=0);
+ //fgLogging.Logging(kHLTLogDebug, "AliHLTDataBuffer::CreateRawBuffer", "data buffer handling", "writing safety pattern to %p offset %d", (*buffer)->GetPointer(), (*buffer)->GetUsedSize());
+ pRawBuffer->WritePattern(fgkSafetyPattern, fgkSafetyPatternSize);
}
return pRawBuffer;
}
// see header file for function documentation
int iResult=0;
if (pBuffer) {
- vector<AliHLTRawBuffer*>::iterator buffer=fgActiveBuffers.begin();
+ AliHLTRawBufferPList::iterator buffer=fgActiveBuffers.begin();
while (buffer!=fgActiveBuffers.end() && (*buffer)!=pBuffer) {
buffer++;
}
if (buffer!=fgActiveBuffers.end()) {
if (fgkSafetyPatternSize>0) {
- //fgLogging.Logging(kHLTLogDebug, "AliHLTDataBuffer::ReleaseRawBuffer", "data buffer handling", "comparing safety pattern at %p offset %d",
reinterpret_cast<void*>(*buffer), reinterpret_cast<AliHLTUInt32_t>(*buffer));
+ //fgLogging.Logging(kHLTLogDebug, "AliHLTDataBuffer::ReleaseRawBuffer", "data buffer handling", "comparing safety pattern at %p offset %d",
(*buffer)->GetPointer(), reinterpret_cast<AliHLTUInt32_t>(*buffer));
if ((*buffer)->CheckPattern(fgkSafetyPattern, fgkSafetyPatternSize)) {
- fgLogging.Logging(kHLTLogFatal, "AliHLTDataBuffer::ReleaseRawBuffer", "data buffer handling", "component has written beyond end of data buffer %p size %d", reinterpret_cast<void*>(*buffer), reinterpret_cast<AliHLTUInt32_t>(*buffer));
+ fgLogging.Logging(kHLTLogFatal, "AliHLTDataBuffer::ReleaseRawBuffer", "data buffer handling", "component has written beyond end of data buffer %p size %d", (*buffer)->GetPointer(), (*buffer)->GetUsedSize());
}
}
(*buffer)->Reset();
{
// see header file for function documentation
int iResult=0;
- vector<AliHLTRawBuffer*>::iterator buffer=fgFreeBuffers.begin();
- while (buffer!=fgFreeBuffers.end()) {
+// int iTotalSize=0;
+// int iCount=fgFreeBuffers.size()+fgActiveBuffers.size();
+ AliHLTRawBufferPList::iterator buffer;;
+ while ((buffer=fgFreeBuffers.begin())!=fgFreeBuffers.end()) {
+// iTotalSize+=(*buffer)->GetTotalSize();
delete *buffer;
fgFreeBuffers.erase(buffer);
- buffer=fgFreeBuffers.begin();
}
- buffer=fgActiveBuffers.begin();
- while (buffer!=fgActiveBuffers.end()) {
- fgLogging.Logging(kHLTLogWarning, "AliHLTDataBuffer::ReleaseRawBuffer", "data buffer handling", "request to delete active raw buffer container (raw buffer %p, size %d)", reinterpret_cast<void*>(*buffer), (*buffer)->GetTotalSize());
+ while ((buffer=fgActiveBuffers.begin())!=fgActiveBuffers.end()) {
+// iTotalSize+=(*buffer)->GetTotalSize();
+ fgLogging.Logging(kHLTLogWarning, "AliHLTDataBuffer::ReleaseRawBuffer", "data buffer handling", "request to delete active raw buffer container (raw buffer %p, size %d)", (*buffer)->GetPointer(), (*buffer)->GetTotalSize());
delete *buffer;
fgActiveBuffers.erase(buffer);
- buffer=fgActiveBuffers.begin();
}
+// fgLogging.Logging(kHLTLogInfo, "AliHLTDataBuffer::ReleaseRawBuffer", "data buffer handling", "Total memory allocation: %d byte in %d buffers", iTotalSize, iCount);
return iResult;
}
-AliHLTConsumerDescriptor* AliHLTDataBuffer::FindConsumer(const AliHLTComponent* pConsumer, vector<AliHLTConsumerDescriptor*> &list) const
+AliHLTConsumerDescriptor* AliHLTDataBuffer::FindConsumer(const AliHLTComponent* pConsumer, AliHLTConsumerDescriptorPList &list) const
{
// see header file for function documentation
AliHLTConsumerDescriptor* pDesc=NULL;
- vector<AliHLTConsumerDescriptor*>::iterator desc=list.begin();
+ AliHLTConsumerDescriptorPList::iterator desc=list.begin();
while (desc!=list.end() && pDesc==NULL) {
if ((pConsumer==NULL || (*desc)->GetComponent()==pConsumer)) {
pDesc=*desc;
AliHLTRawBuffer* pBuffer=fpBuffer;
fpBuffer=NULL;
+ // cleanup forwarded segment lists
+ assert(fForwardedSegments.size()==0);
+ fForwardedSegments.clear();
+ fForwardedSegmentSources.clear();
+
// cleanup consumer states
- vector<AliHLTConsumerDescriptor*>::iterator desc;
+ AliHLTConsumerDescriptorPList::iterator desc;
// if (GetNofPendingConsumers()>0) {
// desc=fConsumers.begin();
// while (desc!=fConsumers.end()) {
}
// cleanup segments
- vector<AliHLTDataBuffer::AliHLTDataSegment>::iterator segment=fSegments.begin();
+ AliHLTDataSegmentList::iterator segment=fSegments.begin();
while (segment!=fSegments.end()) {
fSegments.erase(segment);
segment=fSegments.begin();
}
// this is the version which works on lists of components instead of consumer descriptors
-// int AliHLTDataBuffer::ChangeConsumerState(AliHLTComponent* pConsumer, vector<AliHLTComponent*> &srcList, vector<AliHLTComponent*> &tgtList)
+// int AliHLTDataBuffer::ChangeConsumerState(AliHLTComponent* pConsumer, AliHLTComponentPList &srcList, AliHLTComponentPList &tgtList)
// {
// int iResult=0;
// if (pDesc) {
-// vector<AliHLTComponent*>::iterator desc=srcList.begin();
+// AliHLTComponentPList::iterator desc=srcList.begin();
// while (desc!=srcList.end()) {
// if ((*desc)==pConsumer) {
// srcList.erase(desc);
// return iResult;
// }
-int AliHLTDataBuffer::ChangeConsumerState(AliHLTConsumerDescriptor* pDesc, vector<AliHLTConsumerDescriptor*> &srcList, vector<AliHLTConsumerDescriptor*> &tgtList)
+int AliHLTDataBuffer::ChangeConsumerState(AliHLTConsumerDescriptor* pDesc, AliHLTConsumerDescriptorPList &srcList, AliHLTConsumerDescriptorPList &tgtList)
{
// see header file for function documentation
int iResult=-ENOENT;
if (pDesc) {
- vector<AliHLTConsumerDescriptor*>::iterator desc=srcList.begin();
+ AliHLTConsumerDescriptorPList::iterator desc=srcList.begin();
while (desc!=srcList.end()) {
if ((*desc)==pDesc) {
srcList.erase(desc);
// see header file for function documentation
int iResult=0;
ResetDataBuffer();
- vector<AliHLTConsumerDescriptor*>::iterator desc=fConsumers.begin();
+ AliHLTConsumerDescriptorPList::iterator desc=fConsumers.begin();
while (desc!=fConsumers.end()) {
delete *desc;
fConsumers.erase(desc);
int AliHLTDataBuffer::FindConsumer(AliHLTComponent* pConsumer, int bAllLists)
{
// see header file for function documentation
- vector<AliHLTConsumerDescriptor*>::iterator desc=fConsumers.begin();
+ AliHLTConsumerDescriptorPList::iterator desc=fConsumers.begin();
while (desc!=fConsumers.end()) {
if ((*desc)->GetComponent()==pConsumer)
return 1;
AliHLTDataBuffer::AliHLTRawBuffer::AliHLTRawBuffer(AliHLTUInt32_t size)
:
- fSize(size),
+ fSize(0),
fTotalSize(size),
fPtr(static_cast<AliHLTUInt8_t*>(malloc(size)))
{
AliHLTUInt8_t* AliHLTDataBuffer::AliHLTRawBuffer::UseBuffer(AliHLTUInt32_t size)
{
// see header file for function documentation
- if (size>0 && CheckSize(size)) {
+ if (size>0 && fTotalSize>=size) {
fSize=size;
return fPtr;
}
{
// see header file for function documentation
fSize=0;
+ return 0;
}
int AliHLTDataBuffer::AliHLTRawBuffer::WritePattern(const char* pattern, int size)
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff