TRUE, &did_hardlink,
cancellable, error))
goto out;
+
+ if (did_hardlink && options->devino_to_csum_cache)
+ {
+ struct stat stbuf;
+ OstreeDevIno *key;
+
+ if (TEMP_FAILURE_RETRY (fstatat (destination_dfd, destination_name, &stbuf, AT_SYMLINK_NOFOLLOW)) != 0)
+ {
+ glnx_set_error_from_errno (error);
+ goto out;
+ }
+
+ key = g_new (OstreeDevIno, 1);
+ key->dev = stbuf.st_dev;
+ key->ino = stbuf.st_ino;
+ memcpy (key->checksum, checksum, 65);
+
+ g_hash_table_add ((GHashTable*)options->devino_to_csum_cache, key);
+ }
+
if (did_hardlink)
break;
}
return ret;
}
+static guint
+devino_hash (gconstpointer a)
+{
+ OstreeDevIno *a_i = (gpointer)a;
+ return (guint) (a_i->dev + a_i->ino);
+}
+
+static int
+devino_equal (gconstpointer a,
+ gconstpointer b)
+{
+ OstreeDevIno *a_i = (gpointer)a;
+ OstreeDevIno *b_i = (gpointer)b;
+ return a_i->dev == b_i->dev
+ && a_i->ino == b_i->ino;
+}
+
+/**
+ * ostree_repo_devino_cache_new:
+ *
+ * OSTree has support for pairing ostree_repo_checkout_tree_at() using
+ * hardlinks in combination with a later
+ * ostree_repo_write_directory_to_mtree() using a (normally modified)
+ * directory. In order for OSTree to optimally detect just the new
+ * files, use this function and fill in the `devino_to_csum_cache`
+ * member of `OstreeRepoCheckoutOptions`, then call
+ * ostree_repo_commit_set_devino_cache().
+ *
+ * Returns: (transfer full): Newly allocated cache
+ */
+OstreeRepoDevInoCache *
+ostree_repo_devino_cache_new (void)
+{
+ return (OstreeRepoDevInoCache*) g_hash_table_new_full (devino_hash, devino_equal, g_free, NULL);
+}
+
/**
* ostree_repo_checkout_gc:
* @self: Repo
#include <sys/xattr.h>
#include <glib/gprintf.h>
+struct OstreeRepoCommitModifier {
+ volatile gint refcount;
+
+ OstreeRepoCommitModifierFlags flags;
+ OstreeRepoCommitFilter filter;
+ gpointer user_data;
+ GDestroyNotify destroy_notify;
+
+ OstreeRepoCommitModifierXattrCallback xattr_callback;
+ GDestroyNotify xattr_destroy;
+ gpointer xattr_user_data;
+
+ OstreeSePolicy *sepolicy;
+ GHashTable *devino_cache;
+};
+
gboolean
_ostree_repo_ensure_loose_objdir_at (int dfd,
const char *loose_path,
return ret;
}
-typedef struct {
- dev_t dev;
- ino_t ino;
-} OstreeDevIno;
-
-static guint
-devino_hash (gconstpointer a)
-{
- OstreeDevIno *a_i = (gpointer)a;
- return (guint) (a_i->dev + a_i->ino);
-}
-
-static int
-devino_equal (gconstpointer a,
- gconstpointer b)
-{
- OstreeDevIno *a_i = (gpointer)a;
- OstreeDevIno *b_i = (gpointer)b;
- return a_i->dev == b_i->dev
- && a_i->ino == b_i->ino;
-}
-
static gboolean
scan_one_loose_devino (OstreeRepo *self,
int object_dir_fd,
OstreeDevIno *key;
struct dirent *child_dent;
const char *dot;
- GString *checksum;
gboolean skip;
const char *name;
goto out;
}
- checksum = g_string_new (dent->d_name);
- g_string_append_len (checksum, name, 62);
-
key = g_new (OstreeDevIno, 1);
key->dev = stbuf.st_dev;
key->ino = stbuf.st_ino;
+ memcpy (key->checksum, dent->d_name, 2);
+ memcpy (key->checksum + 2, name, 62);
+ key->checksum[sizeof(key->checksum)-1] = '\0';
- g_hash_table_replace (devino_cache, key, g_string_free (checksum, FALSE));
+ g_hash_table_add (devino_cache, key);
}
}
static const char *
devino_cache_lookup (OstreeRepo *self,
+ OstreeRepoCommitModifier *modifier,
guint32 device,
guint32 inode)
{
- OstreeDevIno dev_ino;
+ OstreeDevIno dev_ino_key;
+ OstreeDevIno *dev_ino_val;
+ GHashTable *cache;
- if (!self->loose_object_devino_hash)
+ if (self->loose_object_devino_hash)
+ cache = self->loose_object_devino_hash;
+ else if (modifier && modifier->devino_cache)
+ cache = modifier->devino_cache;
+ else
return NULL;
- dev_ino.dev = device;
- dev_ino.ino = inode;
- return g_hash_table_lookup (self->loose_object_devino_hash, &dev_ino);
+ dev_ino_key.dev = device;
+ dev_ino_key.ino = inode;
+ dev_ino_val = g_hash_table_lookup (cache, &dev_ino_key);
+ if (!dev_ino_val)
+ return NULL;
+ return dev_ino_val->checksum;
}
/**
g_return_val_if_fail (self->in_transaction == TRUE, FALSE);
if (!self->loose_object_devino_hash)
- self->loose_object_devino_hash = g_hash_table_new_full (devino_hash, devino_equal, g_free, g_free);
+ self->loose_object_devino_hash = (GHashTable*)ostree_repo_devino_cache_new ();
g_hash_table_remove_all (self->loose_object_devino_hash);
if (!scan_loose_devino (self, self->loose_object_devino_hash, cancellable, error))
goto out;
return serialized_tree;
}
-struct OstreeRepoCommitModifier {
- volatile gint refcount;
-
- OstreeRepoCommitModifierFlags flags;
- OstreeRepoCommitFilter filter;
- gpointer user_data;
- GDestroyNotify destroy_notify;
-
- OstreeRepoCommitModifierXattrCallback xattr_callback;
- GDestroyNotify xattr_destroy;
- gpointer xattr_user_data;
-
- OstreeSePolicy *sepolicy;
-};
-
OstreeRepoCommitFilterResult
_ostree_repo_commit_modifier_apply (OstreeRepo *self,
OstreeRepoCommitModifier *modifier,
g_autofree guchar *child_file_csum = NULL;
g_autofree char *tmp_checksum = NULL;
- loose_checksum = devino_cache_lookup (self,
+ loose_checksum = devino_cache_lookup (self, modifier,
g_file_info_get_attribute_uint32 (child_info, "unix::device"),
g_file_info_get_attribute_uint64 (child_info, "unix::inode"));
goto out;
}
- loose_checksum = devino_cache_lookup (self, stbuf.st_dev, stbuf.st_ino);
+ loose_checksum = devino_cache_lookup (self, modifier, stbuf.st_dev, stbuf.st_ino);
if (loose_checksum)
{
if (!ostree_mutable_tree_replace_file (mtree, dent->d_name, loose_checksum,
modifier->xattr_destroy (modifier->xattr_user_data);
g_clear_object (&modifier->sepolicy);
+ g_clear_pointer (&modifier->devino_cache, (GDestroyNotify)g_hash_table_unref);
g_free (modifier);
return;
modifier->sepolicy = sepolicy ? g_object_ref (sepolicy) : NULL;
}
+/**
+ * ostree_repo_commit_modifier_set_devino_cache:
+ * @modifier: Modifier
+ * @cache: A hash table caching device,inode to checksums
+ *
+ * See the documentation for
+ * `ostree_repo_devino_cache_new()`. This function can
+ * then be used for later calls to
+ * `ostree_repo_write_directory_to_mtree()` to optimize commits.
+ *
+ * Note if your process has multiple writers, you should use separate
+ * `OSTreeRepo` instances if you want to also use this API.
+ *
+ * This function will add a reference to @cache without copying - you
+ * should avoid further mutation of the cache.
+ */
+void
+ostree_repo_commit_modifier_set_devino_cache (OstreeRepoCommitModifier *modifier,
+ OstreeRepoDevInoCache *cache)
+{
+ modifier->devino_cache = g_hash_table_ref ((GHashTable*)cache);
+}
+
+OstreeRepoDevInoCache *
+ostree_repo_devino_cache_ref (OstreeRepoDevInoCache *cache)
+{
+ g_hash_table_ref ((GHashTable*)cache);
+ return cache;
+}
+
+void
+ostree_repo_devino_cache_unref (OstreeRepoDevInoCache *cache)
+{
+ g_hash_table_unref ((GHashTable*)cache);
+}
+
+G_DEFINE_BOXED_TYPE(OstreeRepoDevInoCache, ostree_repo_devino_cache,
+ ostree_repo_devino_cache_ref,
+ ostree_repo_devino_cache_unref);
+
G_DEFINE_BOXED_TYPE(OstreeRepoCommitModifier, ostree_repo_commit_modifier,
ostree_repo_commit_modifier_ref,
ostree_repo_commit_modifier_unref);
projects / ostree.git / commitdiff