revert r19450. fixes buildtool.

(bzr r6501)

1 files changed, 10 insertions, 24 deletions

diff --git a/buildtool.cpp b/buildtool.cpp
index 33dabce70..f6cc448f7 100644
--- a/buildtool.cpp
+++ b/buildtool.cpp
@@ -2743,20 +2743,6 @@ bool URI::parse(const String &str)
 //########################################################################
 
 //########################################################################
-//# Stat cache to speed up stat requests
-//########################################################################
-typedef std::map<String, std::pair<int,struct stat> > statCacheType;
-static statCacheType statCache;
-static int cachedStat(const String &f, struct stat *s) {
-    std::pair<statCacheType::iterator, bool> result = statCache.insert(statCacheType::value_type(f, std::pair<int,struct stat>()));
-    if (result.second) {
-        result.first->second.first = stat(f.c_str(), &(result.first->second.second));
-    }
-    *s = result.first->second.second;
-    return result.first->second.first;
-}
-
-//########################################################################
 //# F I L E S E T
 //########################################################################
 /**
@@ -4232,7 +4218,7 @@ bool MakeBase::listDirectories(const String &baseName,
         fullChildPath.append(childName);
         struct stat finfo;
         String childNative = getNativePath(fullChildPath);
-        if (cachedStat(childNative, &finfo)<0)
+        if (stat(childNative.c_str(), &finfo)<0)
             {
             error("cannot stat file:%s", childNative.c_str());
             }
@@ -4822,7 +4808,7 @@ bool MakeBase::createDirectory(const String &dirname)
     if (strlen(cnative)==2 && cnative[1]==':')
         return true;
 #endif
-    if (cachedStat(nativeDir, &finfo)==0)
+    if (stat(cnative, &finfo)==0)
         {
         if (!S_ISDIR(finfo.st_mode))
             {
@@ -4901,7 +4887,7 @@ bool MakeBase::removeDirectory(const String &dirName)
         struct stat finfo;
         String childNative = getNativePath(childName);
         char *cnative = (char *)childNative.c_str();
-        if (cachedStat(childNative, &finfo)<0)
+        if (stat(cnative, &finfo)<0)
             {
             error("cannot stat file:%s", cnative);
             }
@@ -4952,7 +4938,7 @@ bool MakeBase::copyFile(const String &srcFile, const String &destFile)
     //# 1 Check up-to-date times
     String srcNative = getNativePath(srcFile);
     struct stat srcinfo;
-    if (cachedStat(srcNative, &srcinfo)<0)
+    if (stat(srcNative.c_str(), &srcinfo)<0)
         {
         error("source file %s for copy does not exist",
                  srcNative.c_str());
@@ -4961,7 +4947,7 @@ bool MakeBase::copyFile(const String &srcFile, const String &destFile)
 
     String destNative = getNativePath(destFile);
     struct stat destinfo;
-    if (cachedStat(destNative, &destinfo)==0)
+    if (stat(destNative.c_str(), &destinfo)==0)
         {
         if (destinfo.st_mtime >= srcinfo.st_mtime)
             return true;
@@ -5029,7 +5015,7 @@ bool MakeBase::isRegularFile(const String &fileName)
     struct stat finfo;
     
     //Exists?
-    if (cachedStat(native, &finfo)<0)
+    if (stat(native.c_str(), &finfo)<0)
         return false;
 
 
@@ -5049,7 +5035,7 @@ bool MakeBase::isDirectory(const String &fileName)
     struct stat finfo;
     
     //Exists?
-    if (cachedStat(native, &finfo)<0)
+    if (stat(native.c_str(), &finfo)<0)
         return false;
 
 
@@ -5071,7 +5057,7 @@ bool MakeBase::isNewerThan(const String &fileA, const String &fileB)
     String nativeA = getNativePath(fileA);
     struct stat infoA;
     //IF source does not exist, NOT newer
-    if (cachedStat(nativeA, &infoA)<0)
+    if (stat(nativeA.c_str(), &infoA)<0)
         {
         return false;
         }
@@ -5079,7 +5065,7 @@ bool MakeBase::isNewerThan(const String &fileA, const String &fileB)
     String nativeB = getNativePath(fileB);
     struct stat infoB;
     //IF dest does not exist, YES, newer
-    if (cachedStat(nativeB, &infoB)<0)
+    if (stat(nativeB.c_str(), &infoB)<0)
         {
         return true;
         }
@@ -7340,7 +7326,7 @@ public:
                 if (!quiet && verbose)
                     taskstatus("path: %s", fname);
                 //does not exist
-                if (cachedStat(fullName, &finfo)<0)
+                if (stat(fname, &finfo)<0)
                     {
                     if (failOnError)
                         return false;