From fe1705c55b5091d2d789b235fd02363b70cecc38 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Tue, 3 Jan 2017 18:14:01 +0100
Subject: reverse: add single-entry path cache

Speeds up the "ls -lR" benchmark from 2.6 seconds to 2.0.
---
 internal/fusefrontend_reverse/rpath.go | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'internal/fusefrontend_reverse/rpath.go')

diff --git a/internal/fusefrontend_reverse/rpath.go b/internal/fusefrontend_reverse/rpath.go
index af49776..9f52b28 100644
--- a/internal/fusefrontend_reverse/rpath.go
+++ b/internal/fusefrontend_reverse/rpath.go
@@ -82,18 +82,31 @@ func (rfs *ReverseFS) decryptPath(relPath string) (string, error) {
 	if rfs.args.PlaintextNames || relPath == "" {
 		return relPath, nil
 	}
+	// Check if the parent dir is in the cache
+	cDir := saneDir(relPath)
+	dirIV, pDir := rPathCache.lookup(cDir)
+	if dirIV != nil {
+		cName := filepath.Base(relPath)
+		pName, err := rfs.rDecryptName(cName, dirIV, pDir)
+		if err != nil {
+			return "", err
+		}
+		return filepath.Join(pDir, pName), nil
+	}
 	parts := strings.Split(relPath, "/")
 	var transformedParts []string
 	for i := range parts {
 		// Start at the top and recurse
 		currentCipherDir := filepath.Join(parts[:i]...)
 		currentPlainDir := filepath.Join(transformedParts[:i]...)
-		dirIV := derivePathIV(currentCipherDir, ivPurposeDirIV)
+		dirIV = derivePathIV(currentCipherDir, ivPurposeDirIV)
 		transformedPart, err := rfs.rDecryptName(parts[i], dirIV, currentPlainDir)
 		if err != nil {
 			return "", err
 		}
 		transformedParts = append(transformedParts, transformedPart)
 	}
-	return filepath.Join(transformedParts...), nil
+	pRelPath := filepath.Join(transformedParts...)
+	rPathCache.store(cDir, dirIV, saneDir(pRelPath))
+	return pRelPath, nil
 }
-- 
cgit v1.2.3