packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Use mmap() with O_NOATIME if merely reading archive-z2 entries 

Previously we'd open(path, O_NOATIME) and do a series of small read()
calls to just parse the header.  I think this will trigger kernel readahead
into the compressed portion, but we don't care about that.

This should be more efficient.
This commit is contained in:
Colin Walters 2012-12-02 15:20:17 -05:00
parent 7fcebed4e8
commit fc7f05940c
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libgsystem

@ -1 +1 @@
Subproject commit c17376d4acbddfa1909d24167d3ce24531b3db1a Subproject commit 76d4b356378dc3549d402bfdd0bc953da7106f08

39
src/libostree/ostree-core.c
View File

@ -540,28 +540,45 @@ ostree_content_file_parse (gboolean compressed,
struct stat stbuf; struct stat stbuf;
ot_lobj GInputStream *file_input = NULL; ot_lobj GInputStream *file_input = NULL;
ot_lobj GInputStream *ret_input = NULL; ot_lobj GInputStream *ret_input = NULL;
ot_lobj GFileInfo *content_file_info = NULL;
ot_lobj GFileInfo *ret_file_info = NULL; ot_lobj GFileInfo *ret_file_info = NULL;
ot_lvariant GVariant *ret_xattrs = NULL; ot_lvariant GVariant *ret_xattrs = NULL;
file_input = (GInputStream*)gs_file_read_noatime (content_path, cancellable, error); if (out_input)
if (!file_input)
goto out;
if (fstat (g_file_descriptor_based_get_fd ((GFileDescriptorBased*)file_input), &stbuf) < 0)
{ {
ot_util_set_error_from_errno (error, errno); file_input = (GInputStream*)gs_file_read_noatime (content_path, cancellable, error);
goto out; if (!file_input)
} goto out;
if (fstat (g_file_descriptor_based_get_fd ((GFileDescriptorBased*)file_input), &stbuf) < 0)
{
ot_util_set_error_from_errno (error, errno);
goto out;
}
length = stbuf.st_size; length = stbuf.st_size;
}
else
{
GMappedFile *mmaped;
GBytes *bytes;
mmaped = gs_file_map_noatime (content_path, cancellable, error);
if (!mmaped)
goto out;
bytes = g_mapped_file_get_bytes (mmaped);
g_mapped_file_unref (mmaped);
mmaped = NULL;
file_input = g_memory_input_stream_new_from_bytes (bytes);
length = g_bytes_get_size (bytes);
g_bytes_unref (bytes);
}
if (!ostree_content_stream_parse (compressed, file_input, length, trusted, if (!ostree_content_stream_parse (compressed, file_input, length, trusted,
out_input ? &ret_input : NULL, out_input ? &ret_input : NULL,
&ret_file_info, &ret_xattrs, &ret_file_info, &ret_xattrs,
cancellable, error)) cancellable, error))
goto out; goto out;
ret = TRUE; ret = TRUE;
ot_transfer_out_value (out_input, &ret_input); ot_transfer_out_value (out_input, &ret_input);
ot_transfer_out_value (out_file_info, &ret_file_info); ot_transfer_out_value (out_file_info, &ret_file_info);