d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add function to close all unneeded descriptors after fork(2).

Browse Source 
MFC after:	1 week
This commit is contained in:
pjd 2011-01-28 21:48:15 +00:00
parent 8de8b315a5
commit bc13ed0bfa
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sbin/hastd/hastd.c
View File

@ -1,6 +1,6 @@
/*-
* Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* Copyright (c) 2010-2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
* All rights reserved.
*
* This software was developed by Pawel Jakub Dawidek under sponsorship from
@ -93,6 +93,32 @@ g_gate_load(void)
}
}
void
descriptors_cleanup(struct hast_resource *res)
{
struct hast_resource *tres;
TAILQ_FOREACH(tres, &cfg->hc_resources, hr_next) {
if (tres == res) {
PJDLOG_VERIFY(res->hr_role == HAST_ROLE_SECONDARY ||
(res->hr_remotein == NULL &&
res->hr_remoteout == NULL));
continue;
}
if (tres->hr_remotein != NULL)
proto_close(tres->hr_remotein);
if (tres->hr_remoteout != NULL)
proto_close(tres->hr_remoteout);
}
if (cfg->hc_controlin != NULL)
proto_close(cfg->hc_controlin);
proto_close(cfg->hc_controlconn);
proto_close(cfg->hc_listenconn);
(void)pidfile_close(pfh);
hook_fini();
pjdlog_fini();
}
static void
child_exit_log(unsigned int pid, int status)
{

2
sbin/hastd/hastd.h
View File

@ -43,6 +43,8 @@ extern const char *cfgpath;
extern bool sigexit_received;
extern struct pidfh *pfh;
void descriptors_cleanup(struct hast_resource *res);
void hastd_primary(struct hast_resource *res);
void hastd_secondary(struct hast_resource *res, struct nv *nvin);