lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Support debugging with lldb 

Running with lldb cause SIGINT, which makes waitpid() returns
error with errno as EINTR. This patch retry waitpid() to ignore
EINTR errors.
ppa-0.6.1
conanoc 7 years ago
committed by Christian Decker
parent
a6c76f9079
commit
b2f7e9af4a
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      lightningd/bitcoind.c

6
lightningd/bitcoind.c
View File

@ -157,7 +157,7 @@ static void bcli_finished(struct io_conn *conn UNUSED, struct bitcoin_cli *bcli)
bool ok; bool ok;
/* FIXME: If we waited for SIGCHILD, this could never hang! */ /* FIXME: If we waited for SIGCHILD, this could never hang! */
ret = waitpid(bcli->pid, &status, 0); while ((ret = waitpid(bcli->pid, &status, 0)) < 0 && errno == EINTR);
if (ret != bcli->pid) if (ret != bcli->pid)
fatal("%s %s", bcli_args(bcli), fatal("%s %s", bcli_args(bcli),
ret == 0 ? "not exited?" : strerror(errno)); ret == 0 ? "not exited?" : strerror(errno));
@ -740,7 +740,7 @@ static void fatal_bitcoind_failure(struct bitcoind *bitcoind, const char *error_
void wait_for_bitcoind(struct bitcoind *bitcoind) void wait_for_bitcoind(struct bitcoind *bitcoind)
{ {
int from, status; int from, status, ret;
pid_t child; pid_t child;
const char **cmd = cmdarr(bitcoind, bitcoind, "echo", NULL); const char **cmd = cmdarr(bitcoind, bitcoind, "echo", NULL);
bool printed = false; bool printed = false;
@ -759,7 +759,7 @@ void wait_for_bitcoind(struct bitcoind *bitcoind)
fatal("Reading from %s failed: %s", fatal("Reading from %s failed: %s",
cmd[0], strerror(errno)); cmd[0], strerror(errno));
int ret = waitpid(child, &status, 0); while ((ret = waitpid(child, &status, 0)) < 0 && errno == EINTR);
if (ret != child) if (ret != child)
fatal("Waiting for %s: %s", cmd[0], strerror(errno)); fatal("Waiting for %s: %s", cmd[0], strerror(errno));
if (!WIFEXITED(status)) if (!WIFEXITED(status))

Write Preview
Loading…
Cancel
Save