diff -r -u -2 --exclude-from=ignore upd2_org_versions/upd2_013/include/RTItypes.hh upd2/include/RTItypes.hh --- upd2_org_versions/upd2_013/include/RTItypes.hh 2003-01-19 10:26:50.000000000 +0100 +++ upd2/include/RTItypes.hh 2003-01-19 17:46:52.000000000 +0100 @@ -391,28 +391,27 @@ public: Handle _handle; - ULong _valuelength; + ULong _valueLength; char *_value; - AttributeHandleValuePair *_next; // METHODS public : - AttributeHandleValuePair(); - ~AttributeHandleValuePair(); + AttributeHandleValuePair(Handle handle, + const char* value, + ULong value_length); + ~AttributeHandleValuePair(void); }; -class AttributeHandleValuePairSet +class AttributeHandleValuePairSet : private list<AttributeHandleValuePair *> { // ATTRIBUTES public: - OrderType _order; + OrderType _order; TransportType _transport; - ULong _size; - AttributeHandleValuePair *_head; // METHODS public: - virtual ~AttributeHandleValuePairSet(); + virtual ~AttributeHandleValuePairSet(void); - virtual ULong size() const ; + virtual ULong size(void) const; virtual Handle getHandle(ULong i) const throw(ArrayIndexOutOfBounds); virtual ULong getValueLength(ULong i) const throw(ArrayIndexOutOfBounds); @@ -441,6 +440,6 @@ throw(ValueCountExceeded, ArrayIndexOutOfBounds, UnimplementedService); - virtual void empty(); - virtual ULong start() const; + virtual void empty(void); + virtual ULong start(void) const; virtual ULong valid(ULong i) const; virtual ULong next(ULong i) const; @@ -530,25 +529,21 @@ public: Handle _handle; - ULong _valuelength; + ULong _valueLength; char *_value; - ParameterHandleValuePair *_next; -public : - ParameterHandleValuePair(); - ~ParameterHandleValuePair(); + ParameterHandleValuePair(Handle handle, const char* value, ULong length); + ~ParameterHandleValuePair(void); }; -class ParameterHandleValuePairSet +class ParameterHandleValuePairSet : private list<ParameterHandleValuePair *> { public: OrderType _order; TransportType _transport; - ULong _size; - ParameterHandleValuePair *_head; public: - virtual ~ParameterHandleValuePairSet(); + virtual ~ParameterHandleValuePairSet(void); - virtual ULong size() const; + virtual ULong size(void) const; virtual Handle getHandle(ULong i) const throw(ArrayIndexOutOfBounds); @@ -579,6 +574,6 @@ throw(ValueCountExceeded, ArrayIndexOutOfBounds, UnimplementedService); - virtual void empty(); - virtual ULong start() const; + virtual void empty(void); + virtual ULong start(void) const; virtual ULong valid(ULong i) const; virtual ULong next(ULong i) const; diff -r -u -2 --exclude-from=ignore upd2_org_versions/upd2_013/libCERTI/GAV_aux.cc upd2/libCERTI/GAV_aux.cc --- upd2_org_versions/upd2_013/libCERTI/GAV_aux.cc 2003-01-19 10:26:18.000000000 +0100 +++ upd2/libCERTI/GAV_aux.cc 2003-01-19 17:47:35.000000000 +0100 @@ -35,12 +35,17 @@ namespace certi { -AttributeHandleValuePair::AttributeHandleValuePair(void) +// --------------------------------------------------------------------------- +AttributeHandleValuePair::AttributeHandleValuePair(Handle handle, + const char * value, + ULong value_length) { - _handle = 0; - _valuelength = 0; - _value = new char[1024]; - _next =(AttributeHandleValuePair *)NULL; + _handle = handle; + _valueLength = value_length; + + _value = (char *)malloc(value_length); + memcpy(_value, value, value_length); } +// --------------------------------------------------------------------------- AttributeHandleValuePair::~AttributeHandleValuePair(void) { @@ -51,180 +56,177 @@ // AttributeHandleValuePairSet //----------------------------------------------------------------------- -AttributeHandleValuePairSet::~AttributeHandleValuePairSet() +AttributeHandleValuePairSet::~AttributeHandleValuePairSet(void) { - empty(); + empty(); } +// --------------------------------------------------------------------------- inline ULong -AttributeHandleValuePairSet::size() const +AttributeHandleValuePairSet::size(void) const { - return _size; + return list<AttributeHandleValuePair *>::size(); } - -Handle + +// --------------------------------------------------------------------------- +Handle AttributeHandleValuePairSet::getHandle(ULong i) const throw(ArrayIndexOutOfBounds) { - AttributeHandleValuePair *tmp = _head; + list<AttributeHandleValuePair *>::const_iterator j = begin(); + for (ULong k = 0 ; j != end() ; j++,k++) { + if (i == k) + return (*j)->_handle; + } - for(unsigned int j=0; j<_size; j++) { - if(j==i) return tmp->_handle; - else tmp = tmp->_next; - } - throw ArrayIndexOutOfBounds(); + throw ArrayIndexOutOfBounds(); } - + +// --------------------------------------------------------------------------- ULong AttributeHandleValuePairSet::getValueLength(ULong i) const throw(ArrayIndexOutOfBounds) { - AttributeHandleValuePair *tmp = _head; + list<AttributeHandleValuePair *>::const_iterator j = begin(); + for (ULong k = 0 ; j != end() ; j++,k++) { + if (i == k) + return (*j)->_valueLength; + } - for(unsigned int j=0; j<_size; j++) { - if(j==i) return tmp->_valuelength; - else tmp = tmp->_next; - } - throw ArrayIndexOutOfBounds(); + throw ArrayIndexOutOfBounds(); } - + +// --------------------------------------------------------------------------- void -AttributeHandleValuePairSet::getValue(ULong i, - char* buff, - ULong& valueLength) const - throw(ArrayIndexOutOfBounds) +AttributeHandleValuePairSet::getValue(ULong i, + char* buff, + ULong& value_length) const + throw(ArrayIndexOutOfBounds) { - AttributeHandleValuePair *tmp = _head; + list<AttributeHandleValuePair *>::const_iterator j = begin(); + for (ULong k = 0 ; j != end() ; j++,k++) { + if (i == k) { + value_length = (*j)->_valueLength; + memcpy(buff, (*j)->_value, (*j)->_valueLength); + return; + } + } - if(i>=_size) throw ArrayIndexOutOfBounds(); - else { - for(unsigned int j=0; j<i; j++) tmp = tmp->_next ; - memcpy(buff, tmp->_value, tmp->_valuelength); - valueLength = tmp->_valuelength; - } + throw ArrayIndexOutOfBounds(); } - -char * -AttributeHandleValuePairSet::getValuePointer(ULong i, - ULong& valueLength) const - throw(ArrayIndexOutOfBounds) -{ - AttributeHandleValuePair *tmp = _head; - for(unsigned int j=0; j<_size; j++) { - if(j==i) { - valueLength = tmp->_valuelength; - return tmp->_value; +// --------------------------------------------------------------------------- +char * +AttributeHandleValuePairSet::getValuePointer(ULong i, + ULong& value_length) const + throw(ArrayIndexOutOfBounds) +{ + list<AttributeHandleValuePair *>::const_iterator j = begin(); + for (ULong k = 0 ; j != end() ; j++,k++) { + if (i == k) { + value_length = (*j)->_valueLength; + return (*j)->_value; + } } - else tmp = tmp->_next; - } - throw ArrayIndexOutOfBounds(); + + throw ArrayIndexOutOfBounds(); } - + +// --------------------------------------------------------------------------- inline TransportType AttributeHandleValuePairSet::getTransportType(ULong) const - throw(ArrayIndexOutOfBounds, InvalidHandleValuePairSetContext) + throw(ArrayIndexOutOfBounds, InvalidHandleValuePairSetContext) { - return _transport; + return _transport; } - + +// --------------------------------------------------------------------------- inline OrderType AttributeHandleValuePairSet::getOrderType(ULong) const - throw(ArrayIndexOutOfBounds, InvalidHandleValuePairSetContext) + throw(ArrayIndexOutOfBounds, InvalidHandleValuePairSetContext) { - return _order; + return _order; } - + +// --------------------------------------------------------------------------- Region* AttributeHandleValuePairSet::getRegion(ULong) const - throw(ArrayIndexOutOfBounds, InvalidHandleValuePairSetContext, - UnimplementedService)//CERTI + throw(ArrayIndexOutOfBounds, InvalidHandleValuePairSetContext, + UnimplementedService)//CERTI { - throw UnimplementedService(); + throw UnimplementedService(); } - -void + +// --------------------------------------------------------------------------- +void AttributeHandleValuePairSet::add(Handle h, - const char* buff, - ULong valueLength) - throw(ValueLengthExceeded, ValueCountExceeded) -{ - AttributeHandleValuePair *newNode = new AttributeHandleValuePair(); - newNode->_next = _head; - newNode->_handle = h; - newNode->_valuelength = valueLength; - memcpy(newNode->_value, buff, valueLength); - _head = newNode; - _size++; + const char* buff, + ULong value_length) + throw(ValueLengthExceeded, ValueCountExceeded) +{ + AttributeHandleValuePair *ahvp; + ahvp = new AttributeHandleValuePair(h, buff, value_length); + + push_front(ahvp); } - + +// --------------------------------------------------------------------------- void AttributeHandleValuePairSet::remove(Handle h) - throw(ArrayIndexOutOfBounds) + throw(ArrayIndexOutOfBounds) { - AttributeHandleValuePair *tmp = _head; - AttributeHandleValuePair *prec = _head; - - for(unsigned int j=0; j<_size; j++) { - if(tmp->_handle == h) { - if(j==0) _head = _head->_next; - else prec->_next = tmp->_next; - - delete tmp; - _size--; - return; - } - prec = tmp; - tmp = tmp->_next; - } + list<AttributeHandleValuePair *>::iterator j; + for (j = begin() ; j != end() ; j++) { + if ( (*j)->_handle == h) { + delete (*j); + erase(j); + return; + } + } throw ArrayIndexOutOfBounds(); } - + +// --------------------------------------------------------------------------- void AttributeHandleValuePairSet::moveFrom(const AttributeHandleValuePairSet&, - ULong&) - throw(ValueCountExceeded, ArrayIndexOutOfBounds, - UnimplementedService) //CERTI + ULong&) + throw(ValueCountExceeded, ArrayIndexOutOfBounds, + UnimplementedService) //CERTI { - throw UnimplementedService(); + throw UnimplementedService(); } - + +// --------------------------------------------------------------------------- void AttributeHandleValuePairSet::empty(void) { - if (_head != NULL) { - AttributeHandleValuePair * tmp = _head; - AttributeHandleValuePair * next = _head->_next; - for (unsigned int i = 0 ; i < _size-1 ; i++) { - delete tmp; - tmp = next; - next = next->_next; - } - delete tmp; - - _head =(AttributeHandleValuePair *)NULL; - _size = 0; + while (!list<AttributeHandleValuePair *>::empty()) { + delete front(); + pop_front(); } } +// --------------------------------------------------------------------------- ULong -AttributeHandleValuePairSet::start() const +AttributeHandleValuePairSet::start(void) const { -//not implemented -return 0; + //not implemented + return 0; } +// --------------------------------------------------------------------------- ULong AttributeHandleValuePairSet::valid(ULong) const { - //not implemented - return 0; + //not implemented + return 0; } +// --------------------------------------------------------------------------- ULong AttributeHandleValuePairSet::next(ULong) const { - //not implemented - return 0; + //not implemented + return 0; } @@ -237,10 +239,8 @@ throw(MemoryExhausted, ValueCountExceeded, HandleValuePairMaximumExceeded) { - AttributeHandleValuePairSet *ahvps = new AttributeHandleValuePairSet; - ahvps->_order = RECEIVE; - ahvps->_transport = RELIABLE; - ahvps->_head =(AttributeHandleValuePair *)NULL; - ahvps->_size = 0; - return ahvps; + AttributeHandleValuePairSet *ahvps = new AttributeHandleValuePairSet; + ahvps->_order = RECEIVE; + ahvps->_transport = RELIABLE; + return ahvps; } @@ -404,12 +404,16 @@ //----------------------------------------------------------------------- -ParameterHandleValuePair::ParameterHandleValuePair() +ParameterHandleValuePair::ParameterHandleValuePair(Handle handle, + const char * value, + ULong value_length) { - _handle = 0; - _valuelength = 0; - _value = new char [1024]; - _next =(ParameterHandleValuePair *)NULL; + _handle = handle; + _valueLength = value_length; + + _value = (char *)malloc(value_length); + memcpy(_value, value, value_length); } +// --------------------------------------------------------------------------- ParameterHandleValuePair::~ParameterHandleValuePair(void) { @@ -420,185 +424,179 @@ // ParameterHandleValuePairSet //----------------------------------------------------------------------- -ParameterHandleValuePairSet::~ParameterHandleValuePairSet() +ParameterHandleValuePairSet::~ParameterHandleValuePairSet(void) { - empty(); + empty(); } +// --------------------------------------------------------------------------- inline ULong -ParameterHandleValuePairSet::size() const +ParameterHandleValuePairSet::size(void) const { - return _size; + return list<ParameterHandleValuePair *>::size(); } - + +// --------------------------------------------------------------------------- Handle ParameterHandleValuePairSet::getHandle(ULong i) const - throw(ArrayIndexOutOfBounds) + throw(ArrayIndexOutOfBounds) { - ParameterHandleValuePair *tmp = _head; + list<ParameterHandleValuePair *>::const_iterator j = begin(); + for (ULong k = 0 ; j != end() ; j++,k++) { + if (i == k) + return (*j)->_handle; + } - for(unsigned int j=0; j<_size; j++) { - if(j==i) return tmp->_handle; - else tmp = tmp->_next; - } - throw ArrayIndexOutOfBounds(); + throw ArrayIndexOutOfBounds(); } - + +// --------------------------------------------------------------------------- ULong ParameterHandleValuePairSet::getValueLength(ULong i) const - throw(ArrayIndexOutOfBounds) + throw(ArrayIndexOutOfBounds) { - ParameterHandleValuePair *tmp = _head; + list<ParameterHandleValuePair *>::const_iterator j = begin(); + for (ULong k = 0 ; j != end() ; j++,k++) { + if (i == k) + return (*j)->_valueLength; + } - for(unsigned int j=0; j<_size; j++) { - if(j==i) return tmp->_valuelength; - else tmp = tmp->_next; - } - throw ArrayIndexOutOfBounds(); + throw ArrayIndexOutOfBounds(); } - + +// --------------------------------------------------------------------------- void ParameterHandleValuePairSet::getValue(ULong i, - char* buff, - ULong& valueLength) const - throw(ArrayIndexOutOfBounds) -{ - ParameterHandleValuePair *tmp = _head; + char* buff, + ULong& value_length) const + throw(ArrayIndexOutOfBounds) +{ + list<ParameterHandleValuePair *>::const_iterator j = begin(); + for (ULong k = 0 ; j != end() ; j++,k++) { + if (i == k) { + value_length = (*j)->_valueLength; + memcpy(buff, (*j)->_value, (*j)->_valueLength); + return; + } + } - if(i>=_size) throw ArrayIndexOutOfBounds(); - else { - for(unsigned int j=0; j<i; j++) tmp = tmp->_next; - memcpy(buff, tmp->_value, tmp->_valuelength); - valueLength = tmp->_valuelength; - } + throw ArrayIndexOutOfBounds(); } - + +// --------------------------------------------------------------------------- char * ParameterHandleValuePairSet::getValuePointer(ULong i, - ULong& valueLength) const - throw(ArrayIndexOutOfBounds) + ULong& value_length) const + throw(ArrayIndexOutOfBounds) { - ParameterHandleValuePair *tmp = _head; - - for(unsigned int j=0; j<_size; j++) { - if(j==i) { - valueLength = tmp->_valuelength; - return tmp->_value; + list<ParameterHandleValuePair *>::const_iterator j = begin(); + for (ULong k = 0 ; j != end() ; j++,k++) { + if (i == k) { + value_length = (*j)->_valueLength; + return (*j)->_value; + } } - else tmp = tmp->_next; - } - throw ArrayIndexOutOfBounds(); + throw ArrayIndexOutOfBounds(); } - + +// --------------------------------------------------------------------------- inline TransportType ParameterHandleValuePairSet::getTransportType(void) const - throw(InvalidHandleValuePairSetContext) + throw(InvalidHandleValuePairSetContext) { - return _transport; + return _transport; } - + +// --------------------------------------------------------------------------- inline OrderType ParameterHandleValuePairSet::getOrderType(void) const - throw(InvalidHandleValuePairSetContext) + throw(InvalidHandleValuePairSetContext) { - return _order; + return _order; } - + +// --------------------------------------------------------------------------- Region * ParameterHandleValuePairSet::getRegion(void) const - throw(InvalidHandleValuePairSetContext, - UnimplementedService)//CERTI + throw(InvalidHandleValuePairSetContext, + UnimplementedService)//CERTI { - throw UnimplementedService(); + throw UnimplementedService(); } - + +// --------------------------------------------------------------------------- void -ParameterHandleValuePairSet::add(Handle h, - const char* buff, - ULong valueLength) - throw(ValueLengthExceeded, ValueCountExceeded) -{ - ParameterHandleValuePair *newNode = new ParameterHandleValuePair(); - newNode->_next = _head; - newNode->_handle = h; - newNode->_valuelength = valueLength; - memcpy(newNode->_value, buff, valueLength); - _head = newNode; - _size++; +ParameterHandleValuePairSet::add(Handle h, + const char* buff, + ULong value_length) + throw(ValueLengthExceeded, ValueCountExceeded) +{ + ParameterHandleValuePair *phvp; + phvp = new ParameterHandleValuePair(h, buff, value_length); + + push_front(phvp); } - -// not guaranteed safe while iterating + +// --------------------------------------------------------------------------- void ParameterHandleValuePairSet::remove(Handle h) - throw(ArrayIndexOutOfBounds) + throw(ArrayIndexOutOfBounds) { - ParameterHandleValuePair *tmp = _head; - ParameterHandleValuePair *prec = _head; - - for(unsigned int j=0; j<_size; j++) { - if(tmp->_handle == h) { - if(j==0) _head = _head->_next; - else prec->_next = tmp->_next; - delete tmp; - _size--; - return; - } - prec = tmp; - tmp = tmp->_next; - } + list<ParameterHandleValuePair *>::iterator j; + for (j = begin() ; j != end() ; j++) { + if ( (*j)->_handle == h) { + delete (*j); + erase(j); + return; + } + } throw ArrayIndexOutOfBounds(); } - + +// --------------------------------------------------------------------------- void ParameterHandleValuePairSet::moveFrom(const ParameterHandleValuePairSet&, - ULong&) - throw (ValueCountExceeded, ArrayIndexOutOfBounds, - UnimplementedService)//CERTI + ULong&) + throw (ValueCountExceeded, ArrayIndexOutOfBounds, + UnimplementedService)//CERTI { - throw UnimplementedService(); + throw UnimplementedService(); } - +// --------------------------------------------------------------------------- void ParameterHandleValuePairSet::empty(void) { - if (_head != NULL) { - ParameterHandleValuePair * tmp = _head; - ParameterHandleValuePair * next = _head->_next; - for (unsigned int i = 0 ; i < _size-1 ; i++) { - delete tmp; - tmp = next; - next = next->_next; - } - delete tmp; - - _head = (ParameterHandleValuePair *) NULL; - _size = 0; + while (!list<ParameterHandleValuePair *>::empty()) { + delete front(); + pop_front(); } } +// --------------------------------------------------------------------------- ULong ParameterHandleValuePairSet::start(void) const { - //not implemented - return 0; + //not implemented + return 0; } +// --------------------------------------------------------------------------- ULong ParameterHandleValuePairSet::valid(ULong) const { - //not implemented - return 0; + //not implemented + return 0; } +// --------------------------------------------------------------------------- ULong ParameterHandleValuePairSet::next(ULong) const { - //not implemented - return 0; + //not implemented + return 0; } - //----------------------------------------------------------------------- // ParameterSetFactory @@ -607,13 +605,11 @@ ParameterHandleValuePairSet* ParameterSetFactory::create(ULong) - throw (MemoryExhausted, ValueCountExceeded, - HandleValuePairMaximumExceeded) + throw (MemoryExhausted, ValueCountExceeded, + HandleValuePairMaximumExceeded) { - ParameterHandleValuePairSet *phvps = new ParameterHandleValuePairSet; - phvps->_order = RECEIVE; - phvps->_transport = RELIABLE; - phvps->_head =(ParameterHandleValuePair *)NULL; - phvps->_size = 0; - return phvps; + ParameterHandleValuePairSet *phvps = new ParameterHandleValuePairSet; + phvps->_order = RECEIVE; + phvps->_transport = RELIABLE; + return phvps; }