fix compile error2

lkpworkspace · Jun 20, 2024 · 7fd0339 · 7fd0339
1 parent 1f8e35b
commit 7fd0339
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/examples/example_worker_interactive_with_3rd_frame.cpp b/examples/example_worker_interactive_with_3rd_frame.cpp
@@ -102,8 +102,8 @@ class ExampleWorkerInteractiveWith3rdFrame : public myframe::Worker {
           recv_run_flag_ = true;
         } else if (cmd == myframe::CmdChannel::Cmd::kRunWithMsg) {
           auto mailbox = GetMailbox();
-          while (!mailbox->RecvEmpty()) {
-            const auto msg = mailbox->PopRecv();
+          while (!mailbox->RunEmpty()) {
+            const auto msg = mailbox->PopRun();
             // 接收到其它组件消息
             LOG(INFO) << "get main " << msg->GetData();
           }

diff --git a/myframe/mailbox.cpp b/myframe/mailbox.cpp
@@ -96,6 +96,10 @@ bool Mailbox::RunEmpty() const {
   return run_.empty();
 }
 
+int Mailbox::RunSize() const {
+  return run_.size();
+}
+
 const std::shared_ptr<const Msg> Mailbox::PopRun() {
   if (run_.empty()) {
     return nullptr;
@@ -112,7 +116,7 @@ std::list<std::shared_ptr<Msg>>* Mailbox::GetRecvList() {
 std::ostream& operator<<(std::ostream& out, const Mailbox& mailbox) {
   out << mailbox.Addr() << " recv " << mailbox.RecvSize()
     << ", send " << mailbox.SendSize()
-    << ", run " << mailbox.run_.size();
+    << ", run " << mailbox.RunSize();
   return out;
 }
 

diff --git a/myframe/mailbox.h b/myframe/mailbox.h
@@ -16,7 +16,6 @@ namespace myframe {
 
 class Msg;
 class MYFRAME_EXPORT Mailbox final {
-  friend std::ostream& operator<<(std::ostream&, const Mailbox&);
   friend class ActorContext;
   friend class ActorContextManager;
   friend class WorkerContext;
@@ -45,12 +44,15 @@ class MYFRAME_EXPORT Mailbox final {
   /// 信件处理
   void MoveToRun();
   bool RunEmpty() const;
+  int RunSize() const;
   const std::shared_ptr<const Msg> PopRun();
 
- private:
   /// 收件箱
   int RecvSize() const;
   bool RecvEmpty() const;
+
+ private:
+  /// 收件箱
   void RecvClear();
   void Recv(std::shared_ptr<Msg> msg);
   void Recv(std::list<std::shared_ptr<Msg>>* msg_list);