TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 15:53:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

pipeline: Minor optimizations in cycler copy constructor

Browse Source 
When copying a dirty cycler, don't use two separate lock-grabbing calls to add to the clean set, then remove from clean set and move to dirty set

Short-cut the cdata copy loop for the common case of only 1 stage
This commit is contained in:
rdb 2022-11-21 18:29:51 +01:00
parent 8a48c3b711
commit 09f8634433
3 changed files with 53 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
panda/src/pipeline/pipeline.cxx
View File

@ -357,6 +357,42 @@ add_cycler(PipelineCyclerTrueImpl *cycler) {
}
#endif // THREADED_PIPELINE
#ifdef THREADED_PIPELINE
/**
* Adds the indicated cycler to the list of cyclers associated with the
* pipeline. This method only exists when true pipelining is configured on.
*
* If the dirty flag is true, it will be marked as dirty in addition, as though
* add_dirty_cycler() were called immediately afterward.
*/
void Pipeline::
add_cycler(PipelineCyclerTrueImpl *cycler, bool dirty) {
// It's safe to add it to the list while cycling, since the _clean list is
// not touched during the cycle loop.
MutexHolder holder(_lock);
nassertv(!cycler->_dirty);
if (!dirty) {
cycler->insert_before(&_clean);
}
else {
nassertv(_num_stages != 1);
cycler->insert_before(&_dirty);
cycler->_dirty = _next_cycle_seq;
++_num_dirty_cyclers;
#ifdef DEBUG_THREADS
inc_cycler_type(_dirty_cycler_types, cycler->get_parent_type(), 1);
#endif
}
++_num_cyclers;
#ifdef DEBUG_THREADS
inc_cycler_type(_all_cycler_types, cycler->get_parent_type(), 1);
#endif
}
#endif // THREADED_PIPELINE
#ifdef THREADED_PIPELINE
/**
* Marks the indicated cycler as "dirty", meaning it will need to be cycled

1
panda/src/pipeline/pipeline.h
View File

@ -50,6 +50,7 @@ public:
#ifdef THREADED_PIPELINE
void add_cycler(PipelineCyclerTrueImpl *cycler);
void add_cycler(PipelineCyclerTrueImpl *cycler, bool dirty);
void add_dirty_cycler(PipelineCyclerTrueImpl *cycler);
void remove_cycler(PipelineCyclerTrueImpl *cycler);

30
panda/src/pipeline/pipelineCyclerTrueImpl.cxx
View File

@ -56,24 +56,26 @@ PipelineCyclerTrueImpl(const PipelineCyclerTrueImpl &copy) :
nassertv(_num_stages == copy._num_stages);
_data = new CycleDataNode[_num_stages];
// It's no longer critically important that we preserve pointerwise
// equivalence between different stages in the copy, but it doesn't cost
// much and might be a little more efficient, so we do it anyway.
typedef pmap<CycleData *, PT(CycleData) > Pointers;
Pointers pointers;
if (_num_stages == 1) {
_data[0]._cdata = copy._data[0]._cdata->make_copy();
}
else {
// It's no longer critically important that we preserve pointerwise
// equivalence between different stages in the copy, but it doesn't cost
// much and might be a little more efficient, so we do it anyway.
typedef pmap<CycleData *, PT(CycleData) > Pointers;
Pointers pointers;
for (int i = 0; i < _num_stages; ++i) {
PT(CycleData) &new_pt = pointers[copy._data[i]._cdata];
if (new_pt == nullptr) {
new_pt = copy._data[i]._cdata->make_copy();
for (int i = 0; i < _num_stages; ++i) {
PT(CycleData) &new_pt = pointers[copy._data[i]._cdata];
if (new_pt == nullptr) {
new_pt = copy._data[i]._cdata->make_copy();
}
_data[i]._cdata = new_pt.p();
}
_data[i]._cdata = new_pt.p();
}
_pipeline->add_cycler(this);
if (copy._dirty) {
_pipeline->add_dirty_cycler(this);
}
_pipeline->add_cycler(this, copy._dirty != 0);
}
/**