997fee1 Change locking strategy. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Change locking strategy.

jlaffaye committed 15 years ago

commit 997fee177fe34d7757b59721d4779a4e2ccdf46f
parent 6a13ca5

2 files changed +7 -9

modified libpkg/pkgdb.c

@@ -102,7 +102,7 @@ pkgdb_get_dir(void)

 int
 pkgdb_lock(struct pkgdb *db, int flags)
 {
 	char fname[FILENAME_MAX];
 	char fname[MAXPATHLEN];
 	if (db->lock_fd == -1) {
 		snprintf(fname, sizeof(fname), "%s/%s", pkgdb_get_dir(), PKGDB_LOCK);

modified libpkg/pkgdb_cache.c

@@ -57,29 +57,22 @@ pkgdb_cache_getattr(struct pkg *pkg, const char *attr)

 		if (strcmp(attr_key_map[i].attr, attr) == 0)
 			break;
 	pkgdb_lock(pkg->pdb, LOCK_SH);
 	val = pkgdb_cache_vget(pkg->pdb->cdb, attr_key_map[i].key, pkg->idx);
 	pkgdb_lock(pkg->pdb, LOCK_UN);
 	return (val);
 }
 int
 pkgdb_cache_query(struct pkgdb *db, struct pkg *pkg)
 {
 	pkgdb_lock(db, LOCK_SH);
 	while ((pkg->namever = pkgdb_cache_vget(db->cdb, PKGDB_NAMEVER, db->i)) != NULL) {
 		if (pkgdb_match(db, pkg->namever) == 0) {
 			pkg->idx = db->i++;
 			pkg->pdb = db;
 			pkgdb_lock(db, LOCK_UN);
 			return (0);
 		}
 		db->i++;
 	}
 	pkgdb_lock(db, LOCK_UN);
 	return (-1);
 }

@@ -261,6 +254,7 @@ pkgdb_cache_update(struct pkgdb *db)

 	pkg_dbdir = pkgdb_get_dir();
 	pkgdb_lock(db, LOCK_SH);
 	if (stat(pkg_dbdir, &dir_st) == -1) {
 		pkgdb_set_error(db, errno, "stat(%s)", pkg_dbdir);
 		return (-1);

@@ -275,11 +269,15 @@ pkgdb_cache_update(struct pkgdb *db)

 	}
 	if (errno == ENOENT || dir_st.st_mtime > cache_st.st_mtime) {
 		/*
 		* Upgrade the lock to an exclusive lock because we may convert some
 		* +CONTENTS to +MANIFEST format.
 		*/
 		pkgdb_lock(db, LOCK_EX);
 		ret = pkgdb_cache_rebuild(db, pkg_dbdir, cache_path);
 		pkgdb_lock(db, LOCK_UN);
 	}
 	pkgdb_lock(db, LOCK_UN);
 	return (ret);
 }