Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 12973176 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

KLKT: Check the pid, not the function pointer to kill klkt...

parent 2d01b072
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!140Auto klkt
...@@ -96,7 +96,7 @@ static pid_t ___klkt_pid = 0; ...@@ -96,7 +96,7 @@ static pid_t ___klkt_pid = 0;
__attribute__((destructor)) static inline void __attribute__((destructor)) static inline void
___kill_klkt(void) ___kill_klkt(void)
{ {
RETURN_UNLESS(___kill_klkt, "No klkt child process to wait for", NOTHING) RETURN_UNLESS(___klkt_pid, "No klkt child process to wait for", NOTHING)
if (kill(___klkt_pid, SIGTERM) != 0) { if (kill(___klkt_pid, SIGTERM) != 0) {
kill(___klkt_pid, SIGKILL); kill(___klkt_pid, SIGKILL);
...@@ -110,7 +110,7 @@ ___kill_klkt(void) ...@@ -110,7 +110,7 @@ ___kill_klkt(void)
LOG_ERROR("GENERAL", "Failed to wait for child klkt with pid %ld", ___klkt_pid); LOG_ERROR("GENERAL", "Failed to wait for child klkt with pid %ld", ___klkt_pid);
} }
LOG_INFO("GENERAL", "Child klkt status is: %s%d", LOG_INFO("GENERAL", "Child klkt status is %s%d",
/* String desc */ /* String desc */
WIFEXITED(status) ? "exited with status " : WIFEXITED(status) ? "exited with status " :
WIFSIGNALED(status) ? "killed by signal " : WIFSIGNALED(status) ? "killed by signal " :
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter