Implement owner and auto deleter for tasks in DirectObject

Author: bluekyu

render_pipeline/rppanda/showbase/direct_object.hpp

@@ -57,8 +57,19 @@ namespace rppanda {
 class RENDER_PIPELINE_DECL DirectObject : public TypedReferenceCount
 {
 public:
+    DirectObject() = default;
+    DirectObject(const DirectObject&) = delete;
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
+    DirectObject(DirectObject&&);
+#endif
+
     virtual ~DirectObject();
 
+    DirectObject& operator=(const DirectObject&) = delete;
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
+    DirectObject& operator=(DirectObject&&);
+#endif
+
     ALLOC_DELETED_CHAIN(DirectObject);
 
     void accept(const std::string& ev_name, const Messenger::EventFunction& func);
@@ -107,9 +118,23 @@ class RENDER_PIPELINE_DECL DirectObject : public TypedReferenceCount
     void remove_all_tasks();
 
 private:
+    class TaskContainer : public WeakPointerCallback
+    {
+    public:
+        TaskContainer(DirectObject* owner, AsyncTask* task);
+        void wp_callback(void*) final { owner_->task_list_.erase(task_id_); }
+
+        WPT(AsyncTask) task_;
+
+    private:
+        DirectObject* owner_;
+        AtomicAdjust::Integer task_id_;     // While destructing AsyncTask, ID already is deleted
+                                            // So, we save it.
+    };
+
     void do_add_task(AsyncTask* task);
 
-    std::unordered_map<AtomicAdjust::Integer, PT(AsyncTask)> task_list_;
+    std::unordered_map<AtomicAdjust::Integer, TaskContainer> task_list_;
 
 public:
     static TypeHandle get_class_type();

render_pipeline/rppanda/task/task_manager.hpp

@@ -198,9 +198,9 @@ class RENDER_PIPELINE_DECL TaskManager : public TypedObject
     size_t remove_task_matching(const GlobPattern& task_pattern);
 
 private:
-    AsyncTask* setup_task(AsyncTask* task, const std::string& name = {},
-        boost::optional<int> sort = boost::none, boost::optional<int> priority = boost::none,
-        const boost::optional<std::string>& task_chain = boost::none);
+    AsyncTask* setup_task(AsyncTask* task, const std::string& name,
+        boost::optional<int> sort, boost::optional<int> priority,
+        const boost::optional<std::string>& task_chain);
 
     AsyncTaskManager* mgr_;
     ClockObject* global_clock_;

src/rppanda/showbase/direct_object.cpp

@@ -44,13 +44,28 @@
 
 namespace rppanda {
 
+DirectObject::TaskContainer::TaskContainer(DirectObject* owner, AsyncTask* task) : owner_(owner), task_(task), task_id_(task->get_task_id())
+{
+    task_.set_callback(this);
+}
+
+// ************************************************************************************************
+
 TypeHandle DirectObject::type_handle_;
 
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
+DirectObject::DirectObject(DirectObject&&) = default;
+#endif
+
 DirectObject::~DirectObject()
 {
     ignore_all();
 }
 
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
+DirectObject& DirectObject::operator=(DirectObject&&) = default;
+#endif
+
 void DirectObject::accept(const std::string& ev_name, const Messenger::EventFunction& func)
 {
     Messenger::get_global_instance()->accept(ev_name, func, this, true);
@@ -113,31 +128,37 @@ FunctionalTask* DirectObject::do_method_later(float delay_time,
 
 void DirectObject::remove_task(const std::string& task_name)
 {
-    for (const auto& task: task_list_)
+    for (const auto& task_container: task_list_)
     {
-        if (task.second->get_name() == task_name)
-            remove_task(task.second);
+        auto& task = task_container.second.task_;
+        if (task->get_name() == task_name)
+            remove_task(task);
     }
 }
 
 void DirectObject::remove_task(AsyncTask* task)
 {
-    auto id = task->get_task_id();
+    task_list_.erase(task->get_task_id());
     task->remove();
-    task_list_.erase(id);
 }
 
 void DirectObject::remove_all_tasks()
 {
+    std::vector<AsyncTask*> tasks;
+    tasks.reserve(task_list_.size());
     for (const auto& task : task_list_)
-        task.second->remove();
+        tasks.push_back(task.second.task_.p());
+
     task_list_.clear();
+
+    for (const auto& task : tasks)
+        task->remove();
 }
 
 void DirectObject::do_add_task(AsyncTask* task)
 {
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
-    task_list_.insert_or_assign(task->get_task_id(), task);
+    task_list_.insert_or_assign(task->get_task_id(), TaskContainer(this, task));
 #else
     task_list_[task->get_task_id()] = task;
 #endif