diff --git a/direct/src/dcparser/dcClass.cxx b/direct/src/dcparser/dcClass.cxx index 80c8b58ed7..9c4028691d 100644 --- a/direct/src/dcparser/dcClass.cxx +++ b/direct/src/dcparser/dcClass.cxx @@ -24,8 +24,8 @@ using std::string; #ifdef WITHIN_PANDA #ifndef CPPPARSER -PStatCollector DCClass::_update_pcollector("App:Show code:readerPollTask:Update"); -PStatCollector DCClass::_generate_pcollector("App:Show code:readerPollTask:Generate"); +PStatCollector DCClass::_update_pcollector("App:Tasks:readerPollTask:Update"); +PStatCollector DCClass::_generate_pcollector("App:Tasks:readerPollTask:Generate"); #endif // CPPPARSER ConfigVariableBool dc_multiple_inheritance diff --git a/direct/src/distributed/cConnectionRepository.cxx b/direct/src/distributed/cConnectionRepository.cxx index 60579024c8..73f472cb86 100644 --- a/direct/src/distributed/cConnectionRepository.cxx +++ b/direct/src/distributed/cConnectionRepository.cxx @@ -35,7 +35,7 @@ using std::string; const string CConnectionRepository::_overflow_event_name = "CRDatagramOverflow"; #ifndef CPPPARSER -PStatCollector CConnectionRepository::_update_pcollector("App:Show code:readerPollTask:Update"); +PStatCollector CConnectionRepository::_update_pcollector("App:Tasks:readerPollTask:Update"); #endif // CPPPARSER /** diff --git a/direct/src/interval/Interval.py b/direct/src/interval/Interval.py index a88e50d4db..4172c1c982 100644 --- a/direct/src/interval/Interval.py +++ b/direct/src/interval/Interval.py @@ -41,7 +41,7 @@ class Interval(DirectObject): self.pstats = None if __debug__ and TaskManager.taskTimerVerbose: self.pname = name.split('-', 1)[0] - self.pstats = PStatCollector("App:Show code:ivalLoop:%s" % (self.pname)) + self.pstats = PStatCollector("App:Tasks:ivalLoop:%s" % (self.pname)) # Set true if the interval should be invoked if it was # completely skipped over during initialize or finalize, false diff --git a/direct/src/interval/MetaInterval.py b/direct/src/interval/MetaInterval.py index f706c338aa..f2b8166e79 100644 --- a/direct/src/interval/MetaInterval.py +++ b/direct/src/interval/MetaInterval.py @@ -106,7 +106,7 @@ class MetaInterval(CMetaInterval): self.pstats = None if __debug__ and TaskManager.taskTimerVerbose: self.pname = name.split('-', 1)[0] - self.pstats = PStatCollector("App:Show code:ivalLoop:%s" % (self.pname)) + self.pstats = PStatCollector("App:Tasks:ivalLoop:%s" % (self.pname)) self.pythonIvals = [] diff --git a/direct/src/interval/cInterval.cxx b/direct/src/interval/cInterval.cxx index 0e7dba1554..16467b3874 100644 --- a/direct/src/interval/cInterval.cxx +++ b/direct/src/interval/cInterval.cxx @@ -22,7 +22,7 @@ using std::ostream; using std::string; -PStatCollector CInterval::_root_pcollector("App:Show code:ivalLoop"); +PStatCollector CInterval::_root_pcollector("App:Tasks:ivalLoop"); TypeHandle CInterval::_type_handle; static inline string diff --git a/direct/src/showbase/EventManager.py b/direct/src/showbase/EventManager.py index c7c6e00e50..fe32280e3f 100644 --- a/direct/src/showbase/EventManager.py +++ b/direct/src/showbase/EventManager.py @@ -137,11 +137,11 @@ class EventManager: hyphen = name.find('-') if hyphen >= 0: name = name[0:hyphen] - pstatCollector = PStatCollector('App:Show code:eventManager:' + name) + pstatCollector = PStatCollector('App:Tasks:eventManager:' + name) pstatCollector.start() if self.eventHandler: cppPstatCollector = PStatCollector( - 'App:Show code:eventManager:' + name + ':C++') + 'App:Tasks:eventManager:' + name + ':C++') messenger.send(eventName, paramList) diff --git a/direct/src/showbase/Job.py b/direct/src/showbase/Job.py index 76a6f1ee97..f24b5ed78d 100755 --- a/direct/src/showbase/Job.py +++ b/direct/src/showbase/Job.py @@ -35,7 +35,7 @@ class Job(DirectObject): self._priority = Job.Priorities.Normal self._finished = False if __debug__: - self._pstats = PStatCollector("App:Show code:jobManager:%s" % self._name) + self._pstats = PStatCollector("App:Tasks:jobManager:%s" % self._name) def destroy(self): del self._name diff --git a/panda/src/event/asyncTask.cxx b/panda/src/event/asyncTask.cxx index f1d9141e95..0ec0c6d8b7 100644 --- a/panda/src/event/asyncTask.cxx +++ b/panda/src/event/asyncTask.cxx @@ -21,7 +21,7 @@ using std::string; AtomicAdjust::Integer AsyncTask::_next_task_id; -PStatCollector AsyncTask::_show_code_pcollector("App:Show code"); +PStatCollector AsyncTask::_tasks_pcollector("App:Tasks"); TypeHandle AsyncTask::_type_handle; /** @@ -213,7 +213,7 @@ set_name(const string &name) { break; } } - PStatCollector parent(_show_code_pcollector, name.substr(0, trimmed)); + PStatCollector parent(_tasks_pcollector, name.substr(0, trimmed)); // prevent memory leak _task_pcollector = PStatCollector(parent, // name.substr(0, end)); _task_pcollector = parent; diff --git a/panda/src/event/asyncTask.h b/panda/src/event/asyncTask.h index 82e6a4ed34..55c5beb4fb 100644 --- a/panda/src/event/asyncTask.h +++ b/panda/src/event/asyncTask.h @@ -156,7 +156,7 @@ protected: static AtomicAdjust::Integer _next_task_id; - static PStatCollector _show_code_pcollector; + static PStatCollector _tasks_pcollector; PStatCollector _task_pcollector; friend class PythonTask; diff --git a/panda/src/pstatclient/pStatProperties.cxx b/panda/src/pstatclient/pStatProperties.cxx index 03a93d7b59..c44d06d575 100644 --- a/panda/src/pstatclient/pStatProperties.cxx +++ b/panda/src/pstatclient/pStatProperties.cxx @@ -108,15 +108,7 @@ static TimeCollectorProperties time_properties[] = { { 1, "App:Collisions", { 1.0, 0.5, 0.0 } }, { 1, "App:Collisions:Reset", { 0.0, 0.0, 0.5 } }, { 0, "App:Data graph", { 0.5, 0.8, 0.4 } }, - { 1, "App:Show code", { 0.8, 0.2, 1.0 } }, - //{ 0, "App:Show code:General", { 0.4, 0.3, 0.9 } }, - { 0, "App:Show code:Nametags", { 0.8, 0.8, 1.0 } }, - { 0, "App:Show code:Nametags:2d", { 0.0, 0.0, 0.5 } }, - { 0, "App:Show code:Nametags:2d:Contents", { 0.0, 0.5, 0.0 } }, - { 0, "App:Show code:Nametags:2d:Adjust", { 0.5, 0.0, 0.5 } }, - { 0, "App:Show code:Nametags:3d", { 1.0, 0.0, 0.0 } }, - { 0, "App:Show code:Nametags:3d:Contents", { 0.0, 0.5, 0.0 } }, - { 0, "App:Show code:Nametags:3d:Adjust", { 0.5, 0.0, 0.5 } }, + { 1, "App:Tasks", { 0.8, 0.2, 1.0 } }, { 1, "Cull", { 0.21, 0.68, 0.37 }, 1.0 / 30.0 }, { 1, "Cull:Setup", { 0.7, 0.4, 0.5 } }, { 1, "Cull:Sort", { 0.3, 0.3, 0.6 } },