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

core: Use fd-relative creation for tmp/ 

Update libgsystem submodule for a bugfix.

This is both more efficient from a kernel perspective, and avoids us
calling gs_file_get_path_cached() on tmp_dir constantly, which
triggered another bug due to lack of locking.
This commit is contained in:
Colin Walters 2013-09-06 18:19:54 -04:00
parent 249add9c94
commit 2b61caa2fe
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libgsystem

@ -1 +1 @@
Subproject commit 1c1a7c15029176928534d28fb1fb5f17adf7c776 Subproject commit d63409a3d44b61e40f30cde79ebae879925c716d

1
src/libostree/ostree-repo-private.h
View File

@ -29,6 +29,7 @@ struct OstreeRepo {
GFile *repodir; GFile *repodir;
GFile *tmp_dir; GFile *tmp_dir;
int tmp_dir_fd;
GFile *pending_dir; GFile *pending_dir;
GFile *local_heads_dir; GFile *local_heads_dir;
GFile *remote_heads_dir; GFile *remote_heads_dir;

23
src/libostree/ostree-repo.c
View File

@ -97,6 +97,8 @@ ostree_repo_finalize (GObject *object)
g_clear_object (&self->repodir); g_clear_object (&self->repodir);
g_clear_object (&self->tmp_dir); g_clear_object (&self->tmp_dir);
if (self->tmp_dir_fd)
(void) close (self->tmp_dir_fd);
g_clear_object (&self->pending_dir); g_clear_object (&self->pending_dir);
g_clear_object (&self->local_heads_dir); g_clear_object (&self->local_heads_dir);
g_clear_object (&self->remote_heads_dir); g_clear_object (&self->remote_heads_dir);
@ -528,6 +530,9 @@ ostree_repo_open (OstreeRepo *self,
TRUE, &self->enable_uncompressed_cache, error)) TRUE, &self->enable_uncompressed_cache, error))
goto out; goto out;
if (!gs_file_open_dir_fd (self->tmp_dir, &self->tmp_dir_fd, cancellable, error))
goto out;
self->inited = TRUE; self->inited = TRUE;
ret = TRUE; ret = TRUE;
@ -719,6 +724,7 @@ stage_object (OstreeRepo *self,
const char *actual_checksum; const char *actual_checksum;
gboolean do_commit; gboolean do_commit;
OstreeRepoMode repo_mode; OstreeRepoMode repo_mode;
gs_free char *temp_filename = NULL;
gs_unref_object GFile *temp_file = NULL; gs_unref_object GFile *temp_file = NULL;
gs_unref_object GFile *raw_temp_file = NULL; gs_unref_object GFile *raw_temp_file = NULL;
gs_unref_object GFile *stored_path = NULL; gs_unref_object GFile *stored_path = NULL;
@ -783,9 +789,10 @@ stage_object (OstreeRepo *self,
if (repo_mode == OSTREE_REPO_MODE_BARE && temp_file_is_regular) if (repo_mode == OSTREE_REPO_MODE_BARE && temp_file_is_regular)
{ {
gs_unref_object GOutputStream *temp_out = NULL; gs_unref_object GOutputStream *temp_out = NULL;
if (!gs_file_open_in_tmpdir (self->tmp_dir, 0644, &temp_file, &temp_out, if (!gs_file_open_in_tmpdir_at (self->tmp_dir_fd, 0644, &temp_filename, &temp_out,
cancellable, error)) cancellable, error))
goto out; goto out;
temp_file = g_file_get_child (self->tmp_dir, temp_filename);
if (g_output_stream_splice (temp_out, file_input, G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, if (g_output_stream_splice (temp_out, file_input, G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
cancellable, error) < 0) cancellable, error) < 0)
goto out; goto out;
@ -805,10 +812,11 @@ stage_object (OstreeRepo *self,
gs_unref_object GConverter *zlib_compressor = NULL; gs_unref_object GConverter *zlib_compressor = NULL;
gs_unref_object GOutputStream *compressed_out_stream = NULL; gs_unref_object GOutputStream *compressed_out_stream = NULL;
if (!gs_file_open_in_tmpdir (self->tmp_dir, 0644, if (!gs_file_open_in_tmpdir_at (self->tmp_dir_fd, 0644,
&temp_file, &temp_out, &temp_filename, &temp_out,
cancellable, error)) cancellable, error))
goto out; goto out;
temp_file = g_file_get_child (self->tmp_dir, temp_filename);
temp_file_is_regular = TRUE; temp_file_is_regular = TRUE;
file_meta = _ostree_zlib_file_header_new (file_info, xattrs); file_meta = _ostree_zlib_file_header_new (file_info, xattrs);
@ -837,9 +845,10 @@ stage_object (OstreeRepo *self,
else else
{ {
gs_unref_object GOutputStream *temp_out = NULL; gs_unref_object GOutputStream *temp_out = NULL;
if (!gs_file_open_in_tmpdir (self->tmp_dir, 0644, &temp_file, &temp_out, if (!gs_file_open_in_tmpdir_at (self->tmp_dir_fd, 0644, &temp_filename, &temp_out,
cancellable, error)) cancellable, error))
goto out; goto out;
temp_file = g_file_get_child (self->tmp_dir, temp_filename);
if (g_output_stream_splice (temp_out, checksum_input ? (GInputStream*)checksum_input : input, if (g_output_stream_splice (temp_out, checksum_input ? (GInputStream*)checksum_input : input,
G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
cancellable, error) < 0) cancellable, error) < 0)