X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FDepTable.C;h=59ddbd77bfeeacc6f4ffdcc5b37edb9357d7b3d2;hb=34d28f9daae536db06d6cf1a9dcf62dc0f5aa432;hp=15aba4ae879bfb96a7b99f891da7168f1839c1a1;hpb=27de1486ca34aaad446adb798d71a77d6f6304da;p=lyx.git

diff --git a/src/DepTable.C b/src/DepTable.C
index 15aba4ae87..59ddbd77bf 100644
--- a/src/DepTable.C
+++ b/src/DepTable.C
@@ -1,168 +1,252 @@
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor
- *	     Copyright (C) 1995 Matthias Ettrich
- *           Copyright (C) 1995-1998 The LyX Team.
+ *	     Copyright 1995 Matthias Ettrich
+ *           Copyright 1995-2001 The LyX Team.
  *
- *           This file is Copyright (C) 1996-1998
+ *           This file is Copyright 1996-2001
  *           Lars Gullik Bjønnes
+ *           Ben Stanley
  *
- * ======================================================
+ * ====================================================== 
  */
 
 #include <config.h>
 
+#ifdef __GNUG__
+#pragma implementation
+#endif
+
 #include "DepTable.h"
-#include "lyxlib.h"
-#include "filetools.h"
+#include "debug.h"
+
+#include "support/lyxlib.h"
+#include "support/filetools.h"
+#include "support/lstrings.h"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <fstream>
+
+using std::make_pair;
+using std::ofstream;
+using std::ifstream;
+using std::flush;
+using std::endl;
 
-DepTable::DepTable()
+
+inline
+bool DepTable::dep_info::changed() const
 {
-	new_sum = 0;
-	old_sum = 0;
-	next = NULL;
+	return crc_prev != crc_cur && crc_cur != 0;
 }
 
 
-DepTable::DepTable(LString const & f,
-		   bool upd,
-		   unsigned long one,
-		   unsigned long two)
+void DepTable::insert(string const & fi, bool upd)
 {
 	// not quite sure if this is the correct place for MakeAbsPath
-	file = MakeAbsPath(f);
-	new_sum = 0; old_sum = 0;
-	if (one != 0)
-		new_sum = one;
-	if (two != 0)
-		old_sum = two;
-	if (upd) {
-		old_sum = new_sum;
-		new_sum = lyxsum(file.c_str());
+	string const f = MakeAbsPath(fi);
+	if (deplist.find(f) == deplist.end()) {
+		dep_info di;
+		di.crc_prev = 0;
+		if (upd) {
+			lyxerr[Debug::DEPEND] << " CRC..." << flush;
+			di.crc_cur = lyx::sum(f);
+			lyxerr[Debug::DEPEND] << "done." << endl;
+			struct stat f_info;
+			stat(fi.c_str(), &f_info);
+			di.mtime_cur = f_info.st_mtime;
+		} else {
+			di.crc_cur = 0;
+			di.mtime_cur = 0;
+		}
+		deplist[f] = di;
+	} else {
+		lyxerr[Debug::DEPEND] << " Already in DepTable" << endl;
 	}
-	if (lyxerr.debugging()) {
-		char tmp1[256];
-		char tmp2[256];
-		sprintf(tmp1, "%lu", new_sum);
-		sprintf(tmp2, "%lu", old_sum);
-		lyxerr.debug("New file inserted in deplog: " + 
-			     file + " " +
-			     tmp1 + " " + tmp2);
+}
+		
+
+void DepTable::update()
+{
+	lyxerr[Debug::DEPEND] << "Updating DepTable..." << endl;
+	time_t start_time = time(0);
+
+	DepList::iterator itr = deplist.begin();
+	while (itr != deplist.end()) {
+		dep_info &di = itr->second;
+
+		struct stat f_info;
+		if (stat(itr->first.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";
+			} else {
+				di.crc_prev = di.crc_cur;
+				lyxerr[Debug::DEPEND] << itr->first << " CRC... ";
+				di.crc_cur = lyx::sum(itr->first);
+				lyxerr[Debug::DEPEND] << "done";
+			}
+		} 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)) {
+			if (di.changed())
+				lyxerr << " +";
+			lyxerr << endl;
+		}
+		++itr;
 	}
-	next = NULL;
+	time_t time_sec = time(0) - start_time;
+	lyxerr[Debug::DEPEND] << "Finished updating DepTable ("
+		<< time_sec << " sec)." << endl;
 }
 
 
-void DepTable::insert(LString const & fi,
-		      bool upd,
-		      unsigned long one,
-		      unsigned long two)
+bool DepTable::sumchange() const
+{
+	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
 {
 	// not quite sure if this is the correct place for MakeAbsPath
-	LString f = MakeAbsPath(fi);
-	if (f == file) return; // exist already in the log
-	if (next)
-		next->insert(f, upd, one, two);
-	else
-		next = new DepTable(f, upd, one, two);
+	string const fil = MakeAbsPath(f);
+	DepList::const_iterator cit = deplist.find(fil);
+	if (cit != deplist.end()) {
+		if (cit->second.changed())
+			return true;
+	}
+	return false;
 }
-		
 
-void DepTable::update()
+
+bool DepTable::extchanged(string const & ext) const
 {
-	if (!file.empty()) {
-		old_sum = new_sum;
-		new_sum = lyxsum(file.c_str());
-		if (lyxerr.debugging()) {
-			char tmp1[256];
-			char tmp2[256];
-			sprintf(tmp1, "%lu", new_sum);
-			sprintf(tmp2, "%lu", old_sum);
-			lyxerr.debug("update: " + file + " " +
-				     tmp1 + " " + tmp2);
+	DepList::const_iterator cit = deplist.begin();
+	DepList::const_iterator end = deplist.end();
+	for (; cit != end; ++cit) {
+		if (suffixIs(cit->first, ext)) {
+			if (cit->second.changed())
+				return true;
 		}
 	}
-	if (next) next->update();
+	return false;
 }
 
 
-bool DepTable::sumchange()
+bool DepTable::ext_exist(const string& ext ) const
 {
-	bool ret = false;
-	
-	if (!file.empty()) {
-		if (old_sum != new_sum) ret = true;
+	DepList::const_iterator cit = deplist.begin();
+	DepList::const_iterator end = deplist.end();
+	for (; cit != end; ++cit ) {
+		if (suffixIs(cit->first, ext)) {
+			return true;
+		}
 	}
-	if (!ret && next) ret = next->sumchange();
-
-	return ret;
+	return false;
 }
 
 
-bool DepTable::haschanged(LString const & f)
+bool DepTable::exist(string const & fil) const
 {
-	// not quite sure if this is the correct place for MakeAbsPath
-	LString fil = MakeAbsPath(f);
-	bool ret = false;
+	return deplist.find(fil) != deplist.end();
+}
 
-	if (!fil.empty() && !file.empty() && fil == file) {
-		if (new_sum != old_sum && new_sum != 0)
-			ret = true;
+
+void DepTable::remove_files_with_extension(string const & suf)
+{
+	DepList::iterator cit = deplist.begin();
+	DepList::iterator end = deplist.end();
+	while (cit != end) {
+		if (suffixIs(cit->first, 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;
 	}
-	if (!ret && next) ret = next->haschanged(fil);
-	return ret;
 }
 
 
-void DepTable::write(LString const&f)
+void DepTable::remove_file(string const & filename)
 {
-	FilePtr fp(f, FilePtr::write);
-	if (fp() && next) next->write(fp());
+	DepList::iterator cit = deplist.begin();
+	DepList::iterator end = deplist.end();
+	while (cit != end) {
+		if (OnlyFilename(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;
+	}
 }
 
 
-void DepTable::read(LString const &f)
+void DepTable::write(string const & f) const
 {
-	FilePtr fp(f, FilePtr::read);
-	if (fp()) { // file opened
-		char nome[256];
-		unsigned long one = 0;
-		unsigned long two = 0;
-		// scan the file line by line
-		// return true if the two numbers on the line is different
-		int ret = 0;
-		while (!feof(fp())) {
-			ret = fscanf(fp(), "%s %lu %lu",
-				     nome, &one, &two);
-			if (ret !=3) continue;
-			if (lyxerr.debugging()) {
-				char tmp1[255];
-				char tmp2[255];
-				sprintf(tmp1, "%lu", one);
-				sprintf(tmp2, "%lu", two);
-				lyxerr.debug(LString("read dep: ") +
-					     nome + " " + tmp1 +
-					     " " + tmp2);
-			}
-			insert(LString(nome), false, one, two);
+	ofstream ofs(f.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.crc_cur << " "
+			       << cit->second.mtime_cur << endl;
 		}
+		ofs << cit->first << " "
+		    << cit->second.crc_cur << " "
+		    << cit->second.mtime_cur << endl;
 	}
 }
 
 
-void DepTable::write(FILE * f)
+void DepTable::read(string const & f)
 {
-	if (lyxerr.debugging()) {
-		char tmp1[255];
-		char tmp2[255];
-		sprintf(tmp1, "%lu", new_sum);
-		sprintf(tmp2, "%lu", old_sum);
-		lyxerr.print("Write dep: " + file + " " +
-			     tmp1 + " " + tmp2);
+	ifstream ifs(f.c_str());
+	string nome;
+	dep_info di;
+	// This doesn't change through the loop.
+	di.crc_prev = 0;
+	
+	while (ifs >> nome >> di.crc_cur >> di.mtime_cur) {
+		if (lyxerr.debugging(Debug::DEPEND)) {
+			lyxerr << "Read dep: "
+			       << nome << " "
+			       << di.crc_cur << " "
+			       << di.mtime_cur << endl;
+		}
+		deplist[nome] = di;
 	}
-	fprintf(f, "%s %lu %lu\n", file.c_str(),
-		new_sum, old_sum);
-	if (next)
-		next->write(f);
 }
+