/*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <config.h>
#include "process.h"
-#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <signal.h>
inited = true;
/* Create notification pipe. */
- xpipe(fds);
- set_nonblocking(fds[0]);
- set_nonblocking(fds[1]);
+ xpipe_nonblocking(fds);
/* Set up child termination signal handler. */
memset(&sa, 0, sizeof sa);
struct process *p;
const char *slash;
- assert(sigchld_is_blocked());
+ ovs_assert(sigchld_is_blocked());
p = xzalloc(sizeof *p);
p->pid = pid;
int
process_status(const struct process *p)
{
- assert(p->exited);
+ ovs_assert(p->exited);
return p->status;
}
/* process_run_capture() and supporting functions. */
struct stream {
+ size_t max_size;
struct ds log;
int fds[2];
};
static int
-stream_open(struct stream *s)
+stream_open(struct stream *s, size_t max_size)
{
+ int error;
+
+ s->max_size = max_size;
ds_init(&s->log);
if (pipe(s->fds)) {
VLOG_WARN("failed to create pipe: %s", strerror(errno));
return errno;
}
- set_nonblocking(s->fds[0]);
- return 0;
+ error = set_nonblocking(s->fds[0]);
+ if (error) {
+ close(s->fds[0]);
+ close(s->fds[1]);
+ }
+ return error;
}
static void
}
break;
}
- } else if (s->log.length > PROCESS_MAX_CAPTURE) {
- VLOG_WARN("subprocess output overflowed %d-byte buffer",
- PROCESS_MAX_CAPTURE);
+ } else if (s->log.length > s->max_size) {
+ VLOG_WARN("subprocess output overflowed %zu-byte buffer",
+ s->max_size);
break;
}
}
* '*status'.
*
* If 'stdout_log' is nonnull, then the subprocess's output to stdout (up to a
- * limit of PROCESS_MAX_CAPTURE bytes) is captured in a memory buffer, which
+ * limit of 'log_max' bytes) is captured in a memory buffer, which
* when this function returns 0 is stored as a null-terminated string in
* '*stdout_log'. The caller is responsible for freeing '*stdout_log' (by
* passing it to free()). When this function returns an error, '*stdout_log'
* that it captures the subprocess's output to stderr. */
int
process_run_capture(char **argv, char **stdout_log, char **stderr_log,
- int *status)
+ size_t max_log, int *status)
{
struct stream s_stdout, s_stderr;
sigset_t oldsigs;
return error;
}
- error = stream_open(&s_stdout);
+ error = stream_open(&s_stdout, max_log);
if (error) {
return error;
}
- error = stream_open(&s_stderr);
+ error = stream_open(&s_stderr, max_log);
if (error) {
stream_close(&s_stdout);
return error;