4 files changed, 64 insertions, 9 deletions

diff --git a/src/conditionfiletime.cpp b/src/conditionfiletime.cpp
index 148ffac..abcb3f3 100644
--- a/src/conditionfiletime.cpp
+++ b/src/conditionfiletime.cpp
@@ -4,6 +4,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include "statcache.h"
 
 #include <bu/sio.h>
 using namespace Bu;
@@ -18,6 +19,7 @@ ConditionFileTime::~ConditionFileTime()
 
 bool ConditionFileTime::shouldExec( class Runner &r, Target &rTarget )
 {
+        StatCache &Stat = StatCache::getInstance();
         for( StrList::const_iterator j = rTarget.getOutputList().begin(); j; j++ )
         {
                 if( access( (*j).getStr(), F_OK ) )
@@ -30,22 +32,20 @@ bool ConditionFileTime::shouldExec( class Runner &r, Target &rTarget )
                 }
         }
 
-        time_t tOut = 0;
-        struct stat s;
+        time_t tOut = 0, tmp;
         for( StrList::const_iterator j = rTarget.getOutputList().begin();
                  j; j++ )
         {
-                stat( (*j).getStr(), &s );
-                if( tOut == 0 || tOut > s.st_mtime )
+                tmp = Stat.mtime( *j );
+                if( tOut == 0 || tOut > tmp )
                 {
-                        tOut = s.st_mtime;
+                        tOut = tmp;
                 }
         }
         for( StrList::const_iterator j = rTarget.getInputList().begin();
                  j; j++ )
         {
-                stat( (*j).getStr(), &s );
-                if( tOut < s.st_mtime )
+                if( tOut < Stat.mtime( *j ) )
                 {
                         //sio << "-- Target processed because '" << *j
                         //      << "' is newer than output." << sio.nl;
@@ -57,8 +57,7 @@ bool ConditionFileTime::shouldExec( class Runner &r, Target &rTarget )
         for( StrList::const_iterator j = rTarget.getRequiresList().begin();
                  j; j++ )
         {
-                stat( (*j).getStr(), &s );
-                if( tOut < s.st_mtime )
+                if( tOut < Stat.mtime( *j ) )
                 {
                         //sio << "-- Target processed because '" << *j
                         //      << "' is newer than output." << sio.nl;
diff --git a/src/runner.cpp b/src/runner.cpp
index ace9ce9..947f2f5 100644
--- a/src/runner.cpp
+++ b/src/runner.cpp
@@ -417,6 +417,10 @@ Variable Runner::run( AstBranch::NodeList::const_iterator n )
                                                         );
                                         }
                                         break;
+
+                                case AstNode::typePushPrefix:
+                                case AstNode::typePopPrefix:
+                                        break;
 /*
                                 case AstNode::typeCondition:
                                         if( pCurTarget )
diff --git a/src/statcache.cpp b/src/statcache.cpp
new file mode 100644
index 0000000..3f5c21f
--- /dev/null
+++ b/src/statcache.cpp
@@ -0,0 +1,28 @@
+#include "statcache.h"
+
+#include <sys/stat.h>
+
+#include <bu/sio.h>
+
+StatCache::StatCache()
+{
+}
+
+StatCache::~StatCache()
+{
+}
+
+time_t StatCache::mtime( const Bu::FString &sFileName )
+{
+        try
+        {
+                return hMTime.get( sFileName );
+        } catch( ... )
+        {
+                struct stat s;
+                stat( sFileName.getStr(), &s );
+                hMTime.insert( sFileName, s.st_mtime );
+                return s.st_mtime;
+        }
+}
+
diff --git a/src/statcache.h b/src/statcache.h
new file mode 100644
index 0000000..e081ec3
--- /dev/null
+++ b/src/statcache.h
@@ -0,0 +1,24 @@
+#ifndef STAT_CACHE_H
+#define STAT_CACHE_H
+
+#include <bu/hash.h>
+#include <bu/singleton.h>
+#include <bu/fstring.h>
+#include <time.h>
+
+class StatCache : public Bu::Singleton<StatCache>
+{
+friend class Bu::Singleton<StatCache>;
+private:
+        StatCache();
+        virtual ~StatCache();
+
+public:
+        time_t mtime( const Bu::FString &sFileName );
+
+private:
+        typedef Bu::Hash<Bu::FString, time_t> TimeHash;
+        TimeHash hMTime;
+};
+
+#endif