[ostree] core: Add malloc-free API for objects, use *at functions for storing
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] core: Add malloc-free API for objects, use *at functions for storing
- Date: Sat, 7 Sep 2013 14:13:00 +0000 (UTC)
commit a7c0992d94a8c3e37e956d4cb66eef51f4b8fa89
Author: Colin Walters <walters verbum org>
Date: Fri Sep 6 20:33:55 2013 -0400
core: Add malloc-free API for objects, use *at functions for storing
This is more efficient; we avoid malloc of a number of pathname +
GFile objects, plus the kernel doesn't have to traverse the repo path
again.
src/libgsystem | 2 +-
src/libostree/ostree-core-private.h | 17 ++++
src/libostree/ostree-core.c | 46 +++++++++
src/libostree/ostree-core.h | 13 +++
src/libostree/ostree-repo-commit.c | 179 ++++++++++++++++++-----------------
src/libostree/ostree-repo-private.h | 1 +
src/libostree/ostree-repo.c | 7 ++
src/libostree/ostree-repo.h | 13 ---
8 files changed, 175 insertions(+), 103 deletions(-)
---
diff --git a/src/libgsystem b/src/libgsystem
index d63409a..bd2c1e4 160000
--- a/src/libgsystem
+++ b/src/libgsystem
@@ -1 +1 @@
-Subproject commit d63409a3d44b61e40f30cde79ebae879925c716d
+Subproject commit bd2c1e436b270b39ca262765e775b4556d6bd50b
diff --git a/src/libostree/ostree-core-private.h b/src/libostree/ostree-core-private.h
index adb98af..49d5cf8 100644
--- a/src/libostree/ostree-core-private.h
+++ b/src/libostree/ostree-core-private.h
@@ -74,6 +74,23 @@ gboolean _ostree_write_variant_with_size (GOutputStream *output,
GCancellable *cancellable,
GError **error);
+/* XX + / + checksum-2 + . + extension, but let's just use 256 for a
+ * bit of overkill.
+ */
+#define _OSTREE_LOOSE_PATH_MAX (256)
+
+void
+_ostree_loose_path (char *buf,
+ const char *checksum,
+ OstreeObjectType objtype,
+ OstreeRepoMode repo_mode);
+
+void
+_ostree_loose_path_with_suffix (char *buf,
+ const char *checksum,
+ OstreeObjectType objtype,
+ OstreeRepoMode repo_mode,
+ const char *suffix);
G_END_DECLS
diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c
index e0984ca..d88c15d 100644
--- a/src/libostree/ostree-core.c
+++ b/src/libostree/ostree-core.c
@@ -1358,6 +1358,52 @@ ostree_checksum_bytes_peek (GVariant *bytes)
return g_variant_get_fixed_array (bytes, &n_elts, 1);
}
+/*
+ * _ostree_loose_path:
+ * @buf: Output buffer, must be _OSTREE_LOOSE_PATH_MAX in size
+ * @checksum: ASCII checksum
+ * @objtype: Object type
+ * @mode: Repository mode
+ *
+ * Overwrite the contents of @buf with relative path for loose
+ * object.
+ */
+void
+_ostree_loose_path (char *buf,
+ const char *checksum,
+ OstreeObjectType objtype,
+ OstreeRepoMode mode)
+{
+ _ostree_loose_path_with_suffix (buf, checksum, objtype, mode, "");
+}
+
+/*
+ * _ostree_loose_path_with_suffix:
+ * @buf: Output buffer, must be _OSTREE_LOOSE_PATH_MAX in size
+ * @checksum: ASCII checksum
+ * @objtype: Object type
+ * @mode: Repository mode
+ *
+ * Like _ostree_loose_path, but also append a further arbitrary
+ * suffix; useful for finding non-core objects.
+ */
+void
+_ostree_loose_path_with_suffix (char *buf,
+ const char *checksum,
+ OstreeObjectType objtype,
+ OstreeRepoMode mode,
+ const char *suffix)
+{
+ *buf = checksum[0];
+ buf++;
+ *buf = checksum[1];
+ buf++;
+ snprintf (buf, _OSTREE_LOOSE_PATH_MAX - 2, "/%s.%s%s%s",
+ checksum + 2, ostree_object_type_to_string (objtype),
+ (!OSTREE_OBJECT_TYPE_IS_META (objtype) && mode == OSTREE_REPO_MODE_ARCHIVE_Z2) ? "z" : "",
+ suffix);
+}
+
/**
* ostree_get_relative_object_path:
* @checksum: ASCII checksum string
diff --git a/src/libostree/ostree-core.h b/src/libostree/ostree-core.h
index 33721d6..2a0a856 100644
--- a/src/libostree/ostree-core.h
+++ b/src/libostree/ostree-core.h
@@ -104,6 +104,19 @@ typedef enum {
*/
#define OSTREE_COMMIT_GVARIANT_FORMAT G_VARIANT_TYPE ("(a{sv}aya(say)sstayay)")
+/**
+ * OstreeRepoMode:
+ * @OSTREE_REPO_MODE_BARE: Files are stored as themselves; can only be written as root
+ * @OSTREE_REPO_MODE_ARCHIVE_Z2: Files are compressed, should be owned by non-root. Can be served via HTTP
+ *
+ * See the documentation of #OstreeRepo for more information about the
+ * possible modes.
+ */
+typedef enum {
+ OSTREE_REPO_MODE_BARE,
+ OSTREE_REPO_MODE_ARCHIVE_Z2
+} OstreeRepoMode;
+
const GVariantType *ostree_metadata_variant_type (OstreeObjectType objtype);
gboolean ostree_validate_checksum_string (const char *sha256,
diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 116b250..a90cdc8 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -33,38 +33,43 @@
#include "ostree-mutable-tree.h"
static gboolean
-commit_loose_object_impl (OstreeRepo *self,
- GFile *tempfile_path,
- GFile *dest,
- gboolean is_regular,
- GCancellable *cancellable,
- GError **error)
+commit_loose_object_trusted (OstreeRepo *self,
+ const char *checksum,
+ OstreeObjectType objtype,
+ const char *tempfile_name,
+ GCancellable *cancellable,
+ GError **error)
{
gboolean ret = FALSE;
- gs_unref_object GFile *parent = NULL;
+ char loose_prefix[3];
+ char loose_objpath[_OSTREE_LOOSE_PATH_MAX];
- parent = g_file_get_parent (dest);
- if (!gs_file_ensure_directory (parent, FALSE, cancellable, error))
- goto out;
+ _ostree_loose_path (loose_objpath, checksum, objtype, self->mode);
- if (is_regular)
+ loose_prefix[0] = loose_objpath[0];
+ loose_prefix[1] = loose_objpath[1];
+ loose_prefix[2] = '\0';
+ if (G_UNLIKELY (mkdirat (self->objects_dir_fd, loose_prefix, 0777) == -1))
{
- /* Ensure that in case of a power cut, these files have the data we
- * want. See http://lwn.net/Articles/322823/
- */
- if (!gs_file_sync_data (tempfile_path, cancellable, error))
- goto out;
+ int errsv = errno;
+ if (errsv != EEXIST)
+ {
+ ot_util_set_error_from_errno (error, errsv);
+ goto out;
+ }
}
- if (rename (gs_file_get_path_cached (tempfile_path), gs_file_get_path_cached (dest)) < 0)
+ if (G_UNLIKELY (renameat (self->tmp_dir_fd, tempfile_name,
+ self->objects_dir_fd, loose_objpath) < 0))
{
if (errno != EEXIST)
{
ot_util_set_error_from_errno (error, errno);
- g_prefix_error (error, "Storing file '%s': ",
- gs_file_get_path_cached (dest));
+ g_prefix_error (error, "Storing file '%s': ", tempfile_name);
goto out;
}
+ else
+ (void) unlinkat (self->tmp_dir_fd, tempfile_name, 0);
}
ret = TRUE;
@@ -72,29 +77,6 @@ commit_loose_object_impl (OstreeRepo *self,
return ret;
}
-static gboolean
-commit_loose_object_trusted (OstreeRepo *self,
- const char *checksum,
- OstreeObjectType objtype,
- GFile *tempfile_path,
- gboolean is_regular,
- GCancellable *cancellable,
- GError **error)
-{
- gboolean ret = FALSE;
- gs_unref_object GFile *dest_file = NULL;
-
- dest_file = _ostree_repo_get_object_path (self, checksum, objtype);
-
- if (!commit_loose_object_impl (self, tempfile_path, dest_file, is_regular,
- cancellable, error))
- goto out;
-
- ret = TRUE;
- out:
- return ret;
-}
-
/* Create a randomly-named symbolic link in @tempdir which points to
* @target. The filename will be returned in @out_file.
*
@@ -104,34 +86,22 @@ commit_loose_object_trusted (OstreeRepo *self,
* extended attributes, before finally rename()ing it into place.
*/
static gboolean
-make_temporary_symlink (GFile *tmpdir,
- const char *target,
- GFile **out_file,
- GCancellable *cancellable,
- GError **error)
+make_temporary_symlink_at (int tmp_dirfd,
+ const char *target,
+ char **out_name,
+ GCancellable *cancellable,
+ GError **error)
{
gboolean ret = FALSE;
gs_free char *tmpname = NULL;
- DIR *d = NULL;
- int dfd = -1;
guint i;
const int max_attempts = 128;
- d = opendir (gs_file_get_path_cached (tmpdir));
- if (!d)
- {
- int errsv = errno;
- g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
- g_strerror (errsv));
- goto out;
- }
- dfd = dirfd (d);
-
for (i = 0; i < max_attempts; i++)
{
g_free (tmpname);
tmpname = gsystem_fileutil_gen_tmp_name (NULL, NULL);
- if (symlinkat (target, dfd, tmpname) < 0)
+ if (symlinkat (target, tmp_dirfd, tmpname) < 0)
{
if (errno == EEXIST)
continue;
@@ -154,9 +124,8 @@ make_temporary_symlink (GFile *tmpdir,
}
ret = TRUE;
- *out_file = g_file_get_child (tmpdir, tmpname);
+ gs_transfer_out_value (out_name, &tmpname);
out:
- if (d) (void) closedir (d);
return ret;
}
@@ -176,7 +145,6 @@ write_object (OstreeRepo *self,
OstreeRepoMode repo_mode;
gs_free char *temp_filename = NULL;
gs_unref_object GFile *temp_file = NULL;
- gs_unref_object GFile *raw_temp_file = NULL;
gs_unref_object GFile *stored_path = NULL;
gs_free guchar *ret_csum = NULL;
gs_unref_object OstreeChecksumInputStream *checksum_input = NULL;
@@ -189,7 +157,7 @@ write_object (OstreeRepo *self,
gboolean is_symlink = FALSE;
g_return_val_if_fail (self->in_transaction, FALSE);
-
+
if (g_cancellable_set_error_if_cancelled (cancellable, error))
return FALSE;
@@ -249,11 +217,12 @@ write_object (OstreeRepo *self,
}
else if (repo_mode == OSTREE_REPO_MODE_BARE && is_symlink)
{
- if (!make_temporary_symlink (self->tmp_dir,
- g_file_info_get_symlink_target (file_info),
- &temp_file,
- cancellable, error))
+ if (!make_temporary_symlink_at (self->tmp_dir_fd,
+ g_file_info_get_symlink_target (file_info),
+ &temp_filename,
+ cancellable, error))
goto out;
+ temp_file = g_file_get_child (self->tmp_dir, temp_filename);
}
else if (repo_mode == OSTREE_REPO_MODE_ARCHIVE_Z2)
{
@@ -279,7 +248,7 @@ write_object (OstreeRepo *self,
{
zlib_compressor = (GConverter*)g_zlib_compressor_new (G_ZLIB_COMPRESSOR_FORMAT_RAW, 9);
compressed_out_stream = g_converter_output_stream_new (temp_out, zlib_compressor);
-
+
if (g_output_stream_splice (compressed_out_stream, file_input,
G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
cancellable, error) < 0)
@@ -320,11 +289,11 @@ write_object (OstreeRepo *self,
goto out;
}
}
-
+
if (!ostree_repo_has_object (self, objtype, actual_checksum, &have_obj,
cancellable, error))
goto out;
-
+
do_commit = !have_obj;
if (do_commit)
@@ -332,33 +301,67 @@ write_object (OstreeRepo *self,
if (objtype == OSTREE_OBJECT_TYPE_FILE && repo_mode == OSTREE_REPO_MODE_BARE)
{
g_assert (file_info != NULL);
+
/* Now that we know the checksum is valid, apply uid/gid, mode bits,
* and extended attributes.
*/
- if (!gs_file_lchown (temp_file,
- g_file_info_get_attribute_uint32 (file_info, "unix::uid"),
- g_file_info_get_attribute_uint32 (file_info, "unix::gid"),
- cancellable, error))
- goto out;
+ if (G_UNLIKELY (fchownat (self->tmp_dir_fd, temp_filename,
+ g_file_info_get_attribute_uint32 (file_info, "unix::uid"),
+ g_file_info_get_attribute_uint32 (file_info, "unix::gid"),
+ AT_SYMLINK_NOFOLLOW) == -1))
+ {
+ ot_util_set_error_from_errno (error, errno);
+ goto out;
+ }
+
+ /* Sadly we can't use at-relative API for xattrs because
+ * there's no lsetxattrat.
+ */
+ if (xattrs != NULL)
+ {
+ if (!ostree_set_xattrs (temp_file, xattrs, cancellable, error))
+ goto out;
+ }
+
/* symlinks are always 777, there's no lchmod(). Calling
* chmod() on them would apply to their target, which we
* definitely don't want.
*/
if (!is_symlink)
{
- if (!gs_file_chmod (temp_file, g_file_info_get_attribute_uint32 (file_info, "unix::mode"),
- cancellable, error))
- goto out;
- }
- if (xattrs != NULL)
- {
- if (!ostree_set_xattrs (temp_file, xattrs, cancellable, error))
+ int fd;
+ int res;
+
+ if (!gs_file_openat_noatime (self->tmp_dir_fd, temp_filename, &fd,
+ cancellable, error))
goto out;
+
+ do
+ res = fchmod (fd, g_file_info_get_attribute_uint32 (file_info, "unix::mode"));
+ while (G_UNLIKELY (res == -1 && errno == EINTR));
+ if (G_UNLIKELY (res == -1))
+ {
+ (void) close (fd);
+ ot_util_set_error_from_errno (error, errno);
+ goto out;
+ }
+
+ /* Ensure that in case of a power cut, these files have the data we
+ * want. See http://lwn.net/Articles/322823/
+ */
+ if (fsync (fd) == -1)
+ {
+ (void) close (fd);
+ ot_util_set_error_from_errno (error, errno);
+ goto out;
+ }
+ (void) close (fd);
}
}
- if (!commit_loose_object_trusted (self, actual_checksum, objtype, temp_file, temp_file_is_regular,
+ if (!commit_loose_object_trusted (self, actual_checksum, objtype, temp_filename,
cancellable, error))
goto out;
+ g_clear_pointer (&temp_filename, g_free);
g_clear_object (&temp_file);
}
@@ -380,17 +383,15 @@ write_object (OstreeRepo *self,
else
self->txn_stats.content_objects_total++;
g_mutex_unlock (&self->txn_stats_lock);
-
+
if (checksum)
ret_csum = ot_csum_from_gchecksum (checksum);
ret = TRUE;
ot_transfer_out_value(out_csum, &ret_csum);
out:
- if (temp_file)
- (void) unlink (gs_file_get_path_cached (temp_file));
- if (raw_temp_file)
- (void) unlink (gs_file_get_path_cached (raw_temp_file));
+ if (temp_filename)
+ (void) unlinkat (self->tmp_dir_fd, temp_filename, 0);
g_clear_pointer (&checksum, (GDestroyNotify) g_checksum_free);
return ret;
}
diff --git a/src/libostree/ostree-repo-private.h b/src/libostree/ostree-repo-private.h
index 11d4698..de65df6 100644
--- a/src/libostree/ostree-repo-private.h
+++ b/src/libostree/ostree-repo-private.h
@@ -34,6 +34,7 @@ struct OstreeRepo {
GFile *local_heads_dir;
GFile *remote_heads_dir;
GFile *objects_dir;
+ int objects_dir_fd;
GFile *uncompressed_objects_dir;
GFile *remote_cache_dir;
GFile *config_file;
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index 393dc70..7db4697 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -88,6 +88,8 @@ ostree_repo_finalize (GObject *object)
g_clear_object (&self->local_heads_dir);
g_clear_object (&self->remote_heads_dir);
g_clear_object (&self->objects_dir);
+ if (self->objects_dir_fd != -1)
+ (void) close (self->objects_dir_fd);
g_clear_object (&self->uncompressed_objects_dir);
g_clear_object (&self->remote_cache_dir);
g_clear_object (&self->config_file);
@@ -192,6 +194,7 @@ ostree_repo_init (OstreeRepo *self)
{
g_mutex_init (&self->cache_lock);
g_mutex_init (&self->txn_stats_lock);
+ self->objects_dir_fd = -1;
}
/**
@@ -516,6 +519,9 @@ ostree_repo_open (OstreeRepo *self,
TRUE, &self->enable_uncompressed_cache, error))
goto out;
+ if (!gs_file_open_dir_fd (self->objects_dir, &self->objects_dir_fd, cancellable, error))
+ goto out;
+
if (!gs_file_open_dir_fd (self->tmp_dir, &self->tmp_dir_fd, cancellable, error))
goto out;
@@ -568,6 +574,7 @@ _ostree_repo_get_file_object_path (OstreeRepo *self,
return _ostree_repo_get_object_path (self, checksum, OSTREE_OBJECT_TYPE_FILE);
}
+
static gboolean
append_object_dirs_from (OstreeRepo *self,
GFile *dir,
diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h
index 52a9962..c02ec98 100644
--- a/src/libostree/ostree-repo.h
+++ b/src/libostree/ostree-repo.h
@@ -33,19 +33,6 @@ G_BEGIN_DECLS
#define OSTREE_IS_REPO(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), OSTREE_TYPE_REPO))
-/**
- * OstreeRepoMode:
- * @OSTREE_REPO_MODE_BARE: Files are stored as themselves; can only be written as root
- * @OSTREE_REPO_MODE_ARCHIVE_Z2: Files are compressed, should be owned by non-root. Can be served via HTTP
- *
- * See the documentation of #OstreeRepo for more information about the
- * possible modes.
- */
-typedef enum {
- OSTREE_REPO_MODE_BARE,
- OSTREE_REPO_MODE_ARCHIVE_Z2
-} OstreeRepoMode;
-
gboolean ostree_repo_mode_from_string (const char *mode,
OstreeRepoMode *out_mode,
GError **error);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
