cwfs: faster queue implementation using semacquire()

1 files changed, 8 insertions, 6 deletions

diff --git a/sys/src/cmd/cwfs/portdat.h b/sys/src/cmd/cwfs/portdat.h
index d2af352e0..d360ed841 100644
--- a/sys/src/cmd/cwfs/portdat.h
+++ b/sys/src/cmd/cwfs/portdat.h
@@ -160,15 +160,17 @@ enum {
  */
 struct	Queue
 {
-	QLock;			/* to manipulate values */
-	Rendez	empty;
-	Rendez	full;
-
 	char*	name;		/* for debugging */
 
 	int	size;		/* size of queue */
-	int	loc;		/* circular pointer */
-	int	count;		/* how many in queue */
+
+	long	count;		/* how many in queue (semaphore) */
+	long	avail;		/* how many available to send (semaphore) */
+
+	Lock	rl, wl;		/* circular pointers */
+	void	**rp;
+	void	**wp;
+
 	void*	args[1];	/* list of saved pointers, [->size] */
 };