From e8c4b0d57cbe18a3df2ef7a4c500dfae9772aa2b Mon Sep 17 00:00:00 2001 From: ehofman Date: Thu, 12 Jan 2006 13:47:04 +0000 Subject: [PATCH] =?UTF-8?q?Mathias=20Fr=F6hlich:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the new automatic reference counter instead of doing that ourselfes. --- simgear/props/props.cxx | 215 +++++++------------------------ simgear/props/props.hxx | 104 +++------------ simgear/scene/model/modellib.cxx | 26 ++-- simgear/scene/model/modellib.hxx | 3 +- 4 files changed, 76 insertions(+), 272 deletions(-) diff --git a/simgear/props/props.cxx b/simgear/props/props.cxx index cd993d5f..673cde4c 100644 --- a/simgear/props/props.cxx +++ b/simgear/props/props.cxx @@ -9,6 +9,7 @@ #include "props.hxx" #include +#include #include #include @@ -20,6 +21,7 @@ using std::endl; using std::find; using std::sort; using std::vector; +using std::stringstream; #else @@ -29,6 +31,7 @@ using std::vector; SG_USING_STD(sort); SG_USING_STD(find); SG_USING_STD(vector); +SG_USING_STD(stringstream); #if ( _MSC_VER == 1200 ) // MSVC 6 is buggy, and needs something strange here @@ -548,17 +551,33 @@ SGPropertyNode::make_string () const else return "false"; case INT: - sprintf(_buffer, "%d", get_int()); - return _buffer; + { + stringstream sstr; + sstr << get_int(); + _buffer = sstr.str(); + return _buffer.c_str(); + } case LONG: - sprintf(_buffer, "%ld", get_long()); - return _buffer; + { + stringstream sstr; + sstr << get_long(); + _buffer = sstr.str(); + return _buffer.c_str(); + } case FLOAT: - sprintf(_buffer, "%f", get_float()); - return _buffer; + { + stringstream sstr; + sstr << get_float(); + _buffer = sstr.str(); + return _buffer.c_str(); + } case DOUBLE: - sprintf(_buffer, "%f", get_double()); - return _buffer; + { + stringstream sstr; + sstr << get_double(); + _buffer = sstr.str(); + return _buffer.c_str(); + } case STRING: case UNSPECIFIED: return get_string(); @@ -598,25 +617,6 @@ SGPropertyNode::trace_read () const #endif } -/** - * Increment reference counter - */ -void -SGPropertyNode::incrementRef() -{ - ++_count; -} - -/** - * Decrement reference counter - */ -int -SGPropertyNode::decrementRef() -{ - return --_count; -} - - //////////////////////////////////////////////////////////////////////// // Public methods from SGPropertyNode. @@ -632,16 +632,12 @@ const int SGPropertyNode::LAST_USED_ATTRIBUTE = TRACE_WRITE; * Default constructor: always creates a root node. */ SGPropertyNode::SGPropertyNode () - : _name(copy_string("")), - _display_name(0), - _index(0), + : _index(0), _parent(0), - _path(0), _path_cache(0), _type(NONE), _tied(false), _attr(READ|WRITE), - _count(0), _listeners(0) { _local_val.string_val = 0; @@ -652,18 +648,15 @@ SGPropertyNode::SGPropertyNode () * Copy constructor. */ SGPropertyNode::SGPropertyNode (const SGPropertyNode &node) - : _display_name(0), - _index(node._index), + : _index(node._index), + _name(node._name), _parent(0), // don't copy the parent - _path(0), _path_cache(0), _type(node._type), _tied(node._tied), _attr(node._attr), - _count(0), _listeners(0) // CHECK!! { - _name = copy_string(node._name); _local_val.string_val = 0; switch (_type) { case NONE: @@ -737,18 +730,15 @@ SGPropertyNode::SGPropertyNode (const SGPropertyNode &node) SGPropertyNode::SGPropertyNode (const char * name, int index, SGPropertyNode * parent) - : _display_name(0), - _index(index), + : _index(index), _parent(parent), - _path(0), _path_cache(0), _type(NONE), _tied(false), _attr(READ|WRITE), - _count(0), _listeners(0) { - _name = copy_string(name); + _name = name; _local_val.string_val = 0; } @@ -758,9 +748,6 @@ SGPropertyNode::SGPropertyNode (const char * name, */ SGPropertyNode::~SGPropertyNode () { - delete [] _name; - delete [] _display_name; - delete [] _path; delete _path_cache; clearValue(); delete _listeners; @@ -971,34 +958,27 @@ SGPropertyNode::removeChildren (const char * name, bool keep) const char * SGPropertyNode::getDisplayName (bool simplify) const { - string display = _name; + _display_name = _name; if (_index != 0 || !simplify) { - char buffer[64]; - sprintf(buffer, "[%d]", _index); - display += buffer; + stringstream sstr; + sstr << '[' << _index << ']'; + _display_name += sstr.str(); } - _display_name = copy_string(display.c_str()); - return _display_name; + return _display_name.c_str(); } const char * SGPropertyNode::getPath (bool simplify) const { - // Calculate the complete path only once. - if (_path == 0) { - string path; - if (_parent == 0) { - path = ""; - } else { - path = _parent->getPath(simplify); - path += '/'; - path += getDisplayName(simplify); - } - _path = copy_string(path.c_str()); + // Calculate the complete path only once. + if (_parent != 0 && _path.empty()) { + _path = _parent->getPath(simplify); + _path += '/'; + _path += getDisplayName(simplify); } - return _path; + return _path.c_str(); } SGPropertyNode::Type @@ -2053,7 +2033,7 @@ void SGPropertyNode::addChangeListener (SGPropertyChangeListener * listener) { if (_listeners == 0) - _listeners = new vector; + _listeners = new vector; _listeners->push_back(listener); listener->register_property(this); } @@ -2061,13 +2041,13 @@ SGPropertyNode::addChangeListener (SGPropertyChangeListener * listener) void SGPropertyNode::removeChangeListener (SGPropertyChangeListener * listener) { - vector::iterator it = + vector::iterator it = find(_listeners->begin(), _listeners->end(), listener); if (it != _listeners->end()) { _listeners->erase(it); listener->unregister_property(this); if (_listeners->empty()) { - vector * tmp = _listeners; + vector* tmp = _listeners; _listeners = 0; delete tmp; } @@ -2139,8 +2119,7 @@ SGPropertyNode::fireChildRemoved (SGPropertyNode * parent, #define HASH_TABLE_SIZE 199 SGPropertyNode::hash_table::entry::entry () - : _key(0), - _value(0) + : _value(0) { } @@ -2148,13 +2127,12 @@ SGPropertyNode::hash_table::entry::~entry () { // Don't delete the value; we don't own // the pointer. - delete [] _key; } void SGPropertyNode::hash_table::entry::set_key (const char * key) { - _key = copy_string(key); + _key = key; } void @@ -2286,103 +2264,6 @@ SGPropertyNode::hash_table::hashcode (const char * key) } - -/** - * Default constructor - */ -SGPropertyNode_ptr::SGPropertyNode_ptr() -{ - _ptr = 0; -} - -/** - * Copy constructor - */ -SGPropertyNode_ptr::SGPropertyNode_ptr( const SGPropertyNode_ptr &r ) -{ - _ptr = r._ptr; - if (_ptr) - _ptr->incrementRef(); -} - -/** - * Constructor from a pointer to a node - */ -SGPropertyNode_ptr::SGPropertyNode_ptr( SGPropertyNode *p ) -{ - _ptr = p; - if (_ptr) - _ptr->incrementRef(); -} - -/** - * Destructor - */ -SGPropertyNode_ptr::~SGPropertyNode_ptr() -{ - if (_ptr && _ptr->decrementRef() == 0) - delete _ptr; -} - -/** - * Assignement operator - */ -SGPropertyNode_ptr & -SGPropertyNode_ptr::operator=( const SGPropertyNode_ptr &r ) -{ - if (_ptr && _ptr->decrementRef() == 0) - delete _ptr; - _ptr = r._ptr; - if (_ptr) - _ptr->incrementRef(); - - return *this; -} - -/** - * Pointer access operator - */ -SGPropertyNode * -SGPropertyNode_ptr::operator->() -{ - return _ptr; -} - -/** - * Pointer access operator (const) - */ -const SGPropertyNode * -SGPropertyNode_ptr::operator->() const -{ - return _ptr; -} - -/** - * Conversion to SGPropertyNode * operator - */ -SGPropertyNode_ptr::operator SGPropertyNode *() -{ - return _ptr; -} - -/** - * Conversion to const SGPropertyNode * operator - */ -SGPropertyNode_ptr::operator const SGPropertyNode *() const -{ - return _ptr; -} - -/** - * Validity test - */ -bool -SGPropertyNode_ptr::valid() const -{ - return _ptr != 0; -} - - //////////////////////////////////////////////////////////////////////// // Implementation of SGPropertyChangeListener. diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx index a4adb3f0..fb04b6bf 100644 --- a/simgear/props/props.hxx +++ b/simgear/props/props.hxx @@ -41,6 +41,9 @@ SG_USING_STD(ostream); #endif +#include +#include + #ifdef NONE #pragma warn A sloppy coder has defined NONE as a macro! @@ -452,70 +455,8 @@ private: * The smart pointer that manage reference counting */ class SGPropertyNode; -class SGPropertyNode_ptr -{ -public: - - /** - * Default constructor - */ - SGPropertyNode_ptr(); - - /** - * Copy constructor - */ - SGPropertyNode_ptr( const SGPropertyNode_ptr &r ); - - /** - * Constructor from a pointer to a node - */ - SGPropertyNode_ptr( SGPropertyNode *p ); - - /** - * Destructor - */ - ~SGPropertyNode_ptr(); - - /** - * Assignement operator - */ - SGPropertyNode_ptr &operator=( const SGPropertyNode_ptr &r ); - - /** - * Pointer access operator - */ - SGPropertyNode *operator->(); - - /** - * Pointer access operator (const) - */ - const SGPropertyNode *operator->() const; - - /** - * Conversion to SGPropertyNode * operator - */ - operator SGPropertyNode *(); - - /** - * Conversion to const SGPropertyNode * operator - */ - operator const SGPropertyNode *() const; - - /** - * Return the pointer. - */ - SGPropertyNode * ptr () { return _ptr; } - - /** - * Validity test - */ - bool valid() const; - -private: - - SGPropertyNode *_ptr; -}; - +typedef SGSharedPtr SGPropertyNode_ptr; +typedef SGSharedPtr SGConstPropertyNode_ptr; /** @@ -546,7 +487,7 @@ private: /** * A node in a property tree. */ -class SGPropertyNode +class SGPropertyNode : public SGReferenced { public: @@ -629,7 +570,7 @@ public: /** * Get the node's simple (XML) name. */ - const char * getName () const { return _name; } + const char * getName () const { return _name.c_str(); } /** @@ -1240,35 +1181,22 @@ private: void trace_write () const; - /** - * Increment reference counter - */ - void incrementRef(); - - /** - * Decrement reference counter - */ - int decrementRef(); - - friend class SGPropertyNode_ptr; - - - mutable char _buffer[MAX_STRING_LEN+1]; - class hash_table; - char * _name; - mutable char * _display_name; + string _name; + mutable string _display_name; int _index; + /// To avoid cyclic reference counting loops this shall not be a reference + /// counted pointer SGPropertyNode * _parent; vector _children; vector _removedChildren; - mutable char * _path; + mutable string _path; + mutable string _buffer; hash_table * _path_cache; Type _type; bool _tied; int _attr; - int _count; // The right kind of pointer... union { @@ -1307,13 +1235,13 @@ private: public: entry (); ~entry (); - const char * get_key () { return _key; } + const char * get_key () { return _key.c_str(); } void set_key (const char * key); SGPropertyNode * get_value () { return _value; } void set_value (SGPropertyNode * value); private: - char * _key; - SGPropertyNode * _value; + string _key; + SGSharedPtr _value; }; diff --git a/simgear/scene/model/modellib.cxx b/simgear/scene/model/modellib.cxx index 5e7dfc98..b9e625f4 100644 --- a/simgear/scene/model/modellib.cxx +++ b/simgear/scene/model/modellib.cxx @@ -21,11 +21,6 @@ SGModelLib::SGModelLib () SGModelLib::~SGModelLib () { - map::iterator it = _table.begin(); - while (it != _table.end()) { - ssgDeRefDelete(it->second); - _table.erase(it); - } } void @@ -49,16 +44,16 @@ SGModelLib::flush1() return; - map::iterator it = _table.begin(); + map >::iterator it = _table.begin(); while (it != _table.end()) { - ssgBase *item = it->second; // If there is only one reference, it's // ours; no one else is using the item. - if (item->getRef() == 1) { - ssgDeRefDelete(item); + if (!it->second.isShared()) { + string key = it->first; _table.erase(it); - } - it++; + it = _table.upper_bound(key); + } else + it++; } } @@ -90,15 +85,14 @@ SGModelLib::load_model( const string &fg_root, // FIXME: normalize path to // avoid duplicates. - map::iterator it = _table.find(path); + map >::iterator it = _table.find(path); if (it == _table.end()) { - ssgEntity *model = sgLoad3DModel( fg_root, path, prop_root, - sim_time_sec ); - model->ref(); + ssgSharedPtr model = sgLoad3DModel(fg_root, path, prop_root, + sim_time_sec ); _table[path] = model; // add one reference to keep it around personality_branch->addKid( model ); } else { - personality_branch->addKid( (ssgEntity *)it->second ); + personality_branch->addKid( it->second ); } return personality_branch; } diff --git a/simgear/scene/model/modellib.hxx b/simgear/scene/model/modellib.hxx index deed1e68..18e304ea 100644 --- a/simgear/scene/model/modellib.hxx +++ b/simgear/scene/model/modellib.hxx @@ -14,6 +14,7 @@ #include +#include #include SG_USING_STD(map); @@ -38,7 +39,7 @@ public: double sim_time_sec ); protected: - map _table; + map > _table; };