summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/Makefile.in1
-rw-r--r--lib/activate/table-build.c7
-rw-r--r--lib/config/config.c7
-rw-r--r--lib/datastruct/lvm-types.h8
-rw-r--r--lib/device/dev-cache.c254
-rw-r--r--lib/device/device.h2
-rw-r--r--lib/filters/filter-regex.c8
-rw-r--r--old-tests/device/dev_cache_t.c18
8 files changed, 206 insertions, 99 deletions
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 2e55bd08..7d3ffbfe 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -13,6 +13,7 @@ SOURCES=\
config/config.c \
datastruct/bitset.c \
datastruct/hash.c \
+ device/btree.c \
device/dev-cache.c \
device/dev-io.c \
device/device.c \
diff --git a/lib/activate/table-build.c b/lib/activate/table-build.c
index c88d0b32..56ac31eb 100644
--- a/lib/activate/table-build.c
+++ b/lib/activate/table-build.c
@@ -6,7 +6,12 @@
#include "table-build.c"
-/* FIXME: optimise linear runs */
+static void _print_run(FILE *fp, struct logical_volume *lv)
+{
+
+}
+
+
int build_table(struct volume_group *vg, struct logical_volume *lv,
const char *file)
{
diff --git a/lib/config/config.c b/lib/config/config.c
index d75e76b3..815d5388 100644
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -317,7 +317,8 @@ static struct config_value *_value(struct parser *p)
return h;
}
-static struct config_value *_type(struct parser *p) {
+static struct config_value *_type(struct parser *p)
+{
/* [0-9]+ | [0-9]*\.[0-9]* | ".*" */
struct config_value *v = _create_value(p);
@@ -536,7 +537,7 @@ struct config_node *find_config_node(struct config_node *cn,
}
const char *
-find_config_str(struct config_node *cn,
+find_config_str(struct config_node *cn,
const char *path, char sep, const char *fail)
{
struct config_node *n = find_config_node(cn, path, sep);
@@ -550,7 +551,7 @@ find_config_str(struct config_node *cn,
return fail;
}
-int find_config_int(struct config_node *cn, const char *path,
+int find_config_int(struct config_node *cn, const char *path,
char sep, int fail)
{
struct config_node *n = find_config_node(cn, path, sep);
diff --git a/lib/datastruct/lvm-types.h b/lib/datastruct/lvm-types.h
index 3838fbfa..3614e7b6 100644
--- a/lib/datastruct/lvm-types.h
+++ b/lib/datastruct/lvm-types.h
@@ -7,6 +7,8 @@
#ifndef _LVM_TYPES_H
#define _LVM_TYPES_H
+#include "list.h"
+
#include <sys/types.h>
typedef __uint8_t uint8_t;
@@ -21,4 +23,10 @@ typedef __int32_t int32_t;
typedef __int64_t int64_t;
#endif
+
+struct str_list {
+ struct list_head list;
+ char *str;
+};
+
#endif
diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c
index 4e6ed3ec..7b4d6a79 100644
--- a/lib/device/dev-cache.c
+++ b/lib/device/dev-cache.c
@@ -9,6 +9,8 @@
#include "pool.h"
#include "hash.h"
#include "list.h"
+#include "lvm-types.h"
+#include "btree.h"
#include "dbg_malloc.h"
#include <stdlib.h>
@@ -24,7 +26,7 @@
*/
struct dev_iter {
- struct hash_node *current;
+ struct btree_iter *current;
struct dev_filter *filter;
};
@@ -35,7 +37,8 @@ struct dir_list {
static struct {
struct pool *mem;
- struct hash_table *devices;
+ struct hash_table *names;
+ struct btree *devices;
int has_scanned;
struct list_head dirs;
@@ -46,10 +49,91 @@ static struct {
#define _alloc(x) pool_alloc(_cache.mem, (x))
#define _free(x) pool_free(_cache.mem, (x))
-static int _dir_scan(const char *dir);
+static int _insert(const char *path, int rec);
+
+static struct device *_create_dev(const char *path, dev_t d)
+{
+ struct device *dev;
+ char *name = pool_strdup(_cache.mem, path);
+
+ if (!name) {
+ stack;
+ return NULL;
+ }
+
+ if (!(dev = _alloc(sizeof(*dev)))) {
+ stack;
+ goto bad;
+ }
+
+ dev->name = name;
+ INIT_LIST_HEAD(&dev->aliases);
+ dev->dev = d;
+ return dev;
+
+ bad:
+ _free(name);
+ return NULL;
+}
+
+static int _add_alias(struct device *dev, const char *path)
+{
+ struct str_list *sl = _alloc(sizeof(*sl));
+
+ if (!sl) {
+ stack;
+ return 0;
+ }
+
+ if (!(sl->str = pool_strdup(_cache.mem, path))) {
+ stack;
+ return 0;
+ }
+
+ list_add(&sl->list, &dev->aliases);
+ return 1;
+}
+
+/*
+ * Either creates a new dev, or adds an alias to
+ * an existing dev.
+ */
+static int _insert_dev(const char *path, dev_t d)
+{
+ struct device *dev;
+
+ /* is this device already registered ? */
+ if ((dev = (struct device *) btree_lookup(_cache.devices, d))) {
+ if (!_add_alias(dev, path)) {
+ log_err("Couldn't add alias to dir cache.");
+ return 0;
+ }
+
+ } else {
+ /* create new device */
+ if (!(dev = _create_dev(path, d))) {
+ stack;
+ return 0;
+ }
+
+ if (!(btree_insert(_cache.devices, d, dev))) {
+ log_err("Couldn't insert device into binary tree.");
+ _free(dev);
+ return 0;
+ }
+ }
+
+ /* insert the name/alias */
+ if (!(hash_insert(_cache.names, path, dev))) {
+ log_err("Couldn't insert device into hash table.");
+ return 0;
+ }
+
+ return 1;
+}
/*
- * return a new path for the destination of the path.
+ * return a new path for the destination of the link.
*/
static char *_follow_link(const char *path, struct stat *info)
{
@@ -70,6 +154,16 @@ static char *_follow_link(const char *path, struct stat *info)
return pool_strdup(_cache.mem, buffer);
}
+static char *_join(const char *dir, const char *name)
+{
+ int len = strlen(dir) + strlen(name) + 2;
+ char *r = dbg_malloc(len);
+ if (r)
+ snprintf(r, len, "%s/%s", dir, name);
+
+ return r;
+}
+
/*
* Get rid of extra slashes in the path string.
*/
@@ -92,113 +186,83 @@ static void _collapse_slashes(char *str)
*str = *ptr;
}
-static struct device *_create_dev(const char *path, struct stat *info)
+static int _insert_dir(const char *dir)
{
- struct device *dev;
- char *name = pool_strdup(_cache.mem, path);
+ int n, dirent_count, r = 1;
+ struct dirent **dirent;
+ char *path;
- if (!name) {
- stack;
- return NULL;
- }
+ dirent_count = scandir(dir, &dirent, NULL, alphasort);
+ if (dirent_count > 0) {
+ for (n = 0; n < dirent_count; n++) {
+ if (dirent[n]->d_name[0] == '.') {
+ free(dirent[n]);
+ continue;
+ }
- _collapse_slashes(name);
+ if (!(path = _join(dir, dirent[n]->d_name))) {
+ stack;
+ return 0;
+ }
- if (!(dev = _alloc(sizeof(*dev)))) {
- stack;
- goto bad;
- }
+ _collapse_slashes(path);
+ r &= _insert(path, 1);
+ dbg_free(path);
- dev->name = name;
- dev->dev = info->st_rdev;
- return dev;
+ free(dirent[n]);
+ }
+ free(dirent);
+ }
- bad:
- _free(name);
- return NULL;
+ return r;
}
-static int _insert(const char *path, int recurse)
+static int _insert(const char *path, int rec)
{
struct stat info;
- struct device *dev;
-
- /* If entry already exists, replace it */
- if ((dev = (struct device *)hash_lookup(_cache.devices, path))) {
- log_debug("dev-cache: removing %s", path);
- hash_remove(_cache.devices, path);
- }
+ char *actual_path;
+ int r = 0;
if (stat(path, &info) < 0) {
log_sys_very_verbose("stat", path);
return 0;
}
- if (S_ISDIR(info.st_mode)) {
- if (recurse)
- return _dir_scan(path);
-
- return 0;
- }
-
+ /* follow symlinks if neccessary. */
if (S_ISLNK(info.st_mode)) {
log_debug("%s: Following symbolic link", path);
- if (!(path = _follow_link(path, &info))) {
+ if (!(actual_path = _follow_link(path, &info))) {
stack;
return 0;
}
- }
- if (!S_ISBLK(info.st_mode)) {
- log_debug("%s: Not a block device", path);
- return 0;
- }
+ if (stat(actual_path, &info) < 0) {
+ log_sys_very_verbose("stat", actual_path);
+ return 0;
+ }
- if (!(dev = _create_dev(path, &info))) {
- log_debug("%s: Creation of device cache entry failed!", path);
- return 0;
+ dbg_free(actual_path);
}
- log_debug("dev-cache: adding %s", path);
- hash_insert(_cache.devices, path, dev);
-
- return 1;
-}
-
-static char *_join(const char *dir, const char *name)
-{
- int len = strlen(dir) + strlen(name) + 2;
- char *r = dbg_malloc(len);
- if (r)
- snprintf(r, len, "%s/%s", dir, name);
-
- return r;
-}
-
-static int _dir_scan(const char *dir)
-{
- int n, dirent_count;
- struct dirent **dirent;
- char *path;
-
- dirent_count = scandir(dir, &dirent, NULL, alphasort);
- if (dirent_count > 0) {
- for (n = 0; n < dirent_count; n++) {
- if (dirent[n]->d_name[0] == '.') {
- free(dirent[n]);
- continue;
- }
+ if (S_ISDIR(info.st_mode)) { /* add a directory */
+ if (rec)
+ r = _insert_dir(path);
- if ((path = _join(dir, dirent[n]->d_name)))
- _insert(path, 1);
+ } else { /* add a device */
+ if (!S_ISBLK(info.st_mode)) {
+ log_debug("%s: Not a block device", path);
+ return 0;
+ }
- dbg_free(path);
- free(dirent[n]);
+ if (!_insert_dev(path, info.st_rdev)) {
+ stack;
+ return 0;
}
- free(dirent);
+
+ r = 1;
}
- return 1;
+ return r;
}
static void _full_scan(void)
@@ -210,7 +274,7 @@ static void _full_scan(void)
list_for_each(tmp, &_cache.dirs) {
struct dir_list *dl = list_entry(tmp, struct dir_list, list);
- _dir_scan(dl->dir);
+ _insert_dir(dl->dir);
}
_cache.has_scanned = 1;
@@ -218,27 +282,39 @@ static void _full_scan(void)
int dev_cache_init(void)
{
+ _cache.names = NULL;
+
if (!(_cache.mem = pool_create(10 * 1024))) {
stack;
return 0;
}
- if (!(_cache.devices = hash_create(128))) {
+ if (!(_cache.names = hash_create(128))) {
stack;
pool_destroy(_cache.mem);
_cache.mem = 0;
return 0;
}
+ if (!(_cache.devices = btree_create(_cache.mem))) {
+ log_err("Couldn't create binary tree for dev-cache.");
+ goto bad;
+ }
+
INIT_LIST_HEAD(&_cache.dirs);
return 1;
+
+ bad:
+ dev_cache_exit();
+ return 0;
}
void dev_cache_exit(void)
{
pool_destroy(_cache.mem);
- hash_destroy(_cache.devices);
+ if (_cache.names)
+ hash_destroy(_cache.names);
}
int dev_cache_add_dir(const char *path)
@@ -267,11 +343,11 @@ int dev_cache_add_dir(const char *path)
struct device *dev_cache_get(const char *name, struct dev_filter *f)
{
- struct device *d = (struct device *) hash_lookup(_cache.devices, name);
+ struct device *d = (struct device *) hash_lookup(_cache.names, name);
if (!d) {
_insert(name, 0);
- d = (struct device *) hash_lookup(_cache.devices, name);
+ d = (struct device *) hash_lookup(_cache.names, name);
}
return (d && (!f || f->passes_filter(f, d))) ? d : NULL;
@@ -285,7 +361,7 @@ struct dev_iter *dev_iter_create(struct dev_filter *f)
return NULL;
_full_scan();
- di->current = hash_get_first(_cache.devices);
+ di->current = btree_first(_cache.devices);
di->filter = f;
return di;
@@ -298,8 +374,8 @@ void dev_iter_destroy(struct dev_iter *iter)
static inline struct device *_iter_next(struct dev_iter *iter)
{
- struct device *d = hash_get_data(_cache.devices, iter->current);
- iter->current = hash_get_next(_cache.devices, iter->current);
+ struct device *d = btree_get_data(iter->current);
+ iter->current = btree_next(iter->current);
return d;
}
diff --git a/lib/device/device.h b/lib/device/device.h
index 7bf30d07..bf6354e8 100644
--- a/lib/device/device.h
+++ b/lib/device/device.h
@@ -8,6 +8,7 @@
#define _LVM_DEVICE_H
#include "lvm-types.h"
+#include "list.h"
/*
* All devices in LVM will be represented by one of these.
@@ -15,6 +16,7 @@
*/
struct device {
char *name;
+ struct list_head aliases; /* struct str_list from lvm-types.h */
dev_t dev;
};
diff --git a/lib/filters/filter-regex.c b/lib/filters/filter-regex.c
index 5c7f5eb7..4054f652 100644
--- a/lib/filters/filter-regex.c
+++ b/lib/filters/filter-regex.c
@@ -17,8 +17,8 @@ struct rfilter {
struct matcher *engine;
};
-int _extract_pattern(struct pool *mem, const char *pat,
- char **regex, bitset_t accept, int index)
+static int _extract_pattern(struct pool *mem, const char *pat,
+ char **regex, bitset_t accept, int index)
{
char sep, *r, *ptr;
@@ -83,7 +83,7 @@ int _extract_pattern(struct pool *mem, const char *pat,
return 1;
}
-int _build_matcher(struct rfilter *rf, struct config_value *val)
+static int _build_matcher(struct rfilter *rf, struct config_value *val)
{
struct pool *scratch;
struct config_value *v;
@@ -136,7 +136,7 @@ int _build_matcher(struct rfilter *rf, struct config_value *val)
/*
* build the matcher.
*/
- if (!(rf->engine = matcher_create(rf->mem,
+ if (!(rf->engine = matcher_create(rf->mem,
(const char **) regex, count)))
stack;
r = 1;
diff --git a/old-tests/device/dev_cache_t.c b/old-tests/device/dev_cache_t.c
index 0aaefc1d..b197c3b8 100644
--- a/old-tests/device/dev_cache_t.c
+++ b/old-tests/device/dev_cache_t.c
@@ -15,6 +15,13 @@ int main(int argc, char **argv)
int i;
struct device *dev;
struct dev_iter *iter;
+ struct list_head *tmp;
+ struct str_list *sl;
+
+ if (argc < 2) {
+ fprintf(stderr, "usage: %s <dir>\n", argv[0]);
+ exit(1);
+ }
init_log(stderr);
init_debug(_LOG_INFO);
@@ -36,8 +43,15 @@ int main(int argc, char **argv)
exit(1);
}
- while ((dev = dev_iter_get(iter)))
- printf("%s\n", dev->name);
+ while ((dev = dev_iter_get(iter))) {
+ printf("%s", dev->name);
+
+ list_for_each(tmp, &dev->aliases) {
+ sl = list_entry(tmp, struct str_list, list);
+ printf(", %s", sl->str);
+ }
+ printf("\n");
+ }
dev_iter_destroy(iter);
dev_cache_exit();
generated by cgit (git 2.34.1) at 2024-05-18 03:27:12 +0000