Skip to content

Commit

Permalink
* fix PushData mode name in cpp interface
Browse files Browse the repository at this point in the history
* implement Graph::Start(bool, bool) in cpp
* add Grpah::Close() and RealGraph::Close() function in cpp
  • Loading branch information
JackLau1222 authored Dec 3, 2024
1 parent a7d1669 commit af59c89
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
5 changes: 4 additions & 1 deletion bmf/engine/connector/include/builder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ enum GraphMode {
ServerMode,
GeneratorMode,
SubGraphMode,
UpdateMode,
PushDataMode,
};
enum InputManagerType { Immediate, Default, Server, FrameSync, ClockSync };
enum ModuleType { CPP, C, Python, Go };
Expand Down Expand Up @@ -236,6 +236,7 @@ class RealGraph : public std::enable_shared_from_this<RealGraph> {
bool dumpGraph, bool needMerge);

int Run(bool dumpGraph, bool needMerge);
int Close();
Packet Generate(std::string streamName, bool block = true);
int FillPacket(std::string stream_name, Packet packet, bool block = false);
std::shared_ptr<RealStream> InputStream(std::string streamName, std::string notify, std::string alias);
Expand Down Expand Up @@ -637,6 +638,8 @@ class BMF_ENGINE_API Graph {

void Start(std::vector<Stream>& generateStreams, bool dumpGraph = true, bool needMerge = true);

int Close();

std::string Dump();

Node
Expand Down
16 changes: 14 additions & 2 deletions bmf/engine/connector/src/builder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -376,8 +376,8 @@ nlohmann::json RealGraph::Dump() {
case SubGraphMode:
info["mode"] = "Subgraph";
break;
case UpdateMode:
info["mode"] = "Update";
case PushDataMode:
info["mode"] = "Pushdata";
break;
}
for (auto &nd : nodes_)
Expand Down Expand Up @@ -433,6 +433,10 @@ void RealGraph::Start(
Start(dumpGraph, needMerge);
}

int RealGraph::Close() {
return graphInstance_->close();
}

bmf::BMFGraph RealGraph::Instantiate(bool dumpGraph, bool needMerge) {
auto graph_config = Dump().dump(4);
if (dumpGraph || (graphOption_.json_value_.count("dump_graph") &&
Expand Down Expand Up @@ -787,6 +791,10 @@ int Graph::Run(bool dumpGraph, bool needMerge) {
return graph_->Run(dumpGraph, needMerge);
}

void Graph::Start(bool dumpGraph, bool needMerge) {
graph_->Start(dumpGraph, needMerge);
}

void Graph::Start(std::vector<Stream> &generateStreams, bool dumpGraph,
bool needMerge) {
std::vector<std::shared_ptr<internal::RealStream>> generateRealStreams;
Expand All @@ -796,6 +804,10 @@ void Graph::Start(std::vector<Stream> &generateStreams, bool dumpGraph,
graph_->Start(generateRealStreams, dumpGraph, needMerge);
}

int Graph::Close() {
return graph_->Close();
}

Packet Graph::Generate(std::string streamName, bool block) {
return graph_->Generate(streamName, block);
}
Expand Down

0 comments on commit af59c89

Please sign in to comment.