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

repo: Port -refs.c to openat() 

I'd like to incrementally convert all of `ostree-repo*.c` to
fd-relative usage, so that we can sanely introduce
`ostree_repo_new_at()` which doesn't involve GFile.

This one is medium risk, but passes the test suite.
This commit is contained in:
Colin Walters 2016-01-26 21:34:31 -05:00
parent 5bab946b80
commit ca57ec4aa5
5 changed files with 158 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libglnx

@ -1 +1 @@
Subproject commit 03138641298fd6799f46b16423871f959332bacf Subproject commit 769522753c25537e520adc322fa62e5390272add

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

@ -50,8 +50,6 @@ struct OstreeRepo {
int repo_dir_fd; int repo_dir_fd;
GFile *tmp_dir; GFile *tmp_dir;
int tmp_dir_fd; int tmp_dir_fd;
GFile *local_heads_dir;
GFile *remote_heads_dir;
GFile *objects_dir; GFile *objects_dir;
GFile *state_dir; GFile *state_dir;
int objects_dir_fd; int objects_dir_fd;

251
src/libostree/ostree-repo-refs.c
View File

@ -25,19 +25,19 @@
static gboolean static gboolean
add_ref_to_set (const char *remote, add_ref_to_set (const char *remote,
GFile *base, int base_fd,
GFile *child, const char *path,
GHashTable *refs, GHashTable *refs,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
char *contents; char *contents;
char *relpath;
gsize len; gsize len;
GString *refname; GString *refname;
if (!g_file_load_contents (child, cancellable, &contents, &len, NULL, error)) contents = glnx_file_get_contents_utf8_at (base_fd, path, &len, cancellable, error);
if (!contents)
goto out; goto out;
g_strchomp (contents); g_strchomp (contents);
@ -48,9 +48,7 @@ add_ref_to_set (const char *remote,
g_string_append (refname, remote); g_string_append (refname, remote);
g_string_append_c (refname, ':'); g_string_append_c (refname, ':');
} }
relpath = g_file_get_relative_path (base, child); g_string_append (refname, path);
g_string_append (refname, relpath);
g_free (relpath);
g_hash_table_insert (refs, g_string_free (refname, FALSE), contents); g_hash_table_insert (refs, g_string_free (refname, FALSE), contents);
@ -116,44 +114,69 @@ write_checksum_file_at (OstreeRepo *self,
return ret; return ret;
} }
static gboolean
openat_ignore_enoent (int dfd,
const char *path,
int *out_fd,
GError **error)
{
gboolean ret = FALSE;
int target_fd = -1;
target_fd = openat (dfd, path, O_CLOEXEC | O_RDONLY);
if (target_fd < 0)
{
if (errno != ENOENT)
{
glnx_set_error_from_errno (error);
goto out;
}
}
ret = TRUE;
*out_fd = target_fd;
out:
return ret;
}
static gboolean static gboolean
find_ref_in_remotes (OstreeRepo *self, find_ref_in_remotes (OstreeRepo *self,
const char *rev, const char *rev,
GFile **out_file, int *out_fd,
GError **error) GError **error)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
g_autoptr(GFileEnumerator) dir_enum = NULL; g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
g_autoptr(GFile) ret_file = NULL; glnx_fd_close int ret_fd = -1;
dir_enum = g_file_enumerate_children (self->remote_heads_dir, OSTREE_GIO_FAST_QUERYINFO, if (!glnx_dirfd_iterator_init_at (self->repo_dir_fd, "refs/remotes", TRUE, &dfd_iter, error))
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
NULL, error);
if (!dir_enum)
goto out; goto out;
while (TRUE) while (TRUE)
{ {
GFileInfo *file_info; struct dirent *dent = NULL;
GFile *child; glnx_fd_close int remote_dfd = -1;
if (!gs_file_enumerator_iterate (dir_enum, &file_info, &child,
NULL, error)) if (!glnx_dirfd_iterator_next_dent_ensure_dtype (&dfd_iter, &dent, NULL, error))
goto out; goto out;
if (file_info == NULL) if (dent == NULL)
break; break;
if (g_file_info_get_file_type (file_info) != G_FILE_TYPE_DIRECTORY)
if (dent->d_type != DT_DIR)
continue; continue;
g_clear_object (&ret_file); if (!glnx_opendirat (dfd_iter.fd, dent->d_name, TRUE, &remote_dfd, error))
ret_file = g_file_resolve_relative_path (child, rev); goto out;
if (!g_file_query_exists (ret_file, NULL))
g_clear_object (&ret_file); if (!openat_ignore_enoent (remote_dfd, rev, &ret_fd, error))
else goto out;
if (ret_fd != -1)
break; break;
} }
ret = TRUE; ret = TRUE;
ot_transfer_out_value (out_file, &ret_file); *out_fd = ret_fd; ret_fd = -1;
out: out:
return ret; return ret;
} }
@ -210,9 +233,8 @@ resolve_refspec (OstreeRepo *self,
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
__attribute__((unused)) GCancellable *cancellable = NULL; __attribute__((unused)) GCancellable *cancellable = NULL;
GError *temp_error = NULL;
g_autofree char *ret_rev = NULL; g_autofree char *ret_rev = NULL;
g_autoptr(GFile) child = NULL; glnx_fd_close int target_fd = -1;
g_return_val_if_fail (ref != NULL, FALSE); g_return_val_if_fail (ref != NULL, FALSE);
@ -223,40 +245,42 @@ resolve_refspec (OstreeRepo *self,
} }
else if (remote != NULL) else if (remote != NULL)
{ {
child = ot_gfile_resolve_path_printf (self->remote_heads_dir, "%s/%s", const char *remote_ref = glnx_strjoina ("refs/remotes/", remote, "/", ref);
remote, ref);
if (!g_file_query_exists (child, NULL)) if (!openat_ignore_enoent (self->repo_dir_fd, remote_ref, &target_fd, error))
g_clear_object (&child); goto out;
} }
else else
{ {
child = g_file_resolve_relative_path (self->local_heads_dir, ref); const char *local_ref = glnx_strjoina ("refs/heads/", ref);
if (!g_file_query_exists (child, NULL)) if (!openat_ignore_enoent (self->repo_dir_fd, local_ref, &target_fd, error))
goto out;
if (target_fd == -1)
{ {
g_clear_object (&child); local_ref = glnx_strjoina ("refs/remotes/", ref);
child = g_file_resolve_relative_path (self->remote_heads_dir, ref); if (!openat_ignore_enoent (self->repo_dir_fd, local_ref, &target_fd, error))
goto out;
if (!g_file_query_exists (child, NULL)) if (target_fd == -1)
{ {
g_clear_object (&child); if (!find_ref_in_remotes (self, ref, &target_fd, error))
if (!find_ref_in_remotes (self, ref, &child, error))
goto out; goto out;
} }
} }
} }
if (child) if (target_fd != -1)
{ {
if ((ret_rev = gs_file_load_contents_utf8 (child, NULL, &temp_error)) == NULL) ret_rev = glnx_fd_readall_utf8 (target_fd, NULL, NULL, error);
if (!ret_rev)
{ {
g_propagate_error (error, temp_error); g_prefix_error (error, "Couldn't open ref '%s': ", ref);
g_prefix_error (error, "Couldn't open ref '%s': ", gs_file_get_path_cached (child));
goto out; goto out;
} }
g_strchomp (ret_rev); g_strchomp (ret_rev);
if (!ostree_validate_checksum_string (ret_rev, error)) if (!ostree_validate_checksum_string (ret_rev, error))
goto out; goto out;
@ -433,43 +457,50 @@ ostree_repo_resolve_rev (OstreeRepo *self,
static gboolean static gboolean
enumerate_refs_recurse (OstreeRepo *repo, enumerate_refs_recurse (OstreeRepo *repo,
const char *remote, const char *remote,
GFile *base, int base_dfd,
GFile *dir, GString *base_path,
int child_dfd,
const char *path,
GHashTable *refs, GHashTable *refs,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
g_autoptr(GFileEnumerator) enumerator = NULL; g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
enumerator = g_file_enumerate_children (dir, OSTREE_GIO_FAST_QUERYINFO, if (!glnx_dirfd_iterator_init_at (child_dfd, path, FALSE, &dfd_iter, error))
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
cancellable, error);
if (!enumerator)
goto out; goto out;
while (TRUE) while (TRUE)
{ {
GFileInfo *file_info = NULL; guint len = base_path->len;
GFile *child = NULL; struct dirent *dent = NULL;
if (!gs_file_enumerator_iterate (enumerator, &file_info, &child, if (!glnx_dirfd_iterator_next_dent_ensure_dtype (&dfd_iter, &dent, cancellable, error))
NULL, error))
goto out; goto out;
if (file_info == NULL) if (dent == NULL)
break; break;
if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY) g_string_append (base_path, dent->d_name);
if (dent->d_type == DT_DIR)
{ {
if (!enumerate_refs_recurse (repo, remote, base, child, refs, cancellable, error)) g_string_append_c (base_path, '/');
if (!enumerate_refs_recurse (repo, remote, base_dfd, base_path,
dfd_iter.fd, dent->d_name,
refs, cancellable, error))
goto out; goto out;
} }
else if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_REGULAR) else if (dent->d_type == DT_REG)
{ {
if (!add_ref_to_set (remote, base, child, refs, if (!add_ref_to_set (remote, base_dfd, base_path->str, refs,
cancellable, error)) cancellable, error))
goto out; goto out;
} }
g_string_truncate (base_path, len);
} }
ret = TRUE; ret = TRUE;
@ -505,35 +536,55 @@ ostree_repo_list_refs (OstreeRepo *self,
if (refspec_prefix) if (refspec_prefix)
{ {
g_autoptr(GFile) dir = NULL; struct stat stbuf;
g_autoptr(GFile) child = NULL; const char *prefix_path;
g_autoptr(GFileInfo) info = NULL; const char *path;
if (!ostree_parse_refspec (refspec_prefix, &remote, &ref_prefix, error)) if (!ostree_parse_refspec (refspec_prefix, &remote, &ref_prefix, error))
goto out; goto out;
if (remote) if (remote)
dir = g_file_get_child (self->remote_heads_dir, remote);
else
dir = g_object_ref (self->local_heads_dir);
child = g_file_resolve_relative_path (dir, ref_prefix);
if (!ot_gfile_query_info_allow_noent (child, OSTREE_GIO_FAST_QUERYINFO, 0,
&info, cancellable, error))
goto out;
if (info)
{ {
if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY) prefix_path = glnx_strjoina ("refs/remotes/", remote, "/");
path = glnx_strjoina (prefix_path, ref_prefix);
}
else
{
prefix_path = "refs/heads/";
path = glnx_strjoina (prefix_path, ref_prefix);
}
if (fstatat (self->repo_dir_fd, path, &stbuf, 0) < 0)
{
if (errno != ENOENT)
{ {
if (!enumerate_refs_recurse (self, remote, child, child, glnx_set_error_from_errno (error);
ret_all_refs, goto out;
cancellable, error)) }
}
else
{
if (S_ISDIR (stbuf.st_mode))
{
glnx_fd_close int base_fd = -1;
g_autoptr(GString) base_path = g_string_new ("");
if (!glnx_opendirat (self->repo_dir_fd, path, TRUE, &base_fd, error))
goto out;
if (!enumerate_refs_recurse (self, remote, base_fd, base_path,
base_fd, ".",
ret_all_refs, cancellable, error))
goto out; goto out;
} }
else else
{ {
if (!add_ref_to_set (remote, dir, child, ret_all_refs, glnx_fd_close int prefix_dfd = -1;
if (!glnx_opendirat (self->repo_dir_fd, prefix_path, TRUE, &prefix_dfd, error))
goto out;
if (!add_ref_to_set (remote, prefix_dfd, ref_prefix, ret_all_refs,
cancellable, error)) cancellable, error))
goto out; goto out;
} }
@ -541,33 +592,41 @@ ostree_repo_list_refs (OstreeRepo *self,
} }
else else
{ {
g_autoptr(GFileEnumerator) remote_enumerator = NULL; g_auto(GLnxDirFdIterator) dfd_iter = { 0, };
g_autoptr(GString) base_path = g_string_new ("");
if (!enumerate_refs_recurse (self, NULL, self->local_heads_dir, self->local_heads_dir, glnx_fd_close int refs_heads_dfd = -1;
ret_all_refs,
cancellable, error)) if (!glnx_opendirat (self->repo_dir_fd, "refs/heads", TRUE, &refs_heads_dfd, error))
goto out; goto out;
remote_enumerator = g_file_enumerate_children (self->remote_heads_dir, OSTREE_GIO_FAST_QUERYINFO, if (!enumerate_refs_recurse (self, NULL, refs_heads_dfd, base_path,
0, refs_heads_dfd, ".",
cancellable, error); ret_all_refs, cancellable, error))
if (!remote_enumerator) goto out;
g_string_truncate (base_path, 0);
if (!glnx_dirfd_iterator_init_at (self->repo_dir_fd, "refs/remotes", TRUE, &dfd_iter, error))
goto out; goto out;
while (TRUE) while (TRUE)
{ {
GFileInfo *info; struct dirent *dent;
GFile *child; glnx_fd_close int remote_dfd = -1;
const char *name;
if (!gs_file_enumerator_iterate (remote_enumerator, &info, &child, if (!glnx_dirfd_iterator_next_dent_ensure_dtype (&dfd_iter, &dent, cancellable, error))
cancellable, error))
goto out; goto out;
if (!info) if (!dent)
break; break;
name = g_file_info_get_name (info); if (dent->d_type != DT_DIR)
if (!enumerate_refs_recurse (self, name, child, child, continue;
if (!glnx_opendirat (dfd_iter.fd, dent->d_name, TRUE, &remote_dfd, error))
goto out;
if (!enumerate_refs_recurse (self, dent->d_name, remote_dfd, base_path,
remote_dfd, ".",
ret_all_refs, ret_all_refs,
cancellable, error)) cancellable, error))
goto out; goto out;

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

@ -518,8 +518,6 @@ ostree_repo_finalize (GObject *object)
g_clear_object (&self->tmp_dir); g_clear_object (&self->tmp_dir);
if (self->tmp_dir_fd) if (self->tmp_dir_fd)
(void) close (self->tmp_dir_fd); (void) close (self->tmp_dir_fd);
g_clear_object (&self->local_heads_dir);
g_clear_object (&self->remote_heads_dir);
g_clear_object (&self->objects_dir); g_clear_object (&self->objects_dir);
if (self->objects_dir_fd != -1) if (self->objects_dir_fd != -1)
(void) close (self->objects_dir_fd); (void) close (self->objects_dir_fd);
@ -605,8 +603,6 @@ ostree_repo_constructed (GObject *object)
g_assert (self->repodir != NULL); g_assert (self->repodir != NULL);
self->tmp_dir = g_file_resolve_relative_path (self->repodir, "tmp"); self->tmp_dir = g_file_resolve_relative_path (self->repodir, "tmp");
self->local_heads_dir = g_file_resolve_relative_path (self->repodir, "refs/heads");
self->remote_heads_dir = g_file_resolve_relative_path (self->repodir, "refs/remotes");
self->objects_dir = g_file_get_child (self->repodir, "objects"); self->objects_dir = g_file_get_child (self->repodir, "objects");
self->deltas_dir = g_file_get_child (self->repodir, "deltas"); self->deltas_dir = g_file_get_child (self->repodir, "deltas");

2
tests/admin-test.sh
View File

@ -155,6 +155,8 @@ assert_not_streq ${rev} ${newrev}
assert_file_has_content sysroot/ostree/deploy/testos/deploy/${newrev}.0/etc/os-release 'NAME=TestOS' assert_file_has_content sysroot/ostree/deploy/testos/deploy/${newrev}.0/etc/os-release 'NAME=TestOS'
${CMD_PREFIX} ostree admin status ${CMD_PREFIX} ostree admin status
validate_bootloader validate_bootloader
${CMD_PREFIX} ostree --repo=sysroot/ostree/repo refs testos:testos > reftest.txt
assert_file_has_content reftest.txt testos:buildmaster/x86_64-runtime
echo "ok upgrade" echo "ok upgrade"