code: mafs

Info  •  Files  •  Log

Revert "fixed extents to use dprint for debug printing"

This reverts commit 237d25bc91e419404f3012a606b4b9496003db62.

--- a/all.h

+++ b/all.h

@@ -134,6 +134,7 @@

 void	datestr(char*, long);

 Qid	dentryqid(Dentry*);

 void	dofilter(Filter*);

+int		dprint(char *fmt, ...);

 void	exit(void);

 /*Float	famd(Float, int, int, int);*/

 int	fchar(void);

--- a/extents.c

+++ b/extents.c

@@ -20,6 +20,10 @@

  * When freed, adjacent extents are coalesced to create larger extents when

  * possible.

  */

+/*

+ * Verbosity induces the dumping of the pool via p->print at each lock operation.

+ * By default, only one line is logged for each alloc, free, and realloc.

+ */

 Extent *sortbysize(Extents *es, Extent *e);

 void	showextent(char *pre, Extent *e);

@@ -78,7 +82,7 @@

 	Extent *dsmall, *fbig, *f, *d;

 	if(chatty9p > 5)

-		dprint("	+size %llud .. %llud\n", e->blkno, e->blkno+e->len-1);

+		print("	+size %llud .. %llud\n", e->blkno, e->blkno+e->len-1);

 	for(f = d = smallest(es);

 		f != nil;

@@ -119,7 +123,7 @@

 	c->len = len;

 	es->n++;

 	if(chatty9p > 5)

-		dprint("	+%llud .. %llud\n", blkno, blkno+len-1);

+		print("	+%llud .. %llud\n", blkno, blkno+len-1);

 	if(blkno < e->blkno){

 		/* e->low e

@@ -143,7 +147,7 @@

 		c->low = e;

 		return addsize(es, c);

 	}

-	dprint("addextent: should not be here e->blkno"

+	print("addextent: should not be here e->blkno"

 			" %llud .. %llud blkno %llud len %llud\n",

 			e->blkno, e->blkno+e->len-1, blkno, len);

 	abort();

@@ -252,7 +256,7 @@

 		e->len += len;

 		return sortbysize(es, mergenext(es, e));

 	}

-	dprint("increment: should not be here"

+	print("increment: should not be here"

 		" e->blkno %llud .. %llud blkno %llud len %llud\n",

 		e->blkno, e->blkno+e->len-1, blkno, len);

 	abort();

@@ -275,7 +279,7 @@

 }

 /*

-dprint("between e->prev %llud .. %llud and e %llud .. %llud\n",

+print("between e->prev %llud .. %llud and e %llud .. %llud\n",

 	 e->prev->blkno, e->prev->blkno+e->prev->n-1,

 	 e->blkno, e->blkno+e->len-1);

  */

@@ -301,7 +305,7 @@

 	e = es->lru;

 	dir = belongs(es->lru, blkno, len);

 	if(chatty9p > 5){

-		dprint(" 	belongs(e %llud %llud blkno %llud .. %llud) %d\n",

+		print(" 	belongs(e %llud %llud blkno %llud .. %llud) %d\n",

 			 e->blkno, e->blkno+e->len-1, blkno, blkno+len-1, dir);

 	}

 	if(dir == 0)

@@ -351,7 +355,7 @@

 	if(chatty9p > 5){

 		showextents("		before\n", es);

-		dprint(" +%llud %llud\n", blkno, len);

+		print(" +%llud %llud\n", blkno, len);

 	}

 	e = doadd(es, blkno, len);

 	es->lru = e;

@@ -681,7 +685,7 @@

 void

 showextent(char *pre, Extent *e)

 {

-	dprint("%s small %8#p	low %8#p	e %8#p %llud %llud	high %8#p	big %8#p",

+	print("%s small %8#p	low %8#p	e %8#p %llud %llud	high %8#p	big %8#p",

 			pre, e->small, e->low, e, e->blkno, e->len, e->high, e->big);

 }

@@ -690,17 +694,17 @@

 {

 	Extent *e;

-	dprint("%s", msg);

+	print("%s", msg);

 	for(e = lowest(es); e != nil; e = e->high){

-		dprint("	%llud .. %llud", e->blkno, e->blkno+e->len-1);

+		print("	%llud .. %llud", e->blkno, e->blkno+e->len-1);

 //		showextent("	", e);

-		dprint("\n");

+		print("\n");

 	}

-	dprint("			ordered by size\n");

+	print("			ordered by size\n");

 	for(e = smallest(es); e != nil; e = e->big){

-		dprint("	%llud .. %llud has %llud blocks", e->blkno, e->blkno+e->len-1, e->len);

+		print("	%llud .. %llud has %llud blocks", e->blkno, e->blkno+e->len-1, e->len);

 //		showextent("	", e);

-		dprint("\n");

+		print("\n");

 	}

 }

@@ -712,7 +716,7 @@

 	for(e = lowest(es); e != nil; e = e->high)

 		for(i = e->blkno; i<e->blkno+e->len; i++)

-			dprint("%llud\n", i);

+			print("%llud\n", i);

 }

 void *

--- a/fns.h

+++ b/fns.h

@@ -25,4 +25,3 @@

 void	panic(char*, ...);

 int	fprint(int, char*, ...);

-int		dprint(char *fmt, ...);