RFA: Patch: More NewField Related Pooma Code Changes
Jeffrey Oldham
oldham at codesourcery.com
Fri May 11 22:11:30 UTC 2001
Ok to commit this patch?
Attached is a patch of miscellaneous changes found when trying to
explicitly instantiate various Fields.
2001-05-11 Jeffrey D. Oldham <oldham at codesourcery.com>
* Domain/DomainTraits.Region.h
(DomainTraits<Region<1,POOMA_DEFAULT_POSITION_TYPE> >::empty():
Remove name of unused parameter.
* Engine/CompressibleBlock.h
(CompressibleBlockController::CompressibleBlockController):
Reorder member initializations to reflect declaration order.
* Engine/RemoteEngine.h (Engine<Dim, T, Remote<Tag> >::Engine):
Likewise.
* NewField/Field.h (Field::physicalCellDomain): Remove unnecessary
return reference.
* NewField/FieldEngine/FieldEngineBase.ExprEngine.h
(FieldEngineBase::physicalCellDomain): Likewise.
* NewField/FieldEngine/FieldEngineBase.h
(FieldEngineBase::physicalCellDomain): Likewise.
* Tulip/RemoteProxy.h (RemoteProxy::RemoteProxy): Conditionally
declaration variable.
* Utilities/RefCountedBlockPtr.h
(RefBlockController::RefBlockController): Reorder member
initializations to reflect declaration order.
Tested on sequential Linux using g++ by building library
Approved by ???you???
Thanks,
Jeffrey D. Oldham
oldham at codesourcery.com
-------------- next part --------------
Index: Domain/DomainTraits.Region.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Domain/DomainTraits.Region.h,v
retrieving revision 1.12
diff -c -p -r1.12 DomainTraits.Region.h
*** Domain/DomainTraits.Region.h 2001/04/13 02:12:59 1.12
--- Domain/DomainTraits.Region.h 2001/05/11 21:49:09
*************** struct DomainTraits< Region<1,POOMA_DEFA
*** 407,413 ****
static Element_t max(const Storage_t &d) {
return (length(d) >= 0 ? last(d) : first(d));
}
! static bool empty(const Storage_t &d) { return false; }
static int loop(const Storage_t &) { return 0; }
// get the Nth value of the domain, where value # 0 is first(), etc.
--- 407,413 ----
static Element_t max(const Storage_t &d) {
return (length(d) >= 0 ? last(d) : first(d));
}
! static bool empty(const Storage_t &) { return false; }
static int loop(const Storage_t &) { return 0; }
// get the Nth value of the domain, where value # 0 is first(), etc.
Index: Engine/CompressibleBlock.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Engine/CompressibleBlock.h,v
retrieving revision 1.27
diff -c -p -r1.27 CompressibleBlock.h
*** Engine/CompressibleBlock.h 2000/07/11 22:13:00 1.27
--- Engine/CompressibleBlock.h 2001/05/11 21:49:10
*************** private:
*** 451,463 ****
explicit
CompressibleBlockController(int size)
: Observable<T*>(ptr_m),
size_m(size),
- compressible_m(true),
ptr_m(&compressedData_m),
! dataObject_m(-1),
! ucOffset_m(-1),
! viewcount_m(0),
! countUncompressed_m(0)
{
ElementProperties<T>::construct(&compressedData_m);
--- 451,463 ----
explicit
CompressibleBlockController(int size)
: Observable<T*>(ptr_m),
+ compressible_m(true),
+ countUncompressed_m(0),
+ viewcount_m(0),
+ dataObject_m(-1),
size_m(size),
ptr_m(&compressedData_m),
! ucOffset_m(-1)
{
ElementProperties<T>::construct(&compressedData_m);
*************** private:
*** 474,486 ****
CompressibleBlockController(int size, int affinity)
: Observable<T*>(ptr_m),
- size_m(size),
compressible_m(true),
! ptr_m(&compressedData_m),
! dataObject_m(affinity),
! ucOffset_m(-1),
viewcount_m(0),
! countUncompressed_m(0)
{
ElementProperties<T>::construct(&compressedData_m);
--- 474,486 ----
CompressibleBlockController(int size, int affinity)
: Observable<T*>(ptr_m),
compressible_m(true),
! countUncompressed_m(0),
viewcount_m(0),
! dataObject_m(affinity),
! size_m(size),
! ptr_m(&compressedData_m),
! ucOffset_m(-1)
{
ElementProperties<T>::construct(&compressedData_m);
*************** private:
*** 497,509 ****
CompressibleBlockController(int size, int affinity, const T& value)
: Observable<T*>(ptr_m),
- size_m(size),
compressible_m(true),
! ptr_m(&compressedData_m),
! dataObject_m(affinity),
! ucOffset_m(-1),
viewcount_m(0),
! countUncompressed_m(0)
{
ElementProperties<T>::construct(&compressedData_m,value);
--- 497,509 ----
CompressibleBlockController(int size, int affinity, const T& value)
: Observable<T*>(ptr_m),
compressible_m(true),
! countUncompressed_m(0),
viewcount_m(0),
! dataObject_m(affinity),
! size_m(size),
! ptr_m(&compressedData_m),
! ucOffset_m(-1)
{
ElementProperties<T>::construct(&compressedData_m,value);
*************** private:
*** 531,541 ****
CompressibleBlockController(const CompressibleBlockController& model)
: Observable<T*>(ptr_m),
- size_m(model.size_m),
compressible_m(!Pooma::neverCompress()),
dataObject_m(model.dataObject_m.affinity()),
! ucOffset_m(model.ucOffset_m),
! viewcount_m(0)
{
// Lock the model while we get information pertaining to it
// being compressed or not (such data can't be initialized in
--- 531,541 ----
CompressibleBlockController(const CompressibleBlockController& model)
: Observable<T*>(ptr_m),
compressible_m(!Pooma::neverCompress()),
+ viewcount_m(0),
dataObject_m(model.dataObject_m.affinity()),
! size_m(model.size_m),
! ucOffset_m(model.ucOffset_m)
{
// Lock the model while we get information pertaining to it
// being compressed or not (such data can't be initialized in
Index: Engine/RemoteEngine.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Engine/RemoteEngine.h,v
retrieving revision 1.31
diff -c -p -r1.31 RemoteEngine.h
*** Engine/RemoteEngine.h 2001/03/29 00:41:21 1.31
--- Engine/RemoteEngine.h 2001/05/11 21:49:12
*************** Engine<Dim, T, Remote<Tag> >::Engine()
*** 609,616 ****
template <int Dim, class T, class Tag>
Engine<Dim, T, Remote<Tag> >::Engine(const Node<Domain_t> &node)
! : owningContext_m(node.context()),
! domain_m(node.allocated())
{
PAssert(owningContext_m < Pooma::contexts());
--- 609,616 ----
template <int Dim, class T, class Tag>
Engine<Dim, T, Remote<Tag> >::Engine(const Node<Domain_t> &node)
! : domain_m(node.allocated()),
! owningContext_m(node.context())
{
PAssert(owningContext_m < Pooma::contexts());
*************** Engine<Dim, T, Remote<Tag> >::Engine(con
*** 634,641 ****
template <int Dim, class T, class Tag>
Engine<Dim, T, Remote<Tag> >::Engine(const Layout_t &layout)
! : owningContext_m(0),
! domain_m(layout.node().allocated())
{
PAssert(owningContext_m < Pooma::contexts());
--- 634,641 ----
template <int Dim, class T, class Tag>
Engine<Dim, T, Remote<Tag> >::Engine(const Layout_t &layout)
! : domain_m(layout.node().allocated()),
! owningContext_m(0)
{
PAssert(owningContext_m < Pooma::contexts());
*************** Engine<Dim, T, Remote<Tag> >::Engine(con
*** 659,665 ****
template <int Dim, class T, class Tag>
Engine<Dim, T, Remote<Tag> >::Engine(const Domain_t &dom)
! : owningContext_m(0), domain_m(dom)
{
if (engineIsLocal())
{
--- 659,665 ----
template <int Dim, class T, class Tag>
Engine<Dim, T, Remote<Tag> >::Engine(const Domain_t &dom)
! : domain_m(dom), owningContext_m(0)
{
if (engineIsLocal())
{
*************** Engine<Dim, T, Remote<Tag> >::Engine(con
*** 676,683 ****
template <int Dim, class T, class Tag>
Engine<Dim, T, Remote<Tag> >::Engine(int owningContext, const Domain_t &dom)
! : owningContext_m(owningContext),
! domain_m(dom)
{
if (engineIsLocal())
{
--- 676,683 ----
template <int Dim, class T, class Tag>
Engine<Dim, T, Remote<Tag> >::Engine(int owningContext, const Domain_t &dom)
! : domain_m(dom),
! owningContext_m(owningContext)
{
if (engineIsLocal())
{
*************** Engine<Dim, T, Remote<Tag> >::Engine(int
*** 698,704 ****
template <int Dim, class T, class Tag>
Engine<Dim, T, Remote<Tag> >::Engine(const Domain_t &dom, const T& model)
! : owningContext_m(0), domain_m(dom)
{
if (engineIsLocal())
{
--- 698,704 ----
template <int Dim, class T, class Tag>
Engine<Dim, T, Remote<Tag> >::Engine(const Domain_t &dom, const T& model)
! : domain_m(dom), owningContext_m(0)
{
if (engineIsLocal())
{
*************** Engine<Dim, T, Remote<Tag> >::Engine(con
*** 718,725 ****
template <int Dim, class T, class Tag>
Engine<Dim, T, Remote<Tag> >::
Engine(const Engine<Dim, T, Remote<Tag> > &modelEngine)
! : owningContext_m(modelEngine.owningContext()),
! domain_m(modelEngine.domain()),
localEnginePtr_m(modelEngine.localEnginePtr_m)
{
}
--- 718,725 ----
template <int Dim, class T, class Tag>
Engine<Dim, T, Remote<Tag> >::
Engine(const Engine<Dim, T, Remote<Tag> > &modelEngine)
! : domain_m(modelEngine.domain()),
! owningContext_m(modelEngine.owningContext()),
localEnginePtr_m(modelEngine.localEnginePtr_m)
{
}
*************** template <int Dim, class T, class Tag>
*** 728,735 ****
Engine<Dim, T, Remote<Tag> >::
Engine(const Engine<Dim, T, Remote<Tag> > &modelEngine,
const EngineConstructTag &)
! : owningContext_m(modelEngine.owningContext()),
! domain_m(modelEngine.domain()),
localEnginePtr_m(modelEngine.localEnginePtr_m)
{
}
--- 728,735 ----
Engine<Dim, T, Remote<Tag> >::
Engine(const Engine<Dim, T, Remote<Tag> > &modelEngine,
const EngineConstructTag &)
! : domain_m(modelEngine.domain()),
! owningContext_m(modelEngine.owningContext()),
localEnginePtr_m(modelEngine.localEnginePtr_m)
{
}
Index: NewField/Field.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/Field.h,v
retrieving revision 1.12
diff -c -p -r1.12 Field.h
*** NewField/Field.h 2001/04/27 22:52:44 1.12
--- NewField/Field.h 2001/05/11 21:49:13
*************** public:
*** 933,939 ****
return fieldEngine_m.numSubFields();
}
! inline const Domain_t &physicalCellDomain() const
{
return fieldEngine_m.physicalCellDomain();
}
--- 933,939 ----
return fieldEngine_m.numSubFields();
}
! inline const Domain_t physicalCellDomain() const
{
return fieldEngine_m.physicalCellDomain();
}
Index: NewField/FieldEngine/FieldEngineBase.ExprEngine.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/FieldEngine/FieldEngineBase.ExprEngine.h,v
retrieving revision 1.10
diff -c -p -r1.10 FieldEngineBase.ExprEngine.h
*** NewField/FieldEngine/FieldEngineBase.ExprEngine.h 2000/12/13 20:48:29 1.10
--- NewField/FieldEngine/FieldEngineBase.ExprEngine.h 2001/05/11 21:49:13
*************** public:
*** 261,267 ****
//---------------------------------------------------------------------------
// Domain accessor functions.
! inline const Domain_t &physicalCellDomain() const
{
return referenceField_m.physicalCellDomain();
}
--- 261,267 ----
//---------------------------------------------------------------------------
// Domain accessor functions.
! inline const Domain_t physicalCellDomain() const
{
return referenceField_m.physicalCellDomain();
}
Index: NewField/FieldEngine/FieldEngineBase.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/FieldEngine/FieldEngineBase.h,v
retrieving revision 1.11
diff -c -p -r1.11 FieldEngineBase.h
*** NewField/FieldEngine/FieldEngineBase.h 2001/04/27 22:50:27 1.11
--- NewField/FieldEngine/FieldEngineBase.h 2001/05/11 21:49:13
*************** public:
*** 429,435 ****
//---------------------------------------------------------------------------
// Domain accessor functions.
! inline const Domain_t &physicalCellDomain() const
{
return physicalCellDomain_m;
}
--- 429,435 ----
//---------------------------------------------------------------------------
// Domain accessor functions.
! inline const Domain_t physicalCellDomain() const
{
return physicalCellDomain_m;
}
Index: Tulip/RemoteProxy.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Tulip/RemoteProxy.h,v
retrieving revision 1.13
diff -c -p -r1.13 RemoteProxy.h
*** Tulip/RemoteProxy.h 2000/06/08 22:16:59 1.13
--- Tulip/RemoteProxy.h 2001/05/11 21:49:13
*************** public:
*** 112,118 ****
--- 112,120 ----
RemoteProxy(T &val, int owningContext = 0)
{
+ #if POOMA_CHEETAH
int tag = RemoteProxyBase::tag_m++;
+ #endif
if (Pooma::context() == owningContext)
{
value_m = &val;
Index: Utilities/RefCountedBlockPtr.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Utilities/RefCountedBlockPtr.h,v
retrieving revision 1.60
diff -c -p -r1.60 RefCountedBlockPtr.h
*** Utilities/RefCountedBlockPtr.h 2001/05/04 15:41:29 1.60
--- Utilities/RefCountedBlockPtr.h 2001/05/11 21:49:14
*************** public:
*** 145,151 ****
}
RefBlockController(size_t size, const T & model)
! : dealloc_m(false), pBegin_m(0), pEnd_m(0), pEndOfStorage_m(0)
{
// Allocate memory, and set pointers to beginning and ending. This
// also sets the dealloc_m flag to true.
--- 145,151 ----
}
RefBlockController(size_t size, const T & model)
! : pBegin_m(0), pEnd_m(0), pEndOfStorage_m(0), dealloc_m(false)
{
// Allocate memory, and set pointers to beginning and ending. This
// also sets the dealloc_m flag to true.
More information about the pooma-dev
mailing list