Kaydet (Commit) c00ecbe0 authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann

INTEGRATION: CWS configrefactor01 (1.11.24); FILE MERGED

2007/01/12 17:51:17 mmeeks 1.11.24.4: RIP 'memory::Accessor'
2007/01/12 14:50:42 mmeeks 1.11.24.3: Another big prune of memory::Accessor ...
2007/01/11 20:15:56 mmeeks 1.11.24.2: Submitted by: mmeeks
More re-factoring, lots of locking rationalized, drastically reduced
the mutex count, also removed ~300k interlocked increments with a non-interlocking
SimpleReferencedObject base
2007/01/08 20:48:51 mmeeks 1.11.24.1: Issue number:
Submitted by: mmeeks
Substantial configmgr re-factoring #1 ...
	+ remove endless typedef chains
	+ remove custom allocator & associated complexity
	+ remove Pointer, and 'Address' classes
üst 0e754199
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: apinodeupdate.cxx,v $ * $RCSfile: apinodeupdate.cxx,v $
* *
* $Revision: 1.11 $ * $Revision: 1.12 $
* *
* last change: $Author: obo $ $Date: 2006-09-16 14:54:45 $ * last change: $Author: ihi $ $Date: 2007-11-23 14:03:25 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -75,42 +75,42 @@ NodeGroupAccess& withDefaultData(NodeGroupAccess& _aGroup) ...@@ -75,42 +75,42 @@ NodeGroupAccess& withDefaultData(NodeGroupAccess& _aGroup)
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
configuration::GroupUpdater NodeGroupAccess::getNodeUpdater(data::Accessor const& _aAccessor) configuration::GroupUpdater NodeGroupAccess::getNodeUpdater()
{ {
return configuration::GroupUpdater(getTree(_aAccessor),getNodeRef(), getApiTree().getProvider().getTypeConverter()); return configuration::GroupUpdater(getTree(),getNodeRef(), getApiTree().getProvider().getTypeConverter());
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
configuration::GroupDefaulter NodeGroupAccess::getNodeDefaulter(data::Accessor const& _aAccessor) configuration::GroupDefaulter NodeGroupAccess::getNodeDefaulter()
{ {
return configuration::GroupDefaulter(getTree(_aAccessor),getNodeRef(), getApiTree().getDefaultProvider()); return configuration::GroupDefaulter(getTree(),getNodeRef(), getApiTree().getDefaultProvider());
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
configuration::SetElementFactory NodeTreeSetAccess::getElementFactory(data::Accessor const& _aAccessor) configuration::SetElementFactory NodeTreeSetAccess::getElementFactory()
{ {
using namespace configuration; using namespace configuration;
TemplateProvider aProvider = SetElementFactory::findTemplateProvider(getTree(_aAccessor),getNodeRef()); TemplateProvider aProvider = SetElementFactory::findTemplateProvider(getTree(),getNodeRef());
return SetElementFactory(_aAccessor,aProvider); return SetElementFactory(aProvider);
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
configuration::SetDefaulter NodeSetAccess::getNodeDefaulter(data::Accessor const& _aAccessor) configuration::SetDefaulter NodeSetAccess::getNodeDefaulter()
{ {
return configuration::SetDefaulter(getTree(_aAccessor),getNodeRef(), getApiTree().getDefaultProvider()); return configuration::SetDefaulter(getTree(),getNodeRef(), getApiTree().getDefaultProvider());
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
configuration::TreeSetUpdater NodeTreeSetAccess::getNodeUpdater(data::Accessor const& _aAccessor) configuration::TreeSetUpdater NodeTreeSetAccess::getNodeUpdater()
{ {
return configuration::TreeSetUpdater(getTree(_aAccessor),getNodeRef(),getElementInfo(_aAccessor)); return configuration::TreeSetUpdater(getTree(),getNodeRef(),getElementInfo());
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
configuration::ValueSetUpdater NodeValueSetAccess::getNodeUpdater(data::Accessor const& _aAccessor) configuration::ValueSetUpdater NodeValueSetAccess::getNodeUpdater()
{ {
return configuration::ValueSetUpdater(getTree(_aAccessor),getNodeRef(),getElementInfo(_aAccessor), getApiTree().getProvider().getTypeConverter()); return configuration::ValueSetUpdater(getTree(),getNodeRef(),getElementInfo(), getApiTree().getProvider().getTypeConverter());
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
...@@ -178,18 +178,14 @@ bool detachSetElement(Factory& rFactory, configuration::ElementRef const& aEleme ...@@ -178,18 +178,14 @@ bool detachSetElement(Factory& rFactory, configuration::ElementRef const& aEleme
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
UpdateGuardImpl::UpdateGuardImpl(NodeGroupAccess& rNode) UpdateGuardImpl::UpdateGuardImpl(NodeGroupAccess& rNode)
: m_aDataAccess(rNode.getSourceData()) : m_rNode(rNode)
, m_aViewLock(rNode.getDataLock())
, m_rNode(rNode)
{ {
rNode.checkAlive(); rNode.checkAlive();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
UpdateGuardImpl::UpdateGuardImpl(NodeSetAccess& rNode) UpdateGuardImpl::UpdateGuardImpl(NodeSetAccess& rNode)
: m_aDataAccess(rNode.getSourceData()) : m_rNode(rNode)
, m_aViewLock(rNode.getDataLock())
, m_rNode(rNode)
{ {
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment