Attachment 179661 Details for Bug 204340 – add svcpool_close (cleaned up version)

[patch] add svcpool_close (cleaned up version)

svccrash.patch (text/plain), 3.09 KB, created by Rick Macklem on 2017-02-06 00:58:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rick Macklem

Created: 2017-02-06 00:58:15 UTC

Size: 3.09 KB

patch

obsolete

>--- rpc/svc.h.sav	2017-02-01 11:36:04.253254000 -0500
>+++ rpc/svc.h	2017-02-01 11:38:06.692413000 -0500
>@@ -729,6 +729,12 @@ extern SVCPOOL* svcpool_create(const cha
> extern void svcpool_destroy(SVCPOOL *pool);
> 
> /*
>+ * Close a service pool.  Similar to svcpool_destroy(), but it does not
>+ * free the data structures.  As such, the pool can be used again.
>+ */
>+extern void svcpool_close(SVCPOOL *pool);
>+
>+/*
>  * Transport independent svc_create routine.
>  */
> extern int svc_create(SVCPOOL *, void (*)(struct svc_req *, SVCXPRT *),
>--- rpc/svc.c.sav	2017-02-01 11:27:07.665884000 -0500
>+++ rpc/svc.c	2017-02-05 10:14:02.829432000 -0500
>@@ -75,6 +75,7 @@ static void svc_new_thread(SVCGROUP *grp
> static void xprt_unregister_locked(SVCXPRT *xprt);
> static void svc_change_space_used(SVCPOOL *pool, long delta);
> static bool_t svc_request_space_available(SVCPOOL *pool);
>+static void svcpool_cleanup(SVCPOOL *pool);
> 
> /* ***************  SVCXPRT related stuff **************** */
> 
>@@ -174,8 +175,12 @@ svcpool_create(const char *name, struct 
> 	return pool;
> }
> 
>-void
>-svcpool_destroy(SVCPOOL *pool)
>+/*
>+ * Code common to svcpool_destroy() and svcpool_close(), which cleans up
>+ * the pool data structures.
>+ */
>+static void
>+svcpool_cleanup(SVCPOOL *pool)
> {
> 	SVCGROUP *grp;
> 	SVCXPRT *xprt, *nxprt;
>@@ -211,6 +216,15 @@ svcpool_destroy(SVCPOOL *pool)
> 		mtx_lock(&pool->sp_lock);
> 	}
> 	mtx_unlock(&pool->sp_lock);
>+}
>+
>+void
>+svcpool_destroy(SVCPOOL *pool)
>+{
>+	SVCGROUP *grp;
>+	int g;
>+
>+	svcpool_cleanup(pool);
> 
> 	for (g = 0; g < SVC_MAXGROUPS; g++) {
> 		grp = &pool->sp_groups[g];
>@@ -226,6 +240,30 @@ svcpool_destroy(SVCPOOL *pool)
> }
> 
> /*
>+ * Similar to svcpool_destroy(), except that it does not destroy the actual
>+ * data structures.  As such, "pool" may be used again.
>+ */
>+void
>+svcpool_close(SVCPOOL *pool)
>+{
>+	SVCGROUP *grp;
>+	int g;
>+
>+	svcpool_cleanup(pool);
>+
>+	/* Now, initialize the pool's state for a fresh svc_run() call. */
>+	mtx_lock(&pool->sp_lock);
>+	pool->sp_state = SVCPOOL_INIT;
>+	mtx_unlock(&pool->sp_lock);
>+	for (g = 0; g < SVC_MAXGROUPS; g++) {
>+		grp = &pool->sp_groups[g];
>+		mtx_lock(&grp->sg_lock);
>+		grp->sg_state = SVCPOOL_ACTIVE;
>+		mtx_unlock(&grp->sg_lock);
>+	}
>+}
>+
>+/*
>  * Sysctl handler to get the present thread count on a pool
>  */
> static int
>--- fs/nfsserver/nfs_nfsdkrpc.c.sav	2017-02-01 10:07:47.961431000 -0500
>+++ fs/nfsserver/nfs_nfsdkrpc.c	2017-02-01 11:40:01.541209000 -0500
>@@ -551,18 +551,16 @@ nfsrvd_init(int terminating)
> 		nfsd_master_proc = NULL;
> 		NFSD_UNLOCK();
> 		nfsrv_freeallbackchannel_xprts();
>-		svcpool_destroy(nfsrvd_pool);
>-		nfsrvd_pool = NULL;
>+		svcpool_close(nfsrvd_pool);
>+		NFSD_LOCK();
>+	} else {
>+		NFSD_UNLOCK();
>+		nfsrvd_pool = svcpool_create("nfsd",
>+		    SYSCTL_STATIC_CHILDREN(_vfs_nfsd));
>+		nfsrvd_pool->sp_rcache = NULL;
>+		nfsrvd_pool->sp_assign = fhanew_assign;
>+		nfsrvd_pool->sp_done = fha_nd_complete;
> 		NFSD_LOCK();
> 	}
>-
>-	NFSD_UNLOCK();
>-
>-	nfsrvd_pool = svcpool_create("nfsd", SYSCTL_STATIC_CHILDREN(_vfs_nfsd));
>-	nfsrvd_pool->sp_rcache = NULL;
>-	nfsrvd_pool->sp_assign = fhanew_assign;
>-	nfsrvd_pool->sp_done = fha_nd_complete;
>-
>-	NFSD_LOCK();
> }
>

Actions: View | Diff

Attachments on bug 204340: 163160 | 163217 | 163299 | 163300 | 179512 | 179661