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

added a cache to the datablock optimizer so it wouldn't need to read the entire datablock to find its optimizations

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3667 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-09-25 10:09:53 +00:00
parent 15e6286454
commit f4089b9d60
2 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Source/build.cpp
View file

@ -276,6 +276,7 @@ definedlist.add("NSIS_SUPPORT_LANG_IN_STRINGS");
cur_entries=&build_entries; cur_entries=&build_entries;
cur_datablock=&build_datablock; cur_datablock=&build_datablock;
cur_datablock_cache=&build_datablock_cache;
cur_functions=&build_functions; cur_functions=&build_functions;
cur_labels=&build_labels; cur_labels=&build_labels;
cur_sections=&build_sections; cur_sections=&build_sections;
@ -706,10 +707,12 @@ int CEXEBuild::preprocess_string(char *out, const char *in, WORD codepage/*=CP_A
// the datablock as necessary). Reduces overhead if you want to add files to a couple places. // the datablock as necessary). Reduces overhead if you want to add files to a couple places.
// Woo, an optimizing installer generator, now we're styling. // Woo, an optimizing installer generator, now we're styling.
int CEXEBuild::datablock_optimize(int start_offset) int CEXEBuild::datablock_optimize(int start_offset, int first_int)
{ {
int this_len = cur_datablock->getlen() - start_offset; int this_len = cur_datablock->getlen() - start_offset;
int pos = 0;
cached_db_size this_size = {first_int, start_offset};
cur_datablock_cache->add(&this_size, sizeof(cached_db_size));
if (!build_optimize_datablock || this_len < (int) sizeof(int)) if (!build_optimize_datablock || this_len < (int) sizeof(int))
return start_offset; return start_offset;
@ -717,16 +720,15 @@ int CEXEBuild::datablock_optimize(int start_offset)
MMapBuf *db = (MMapBuf *) cur_datablock; MMapBuf *db = (MMapBuf *) cur_datablock;
db->setro(TRUE); db->setro(TRUE);
int first_int = *(int *) db->get(start_offset, sizeof(int)); cached_db_size *db_sizes = (cached_db_size *) cur_datablock_cache->get();
db->release(); int db_sizes_num = cur_datablock_cache->getlen() / sizeof(cached_db_size);
db_sizes_num--; // don't compare with the one we just added
while (pos < start_offset) for (int i = 0; i < db_sizes_num; i++)
{ {
int this_int = *(int *) db->get(pos, sizeof(int)); if (db_sizes[i].first_int == first_int)
db->release();
if (this_int == first_int)
{ {
int pos = db_sizes[i].start_offset;
int left = this_len; int left = this_len;
while (left > 0) while (left > 0)
{ {
@ -753,11 +755,10 @@ int CEXEBuild::datablock_optimize(int start_offset)
db_opt_save += this_len; db_opt_save += this_len;
db->resize(max(start_offset, pos + this_len)); db->resize(max(start_offset, pos + this_len));
db->setro(FALSE); db->setro(FALSE);
cur_datablock_cache->resize(cur_datablock_cache->getlen() - sizeof(cached_db_size));
return pos; return pos;
} }
} }
pos += sizeof(int) + (this_int & 0x7fffffff);
} }
db->setro(FALSE); db->setro(FALSE);
@ -874,7 +875,7 @@ int CEXEBuild::add_db_data(IMMap *map) // returns offset
*(int*)db->get(st, sizeof(int)) = used | 0x80000000; *(int*)db->get(st, sizeof(int)) = used | 0x80000000;
db->release(); db->release();
int nst = datablock_optimize(st); int nst = datablock_optimize(st, used | 0x80000000);
if (nst == st) db_comp_save += length - used; if (nst == st) db_comp_save += length - used;
else st = nst; else st = nst;
} }
@ -903,7 +904,7 @@ int CEXEBuild::add_db_data(IMMap *map) // returns offset
left -= l; left -= l;
} }
st = datablock_optimize(st); st = datablock_optimize(st, length);
} }
db_full_size += length + sizeof(int); db_full_size += length + sizeof(int);
@ -3011,6 +3012,7 @@ void CEXEBuild::set_uninstall_mode(int un)
if (un) if (un)
{ {
cur_datablock=&ubuild_datablock; cur_datablock=&ubuild_datablock;
cur_datablock_cache=&ubuild_datablock_cache;
cur_entries=&ubuild_entries; cur_entries=&ubuild_entries;
cur_functions=&ubuild_functions; cur_functions=&ubuild_functions;
cur_labels=&ubuild_labels; cur_labels=&ubuild_labels;
@ -3024,6 +3026,7 @@ void CEXEBuild::set_uninstall_mode(int un)
else else
{ {
cur_datablock=&build_datablock; cur_datablock=&build_datablock;
cur_datablock_cache=&build_datablock_cache;
cur_entries=&build_entries; cur_entries=&build_entries;
cur_functions=&build_functions; cur_functions=&build_functions;
cur_labels=&build_labels; cur_labels=&build_labels;

12
Source/build.h
View file

@ -198,7 +198,7 @@ class CEXEBuild {
#endif //NSIS_CONFIG_PLUGIN_SUPPORT #endif //NSIS_CONFIG_PLUGIN_SUPPORT
// build.cpp functions used mostly within build.cpp // build.cpp functions used mostly within build.cpp
int datablock_optimize(int start_offset); int datablock_optimize(int start_offset, int first_int);
void printline(int l); void printline(int l);
int process_jump(LineParser &line, int wt, int *offs); int process_jump(LineParser &line, int wt, int *offs);
@ -328,8 +328,16 @@ class CEXEBuild {
TinyGrowBuf build_pages, ubuild_pages, *cur_pages; TinyGrowBuf build_pages, ubuild_pages, *cur_pages;
TinyGrowBuf build_ctlcolors, ubuild_ctlcolors, *cur_ctlcolors; TinyGrowBuf build_ctlcolors, ubuild_ctlcolors, *cur_ctlcolors;
// don't forget to update the cache after updating the datablock
// see datablock_optimize for an example
MMapBuf build_datablock, ubuild_datablock; MMapBuf build_datablock, ubuild_datablock;
IGrowBuf *cur_datablock; TinyGrowBuf build_datablock_cache, ubuild_datablock_cache;
IGrowBuf *cur_datablock, *cur_datablock_cache;
struct cached_db_size
{
int first_int; // size | (compressed ? 0x80000000 : 0)
int start_offset;
};
int build_filebuflen; int build_filebuflen;