Schedule Diagram show cowns as arrows

Author: xFrednet

src/lang/interpreter.cc

@@ -635,14 +635,16 @@ namespace verona::interpreter
       auto cown_info = cowns.find(cown);
       if (cown_info != cowns.end())
       {
-        auto pending = cown_info->second;
+        auto predecessor = cown_info->second;
         // If a behavior is pending, set the successor
-        if (pending->status != rt::core::Behavior::Status::Done)
+        if (predecessor->status != rt::core::Behavior::Status::Done)
         {
-          if (pending->succ.insert(behavior).second)
+          if (predecessor->succ.insert(behavior).second)
           {
             behavior->pred_ctn += 1;
           }
+          // Only needed for Mermaid:
+          behavior->cown_deps[cown] = predecessor.get();
         }
       }
       // Update pointer to the last pending behavior

src/rt/behavior.h

@@ -96,6 +96,12 @@ namespace rt::core
     objects::Region* local_region;
 
   public:
+    // This maps the cowns of this behavior to the previous behavior this
+    // is waiting on. This is used to draw the dependencies, it is not used
+    // for sceduling.
+    // Both of these pointers are weak reference.
+    std::map<objects::DynObject*, Behavior*> cown_deps;
+
     Status status;
     // The cowns as they were passed in to the cown. These have to be provided
     // to the new Interpreter to populate the frame

src/rt/core.h

@@ -361,10 +361,9 @@ namespace rt::core
 
     // TODO: This should really be split into `get_name()` just getting the name
     // and `get_info()` or the additional info text like lrc and status
-    std::string get_name() override
+    std::optional<std::string> get_additional_info() override
     {
       std::stringstream ss;
-      ss << this->name << std::endl;
       ss << "status=" << to_string(status);
       return ss.str();
     }

src/rt/core/behavior.cc

@@ -85,6 +85,9 @@ namespace rt::core
     return rt::try_get_bytecode(this->code).value();
   }
 
+  // FIXME: Currently both the scheduler and the behavior has a function
+  // to complete a behavior. All of this should really be in one place. It
+  // might be better to move all of this into the scheduler.
   void Behavior::complete()
   {
     this->status = Status::Done;
@@ -98,6 +101,14 @@ namespace rt::core
     }
     this->cowns.clear();
 
+    for (auto [cown, waiting_on] : cown_deps)
+    {
+      if (waiting_on == this)
+      {
+        cown_deps.erase(cown);
+      }
+    }
+
     this->s_running_behaviors.erase(this->id);
   }
 } // namespace rt::core

src/rt/objects/dyn_object.h

@@ -137,6 +137,12 @@ namespace rt::objects
       return name;
     }
 
+    // TODO make more types use this instead of `get_name()`
+    virtual std::optional<std::string> get_additional_info()
+    {
+      return std::nullopt;
+    }
+
     /// TODO remove virtual once we have primitive functions.
     virtual DynObject* is_primitive()
     {

src/rt/ui/mermaid.cc

@@ -201,15 +201,7 @@ namespace rt::ui
 
     void draw_behavior(core::behavior_ptr behavior)
     {
-      out << "subgraph " << behavior->id_str() << "[\" \"]" << std::endl;
       draw_behavior_info(behavior.get());
-
-      for (auto [_, c] : behavior->ordered_cown)
-      {
-        this->draw_cown(c, behavior);
-      }
-      out << "end" << std::endl;
-
       // Set background color
       auto background = ERROR_NODE_COLOR;
       switch (behavior->status)
@@ -224,31 +216,23 @@ namespace rt::ui
           background = BEHAVIOR_PENDING_COLOR;
           break;
       }
-      out << "style " << behavior->id_str() << " fill:" << background
-          << std::endl;
-    }
-
-    void draw_dependencies(core::behavior_ptr behavior)
-    {
-      for (auto [_, cown_obj] : behavior->ordered_cown)
-      {
-        assert(cown_obj->get_prototype() == core::cownPrototypeObject());
-        core::CownObject* cown = reinterpret_cast<core::CownObject*>(cown_obj);
-        auto cown_id = cown->get_id();
-
-        // Draw dependencies
-        for (auto succ : behavior->succ)
-        {
-          if (succ->ordered_cown.contains(cown_id))
-          {
-            out << "    ";
-            out << cown_node_id(cown, succ->id);
-            out << " --> ";
-            out << cown_node_id(cown, behavior->id);
-            out << std::endl;
-            edge_counter += 1;
-          }
-        }
+      out << "style " << this->behavior_node_name(behavior.get())
+          << " fill:" << background << std::endl;
+
+      for (auto [cown, pred] : behavior->cown_deps)
+      {
+        out << "    ";
+        out << this->behavior_node_name(behavior.get());
+        out << " --> |";
+        // TODO: This really shouldn't directly access the name. get_name()
+        // should always just return the name and then there is a
+        // `more_info()` method that provides additional info like
+        // the cown status or LRC for regions etc.
+        out << escape(cown->get_name());
+        out << "| ";
+        out << this->behavior_node_name(pred);
+        out << std::endl;
+        edge_counter += 1;
       }
     }
 
@@ -290,15 +274,6 @@ namespace rt::ui
         this->draw_behavior(behavior);
       }
 
-      for (auto& [bid, behavior] : behaviors)
-      {
-        this->draw_dependencies(behavior);
-      }
-
-      // TODO:
-      // -> Show running behavior?
-      // -> Cown colors
-
       // Footer
       this->draw_footer();
     }