mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 23:35:27 +00:00
Code Issues Releases Wiki Activity

daemon: Close standard file descriptors after detach for windows.

Browse Source 
In the unit tests, we check for some logs stored in stderr. In case
of windows, unit tests fail because the child writes additional information
into stderr because it does not have it closed. This commit
closes standard file descriptors for windows too.

Because the functions related to closing file descriptors is common
for both windows and unix, add it to the common daemonization file
daemon.c

Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Gurucharan Shetty
2014-04-23 10:28:00 -07:00
parent a91dc4447b
commit d6bc33f37a
5 changed files with 94 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
lib/daemon-unix.c
View File

@@ -63,10 +63,6 @@ static int daemonize_fd = -1;
* it dies due to an error signal? */
static bool monitor;
/* For each of the standard file descriptors, whether to replace it by
* /dev/null (if false) or keep it for the daemon to use (if true). */
static bool save_fds[3];
static void check_already_running(void);
static int lock_pidfile(FILE *, int command);
static char *make_pidfile_name(const char *name);
@@ -136,22 +132,6 @@ daemon_set_monitor(void)
monitor = true;
}
/* A daemon doesn't normally have any use for the file descriptors for stdin,
* stdout, and stderr after it detaches. To keep these file descriptors from
* e.g. holding an SSH session open, by default detaching replaces each of
* these file descriptors by /dev/null. But a few daemons expect the user to
* redirect stdout or stderr to a file, in which case it is desirable to keep
* these file descriptors. This function, therefore, disables replacing 'fd'
* by /dev/null when the daemon detaches. */
void
daemon_save_fd(int fd)
{
ovs_assert(fd == STDIN_FILENO ||
fd == STDOUT_FILENO ||
fd == STDERR_FILENO);
save_fds[fd] = true;
}
/* If a pidfile has been configured, creates it and stores the running
* process's pid in it. Ensures that the pidfile will be deleted when the
* process exits. */
@@ -441,47 +421,6 @@ monitor_daemon(pid_t daemon_pid)
set_subprogram_name("");
}
/* Returns a readable and writable fd for /dev/null, if successful, otherwise
* a negative errno value. The caller must not close the returned fd (because
* the same fd will be handed out to subsequent callers). */
static int
get_null_fd(void)
{
static int null_fd;
if (!null_fd) {
null_fd = open("/dev/null", O_RDWR);
if (null_fd < 0) {
int error = errno;
VLOG_ERR("could not open /dev/null: %s", ovs_strerror(error));
null_fd = -error;
}
}
return null_fd;
}
/* Close standard file descriptors (except any that the client has requested we
* leave open by calling daemon_save_fd()). If we're started from e.g. an SSH
* session, then this keeps us from holding that session open artificially. */
static void
close_standard_fds(void)
{
int null_fd = get_null_fd();
if (null_fd >= 0) {
int fd;
for (fd = 0; fd < 3; fd++) {
if (!save_fds[fd]) {
dup2(null_fd, fd);
}
}
}
/* Disable logging to stderr to avoid wasting CPU time. */
vlog_set_levels(NULL, VLF_CONSOLE, VLL_OFF);
}
/* If daemonization is configured, then starts daemonization, by forking and
* returning in the child process. The parent process hangs around until the
* child lets it know either that it completed startup successfully (by calling