dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Store datablock optimizer statistics as UINT64 in case the same large file is added many times

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6457 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-03-31 17:34:58 +00:00
parent ed4f2ab384
commit 4ac358dc35
4 changed files with 32 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Source/build.cpp
View file

@ -154,7 +154,8 @@ CEXEBuild::CEXEBuild() :
#endif
if (sizeof(void*) > 4) definedlist.add(_T("NSIS_MAKENSIS64"));
db_opt_save=db_comp_save=db_full_size=db_opt_save_u=db_comp_save_u=db_full_size_u=0;
db_opt_save=db_opt_save_u=0;
db_comp_save=db_full_size=db_comp_save_u=db_full_size_u=0;
// Added by Amir Szekely 31st July 2002
#ifdef NSIS_CONFIG_COMPRESSION_SUPPORT
@ -860,8 +861,8 @@ int CEXEBuild::add_db_data(IMMap *mmap) // returns offset
{
// grow datablock so that there is room to compress into
int bufferlen = length + 1024 + length / 4; // give a nice 25% extra space
if (st+bufferlen+sizeof(int) < 0) // we've hit a signed integer overflow (file is over 1.6 GB)
bufferlen = INT_MAX-st-sizeof(int); // so maximize compressor room and hope the file compresses well
if (st+bufferlen+(signed)sizeof(int) < 0) // we've hit a signed integer overflow (file is over 1.6 GB)
bufferlen = INT_MAX-st-sizeof(int); // so maximize compressor room and hope the file compresses well
db->resize(st + bufferlen + sizeof(int));
int n = compressor->Init(build_compress_level, build_compress_dict_size);
@ -952,10 +953,15 @@ int CEXEBuild::add_db_data(IMMap *mmap) // returns offset
{
// Adding the same file twice can push cur_datablock over the limit
// because datablock_optimize() happens too late. Let's try to find a dupe early.
if (this->build_optimize_datablock && st + sizeof(int) + length < 0)
if (this->build_optimize_datablock && st + length < 0)
{
int oldst;
if (datablock_finddata(*mmap, 0, length, &oldst)) return oldst;
if (datablock_finddata(*mmap, 0, length, &oldst))
{
// BUGBUG: Should we increase db_full_size? db_full_size = BUGBUG64TRUNCATE(int,db_full_size+length);
db_opt_save += length;
return oldst;
}
}
db->resize(st + sizeof(int) + length);
@ -2813,11 +2819,12 @@ int CEXEBuild::write_output(void)
if (db_opt_save)
{
int total_out_size_estimate=BUGBUG64TRUNCATE(int, // BUGBUG: This should be UINT64 or at least unsigned
m_exehead_size+sizeof(fh)+build_datablock.getlen()+(build_crcchk?sizeof(crc32_t):0));
int pc=(int)(((INT64)db_opt_save*1000)/(db_opt_save+total_out_size_estimate));
INFO_MSG(_T("Datablock optimizer saved %d bytes (~%d.%d%%).\n"),db_opt_save,
pc/10,pc%10);
UINT32 disp_db_opt_save, total_out_size_estimate=
m_exehead_size+sizeof(fh)+build_datablock.getlen()+(build_crcchk?sizeof(crc32_t):0);
int pc=(int)((db_opt_save*1000)/(db_opt_save+total_out_size_estimate));
const TCHAR *disp_savedunit=GetFriendlySize(db_opt_save, disp_db_opt_save, true);
INFO_MSG(_T("Datablock optimizer saved %u %") NPRIs _T(" (~%d.%d%%).\n"),
disp_db_opt_save,disp_savedunit,pc/10,pc%10);
}
#ifdef NSIS_CONFIG_COMPRESSION_SUPPORT
@ -3332,7 +3339,7 @@ void CEXEBuild::set_uninstall_mode(int un)
definedlist.del(_T("__UNINSTALL__"));
}
SWAP(db_opt_save_u,db_opt_save,int);
SWAP(db_opt_save_u,db_opt_save,UINT64);
SWAP(db_comp_save_u,db_comp_save,int);
SWAP(db_full_size_u,db_full_size,unsigned int);
}

3
Source/build.h
View file

@ -465,7 +465,8 @@ class CEXEBuild {
StringList m_macro_entry;
int db_opt_save, db_opt_save_u, db_comp_save, db_comp_save_u;
UINT64 db_opt_save, db_opt_save_u;
int db_comp_save, db_comp_save_u;
unsigned int db_full_size, db_full_size_u;
FastStringList include_dirs;

11
Source/util.cpp
View file

@ -85,6 +85,17 @@ unsigned int my_strncpy(TCHAR*Dest, const TCHAR*Src, unsigned int cchMax)
return cch;
}
const TCHAR* GetFriendlySize(UINT64 n, unsigned int&fn, bool accurate)
{
static const TCHAR* names[] = {
_T("bytes"), _T("KiB"), _T("MiB"), _T("GiB"), _T("TiB")
};
unsigned char s = 0;
while(n > ((!accurate || s) ? 1024-1 : UINT_MAX)) n /= 1024, ++s;
fn = (unsigned int) n;
return s >= COUNTOF(names) ? _T("?") : 1 == fn && !s ? _T("byte") : names[s];
}
// Returns 0 if everything is OK
// Returns -1 if can't find the file
// Returns -2 if the file is an invalid bitmap

1
Source/util.h
View file

@ -35,6 +35,7 @@
extern double my_wtof(const wchar_t *str);
extern unsigned int my_strncpy(TCHAR*Dest, const TCHAR*Src, unsigned int cchMax);
size_t my_strftime(TCHAR *s, size_t max, const TCHAR *fmt, const struct tm *tm);
const TCHAR* GetFriendlySize(UINT64 n, unsigned int&fn, bool accurate = false);
// Adds the bitmap in filename using resource editor re as id id.
// If width or height are specified it will also make sure the bitmap is in that size