Index: lib/xvfs/xvfs.c.rvt
==================================================================
--- lib/xvfs/xvfs.c.rvt
+++ lib/xvfs/xvfs.c.rvt
@@ -40,94 +40,46 @@
 #endif
 
 #ifndef HAVE_DEFINED_XVFS_FILE_DATA
 #define HAVE_DEFINED_XVFS_FILE_DATA 1
 struct xvfs_file_data {
-	const char          *name;
-	xvfs_file_type_t    type;
-	xvfs_size_t         size;
+	const char * const        name;
+	const xvfs_file_type_t    type;
+	const xvfs_size_t         size;
 	union {
-		const unsigned char *fileContents;
+		const unsigned char * const fileContents;
 		const char          **dirChildren;
 	} data;
 };
 #endif
 
 <?
 	package require xvfs
 
-	set ::xvfs::hashNameThreshold 3
-	if {[info exists ::env(XVFS_CREATE_HASH_NAME_THRESHOLD)]} {
-		set ::xvfs::hashNameThreshold $::env(XVFS_CREATE_HASH_NAME_THRESHOLD)
-	}
-	if {$::xvfs::hashNameThreshold < 0} {
-		set ::xvfs::hashNameThreshold [expr {2**31}]
-	}
 	xvfs::main $::xvfs::argv
 
-	proc emitFilenameVerification {indentLevel outputFileNameLen outputFileIndexes} {
-		set indent [string repeat "\t" $indentLevel]
-		foreach outputFileIndex $outputFileIndexes {
-?><?= $indent ?>if (memcmp(path, xvfs_<?= $::xvfs::fsName ?>_data[<?= $outputFileIndex ?>].name, <?= $outputFileNameLen ?>) == 0) {
-<?= $indent ?>	return(<?= $outputFileIndex ?>);
-<?= $indent ?>}
-<?
-		}
-	}
 ?>
 static long xvfs_<?= $::xvfs::fsName ?>_nameToIndex(const char *path) {
-<?
-	for {set index 0} {$index < [llength $::xvfs::outputFiles]} {incr index} {
-		set outputFileName [lindex $::xvfs::outputFiles $index]
-		set outputFileNameLen [string length $outputFileName]
-		set outputFileNameHash [zlib adler32 $outputFileName 0]
-		lappend outputFileNameHashToIndex([list $outputFileNameLen $outputFileNameHash]) $index
-		lappend outputFileNameLenToIndex($outputFileNameLen) $index
-	}
-
-	set needZlib false
-	foreach {outputFileNameLen outputFileIndexes} [lsort -stride 2 -dictionary [array get outputFileNameLenToIndex]] {
-		if {[llength $outputFileIndexes] > $::xvfs::hashNameThreshold} {
-			set needZlib true
-			break;
-		}
-	}
-?><?
-	if {$needZlib} {
-?>	unsigned int pathHash;
-<?	} ?>	size_t pathLen;
-	
+	long pathIndex;
+	ssize_t pathLen;
+
 	if (path == NULL) {
 		return(XVFS_NAME_LOOKUP_ERROR);
 	}
 
 	pathLen = strlen(path);
-	switch (pathLen) {
-<?
-
-	foreach {outputFileNameLen outputFileIndexes} [lsort -stride 2 -dictionary [array get outputFileNameLenToIndex]] {
-?>		case <?= $outputFileNameLen ?>:
-<?
-			if {[llength $outputFileIndexes] > $::xvfs::hashNameThreshold} {
-?>			pathHash = Tcl_ZlibAdler32(0, (const unsigned char *) path, <?= $outputFileNameLen ?>);
-			switch (pathHash) {
-<?
-				foreach {key outputFileIndexes} [lsort -stride 2 -dictionary [array get outputFileNameHashToIndex [list $outputFileNameLen *]]] {
-					set outputFileNameHash [lindex $key 1]
-?>				case <?= $outputFileNameHash ?>:
-<?
-					emitFilenameVerification 5 $outputFileNameLen $outputFileIndexes
-?>					break;	
-<?
-				}
-?>			}
-<?
-			} else {
-				emitFilenameVerification 3 $outputFileNameLen $outputFileIndexes
-			}
-?>			break;
-<?	} ?>	}
+
+	pathIndex = <?= [::xvfs::generatePerfectHashFunctionCall "path" pathLen XVFS_NAME_LOOKUP_ERROR $::xvfs::outputFiles] ?>;
+	if (pathIndex < 0 || pathIndex > <?= [llength $::xvfs::outputFiles] ?>) {
+		pathIndex = XVFS_NAME_LOOKUP_ERROR;
+	}
+
+	if (pathIndex != XVFS_NAME_LOOKUP_ERROR) {
+		if (strcmp(path, xvfs_<?= $::xvfs::fsName ?>_data[pathIndex].name) == 0) {
+			return(pathIndex);
+		}
+	}
 	
 	return(XVFS_NAME_LOOKUP_ERROR);
 }
 
 static const char **xvfs_<?= $::xvfs::fsName ?>_getChildren(const char *path, Tcl_WideInt *count) {

Index: lib/xvfs/xvfs.tcl
==================================================================
--- lib/xvfs/xvfs.tcl
+++ lib/xvfs/xvfs.tcl
@@ -308,7 +308,69 @@
 proc ::xvfs::staticIncludeHeader {pathToHeaderFile} {
 	set fd [open $pathToHeaderFile]
 	::xvfs::staticIncludeHeaderData [read $fd]
 	close $fd
 }
+
+proc ::xvfs::generatePerfectHashFunctionCall {cVarName cVarLength invalidValue nameList} {
+	set minVal 0
+	set maxVal [llength $nameList]
+	set testExpr {([zlib adler32 $nameItem $alpha] + $beta) % $gamma}
+	set testExprC {((Tcl_ZlibAdler32($alpha, (unsigned char *) $cVarName, $cVarLength) + $beta) % $gamma)}
+
+	set round -1
+
+	set beta 0
+	set gamma $maxVal
+
+	while true {
+		incr round
+
+		set alpha $round
+		set gamma [expr {($round % ($maxVal + 1)) + $maxVal}]
+
+		set idx -1
+		set seenIndexes [list]
+		set failed false
+		foreach nameItem $nameList {
+			incr idx
+
+			set testExprVal [expr $testExpr]
+
+			if {$testExprVal in $seenIndexes} {
+				incr alpha
+				set failed true
+				break
+			}
+
+			lappend seenIndexes $testExprVal
+		}
+
+		if {!$failed} {
+			break
+		}
+	}
+
+	unset -nocomplain mapArray
+	for {set idx 0} {$idx < $gamma} {incr idx} {
+		set mapArray($idx) $invalidValue
+	}
+
+	set idx -1
+	foreach nameItem $nameList {
+		incr idx
+
+		set mapArray([expr $testExpr]) $idx
+	}
+
+	set map "(long\[\])\{"
+	for {set idx 0} {$idx < $gamma} {incr idx} {
+		append map "$mapArray($idx), "
+	}
+	set map [string range $map 0 end-2]
+	append map "\}\[[subst $testExprC]\]"
+	set phfCall $map
+
+	return $phfCall
+}
 
 package provide xvfs 1