PERFORCE change 104665 for review

[Chris Jones]

http://perforce.freebsd.org/chv.cgi?CH=104665

Change 104665 by cdjones at cdjones-impulse on 2006/08/21 08:44:56

	Get rid of more debugging output.

Affected files ...

.. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#25 edit

Differences ...

==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_jail.c#25 (text+ko) ====

@@ -173,13 +173,7 @@
 			 *
 			 */
 			
-			printf("jpager/%d: memory %ld / %ld bytes\n", 
-			       pr_id, usage, limit);
-			
 			if ((usage - limit) > 0) {
-				printf("jpager/%d: overcommitted by %ld bytes (%f percent)\n",
-				       pr_id, usage - limit,
-				       (double) 100 * ((double) (usage - limit) / (double) limit)); 
 				sx_slock(&allproc_lock);
 				LIST_FOREACH(p, &allproc, p_list) {
 					
@@ -228,17 +222,11 @@
 					if (cursize < 0)
 						newsize = 0;
 					PROC_UNLOCK(p);
-					printf("jpager/%d: squeezing process %d from %ld to %ld\n", 
-					       pr_id, p->p_pid, cursize, newsize);
 					vm_pageout_map_deactivate_pages(&p->p_vmspace->vm_map, newsize);
-					printf("jpager/%d: squeezed process %d from %ld to %ld (wanted %ld)\n",
-					       pr_id, p->p_pid, cursize, 
-					       vmspace_resident_count(p->p_vmspace), newsize);
 				} /* end LIST_FOREACH procs */
 				sx_sunlock(&allproc_lock);
 			}
 		}
-
 		tsleep(pr, 0, "-", jail_memory_pager_interval * hz); 
 	}
 	
@@ -329,7 +317,10 @@
 	td->td_retval[0] = jaa.jid;
 	return (0);
 e_dropprref:
-	/* TODO: kill pager, scheduler if they've started. */
+	if (j_pager_proc != NULL) {
+		*pr->pr_pager_flags_ptr = J_PAGER_TD_DIE;
+		wakeup(pr);
+	}
 	mtx_lock(&allprison_mtx);
 	LIST_REMOVE(pr, pr_list);
 	prisoncount--;