Skip to content

Commit

Permalink
* use std::queue to replace SafeQueue in queue_map_
Browse files Browse the repository at this point in the history
* adjust some code lines in optimizer.cpp
  • Loading branch information
JackLau1222 authored and HuHeng committed Oct 30, 2024
1 parent e18a1d2 commit be9d127
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
3 changes: 1 addition & 2 deletions bmf/engine/c_engine/include/assemble_module.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#include <bmf/sdk/module.h>
#include <bmf/sdk/module_registry.h>
#include "safe_queue.h"

USE_BMF_SDK_NS
class AssembleModule : public Module {
Expand All @@ -38,7 +37,7 @@ class AssembleModule : public Module {

int queue_index_;

std::map<int, std::shared_ptr<bmf_engine::SafeQueue<Packet>>> queue_map_;
std::map<int, std::shared_ptr<std::queue<Packet>>> queue_map_;
};

REGISTER_MODULE_CLASS(AssembleModule)
Expand Down
27 changes: 14 additions & 13 deletions bmf/engine/c_engine/src/assemble_module.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ int AssembleModule::process(Task &task) {
last_input_num_ = task.get_inputs().size();
// init queue_map_
for (int i = 0; i < last_input_num_; i++) {
std::shared_ptr<bmf_engine::SafeQueue<Packet>> tmp_queue =
std::make_shared<bmf_engine::SafeQueue<Packet>>();
std::shared_ptr<std::queue<Packet>> tmp_queue =
std::make_shared<std::queue<Packet>>();
queue_map_.insert(
std::pair<int, std::shared_ptr<bmf_engine::SafeQueue<Packet>>>(
std::pair<int, std::shared_ptr<std::queue<Packet>>>(
i, tmp_queue));
}
}
Expand Down Expand Up @@ -71,18 +71,19 @@ int AssembleModule::process(Task &task) {
if (in_eof_[queue_index_] == true)
continue;

if (queue->second->pop(packet)) {
task.fill_output_packet(0, packet);
if (packet.timestamp() == BMF_EOF) {
in_eof_[queue_index_] = true;
}
BMFLOG_NODE(BMF_DEBUG, node_id_)
<< "get packet :" << packet.timestamp()
<< " data:" << packet.type_info().name
<< " in queue:" << queue_index_;
packet = queue->second->front();
queue->second->pop();

queue_index_ = (queue_index_ + 1) % queue_map_.size();
task.fill_output_packet(0, packet);
if (packet.timestamp() == BMF_EOF) {
in_eof_[queue_index_] = true;
}
BMFLOG_NODE(BMF_DEBUG, node_id_)
<< "get packet :" << packet.timestamp()
<< " data:" << packet.type_info().name
<< " in queue:" << queue_index_;

queue_index_ = (queue_index_ + 1) % queue_map_.size();
}

bool all_eof = true;
Expand Down
4 changes: 2 additions & 2 deletions bmf/engine/c_engine/src/optimizer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,8 @@ void process_distributed_node(std::vector<bmf_engine::NodeConfig> &nodes) {
node->output_streams[0].get_identifier() &&
tem_node.get_id() != assemble_node.get_id()) {
tem_node.change_input_stream_identifier((assemble_node.
get_output_streams())[0].
get_identifier());
get_output_streams())[0].
get_identifier());
}
}
}
Expand Down

0 comments on commit be9d127

Please sign in to comment.