luke
/
verilator
mirror of https://github.com/verilator/verilator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix --skip-identical to handle closer timestamps looking at ctime.

This commit is contained in:
Wilson Snyder 2017-10-13 20:34:36 -04:00
parent de35c90847
commit 5bc2f87d3e
3 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internals.pod
View File

@ -237,10 +237,10 @@ implementation is not found, the system will look in turn for overloaded
implementations up the inheritance hierarchy. For example calling C<accept> implementations up the inheritance hierarchy. For example calling C<accept>
on C<AstIf> will look in turn for: on C<AstIf> will look in turn for:
void visit (AstIf* nodep, AstNUser* vup) void visit (AstIf* nodep)
void visit (AstNodeIf* nodep, AstNUser* vup) void visit (AstNodeIf* nodep)
void visit (AstNodeStmt* nodep, AstNUser* vup) void visit (AstNodeStmt* nodep)
void visit (AstNode* nodep, AstNUser* vup) void visit (AstNode* nodep)
There are three ways data is passed between visitor functions. There are three ways data is passed between visitor functions.

44
src/V3File.cpp
View File

@ -34,6 +34,14 @@
# define INFILTER_PIPE // Allow pipe filtering. Needs fork() # define INFILTER_PIPE // Allow pipe filtering. Needs fork()
#endif #endif
#ifdef st_mtime // Linux 2.6
# define VL_STAT_CTIME_NSEC(stat) ((stat).st_ctim.tv_nsec) // Nanoseconds
# define VL_STAT_MTIME_NSEC(stat) ((stat).st_mtim.tv_nsec) // Nanoseconds
#else
# define VL_STAT_CTIME_NSEC(stat) (0)
# define VL_STAT_MTIME_NSEC(stat) (0)
#endif
#ifdef INFILTER_PIPE #ifdef INFILTER_PIPE
# include <sys/wait.h> # include <sys/wait.h>
#endif #endif
@ -62,6 +70,7 @@ class V3FileDependImp {
public: public:
DependFile(const string& filename, bool target) DependFile(const string& filename, bool target)
: m_target(target), m_filename(filename) { : m_target(target), m_filename(filename) {
m_stat.st_ctime = 0;
m_stat.st_mtime = 0; m_stat.st_mtime = 0;
} }
~DependFile() {} ~DependFile() {}
@ -69,7 +78,10 @@ class V3FileDependImp {
bool target() const { return m_target; } bool target() const { return m_target; }
off_t size() const { return m_stat.st_size; } off_t size() const { return m_stat.st_size; }
ino_t ino() const { return m_stat.st_ino; } ino_t ino() const { return m_stat.st_ino; }
time_t mtime() const { return m_stat.st_mtime; } time_t cstime() const { return m_stat.st_ctime; } // Seconds
time_t cnstime() const { return VL_STAT_CTIME_NSEC(m_stat); } // Nanoseconds
time_t mstime() const { return m_stat.st_mtime; } // Seconds
time_t mnstime() const { return VL_STAT_MTIME_NSEC(m_stat); } // Nanoseconds
void loadStats() { void loadStats() {
if (!m_stat.st_mtime) { if (!m_stat.st_mtime) {
string fn = filename(); string fn = filename();
@ -178,7 +190,10 @@ inline void V3FileDependImp::writeTimes(const string& filename, const string& cm
*ofp<<(iter->target()?"T":"S")<<" "; *ofp<<(iter->target()?"T":"S")<<" ";
*ofp<<" "<<setw(8)<<showSize; *ofp<<" "<<setw(8)<<showSize;
*ofp<<" "<<setw(8)<<showIno; *ofp<<" "<<setw(8)<<showIno;
*ofp<<" "<<setw(11)<<iter->mtime(); *ofp<<" "<<setw(11)<<iter->cstime();
*ofp<<" "<<setw(11)<<iter->cnstime();
*ofp<<" "<<setw(11)<<iter->mstime();
*ofp<<" "<<setw(11)<<iter->mnstime();
*ofp<<" \""<<iter->filename()<<"\""; *ofp<<" \""<<iter->filename()<<"\"";
*ofp<<endl; *ofp<<endl;
} }
@ -209,31 +224,42 @@ inline bool V3FileDependImp::checkTimes(const string& filename, const string& cm
off_t chkSize; *ifp>>chkSize; off_t chkSize; *ifp>>chkSize;
ino_t chkIno; *ifp>>chkIno; ino_t chkIno; *ifp>>chkIno;
if (ifp->eof()) break; // Needed to read final whitespace before found eof if (ifp->eof()) break; // Needed to read final whitespace before found eof
time_t chkMtime; *ifp>>chkMtime; time_t chkCstime; *ifp>>chkCstime;
time_t chkCnstime; *ifp>>chkCnstime;
time_t chkMstime; *ifp>>chkMstime;
time_t chkMnstime; *ifp>>chkMnstime;
char quote; *ifp>>quote; char quote; *ifp>>quote;
string chkFilename; getline(*ifp, chkFilename, '"'); string chkFilename; getline(*ifp, chkFilename, '"');
//UINFO(9," got d="<<chkDir<<" s="<<chkSize<<" mt="<<chkMtime<<" fn = "<<chkFilename<<endl);
V3Options::fileNfsFlush(chkFilename);
struct stat chkStat; struct stat chkStat;
int err = stat(chkFilename.c_str(), &chkStat); int err = stat(chkFilename.c_str(), &chkStat);
if (err!=0) { if (err!=0) {
UINFO(2," --check-times failed: missing "<<chkFilename<<endl); UINFO(2," --check-times failed: missing "<<chkFilename<<endl);
return false; return false;
} }
if (filename != chkFilename) { // See above; we were writing it at the time... //UINFO(9," got d="<<chkDir<<" s="<<chkSize<<" ct="<<chkCstime<<"."<<chkCnstime<<" mt="<<chkMstime<<"."<<chkMnstime<<" fn = "<<chkFilename<<endl);
//UINFO(9," nowSt s="<<chkStat.st_size<<" mt="<<chkStat.st_mtime<<" ct="<<chkStat.st_ctime<<" fn = "<<chkFilename<<endl);
if (filename != chkFilename) { // Other then the .dat file itself, as we were writing it at the time...
// We'd like this rule: // We'd like this rule:
//if (!(chkStat.st_size == chkSize //if (!(chkStat.st_size == chkSize
// && chkStat.st_mtime == chkMtime) { // && chkStat.st_mtime == chkMstime) {
// However NFS messes us up, as there might be some data outstanding when // However NFS messes us up, as there might be some data outstanding when
// we determined the original size. For safety, we know the creation time // we determined the original size. For safety, we know the creation time
// must be within a few second window... call it 20 sec. // must be within a few second window... call it 20 sec.
if (!(chkStat.st_size >= chkSize if (!(chkStat.st_size >= chkSize
&& chkStat.st_ino == chkIno && chkStat.st_ino == chkIno
&& chkStat.st_mtime >= chkMtime && chkStat.st_ctime == chkCstime
&& chkStat.st_mtime <= (chkMtime + 20))) { && VL_STAT_CTIME_NSEC(chkStat) == chkCnstime
&& chkStat.st_mtime <= (chkMstime + 20)
// Not comparing chkMnstime
)) {
UINFO(2," --check-times failed: out-of-date "<<chkFilename UINFO(2," --check-times failed: out-of-date "<<chkFilename
<<"; "<<chkStat.st_size<<"=?"<<chkSize <<"; "<<chkStat.st_size<<"=?"<<chkSize
<<" "<<chkStat.st_mtime<<"=?"<<chkMtime<<endl); <<" "<<chkStat.st_ctime<<"."<<VL_STAT_CTIME_NSEC(chkStat)
<<"=?"<<chkCstime<<"."<<chkCnstime
<<" "<<chkStat.st_mtime<<"."<<VL_STAT_MTIME_NSEC(chkStat)
<<"=?"<<chkMstime<<"."<<chkMnstime<<endl);
return false; return false;
} }
} }

1
src/V3Options.h
View File

@ -36,7 +36,6 @@
class V3OptionsImp; class V3OptionsImp;
class FileLine; class FileLine;
struct stat;
typedef vector<string> V3StringList; typedef vector<string> V3StringList;
typedef set<string> V3StringSet; typedef set<string> V3StringSet;