Просмотр исходного кода

Change compressor costs to be 100 apart

This will give us the freedom to insert more compressors at
positions in between.

Also change the cost of uncompressed to 0, as that really has
no overhead, and the values do not really mean much.
Julian Andres Klode лет назад: 10
Родитель
Сommit
59f1f42b75
1 измененных файлов с 9 добавлено и 9 удалено
  1. 9 9
      apt-pkg/aptconfiguration.cc

+ 9 - 9
apt-pkg/aptconfiguration.cc

@@ -364,30 +364,30 @@ const Configuration::getCompressors(bool const Cached) {
 
 
 	setDefaultConfigurationForCompressors();
 	setDefaultConfigurationForCompressors();
 
 
-	compressors.push_back(Compressor(".", "", "", NULL, NULL, 1));
+	compressors.push_back(Compressor(".", "", "", NULL, NULL, 0));
 	if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->FindFile("Dir::Bin::gzip")) == true)
 	if (_config->Exists("Dir::Bin::gzip") == false || FileExists(_config->FindFile("Dir::Bin::gzip")) == true)
-		compressors.push_back(Compressor("gzip",".gz","gzip","-6n","-d",2));
+		compressors.push_back(Compressor("gzip",".gz","gzip","-6n","-d",100));
 #ifdef HAVE_ZLIB
 #ifdef HAVE_ZLIB
 	else
 	else
-		compressors.push_back(Compressor("gzip",".gz","false", NULL, NULL, 2));
+		compressors.push_back(Compressor("gzip",".gz","false", NULL, NULL, 100));
 #endif
 #endif
 	if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true)
 	if (_config->Exists("Dir::Bin::xz") == false || FileExists(_config->FindFile("Dir::Bin::xz")) == true)
-		compressors.push_back(Compressor("xz",".xz","xz","-6","-d",3));
+		compressors.push_back(Compressor("xz",".xz","xz","-6","-d",200));
 #ifdef HAVE_LZMA
 #ifdef HAVE_LZMA
 	else
 	else
-		compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 3));
+		compressors.push_back(Compressor("xz",".xz","false", NULL, NULL, 200));
 #endif
 #endif
 	if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true)
 	if (_config->Exists("Dir::Bin::bzip2") == false || FileExists(_config->FindFile("Dir::Bin::bzip2")) == true)
-		compressors.push_back(Compressor("bzip2",".bz2","bzip2","-6","-d",4));
+		compressors.push_back(Compressor("bzip2",".bz2","bzip2","-6","-d",300));
 #ifdef HAVE_BZ2
 #ifdef HAVE_BZ2
 	else
 	else
-		compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 4));
+		compressors.push_back(Compressor("bzip2",".bz2","false", NULL, NULL, 300));
 #endif
 #endif
 	if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true)
 	if (_config->Exists("Dir::Bin::lzma") == false || FileExists(_config->FindFile("Dir::Bin::lzma")) == true)
-		compressors.push_back(Compressor("lzma",".lzma","lzma","-6","-d",5));
+		compressors.push_back(Compressor("lzma",".lzma","lzma","-6","-d",400));
 #ifdef HAVE_LZMA
 #ifdef HAVE_LZMA
 	else
 	else
-		compressors.push_back(Compressor("lzma",".lzma","false", NULL, NULL, 5));
+		compressors.push_back(Compressor("lzma",".lzma","false", NULL, NULL, 400));
 #endif
 #endif
 
 
 	std::vector<std::string> const comp = _config->FindVector("APT::Compressor");
 	std::vector<std::string> const comp = _config->FindVector("APT::Compressor");