diff options
author | Dan McGee <dan@archlinux.org> | 2009-09-15 05:44:51 +0200 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2009-09-20 19:19:57 +0200 |
commit | 72883e3bcbc1ff2d46667fceb48c3c2c682cfe79 (patch) | |
tree | 46b4882f5375dd426c938f30968263f9e6af5355 /lib/libalpm/db.h | |
parent | 6bfca2fd14d07a18d7000d1f9dd998428036656f (diff) | |
download | pacman-72883e3bcbc1ff2d46667fceb48c3c2c682cfe79.tar.gz pacman-72883e3bcbc1ff2d46667fceb48c3c2c682cfe79.tar.xz |
Fully implement database lazy loading
Commit 34e1413d75 attempted to implement lazy loading of package databases.
Although it took care of my main complaint (creating the database directory
if it didn't exist), it didn't allow sync repos to be registered before
alpm_option_set_dbpath() had been called.
With this patch, we no longer compute the individual repository DB paths
until necessary, allowing full lazy loading to work as intended, and
allowing us to drop the extra setlibpath() calls from the frontend. This
allows the changes introduced in a2cd48960 (but later reverted) to be added
back in again.
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/db.h')
-rw-r--r-- | lib/libalpm/db.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 950ace22..29816032 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -40,18 +40,20 @@ typedef enum _pmdbinfrq_t { /* Database */ struct __pmdb_t { - char *path; char *treename; + /* do not access directly, use _alpm_db_path(db) for lazy access */ + char *_path; unsigned short pkgcache_loaded; - alpm_list_t *pkgcache; unsigned short grpcache_loaded; + unsigned short is_local; + alpm_list_t *pkgcache; alpm_list_t *grpcache; alpm_list_t *servers; }; /* db.c, database general calls */ -pmdb_t *_alpm_db_new(const char *dbpath, const char *treename); void _alpm_db_free(pmdb_t *db); +const char *_alpm_db_path(pmdb_t *db); int _alpm_db_cmp(const void *d1, const void *d2); alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles); pmdb_t *_alpm_db_register_local(void); |