X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverterCache.cpp;h=0f4d03efb9d42b9b1df356d9d8793cdf09df041c;hb=3bbce7f24afbb469fff5ad352778af73d57b44d8;hp=77ba7b32e64210ddbe80309976050255c0b89349;hpb=cb5dd33475e7cca472ead1fd3eac9f174b8b76ba;p=features.git

diff --git a/src/ConverterCache.cpp b/src/ConverterCache.cpp
index 77ba7b32e6..0f4d03efb9 100644
--- a/src/ConverterCache.cpp
+++ b/src/ConverterCache.cpp
@@ -25,8 +25,8 @@
 #include "support/lyxtime.h"
 #include "support/Package.h"
 
+#include "support/checksum.h"
 #include "support/lassert.h"
-#include <boost/crc.hpp>
 
 #include <algorithm>
 #include <fstream>
@@ -41,27 +41,21 @@ namespace lyx {
 
 namespace {
 
-unsigned long do_crc(string const & s)
-{
-	boost::crc_32_type crc;
-	crc = for_each(s.begin(), s.end(), crc);
-	return crc.checksum();
-}
-
-
+// FIXME THREAD
+// This should be OK because it is only assigned during init()
 static FileName cache_dir;
 
 
 class CacheItem {
 public:
-	CacheItem()
-	{}
+	CacheItem() : timestamp(0), checksum(0) {}
 	CacheItem(FileName const & orig_from, string const & to_format,
 		  time_t t, unsigned long c)
 		: timestamp(t), checksum(c)
 	{
 		ostringstream os;
-		os << setw(10) << setfill('0') << do_crc(orig_from.absFileName())
+		os << setw(10) << setfill('0')
+		   << support::checksum(orig_from.absFileName())
 		   << '-' << to_format;
 		cache_name = FileName(addName(cache_dir.absFileName(), os.str()));
 		LYXERR(Debug::FILES, "Add file cache item " << orig_from
@@ -75,7 +69,7 @@ public:
 	unsigned long checksum;
 };
 
-}
+} // namespace
 
 
 /** The cache contains one item per orig file and target format, so use a
@@ -158,7 +152,11 @@ void ConverterCache::Impl::readIndex()
 		FormatCache & format_cache = cache[orig_from_name];
 		if (format_cache.from_format.empty())
 			format_cache.from_format =
-				formats.getFormatFromFile(orig_from_name);
+				// FIXME perf: This very expensive function is called on all
+				// cached files on opening. This slows LyX startup a lot. It
+				// would be better if this information was retrieved in a
+				// delayed fashion.
+				theFormats().getFormatFromFile(orig_from_name);
 		format_cache.cache[to_format] = item;
 	}
 	is.close();
@@ -193,14 +191,14 @@ CacheItem * ConverterCache::Impl::find(FileName const & from,
 		string const & format)
 {
 	if (!lyxrc.use_converter_cache)
-		return 0;
+		return nullptr;
 	CacheType::iterator const it1 = cache.find(from);
 	if (it1 == cache.end())
-		return 0;
+		return nullptr;
 	FormatCacheType & format_cache = it1->second.cache;
 	FormatCacheType::iterator const it2 = format_cache.find(format);
 	if (it2 == format_cache.end())
-		return 0;
+		return nullptr;
 	return &(it2->second);
 }
 
@@ -239,6 +237,8 @@ void ConverterCache::init()
 	cache_dir = FileName(addName(package().user_support().absFileName(), "cache"));
 	if (!cache_dir.exists())
 		if (!cache_dir.createDirectory(0700)) {
+			// FIXME This should really be displayed as a message. But the GUI
+			// does not exist yet.
 			lyxerr << "Could not create cache directory `"
 			       << cache_dir << "'." << endl;
 			exit(EXIT_FAILURE);
@@ -249,7 +249,7 @@ void ConverterCache::init()
 
 void ConverterCache::writeIndex() const
 {
-	if (!lyxrc.use_converter_cache 
+	if (!lyxrc.use_converter_cache
 		  || cache_dir.empty())
 		return;
 	pimpl_->writeIndex();
@@ -315,7 +315,7 @@ void ConverterCache::add(FileName const & orig_from, string const & to_format,
 			FormatCache & format_cache = pimpl_->cache[orig_from];
 			if (format_cache.from_format.empty())
 				format_cache.from_format =
-					formats.getFormatFromFile(orig_from);
+					theFormats().getFormatFromFile(orig_from);
 			format_cache.cache[to_format] = new_item;
 		} else
 			LYXERR(Debug::FILES, "ConverterCache::add(" << orig_from << "):\n"
@@ -431,7 +431,7 @@ FileName const & ConverterCache::cacheName(FileName const & orig_from,
 	LYXERR(Debug::FILES, orig_from << ' ' << to_format);
 
 	CacheItem * const item = pimpl_->find(orig_from, to_format);
-	LASSERT(item, /**/);
+	LASSERT(item, { static const FileName fn; return fn; });
 	return item->cache_name;
 }
 
@@ -455,7 +455,7 @@ bool ConverterCache::copy(FileName const & orig_from, string const & to_format,
 	}
 
 	CacheItem * const item = pimpl_->find(orig_from, to_format);
-	LASSERT(item, /**/);
+	LASSERT(item, return false);
 	Mover const & mover = getMover(to_format);
 	return mover.copy(item->cache_name, dest,
 	                  onlyFileName(dest.absFileName()));