summaryrefslogtreecommitdiff
path: root/src/irmd
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-08-23 14:30:33 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-08-23 14:30:33 +0200
commit7c19363bc062efd52f54cc76a06685f9a9a757b5 (patch)
treeeb5cf7a9fea4e1ec752410640c6ae6fceef27b5f /src/irmd
parentf4c38f42f83c4a7df15b2351cb372f7638ae29ed (diff)
parentc266a1e8609eb84e05acbd63b230777a4aa35977 (diff)
downloadouroboros-7c19363bc062efd52f54cc76a06685f9a9a757b5.tar.gz
ouroboros-7c19363bc062efd52f54cc76a06685f9a9a757b5.zip
Merged in dstaesse/ouroboros/be-bugfixing (pull request #218)
Various fixes
Diffstat (limited to 'src/irmd')
-rw-r--r--src/irmd/main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c
index df93c75a..5366b535 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -1286,15 +1286,16 @@ static pid_t auto_execute(char ** argv)
return -1;
}
- LOG_INFO("Executing %s.", argv[0]);
api = fork();
if (api == -1) {
LOG_ERR("Failed to fork");
return api;
}
- if (api != 0)
+ if (api != 0) {
+ LOG_INFO("Instantiated %s as AP-i %d.", argv[0], api);
return api;
+ }
execv(argv[0], argv);
@@ -1653,9 +1654,9 @@ void * irm_sanitize()
list_for_each_safe(p, h, &irmd->spawned_apis) {
struct pid_el * e = list_entry(p, struct pid_el, next);
+ waitpid(e->pid, &s, WNOHANG);
if (kill(e->pid, 0) >= 0)
continue;
- waitpid(e->pid, &s, WNOHANG);
LOG_DBG("Child process %d died, error %d.", e->pid, s);
list_del(&e->next);
free(e);
@@ -1693,8 +1694,7 @@ void * irm_sanitize()
continue;
LOG_DBG("Dead AP-I removed from: %d %s.",
a->pid, e->name);
- list_del(&a->next);
- free(a);
+ reg_entry_del_api(e, a->pid);
}
}