# HG changeset patch
# User Erik Quanstrom <quanstro@quanstro.net>
# Date 1330591387 -3600
# Node ID 80f4e3c275c48f9df897025e12e554983af03ebb
# Parent  06f94514f69557ea9dfa1d94fbf8ff93bd3fd237
swap: remove references to old swap

in addition, conf.nproc was set to 57000 before adjustment
down to 1000.  this was due to assuming that page size is
much smaller than 1mb.

so instead, just set conf.nproc = 1000.  (should that be
2000 as before?)

R=nixiedev, nemo
CC=nix-dev
http://codereview.appspot.com/5708048

Committer: Francisco J Ballesteros <nemo.mbox@gmail.com>

diff -r 06f94514f695 -r 80f4e3c275c4 sys/src/nix/k10/dat.h
--- a/sys/src/nix/k10/dat.h	Thu Mar 01 09:41:11 2012 +0100
+++ b/sys/src/nix/k10/dat.h	Thu Mar 01 09:43:07 2012 +0100
@@ -117,8 +117,6 @@
 	ulong	copymode;	/* 0 is copy on write, 1 is copy on reference */
 	ulong	ialloc;		/* max interrupt time allocation in bytes */
 	ulong	nimage;		/* number of page cache image headers */
-	ulong	nswap;		/* number of swap pages */
-	int	nswppo;		/* max # of pageouts per segment pass */
 };
 
 enum
diff -r 06f94514f695 -r 80f4e3c275c4 sys/src/nix/k10/main.c
--- a/sys/src/nix/k10/main.c	Thu Mar 01 09:41:11 2012 +0100
+++ b/sys/src/nix/k10/main.c	Thu Mar 01 09:43:07 2012 +0100
@@ -504,15 +504,8 @@
 	conf.npage = 0;
 	for(i=0; i<nelem(conf.mem); i++)
 		conf.npage += conf.mem[i].npage;
-
-	conf.nproc = 100 + ((conf.npage*PGSZ)/MB)*5;
-	if(cpuserver)
-		conf.nproc *= 3;
-	if(conf.nproc > 1000)
-		conf.nproc = 1000;
+	conf.nproc = 1000;
 	conf.nimage = 200;
-	conf.nswap = conf.nproc*80;
-	conf.nswppo = 4096;
 }
 
 static void
diff -r 06f94514f695 -r 80f4e3c275c4 sys/src/nix/port/portdat.h
--- a/sys/src/nix/port/portdat.h	Thu Mar 01 09:41:11 2012 +0100
+++ b/sys/src/nix/port/portdat.h	Thu Mar 01 09:43:07 2012 +0100
@@ -375,19 +375,6 @@
 	int	pgszi;			/* size index in m->pgsz[] */
 };
 
-struct Swapalloc
-{
-	Lock;				/* Free map lock */
-	int	free;			/* currently free swap pages */
-	uchar*	swmap;			/* Base of swap map in memory */
-	uchar*	alloc;			/* Round robin allocator */
-	uchar*	last;			/* Speed swap allocation */
-	uchar*	top;			/* Top of swap map */
-	Rendez	r;			/* Pager kproc idle sleep */
-	ulong	highwater;		/* Pager start threshold */
-	ulong	headroom;		/* Space pager frees under highwater */
-}swapalloc;
-
 struct Image
 {
 	Ref;