uloop_process_delete(&proc->uloop);
list_del(&proc->list);
netifd_fd_delete(&proc->log_fd);
+ if (proc->log_buf) {
+ free(proc->log_buf);
+ proc->log_buf = NULL;
+ }
}
void
{
struct netifd_process *proc;
const char *log_prefix;
- char *buf, *cur;
+ char *buf, *start, *cur;
int maxlen, len, read_len;
proc = container_of(fd, struct netifd_process, log_uloop);
if (!proc->log_buf)
proc->log_buf = malloc(LOG_BUF_SIZE + 1);
- buf = proc->log_buf + proc->log_buf_ofs;
- maxlen = LOG_BUF_SIZE - proc->log_buf_ofs;
-
log_prefix = proc->log_prefix;
if (!log_prefix)
log_prefix = "process";
retry:
+ buf = proc->log_buf + proc->log_buf_ofs;
+ maxlen = LOG_BUF_SIZE - proc->log_buf_ofs;
read_len = len = read(fd->fd, buf, maxlen);
if (len < 0) {
- if (errno == EAGAIN)
+ if (errno == EINTR)
goto retry;
goto out;
proc->log_buf_ofs += len;
cur = buf;
- buf = proc->log_buf;
- while ((cur = memchr(cur, '\n', len))) {
+ start = proc->log_buf;
+ while (len > 0) {
+ cur = memchr(cur, '\n', len);
+ if (!cur)
+ break;
+
*cur = 0;
if (!proc->log_overflow)
netifd_log_message(L_NOTICE, "%s (%d): %s\n",
- log_prefix, proc->uloop.pid, buf);
+ log_prefix, proc->uloop.pid, start);
else
proc->log_overflow = false;
cur++;
len -= cur - buf;
- buf = cur;
+ buf = start = cur;
}
if (buf > proc->log_buf && len > 0)
- memmove(buf, proc->log_buf, len);
+ memmove(proc->log_buf, buf, len);
if (len == LOG_BUF_SIZE) {
if (!proc->log_overflow) {
}
proc->log_buf_ofs = len;
- if (read_len == maxlen)
+ if (read_len > 0)
goto retry;
out:
uloop_process_add(&proc->uloop);
list_add_tail(&proc->list, &process_list);
+ proc->log_buf_ofs = 0;
proc->log_uloop.fd = proc->log_fd.fd = pfds[0];
proc->log_uloop.cb = netifd_process_log_cb;
netifd_fd_add(&proc->log_fd);
if (!proc->uloop.pending)
return;
- kill(proc->uloop.pid, SIGTERM);
+ kill(proc->uloop.pid, SIGKILL);
netifd_delete_process(proc);
}