Attachment 159630 Details for Bug 202147 – casperd queuelen patch, and man page fixes

[patch] casperd queuelen patch, and man page fixes

casperd.diff (text/plain), 2.44 KB, created by Kurt Lidl on 2015-08-07 03:20:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Lidl

Created: 2015-08-07 03:20:15 UTC

Size: 2.44 KB

patch

obsolete

>Index: sbin/casperd/casperd.8
>===================================================================
>--- sbin/casperd/casperd.8	(revision 286391)
>+++ sbin/casperd/casperd.8	(working copy)
>@@ -35,8 +35,8 @@
> .Nd "Capability Services friendly daemon"
> .Sh SYNOPSIS
> .Nm
>-[-Fhv] [-D servconfdir] [-P pidfile] [-S sockpath]
> .Op Fl Fhv
>+.Op Fl l Ar listenqueue
> .Op Fl D Ar servconfdir
> .Op Fl P Ar pidfile
> .Op Fl S Ar sockpath
>@@ -74,6 +74,12 @@
> Print the
> .Nm
> usage message.
>+.It Fl l Ar listenqueue
>+Specify depth of socket listen queue for the
>+.Nm
>+daemon.
>+The default queue length is
>+.Pa 16 .
> .It Fl P Ar pidfile
> Specify alternative location of a file where main process PID will be
> stored.
>Index: sbin/casperd/casperd.c
>===================================================================
>--- sbin/casperd/casperd.c	(revision 286391)
>+++ sbin/casperd/casperd.c	(working copy)
>@@ -66,6 +66,7 @@
> #define	CASPERD_PIDFILE		"/var/run/casperd.pid"
> #define	CASPERD_SERVCONFDIR	"/etc/casper"
> #define	CASPERD_SOCKPATH	"/var/run/casper"
>+#define	CASPERD_DEFAULT_LQLEN	16
> 
> typedef void service_function_t(struct service_connection *, const nvlist_t *,
>     nvlist_t *);
>@@ -534,7 +535,7 @@
> }
> 
> static void
>-main_loop(const char *sockpath, struct pidfh *pfh)
>+main_loop(int lqlen, const char *sockpath, struct pidfh *pfh)
> {
> 	fd_set fds;
> 	struct sockaddr_un sun;
>@@ -559,7 +560,7 @@
> 	if (bind(lsock, (struct sockaddr *)&sun, sizeof(sun)) == -1)
> 		pjdlog_exit(1, "Unable to bind to %s", sockpath);
> 	(void)umask(oldumask);
>-	if (listen(lsock, 8) == -1)
>+	if (listen(lsock, lqlen) == -1)
> 		pjdlog_exit(1, "Unable to listen on %s", sockpath);
> 
> 	for (;;) {
>@@ -627,7 +628,7 @@
> 	struct pidfh *pfh;
> 	const char *pidfile, *servconfdir, *sockpath;
> 	pid_t otherpid;
>-	int ch, debug;
>+	int ch, debug, lqlen = CASPERD_DEFAULT_LQLEN;
> 	bool foreground;
> 
> 	pjdlog_init(PJDLOG_MODE_STD);
>@@ -638,7 +639,7 @@
> 	servconfdir = CASPERD_SERVCONFDIR;
> 	sockpath = CASPERD_SOCKPATH;
> 
>-	while ((ch = getopt(argc, argv, "D:FhP:S:v")) != -1) {
>+	while ((ch = getopt(argc, argv, "D:Fhl:P:S:v")) != -1) {
> 		switch (ch) {
> 		case 'D':
> 			servconfdir = optarg;
>@@ -646,6 +647,11 @@
> 		case 'F':
> 			foreground = true;
> 			break;
>+		case 'l':
>+			lqlen = strtol(optarg, NULL, 0);
>+			if (lqlen < 1)
>+				lqlen = CASPERD_DEFAULT_LQLEN;
>+			break;
> 		case 'P':
> 			pidfile = optarg;
> 			break;
>@@ -711,5 +717,5 @@
> 	/*
> 	 * Wait for connections.
> 	 */
>-	main_loop(sockpath, pfh);
>+	main_loop(lqlen, sockpath, pfh);
> }

Actions: View | Diff

Attachments on bug 202147: 159630 | 160359