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

Improve supervisor signal handler safety

Browse source 
Now should only be making async-signal-safe calls
This commit is contained in:
Jon Siwek 2020-01-14 18:56:34 -08:00
parent 3e1a9ebec3
commit f5b3673890
4 changed files with 38 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Flare.cc
View file

@ -13,8 +13,11 @@ Flare::Flare()
{
}
static void bad_pipe_op(const char* which)
static void bad_pipe_op(const char* which, bool signal_safe)
{
if ( signal_safe )
abort();
char buf[256];
bro_strerror_r(errno, buf, sizeof(buf));
@ -27,7 +30,7 @@ static void bad_pipe_op(const char* which)
}
}
void Flare::Fire()
void Flare::Fire(bool signal_safe)
{
char tmp = 0;
@ -49,14 +52,14 @@ void Flare::Fire()
// Interrupted: try again.
continue;
bad_pipe_op("write");
bad_pipe_op("write", signal_safe);
}
// No error, but didn't write a byte: try again.
}
}
int Flare::Extinguish()
int Flare::Extinguish(bool signal_safe)
{
int rval = 0;
char tmp[256];
@ -80,7 +83,7 @@ int Flare::Extinguish()
// Interrupted: try again.
continue;
bad_pipe_op("read");
bad_pipe_op("read", signal_safe);
}
return rval;