Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 02:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move Flare/Pipe from the bro namespace to zeek::detail

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-05-20 14:06:38 -07:00
parent 60ed29c3b6
commit 4a1b39a2be
9 changed files with 18 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/supervisor/Supervisor.cc
View file

@ -83,8 +83,8 @@ struct Stem {
pid_t parent_pid;
int last_signal = -1;
std::unique_ptr<bro::Flare> signal_flare;
std::unique_ptr<bro::PipePair> pipe;
std::unique_ptr<zeek::detail::Flare> signal_flare;
std::unique_ptr<zeek::detail::PipePair> pipe;
std::map<std::string, Supervisor::Node> nodes;
std::string msg_buffer;
bool shutting_down = false;
@ -426,7 +426,7 @@ size_t Supervisor::ProcessMessages()
}
Stem::Stem(Supervisor::StemState ss)
: parent_pid(ss.parent_pid), signal_flare(new bro::Flare()), pipe(std::move(ss.pipe))
: parent_pid(ss.parent_pid), signal_flare(new zeek::detail::Flare()), pipe(std::move(ss.pipe))
{
zeek::set_thread_name("zeek.stem");
pipe->Swap();
@ -928,7 +928,7 @@ std::optional<Supervisor::StemState> Supervisor::CreateStem(bool supervisor_mode
fds[i] = std::stoi(zeek_stem_nums[i + 1]);
StemState ss;
ss.pipe = std::make_unique<bro::PipePair>(FD_CLOEXEC, O_NONBLOCK, fds);
ss.pipe = std::make_unique<zeek::detail::PipePair>(FD_CLOEXEC, O_NONBLOCK, fds);
ss.parent_pid = stem_ppid;
zeek::Supervisor::RunStem(std::move(ss));
return {};
@ -938,7 +938,7 @@ std::optional<Supervisor::StemState> Supervisor::CreateStem(bool supervisor_mode
return {};
StemState ss;
ss.pipe = std::make_unique<bro::PipePair>(FD_CLOEXEC, O_NONBLOCK);
ss.pipe = std::make_unique<zeek::detail::PipePair>(FD_CLOEXEC, O_NONBLOCK);
ss.parent_pid = getpid();
ss.pid = fork();

6
src/supervisor/Supervisor.h
View file

@ -241,7 +241,7 @@ public:
/**
* Bidirectional pipes that allow the Supervisor and Stem to talk.
*/
std::unique_ptr<bro::PipePair> pipe;
std::unique_ptr<zeek::detail::PipePair> pipe;
/**
* The Stem's parent process ID (i.e. PID of the Supervisor).
*/
@ -382,9 +382,9 @@ private:
Config config;
pid_t stem_pid;
std::unique_ptr<bro::PipePair> stem_pipe;
std::unique_ptr<zeek::detail::PipePair> stem_pipe;
int last_signal = -1;
bro::Flare signal_flare;
zeek::detail::Flare signal_flare;
NodeMap nodes;
std::string msg_buffer;
};