From 1c20a49dba70a03080df0f6af6a42aa941d3fc3b Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Mon, 18 Mar 2013 13:30:50 +0900
Subject: [PATCH] Use the recursive set allocator for mightsee.

This completely removes the lock used to protect the set allocation code
while keeping the use of the set api clean.
---
 tools/qfvis/include/vis.h  |  1 +
 tools/qfvis/source/flow.c  | 11 +++++------
 tools/qfvis/source/qfvis.c |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/qfvis/include/vis.h b/tools/qfvis/include/vis.h
index 32dc0e5fa..70ad52416 100644
--- a/tools/qfvis/include/vis.h
+++ b/tools/qfvis/include/vis.h
@@ -129,6 +129,7 @@ typedef struct threaddata_s {
 	portal_t   *base;			///< portal for which this thread is being run
 	pstack_t    pstack_head;
 	sep_t      *sep_freelist;	///< per-thread list of free separators
+	set_pool_t  set_pool;
 } threaddata_t;
 
 extern int numportals;
diff --git a/tools/qfvis/source/flow.c b/tools/qfvis/source/flow.c
index 7c2668d45..1b2a58514 100644
--- a/tools/qfvis/source/flow.c
+++ b/tools/qfvis/source/flow.c
@@ -75,15 +75,13 @@ CheckStack (cluster_t *cluster, threaddata_t *thread)
 }
 
 static pstack_t *
-new_stack (void)
+new_stack (threaddata_t *td)
 {
 	pstack_t   *stack;
 
 	stack = malloc (sizeof (pstack_t));
 	stack->next = 0;
-	LOCK;
-	stack->mightsee = set_new_size (portalclusters);
-	UNLOCK;
+	stack->mightsee = set_new_size_r (&td->set_pool, portalclusters);
 	return stack;
 }
 
@@ -286,7 +284,7 @@ RecursiveClusterFlow (int clusternum, threaddata_t *thread, pstack_t *prevstack)
 	thread->stats.chains++;
 
 	if (!prevstack->next)
-		prevstack->next = new_stack ();
+		prevstack->next = new_stack (thread);
 	stack = prevstack->next;
 	stack->cluster = 0;
 
@@ -465,9 +463,10 @@ PortalFlow (threaddata_t *data, portal_t *portal)
 	if (portal->status != stat_selected)
 		Sys_Error ("PortalFlow: reflowed");
 	portal->status = stat_working;
-	portal->visbits = set_new_size (portalclusters);
 	UNLOCK;
 
+	portal->visbits = set_new_size_r (&data->set_pool, portalclusters);
+
 	data->clustervis = portal->visbits;
 	data->base = portal;
 
diff --git a/tools/qfvis/source/qfvis.c b/tools/qfvis/source/qfvis.c
index fc4d3c7fe..135dac636 100644
--- a/tools/qfvis/source/qfvis.c
+++ b/tools/qfvis/source/qfvis.c
@@ -363,6 +363,7 @@ LeafThread (void *_thread)
 	threaddata_t data;
 
 	memset (&data, 0, sizeof (data));
+	set_pool_init (&data.set_pool);
 	do {
 		portal = GetNextPortal ();
 		if (!portal)