diff options
| author | ticktock35 <ticktock35@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2008-12-27 11:52:36 (EST) |
|---|---|---|
| committer | ticktock35 <ticktock35@e8e0d7a0-c8d9-11dd-a880-a1081c7ac358> | 2008-12-27 11:52:36 (EST) |
| commit | 47daab916286d7ac837ecaadb607b09797822fc2 (patch) | |
| tree | 4558e6e21a477c2d63740f2425549887198c6f6f /libbb/unarchive.c | |
| parent | 21eb7f75a568f0c6e44836b89ca57f5d7846f5dc (diff) | |
Thanks for Mike Westerhof <mwester@dls.net>
----------
This patchset updates the libbb stuff to use a vfork() version of
gz_open, called gzvopen. This is done because a standard fork will
duplicate the entire address space. This will invoke the OOM
(out of memory) killer on small-memory machines, because most often
by the time we unzip any package, we've read the entire package
database into memory already. By using vfork() and immediatly
execing the external gunzip utility, we avoid the need to clone the
entire address space.
Yes, this is actually **LESS** efficient than the original way!
But there is no way to (currently) dodge the OOM killer on a
per-process basis, so the alternatives are to either change the
OOM killer behavior system-wide, or to use this workaround.
Mike Westerhof, Dec 2008
git-svn-id: http://opkg.googlecode.com/svn/trunk@190 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358
Diffstat (limited to 'libbb/unarchive.c')
| -rw-r--r-- | libbb/unarchive.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libbb/unarchive.c b/libbb/unarchive.c index bb70ccb..3251c71 100644 --- a/libbb/unarchive.c +++ b/libbb/unarchive.c @@ -749,7 +749,7 @@ char *deb_extract(const char *package_filename, FILE *out_stream, while ((ar_header = get_header_ar(deb_stream)) != NULL) { if (strcmp(ared_file, ar_header->name) == 0) { /* open a stream of decompressed data */ - uncompressed_stream = gz_open(deb_stream, &gunzip_pid); + uncompressed_stream = gzvopen(deb_stream, &gunzip_pid); archive_offset = 0; output_buffer = unarchive(uncompressed_stream, out_stream, get_header_tar, free_header_tar, extract_function, prefix, file_list); } @@ -757,7 +757,7 @@ char *deb_extract(const char *package_filename, FILE *out_stream, free (ar_header->name); free (ar_header); } - gz_close(gunzip_pid); + gzvclose(gunzip_pid); fclose(deb_stream); fclose(uncompressed_stream); free(ared_file); @@ -769,7 +769,7 @@ char *deb_extract(const char *package_filename, FILE *out_stream, file_header_t *tar_header; archive_offset = 0; fseek(deb_stream, 0, SEEK_SET); - unzipped_opkg_stream = gz_open(deb_stream, &unzipped_opkg_pid); + unzipped_opkg_stream = gzvopen(deb_stream, &unzipped_opkg_pid); /*fprintf(stderr, __FUNCTION__ ": processing opkg %s -- ared_file=%s\n", package_filename, ared_file);*/ /* walk through outer tar file to find ared_file */ @@ -779,7 +779,7 @@ char *deb_extract(const char *package_filename, FILE *out_stream, name_offset = 2; if (strcmp(ared_file, tar_header->name+name_offset) == 0) { /* open a stream of decompressed data */ - uncompressed_stream = gz_open(unzipped_opkg_stream, &gunzip_pid); + uncompressed_stream = gzvopen(unzipped_opkg_stream, &gunzip_pid); archive_offset = 0; /*fprintf(stderr, __FUNCTION__ ":%d: here -- found file\n", __LINE__);*/ output_buffer = unarchive(uncompressed_stream, @@ -791,14 +791,14 @@ char *deb_extract(const char *package_filename, FILE *out_stream, file_list); /*fprintf(stderr, __FUNCTION__ ":%d: unarchive complete\n", __LINE__);*/ free_header_tar(tar_header); - gz_close(gunzip_pid); + gzvclose(gunzip_pid); fclose(uncompressed_stream); break; } seek_sub_file(unzipped_opkg_stream, tar_header->size); free_header_tar(tar_header); } - gz_close(unzipped_opkg_pid); + gzvclose(unzipped_opkg_pid); fclose(unzipped_opkg_stream); fclose(deb_stream); free(ared_file); |