ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up Sustain.h and Sustain.cpp.

Browse Source 
* Bring out magic numbers.
  * Get rid of boost::format.
This commit is contained in:
Tom Ritchford
2015-04-02 20:54:02 -04:00
committed by Nik Bougalis
parent 2b040569e7
commit d575cd50b1
2 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ripple/basics/Sustain.h
View File

@@ -30,9 +30,9 @@ namespace ripple {
// VFALCO TODO Rename this and put it in a class. // VFALCO TODO Rename this and put it in a class.
// VFALCO TODO Reimplement cross-platform using beast::Process and its ilk // VFALCO TODO Reimplement cross-platform using beast::Process and its ilk
// //
extern bool HaveSustain (); bool HaveSustain ();
extern std::string StopSustain (); std::string StopSustain ();
extern std::string DoSustain (std::string logFile); std::string DoSustain (std::string const& logFile);
} // ripple } // ripple

42
src/ripple/basics/impl/Sustain.cpp
View File

@@ -39,6 +39,9 @@ namespace ripple {
#ifdef __unix__ #ifdef __unix__
static auto const sleepBeforeWaiting = 10;
static auto const sleepBetweenWaits = 1;
static pid_t pManager = static_cast<pid_t> (0); static pid_t pManager = static_cast<pid_t> (0);
static pid_t pChild = static_cast<pid_t> (0); static pid_t pChild = static_cast<pid_t> (0);
@@ -61,29 +64,28 @@ bool HaveSustain ()
std::string StopSustain () std::string StopSustain ()
{ {
if (getppid () != pManager) if (getppid () != pManager)
return std::string (); return "";
kill (pManager, SIGHUP); kill (pManager, SIGHUP);
return "Terminating monitor"; return "Terminating monitor";
} }
std::string DoSustain (std::string logFile) std::string DoSustain (std::string const& logFile)
{ {
int childCount = 0;
pManager = getpid (); pManager = getpid ();
signal (SIGINT, stop_manager); signal (SIGINT, stop_manager);
signal (SIGHUP, stop_manager); signal (SIGHUP, stop_manager);
signal (SIGUSR1, pass_signal); signal (SIGUSR1, pass_signal);
signal (SIGUSR2, pass_signal); signal (SIGUSR2, pass_signal);
while (1) for (auto childCount = 1;; ++childCount)
{ {
++childCount;
pChild = fork (); pChild = fork ();
if (pChild == -1) if (pChild == -1)
_exit (0); _exit (0);
auto cc = std::to_string (childCount);
if (pChild == 0) if (pChild == 0)
{ {
setCallingThreadName ("main"); setCallingThreadName ("main");
@@ -91,26 +93,26 @@ std::string DoSustain (std::string logFile)
signal (SIGHUP, SIG_DFL); signal (SIGHUP, SIG_DFL);
signal (SIGUSR1, SIG_DFL); signal (SIGUSR1, SIG_DFL);
signal (SIGUSR2, SIG_DFL); signal (SIGUSR2, SIG_DFL);
return str (boost::format ("Launching child %d") % childCount);; return "Launching child " + cc;
} }
setCallingThreadName (boost::str (boost::format ("#%d") % childCount).c_str ()); setCallingThreadName (("#" + cc).c_str());
sleep (9); sleep (sleepBeforeWaiting);
do
for (;;)
{ {
int i; int i;
sleep (1);
waitpid (pChild, &i, 0); waitpid (pChild, &i, 0);
if (kill (pChild, 0))
break;
sleep (sleepBetweenWaits);
} }
while (kill (pChild, 0) == 0);
rename ("core", boost::str (boost::format ("core.%d") % static_cast<int> (pChild)).c_str ()); auto pc = std::to_string (pChild);
rename ("core", ("core." + pc).c_str ());
if (!logFile.empty()) // FIXME: logFile hasn't been set yet if (!logFile.empty()) // FIXME: logFile hasn't been set yet
rename (logFile.c_str(), rename (logFile.c_str(), (logFile + "." + pc).c_str ());
boost::str (boost::format ("%s.%d")
% logFile
% static_cast<int> (pChild)).c_str ());
} }
} }
@@ -120,13 +122,15 @@ bool HaveSustain ()
{ {
return false; return false;
} }
std::string DoSustain (std::string)
std::string DoSustain (const std::string&)
{ {
return std::string (); return "";
} }
std::string StopSustain () std::string StopSustain ()
{ {
return std::string (); return "";
} }
#endif #endif