[fix] Circular reference error

projects/llm_framework/main/src/main.cpp

@@ -89,9 +89,14 @@ class llm_llm : public StackFlow {
  task_count_ = 1;
  }
 
- void task_output(const std::shared_ptr<llm_task> llm_task_obj, const std::shared_ptr<llm_channel_obj> llm_channel,
- const std::string &data, bool finish)
+ void task_output(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak, const std::string &data, bool finish)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  if (llm_channel->enstream_) {
  static int count = 0;
  nlohmann::json data_body;
@@ -109,10 +114,15 @@ class llm_llm : public StackFlow {
  }
  }
 
- void task_user_data(const std::shared_ptr<llm_task> llm_task_obj,
- const std::shared_ptr<llm_channel_obj> llm_channel, const std::string &object,
+ void task_user_data(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak, const std::string &object,
  const std::string &data)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  const std::string *next_data = &data;
  int ret;
  std::string tmp_msg1;
@@ -157,10 +167,13 @@ class llm_llm : public StackFlow {
  if (ret == 0) {
  llm_channel->set_output(llm_task_obj->enoutput_);
  llm_channel->set_stream(llm_task_obj->enstream_);
- llm_task_obj->set_output(std::bind(&llm_llm::task_output, this, llm_task_obj, llm_channel,
- std::placeholders::_1, std::placeholders::_2));
- llm_channel->subscriber_work_id("", std::bind(&llm_llm::task_user_data, this, llm_task_obj, llm_channel,
- std::placeholders::_1, std::placeholders::_2));
+ llm_task_obj->set_output(std::bind(&llm_llm::task_output, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1,
+ std::placeholders::_2));
+ llm_channel->subscriber_work_id(
+ "",
+ std::bind(&llm_llm::task_user_data, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1, std::placeholders::_2));
  llm_task_[work_id_num] = llm_task_obj;
  send("None", "None", LLM_NO_ERROR, work_id);
  return 0;

projects/llm_framework/main_asr/src/main.cpp

@@ -292,9 +292,14 @@ class llm_asr : public StackFlow {
  EVENT_TASK_PAUSE, std::bind(&llm_asr::_task_pause, this, std::placeholders::_1, std::placeholders::_2));
  }
 
- void task_output(const std::shared_ptr<llm_task> llm_task_obj, const std::shared_ptr<llm_channel_obj> llm_channel,
- const std::string &data, bool finish)
+ void task_output(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak, const std::string &data, bool finish)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  std::string tmp_msg1;
  const std::string *next_data = &data;
  if (finish) {
@@ -340,10 +345,15 @@ class llm_asr : public StackFlow {
  return 0;
  }
 
- void task_user_data(const std::shared_ptr<llm_task> llm_task_obj,
- const std::shared_ptr<llm_channel_obj> llm_channel, const std::string &object,
+ void task_user_data(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak, const std::string &object,
  const std::string &data)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  std::string tmp_msg1;
  const std::string *next_data = &data;
  int ret;
@@ -398,8 +408,14 @@ class llm_asr : public StackFlow {
  event_queue_.enqueue(EVENT_TASK_PAUSE, work_id, "");
  }
 
- void task_work(const std::shared_ptr<llm_task> llm_task_obj, const std::shared_ptr<llm_channel_obj> llm_channel)
+ void task_work(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  llm_task_obj->kws_awake();
  if ((!audio_url_.empty()) && (llm_task_obj->audio_flage_ == false)) {
  llm_channel->subscriber(audio_url_,
@@ -408,9 +424,15 @@ class llm_asr : public StackFlow {
  }
  }
 
- void kws_awake(const std::shared_ptr<llm_task> llm_task_obj, const std::shared_ptr<llm_channel_obj> llm_channel,
- const std::string &object, const std::string &data)
+ void kws_awake(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak, const std::string &object,
+ const std::string &data)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  std::this_thread::sleep_for(std::chrono::milliseconds(llm_task_obj->awake_delay_));
  task_work(llm_task_obj, llm_channel);
  }
@@ -476,10 +498,9 @@ class llm_asr : public StackFlow {
  llm_channel->set_output(llm_task_obj->enoutput_);
  llm_channel->set_stream(llm_task_obj->enstream_);
  llm_task_obj->pause = std::bind(&llm_asr::task_pause, this, work_id, "");
- SLOGI("llm_task_obj->enoutput_:%d", llm_task_obj->enoutput_);
- SLOGI("llm_task_obj->enstream_:%d", llm_task_obj->enstream_);
- llm_task_obj->set_output(std::bind(&llm_asr::task_output, this, llm_task_obj, llm_channel,
- std::placeholders::_1, std::placeholders::_2));
+ llm_task_obj->set_output(std::bind(&llm_asr::task_output, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1,
+ std::placeholders::_2));
 
  for (const auto input : llm_task_obj->inputs_) {
  if (input.find("sys") != std::string::npos) {
@@ -489,13 +510,15 @@ class llm_asr : public StackFlow {
  llm_task_obj->audio_flage_ = true;
  } else if (input.find("asr") != std::string::npos) {
  llm_channel->subscriber_work_id(
- "", std::bind(&llm_asr::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1,
+ "", std::bind(&llm_asr::task_user_data, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1,
  std::placeholders::_2));
  } else if (input.find("kws") != std::string::npos) {
  llm_task_obj->ensleep_ = true;
  task_pause(work_id, "");
  llm_channel->subscriber_work_id(
- input, std::bind(&llm_asr::kws_awake, this, llm_task_obj, llm_channel, std::placeholders::_1,
+ input, std::bind(&llm_asr::kws_awake, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1,
  std::placeholders::_2));
  }
  }
@@ -534,8 +557,10 @@ class llm_asr : public StackFlow {
  llm_task_obj->inputs_.push_back(data);
  } else if (data.find("kws") != std::string::npos) {
  llm_task_obj->ensleep_ = true;
- ret = llm_channel->subscriber_work_id(data, std::bind(&llm_asr::kws_awake, this, llm_task_obj, llm_channel,
- std::placeholders::_1, std::placeholders::_2));
+ ret = llm_channel->subscriber_work_id(
+ data,
+ std::bind(&llm_asr::kws_awake, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1, std::placeholders::_2));
  llm_task_obj->inputs_.push_back(data);
  }
  if (ret) {

projects/llm_framework/main_kws/src/main.cpp

@@ -314,16 +314,28 @@ class llm_kws : public StackFlow {
  }
  }
 
- void task_pause(const std::shared_ptr<llm_task> llm_task_obj, const std::shared_ptr<llm_channel_obj> llm_channel)
+ void task_pause(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  if (llm_task_obj->audio_flage_) {
  if (!audio_url_.empty()) llm_channel->stop_subscriber(audio_url_);
  llm_task_obj->audio_flage_ = false;
  }
  }
 
- void task_work(const std::shared_ptr<llm_task> llm_task_obj, const std::shared_ptr<llm_channel_obj> llm_channel)
+ void task_work(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  if ((!audio_url_.empty()) && (llm_task_obj->audio_flage_ == false)) {
  llm_channel->subscriber(audio_url_,
  std::bind(&llm_task::sys_pcm_on_data, llm_task_obj.get(), std::placeholders::_1));
@@ -363,10 +375,15 @@ class llm_kws : public StackFlow {
  send("None", "None", LLM_NO_ERROR, work_id);
  }
 
- void task_user_data(const std::shared_ptr<llm_task> llm_task_obj,
- const std::shared_ptr<llm_channel_obj> llm_channel, const std::string &object,
+ void task_user_data(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak, const std::string &object,
  const std::string &data)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  std::string tmp_msg1;
  const std::string *next_data = &data;
  int ret;
@@ -426,7 +443,8 @@ class llm_kws : public StackFlow {
  llm_task_obj->audio_flage_ = true;
  } else if (input.find("kws") != std::string::npos) {
  llm_channel->subscriber_work_id(
- "", std::bind(&llm_kws::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1,
+ "", std::bind(&llm_kws::task_user_data, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1,
  std::placeholders::_2));
  }
  }

projects/llm_framework/main_llm/src/main.cpp

@@ -152,7 +152,11 @@ class llm_task {
  }
  };
  lLaMa_ = std::make_unique<LLM>();
- if (!lLaMa_->Init(mode_config_)) return -2;
+ if (!lLaMa_->Init(mode_config_)) {
+ lLaMa_->Deinit();
+ lLaMa_.reset();
+ return -2;
+ }
 
  } catch (...) {
  SLOGE("config false");
@@ -216,6 +220,9 @@ class llm_task {
 
  ~llm_task()
  {
+ if (lLaMa_) {
+ lLaMa_->Deinit();
+ }
  }
 };
 
@@ -248,9 +255,14 @@ class llm_llm : public StackFlow {
  repeat_event(1000, std::bind(&llm_llm::_load_config, this));
  }
 
- void task_output(const std::shared_ptr<llm_task> llm_task_obj, const std::shared_ptr<llm_channel_obj> llm_channel,
- const std::string &data, bool finish)
+ void task_output(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak, const std::string &data, bool finish)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  SLOGI("send:%s", data.c_str());
  if (llm_channel->enstream_) {
  static int count = 0;
@@ -271,10 +283,15 @@ class llm_llm : public StackFlow {
  }
  }
 
- void task_user_data(const std::shared_ptr<llm_task> llm_task_obj,
- const std::shared_ptr<llm_channel_obj> llm_channel, const std::string &object,
+ void task_user_data(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak, const std::string &object,
  const std::string &data)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  const std::string *next_data = &data;
  int ret;
  std::string tmp_msg1;
@@ -294,9 +311,15 @@ class llm_llm : public StackFlow {
  llm_task_obj->inference((*next_data));
  }
 
- void task_asr_data(const std::shared_ptr<llm_task> llm_task_obj, const std::shared_ptr<llm_channel_obj> llm_channel,
- const std::string &object, const std::string &data)
+ void task_asr_data(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak, const std::string &object,
+ const std::string &data)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  if (object.find("stream") != std::string::npos) {
  if (sample_json_str_get(data, "finish") == "true") {
  llm_task_obj->inference(sample_json_str_get(data, "delta"));
@@ -306,9 +329,15 @@ class llm_llm : public StackFlow {
  }
  }
 
- void kws_awake(const std::shared_ptr<llm_task> llm_task_obj, const std::shared_ptr<llm_channel_obj> llm_channel,
- const std::string &object, const std::string &data)
+ void kws_awake(const std::weak_ptr<llm_task> llm_task_obj_weak,
+ const std::weak_ptr<llm_channel_obj> llm_channel_weak, const std::string &object,
+ const std::string &data)
  {
+ auto llm_task_obj = llm_task_obj_weak.lock();
+ auto llm_channel = llm_channel_weak.lock();
+ if (!(llm_task_obj && llm_channel)) {
+ return;
+ }
  llm_task_obj->lLaMa_->Stop();
  }
 
@@ -341,21 +370,25 @@ class llm_llm : public StackFlow {
  llm_channel->set_output(llm_task_obj->enoutput_);
  llm_channel->set_stream(llm_task_obj->enstream_);
 
- llm_task_obj->set_output(std::bind(&llm_llm::task_output, this, llm_task_obj, llm_channel,
- std::placeholders::_1, std::placeholders::_2));
+ llm_task_obj->set_output(std::bind(&llm_llm::task_output, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1,
+ std::placeholders::_2));
 
  for (const auto input : llm_task_obj->inputs_) {
  if (input.find("llm") != std::string::npos) {
  llm_channel->subscriber_work_id(
- "", std::bind(&llm_llm::task_user_data, this, llm_task_obj, llm_channel, std::placeholders::_1,
+ "", std::bind(&llm_llm::task_user_data, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1,
  std::placeholders::_2));
  } else if (input.find("asr") != std::string::npos) {
- llm_channel->subscriber_work_id(input,
- std::bind(&llm_llm::task_asr_data, this, llm_task_obj, llm_channel,
- std::placeholders::_1, std::placeholders::_2));
+ llm_channel->subscriber_work_id(
+ input, std::bind(&llm_llm::task_asr_data, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1,
+ std::placeholders::_2));
  } else if (input.find("kws") != std::string::npos) {
  llm_channel->subscriber_work_id(
- input, std::bind(&llm_llm::kws_awake, this, llm_task_obj, llm_channel, std::placeholders::_1,
+ input, std::bind(&llm_llm::kws_awake, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1,
  std::placeholders::_2));
  }
  }
@@ -388,12 +421,15 @@ class llm_llm : public StackFlow {
  auto llm_task_obj = llm_task_[work_id_num];
  if (data.find("asr") != std::string::npos) {
  ret = llm_channel->subscriber_work_id(
- data, std::bind(&llm_llm::task_asr_data, this, llm_task_obj, llm_channel, std::placeholders::_1,
- std::placeholders::_2));
+ data,
+ std::bind(&llm_llm::task_asr_data, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1, std::placeholders::_2));
  llm_task_obj->inputs_.push_back(data);
  } else if (data.find("kws") != std::string::npos) {
- ret = llm_channel->subscriber_work_id(data, std::bind(&llm_llm::kws_awake, this, llm_task_obj, llm_channel,
- std::placeholders::_1, std::placeholders::_2));
+ ret = llm_channel->subscriber_work_id(
+ data,
+ std::bind(&llm_llm::kws_awake, this, std::weak_ptr<llm_task>(llm_task_obj),
+ std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1, std::placeholders::_2));
  llm_task_obj->inputs_.push_back(data);
  }
  if (ret) {