X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDepTable.C;h=0c745f0950c15a6652f19968eacc544db80b789d;hb=b01a9dc187d9cd396a57463ad27511379dcdc9cd;hp=e493d794aaab18d137bd5057ae5ef6efce5372cc;hpb=adaef99e60e28eba8c413a3472cc71e234718af0;p=lyx.git diff --git a/src/DepTable.C b/src/DepTable.C index e493d794aa..0c745f0950 100644 --- a/src/DepTable.C +++ b/src/DepTable.C @@ -1,87 +1,140 @@ -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. +/** + * \file DepTable.C + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * This file is Copyright 1996-2000 - * Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes + * \author Jean-Marc Lasgouttes + * \author Ben Stanley * - * ====================================================== + * Full author contact details are available in file CREDITS. */ #include -#ifdef __GNUG__ -#pragma implementation -#endif - #include "DepTable.h" + +#include "debug.h" + #include "support/lyxlib.h" #include "support/filetools.h" +#include "support/lstrings.h" +#include "support/lyxtime.h" + +#include + #include -using std::make_pair; + +namespace lyx { + +#ifndef CXX_GLOBAL_CSTD +using std::time; +#endif + +using support::FileName; +using support::ltrim; +using support::onlyFilename; +using support::suffixIs; +using support::sum; + +using std::endl; +using std::flush; +using std::getline; +using std::string; using std::ofstream; using std::ifstream; -using std::endl; -void DepTable::insert(string const & fi, - bool upd, - unsigned long one, - unsigned long two) +inline +bool DepTable::dep_info::changed() const +{ + return crc_prev != crc_cur && crc_cur != 0; +} + + +void DepTable::insert(FileName const & f, bool upd) { - // not quite sure if this is the correct place for MakeAbsPath - string f = MakeAbsPath(fi); if (deplist.find(f) == deplist.end()) { + dep_info di; + di.crc_prev = 0; if (upd) { - one = two; - two = lyx::sum(f); + lyxerr[Debug::DEPEND] << " CRC..." << flush; + di.crc_cur = sum(f); + lyxerr[Debug::DEPEND] << "done." << endl; + struct stat f_info; + stat(f.toFilesystemEncoding().c_str(), &f_info); + di.mtime_cur = f_info.st_mtime; + } else { + di.crc_cur = 0; + di.mtime_cur = 0; } - deplist[f] = make_pair(one, two); + deplist[f] = di; + } else { + lyxerr[Debug::DEPEND] << " Already in DepTable" << endl; } } - + void DepTable::update() { - for (DepList::iterator itr = deplist.begin(); - itr != deplist.end(); - ++itr) { - unsigned long const one = (*itr).second.second; - unsigned long const two = lyx::sum((*itr).first); - (*itr).second = make_pair(one, two); + lyxerr[Debug::DEPEND] << "Updating DepTable..." << endl; + time_type const start_time = current_time(); + + DepList::iterator itr = deplist.begin(); + while (itr != deplist.end()) { + dep_info &di = itr->second; + + struct stat f_info; + if (stat(itr->first.toFilesystemEncoding().c_str(), &f_info) == 0) { + if (di.mtime_cur == f_info.st_mtime) { + di.crc_prev = di.crc_cur; + lyxerr[Debug::DEPEND] << itr->first << " same mtime" << endl; + } else { + di.crc_prev = di.crc_cur; + lyxerr[Debug::DEPEND] << itr->first << " CRC... " << flush; + di.crc_cur = sum(itr->first); + lyxerr[Debug::DEPEND] << "done" << endl; + } + } else { + // file doesn't exist + // remove stale files - if it's re-created, it + // will be re-inserted by deplog. + lyxerr[Debug::DEPEND] << itr->first + << " doesn't exist. removing from DepTable." << endl; + DepList::iterator doomed = itr++; + deplist.erase(doomed); + continue; + } + if (lyxerr.debugging(Debug::DEPEND)) { - lyxerr << "Update dep: " << (*itr).first << " " - << one << " " << two; - if (one != two) + if (di.changed()) lyxerr << " +"; lyxerr << endl; } + ++itr; } + time_type const time_sec = current_time() - start_time; + lyxerr[Debug::DEPEND] << "Finished updating DepTable (" + << time_sec << " sec)." << endl; } bool DepTable::sumchange() const { - for (DepList::const_iterator cit = deplist.begin(); - cit != deplist.end(); - ++cit) { - if ((*cit).second.first != (*cit).second.second) return true; + DepList::const_iterator cit = deplist.begin(); + DepList::const_iterator end = deplist.end(); + for (; cit != end; ++cit) { + if (cit->second.changed()) return true; } return false; } -bool DepTable::haschanged(string const & f) const +bool DepTable::haschanged(FileName const & fil) const { - // not quite sure if this is the correct place for MakeAbsPath - string fil = MakeAbsPath(f); DepList::const_iterator cit = deplist.find(fil); if (cit != deplist.end()) { - if ((*cit).second.first != (*cit).second.second - && (*cit).second.second != 0) + if (cit->second.changed()) return true; } return false; @@ -90,11 +143,11 @@ bool DepTable::haschanged(string const & f) const bool DepTable::extchanged(string const & ext) const { - for (DepList::const_iterator cit = deplist.begin(); - cit != deplist.end(); - ++cit) { - if (suffixIs((*cit).first, ext)) { - if ((*cit).second.first != (*cit).second.second) + DepList::const_iterator cit = deplist.begin(); + DepList::const_iterator end = deplist.end(); + for (; cit != end; ++cit) { + if (suffixIs(cit->first.absFilename(), ext)) { + if (cit->second.changed()) return true; } } @@ -102,57 +155,105 @@ bool DepTable::extchanged(string const & ext) const } -bool DepTable::exist(string const & fil) const +bool DepTable::ext_exist(string const & ext) const { - DepList::const_iterator cit = deplist.find(fil); - if (cit != deplist.end()) return true; + DepList::const_iterator cit = deplist.begin(); + DepList::const_iterator end = deplist.end(); + for (; cit != end; ++cit) { + if (suffixIs(cit->first.absFilename(), ext)) { + return true; + } + } return false; } +bool DepTable::exist(FileName const & fil) const +{ + return deplist.find(fil) != deplist.end(); +} + + void DepTable::remove_files_with_extension(string const & suf) { - DepList tmp; - for (DepList::const_iterator cit = deplist.begin(); - cit != deplist.end(); ++cit) { - if (!suffixIs((*cit).first, suf)) - tmp[(*cit).first] = (*cit).second; + DepList::iterator cit = deplist.begin(); + DepList::iterator end = deplist.end(); + while (cit != end) { + if (suffixIs(cit->first.absFilename(), suf)) { + // Can't erase the current iterator, but we + // can increment and then erase. + // Deplist is a map so only the erased + // iterator is invalidated. + DepList::iterator doomed = cit++; + deplist.erase(doomed); + continue; + } + ++cit; + } +} + + +void DepTable::remove_file(FileName const & filename) +{ + DepList::iterator cit = deplist.begin(); + DepList::iterator end = deplist.end(); + while (cit != end) { + if (cit->first == filename) { + // Can't erase the current iterator, but we + // can increment and then erase. + // deplist is a map so only the erased + // iterator is invalidated. + DepList::iterator doomed = cit++; + deplist.erase(doomed); + continue; + } + ++cit; } - deplist.swap(tmp); } -void DepTable::write(string const & f) const +void DepTable::write(FileName const & f) const { - ofstream ofs(f.c_str()); - for (DepList::const_iterator cit = deplist.begin(); - cit != deplist.end(); ++cit) { + ofstream ofs(f.toFilesystemEncoding().c_str()); + DepList::const_iterator cit = deplist.begin(); + DepList::const_iterator end = deplist.end(); + for (; cit != end; ++cit) { if (lyxerr.debugging(Debug::DEPEND)) { + // Store the second (most recently calculated) + // CRC value. + // The older one is effectively set to 0 upon re-load. lyxerr << "Write dep: " - << (*cit).first << " " - << (*cit).second.first << " " - << (*cit).second.second << endl; + << cit->second.crc_cur << ' ' + << cit->second.mtime_cur << ' ' + << cit->first << endl; } - ofs << (*cit).first << " " - << (*cit).second.first << " " - << (*cit).second.second << endl; + ofs << cit->second.crc_cur << ' ' + << cit->second.mtime_cur << ' ' + << cit->first << endl; } } -void DepTable::read(string const & f) +bool DepTable::read(FileName const & f) { - ifstream ifs(f.c_str()); + ifstream ifs(f.toFilesystemEncoding().c_str()); string nome; - unsigned long one = 0; - unsigned long two = 0; - while(ifs >> nome >> one >> two) { + dep_info di; + // This doesn't change through the loop. + di.crc_prev = 0; + + while (ifs >> di.crc_cur >> di.mtime_cur && getline(ifs, nome)) { + nome = ltrim(nome); if (lyxerr.debugging(Debug::DEPEND)) { lyxerr << "Read dep: " - << nome << " " - << one << " " - << two << endl; + << di.crc_cur << ' ' + << di.mtime_cur << ' ' + << nome << endl; } - deplist[nome] = make_pair(one, two); + deplist[FileName(nome)] = di; } + return deplist.size(); } + + +} // namespace lyx