code: mafs

Download patch

ref: 0ee5be4865fd1aae67de9255d63fde5dccd65069
parent: 8279e5159846f8a18cfe7594c6c7a45985809e0e
author: 9ferno <gophone2015@gmail.com>
date: Sun Oct 16 23:46:21 EDT 2022

replaced size names with the bibytes versions

--- a/console.c
+++ b/console.c
@@ -69,7 +69,7 @@
 	used = config.nblocks - free;
 	dprint("(blocks) free %ulld, used %ulld, total %ulld\n",
 			free, used, config.nblocks);
-	dprint("(MB) free %ulld, used %ulld, total %ulld\n",
+	dprint("(MiB) free %ulld, used %ulld, total %ulld\n",
 			free * Rawblocksize / 1048576,
 			used * Rawblocksize / 1048576,
 			config.size / 1048576);
--- a/ctl.c
+++ b/ctl.c
@@ -98,45 +98,49 @@
 
 	free = nfrees(&frees);
 	used = config.nblocks - free;
-	if(config.size > TB)
+	if(config.size > TiB)
 	n = snprint(buf, 1024, "(blocks) free %ulld, used %ulld, total %ulld\n"
-						"(GB) free %ulld, used %ulld, total %ulld\n"
-						"(TB) free %ulld, used %ulld, total %ulld\n",
+						"(MiB) free %ulld, used %ulld, total %ulld\n"
+						"(GiB) free %ulld, used %ulld, total %ulld\n"
+						"(TiB) free %ulld, used %ulld, total %ulld\n",
 						free, used, config.nblocks,
-						free * Rawblocksize / GB,
-						used * Rawblocksize / GB,
-						config.size / GB,
-						free * Rawblocksize / TB,
-						used * Rawblocksize / TB,
-						config.size / TB
+						free * Rawblocksize / MiB,
+						used * Rawblocksize / MiB,
+						config.size / MiB,
+						free * Rawblocksize / GiB,
+						used * Rawblocksize / GiB,
+						config.size / GiB,
+						free * Rawblocksize / TiB,
+						used * Rawblocksize / TiB,
+						config.size / TiB
 						);
-	else if(config.size > GB)
+	else if(config.size > GiB)
 	n = snprint(buf, 1024, "(blocks) free %ulld, used %ulld, total %ulld\n"
-						"(MB) free %ulld, used %ulld, total %ulld\n"
-						"(GB) free %ulld, used %ulld, total %ulld\n",
+						"(MiB) free %ulld, used %ulld, total %ulld\n"
+						"(GiB) free %ulld, used %ulld, total %ulld\n",
 						free, used, config.nblocks,
-						free * Rawblocksize / MB,
-						used * Rawblocksize / MB,
-						config.size / MB,
-						free * Rawblocksize / GB,
-						used * Rawblocksize / GB,
-						config.size / GB
+						free * Rawblocksize / MiB,
+						used * Rawblocksize / MiB,
+						config.size / MiB,
+						free * Rawblocksize / GiB,
+						used * Rawblocksize / GiB,
+						config.size / GiB
 						);
-	else if(config.size > MB)
+	else if(config.size > MiB)
 	n = snprint(buf, 1024, "(blocks) free %ulld, used %ulld, total %ulld\n"
-						"(MB) free %ulld, used %ulld, total %ulld\n",
+						"(MiB) free %ulld, used %ulld, total %ulld\n",
 						free, used, config.nblocks,
-						free * Rawblocksize / MB,
-						used * Rawblocksize / MB,
-						config.size / MB
+						free * Rawblocksize / MiB,
+						used * Rawblocksize / MiB,
+						config.size / MiB
 						);
 	else
 	n = snprint(buf, 1024, "(blocks) free %ulld, used %ulld, total %ulld\n"
-						"(KB) free %ulld, used %ulld, total %ulld\n",
+						"(KiB) free %ulld, used %ulld, total %ulld\n",
 						free, used, config.nblocks,
-						free * Rawblocksize / KB,
-						used * Rawblocksize / KB,
-						config.size / KB
+						free * Rawblocksize / KiB,
+						used * Rawblocksize / KiB,
+						config.size / KiB
 						);
 	if(req->ifcall.offset < n){
 		req->ofcall.count = min(req->ifcall.count,n);
--- a/dat.h
+++ b/dat.h
@@ -19,10 +19,10 @@
 	Msec	= 1000ULL,
 	Iounit	= 65536,
 	Nbkp	= 2,
-	KB	= 1024ULL,	/* in bytes */
-	MB	= KB*KB,	/* in bytes */
-	GB	= KB*MB,	/* in bytes */
-	TB	= KB*GB,	/* in bytes */
+	KiB	= 1024ULL,	/* Kibibytes */
+	MiB	= KiB*KiB,	/* Mibibytes */
+	GiB	= KiB*MiB,	/* Gibibytes */
+	TiB	= KiB*GiB,	/* Tibibytes */
 
 	/*
 	https://cs.stackexchange.com/questions/11029/why-is-it-best-to-use-a-prime-number-as-a-mod-in-a-hashing-function
@@ -30,7 +30,7 @@
 		using Nbuckets=2 for testing.
 
 	Size of buffer cache = Nbuckets * Ncollisions * Maxspansize
-		= 256 * 10 * 1MB = 2.5GB
+		= 256 * 10 * 1MiB = 2.5GiB
 	 */
 	Nbuckets = 256,	/* number of Hiob */
 	Ncollisions = 10,	/* soft limit after which we start reusing older Iobuf's */
@@ -203,7 +203,7 @@
 enum {
 	Blocksize	= Rawblocksize - sizeof(Tag),
 	Namelen		= (Blocksize-sizeof(Dentry1)),/* max size of file name components */
-	Maxspanlen	= MB/Rawblocksize,	/* in blocks */
+	Maxspanlen	= MiB/Rawblocksize,	/* in blocks */
 	Maxspansize	= (Maxspanlen*Rawblocksize)-sizeof(Tag), /* in bytes */
 
 	Ndentryperblock	= 1, /* Blocksize / sizeof(Dentry), */
@@ -376,7 +376,7 @@
 	Tind0,		/* points to Tdata blocks for files or Tdentry blocks for directories. */
 	Tind1,		/* points to Tind0 blocks */
 	Tind2,		/* points to Tind1 blocks */
-	Tind3,		/* list of Tind2 blocks. we can have a 12 TB file */
+	Tind3,		/* list of Tind2 blocks. we can have a 12 TiB file */
 	Maxtind,	/* should be Tind0+Niblock */
 				/* gap for more indirect block depth in future */
 	MAXTAG,
--- a/mafs.c
+++ b/mafs.c
@@ -230,6 +230,6 @@
 			sizeof(Dentry1), Namelen);
 	max = maxsize();
 	dprint("maximum possible spans %llud\n", max);
-	dprint("	(%llud*Maxspansize = %llud bytes = %llud TB)\n",
-			max, max*Maxspansize, (max*Maxspansize)/(MB*MB));
+	dprint("	(%llud*Maxspansize = %llud bytes = %llud TiB)\n",
+			max, max*Maxspansize, (max*Maxspansize)/(MiB*MiB));
 }
--- a/reconcile.c
+++ b/reconcile.c
@@ -27,9 +27,6 @@
  */
 
 enum {
-	KiB = 1024ULL * sizeof(uchar),	/* kibi byte */
-	MiB = KiB * KiB,        		/* mebi byte */
-
 	FileNameLen = KiB,
 };
 
--- a/tests/sizes.c
+++ b/tests/sizes.c
@@ -118,7 +118,7 @@
 	max = maxsize();
 	print("maximum possible spans %llud\n", max);
 	print("	(%llud*Maxspansize = %llud bytes)\n", max, max*Maxspansize);
-	print("	(%llud*Maxspansize = %llud bytes = %llud TB)\n",
-			max, max*Maxspansize, (max*Maxspansize)/(MB*MB));
+	print("	(%llud*Maxspansize = %llud bytes = %llud TiB)\n",
+			max, max*Maxspansize, (max*Maxspansize)/(MiB*MiB));
 	exits(0);
 }