@@ -23,8 +23,6 @@ enum {
};
static struct gpiosim_ctx *sim_ctx;
-static pid_t pid;
-static guint sim_id;
G_DEFINE_TYPE(GPIOSimChip, g_gpiosim_chip, G_TYPE_OBJECT);
@@ -41,7 +39,6 @@ static void g_gpiosim_ctx_init(void)
g_strerror(errno));
atexit(g_gpiosim_ctx_unref);
- pid = getpid();
}
static void g_gpiosim_chip_constructed(GObject *obj)
@@ -175,7 +172,6 @@ static void g_gpiosim_chip_dispose(GObject *obj)
}
gpiosim_dev_unref(dev);
- sim_id--;
}
static void g_gpiosim_chip_finalize(GObject *obj)
@@ -239,13 +235,12 @@ static void g_gpiosim_chip_init(GPIOSimChip *self)
if (!sim_ctx)
g_gpiosim_ctx_init();
- dev_name = g_strdup_printf("gpiod-test-dev.%u.%u", pid, sim_id++);
- dev = gpiosim_dev_new(sim_ctx, dev_name);
+ dev = gpiosim_dev_new(sim_ctx);
if (!dev)
g_error("Unable to instantiate new GPIO device: %s",
g_strerror(errno));
- self->bank = gpiosim_bank_new(dev, "bank");
+ self->bank = gpiosim_bank_new(dev);
gpiosim_dev_unref(dev);
if (!self->bank)
g_error("Unable to instantiate new GPIO bank: %s",
@@ -10,7 +10,7 @@ AM_CFLAGS += -include $(top_builddir)/config.h
libgpiosim_la_SOURCES = gpiosim.c gpiosim.h
libgpiosim_la_CFLAGS = $(AM_CFLAGS) $(KMOD_CFLAGS) $(MOUNT_CFLAGS)
libgpiosim_la_LDFLAGS = -version-info $(subst .,:,$(ABI_GPIOSIM_VERSION))
-libgpiosim_la_LDFLAGS += $(KMOD_LIBS) $(MOUNT_LIBS)
+libgpiosim_la_LDFLAGS += $(KMOD_LIBS) $(MOUNT_LIBS) -pthread
gpiosim_selftest_SOURCES = gpiosim-selftest.c
gpiosim_selftest_LDADD = libgpiosim.la
@@ -31,27 +31,27 @@ int main(int argc UNUSED, char **argv UNUSED)
return EXIT_FAILURE;
}
- printf("Creating a chip with random name\n");
+ printf("Creating a chip\n");
- dev = gpiosim_dev_new(ctx, NULL);
+ dev = gpiosim_dev_new(ctx);
if (!dev) {
- perror("Unable to create a chip with random name");
+ perror("Unable to create a chip");
return EXIT_FAILURE;
}
- printf("Creating a bank with a random name\n");
+ printf("Creating a bank\n");
- bank0 = gpiosim_bank_new(dev, NULL);
+ bank0 = gpiosim_bank_new(dev);
if (!bank0) {
- perror("Unable to create a bank with random name");
+ perror("Unable to create a bank");
return EXIT_FAILURE;
}
- printf("Creating a bank with a specific name\n");
+ printf("Creating a second bank\n");
- bank1 = gpiosim_bank_new(dev, "foobar");
+ bank1 = gpiosim_bank_new(dev);
if (!bank1) {
- perror("Unable to create a bank with a specific name");
+ perror("Unable to create a bank");
return EXIT_FAILURE;
}
@@ -5,6 +5,8 @@
#include <libkmod.h>
#include <libmount.h>
#include <linux/version.h>
+#include <pthread.h>
+#include <search.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
@@ -22,6 +24,136 @@
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
#define MIN_KERNEL_VERSION KERNEL_VERSION(5, 17, 0)
+static pthread_mutex_t id_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_once_t id_init_once = PTHREAD_ONCE_INIT;
+static void *id_root;
+
+struct id_find_next_ctx {
+ int lowest;
+ bool found;
+};
+
+struct id_del_ctx {
+ int id;
+ int *idp;
+};
+
+static void id_cleanup(void)
+{
+ tdestroy(id_root, free);
+}
+
+static void id_schedule_cleanup(void)
+{
+ atexit(id_cleanup);
+}
+
+static int id_compare(const void *p1, const void *p2)
+{
+ int id1 = *(int *)p1;
+ int id2 = *(int *)p2;
+
+ if (id1 < id2)
+ return -1;
+ if (id1 > id2)
+ return 1;
+ return 0;
+}
+
+static void id_find_next(const void *node, VISIT which, void *data)
+{
+ struct id_find_next_ctx *ctx = data;
+ int *id = *(int **)node;
+
+ if (ctx->found)
+ return;
+
+ switch (which) {
+ case postorder:
+ case leaf:
+ if (*id != ctx->lowest)
+ ctx->found = true;
+ else
+ ctx->lowest++;
+ break;
+ default:
+ break;
+ };
+}
+
+static void id_del(const void *node, VISIT which, void *data)
+{
+ struct id_del_ctx *ctx = data;
+ int *id = *(int **)node;
+
+ if (ctx->idp)
+ return;
+
+ switch (which) {
+ case postorder:
+ case leaf:
+ if (*id == ctx->id)
+ ctx->idp = id;
+ break;
+ default:
+ break;
+ }
+}
+
+static int id_alloc(void)
+{
+ struct id_find_next_ctx ctx;
+ void *ret;
+ int *id;
+
+ pthread_once(&id_init_once, id_schedule_cleanup);
+
+ ctx.lowest = 0;
+ ctx.found = false;
+
+ pthread_mutex_lock(&id_lock);
+
+ twalk_r(id_root, id_find_next, &ctx);
+
+ id = malloc(sizeof(*id));
+ if (!id) {
+ pthread_mutex_unlock(&id_lock);
+ return -1;
+ }
+
+ *id = ctx.lowest;
+
+ ret = tsearch(id, &id_root, id_compare);
+ if (!ret) {
+ pthread_mutex_unlock(&id_lock);
+ /* tsearch() doesn't set errno. */
+ errno = ENOMEM;
+ return -1;
+ }
+
+ pthread_mutex_unlock(&id_lock);
+
+ return *id;
+}
+
+static void id_free(int id)
+{
+ struct id_del_ctx ctx;
+
+ ctx.id = id;
+ ctx.idp = NULL;
+
+ pthread_mutex_lock(&id_lock);
+
+ twalk_r(id_root, id_del, &ctx);
+ if (ctx.idp) {
+ tdelete(ctx.idp, &id_root, id_compare);
+ free(ctx.idp);
+ }
+
+ pthread_mutex_unlock(&id_lock);
+}
+
struct refcount {
unsigned int cnt;
void (*release)(struct refcount *);
@@ -233,62 +365,22 @@ out_unref_kmod:
return ret;
}
-/* We don't have mkdtempat()... :( */
-static char *make_random_dir_at(int at)
+static char *configfs_make_item(int at, int id)
{
- static const char chars[] = "abcdefghijklmnoprstquvwxyz"
- "ABCDEFGHIJKLMNOPRSTQUVWXYZ"
- "0123456789";
-
- char name[] = "XXXXXXXXXXXX\0";
- unsigned int idx, i;
+ char *item_name;
int ret;
-again:
- for (i = 0; i < sizeof(name) - 1; i++) {
- ret = getrandom(&idx, sizeof(idx), GRND_NONBLOCK);
- if (ret != sizeof(idx)) {
- if (ret >= 0)
- errno = EAGAIN;
-
- return NULL;
- }
-
- name[i] = chars[idx % (ARRAY_SIZE(chars) - 1)];
- }
+ ret = asprintf(&item_name, "%s.%u.%d",
+ program_invocation_short_name, getpid(), id);
+ if (ret < 0)
+ return NULL;
- ret = mkdirat(at, name, 0600);
+ ret = mkdirat(at, item_name, 0600);
if (ret) {
- if (errno == EEXIST)
- goto again;
-
+ free(item_name);
return NULL;
}
- return strdup(name);
-}
-
-static char *configfs_make_item_name(int at, const char *name)
-{
- char *item_name;
- int ret;
-
- if (name) {
- item_name = strdup(name);
- if (!item_name)
- return NULL;
-
- ret = mkdirat(at, item_name, 0600);
- if (ret) {
- free(item_name);
- return NULL;
- }
- } else {
- item_name = make_random_dir_at(at);
- if (!item_name)
- return NULL;
- }
-
return item_name;
}
@@ -303,6 +395,7 @@ struct gpiosim_dev {
struct gpiosim_ctx *ctx;
bool live;
char *item_name;
+ int id;
char *dev_name;
int cfs_dir_fd;
int sysfs_dir_fd;
@@ -314,6 +407,7 @@ struct gpiosim_bank {
struct gpiosim_dev *dev;
struct list_head siblings;
char *item_name;
+ int id;
char *chip_name;
char *dev_path;
int cfs_dir_fd;
@@ -478,22 +572,27 @@ static void dev_release(struct refcount *ref)
close(dev->cfs_dir_fd);
free(dev->dev_name);
free(dev->item_name);
+ id_free(dev->id);
gpiosim_ctx_unref(ctx);
free(dev);
}
GPIOSIM_API struct gpiosim_dev *
-gpiosim_dev_new(struct gpiosim_ctx *ctx, const char *name)
+gpiosim_dev_new(struct gpiosim_ctx *ctx)
{
+ int configfs_fd, ret, id;
struct gpiosim_dev *dev;
- int configfs_fd, ret;
char devname[128];
char *item_name;
- item_name = configfs_make_item_name(ctx->cfs_dir_fd, name);
- if (!item_name)
+ id = id_alloc();
+ if (id < 0)
return NULL;
+ item_name = configfs_make_item(ctx->cfs_dir_fd, id);
+ if (!item_name)
+ goto err_free_id;
+
configfs_fd = openat(ctx->cfs_dir_fd, item_name, O_RDONLY);
if (configfs_fd < 0)
goto err_unlink;
@@ -513,6 +612,7 @@ gpiosim_dev_new(struct gpiosim_ctx *ctx, const char *name)
dev->cfs_dir_fd = configfs_fd;
dev->sysfs_dir_fd = -1;
dev->item_name = item_name;
+ dev->id = id;
dev->dev_name = strdup(devname);
if (!dev->dev_name)
@@ -529,6 +629,8 @@ err_close_fd:
err_unlink:
unlinkat(ctx->cfs_dir_fd, item_name, AT_REMOVEDIR);
free(item_name);
+err_free_id:
+ id_free(id);
return NULL;
}
@@ -747,25 +849,30 @@ static void bank_release(struct refcount *ref)
/* If the device wasn't disabled yet, this fd is still open. */
close(bank->sysfs_dir_fd);
free(bank->item_name);
+ id_free(bank->id);
free(bank->chip_name);
free(bank->dev_path);
free(bank);
}
GPIOSIM_API struct gpiosim_bank*
-gpiosim_bank_new(struct gpiosim_dev *dev, const char *name)
+gpiosim_bank_new(struct gpiosim_dev *dev)
{
struct gpiosim_bank *bank;
- int configfs_fd;
+ int configfs_fd, id;
char *item_name;
if (!dev_check_pending(dev))
return NULL;
- item_name = configfs_make_item_name(dev->cfs_dir_fd, name);
- if (!item_name)
+ id = id_alloc();
+ if (id < 0)
return NULL;
+ item_name = configfs_make_item(dev->cfs_dir_fd, id);
+ if (!item_name)
+ goto err_free_id;
+
configfs_fd = openat(dev->cfs_dir_fd, item_name, O_RDONLY);
if (configfs_fd < 0)
goto err_unlink;
@@ -781,6 +888,7 @@ gpiosim_bank_new(struct gpiosim_dev *dev, const char *name)
bank->cfs_dir_fd = configfs_fd;
bank->dev = gpiosim_dev_ref(dev);
bank->item_name = item_name;
+ bank->id = id;
return bank;
@@ -788,6 +896,8 @@ err_close_cfs:
close(configfs_fd);
err_unlink:
unlinkat(dev->cfs_dir_fd, item_name, AT_REMOVEDIR);
+err_free_id:
+ id_free(id);
return NULL;
}
@@ -36,7 +36,7 @@ struct gpiosim_ctx *gpiosim_ctx_ref(struct gpiosim_ctx *ctx);
void gpiosim_ctx_unref(struct gpiosim_ctx *ctx);
struct gpiosim_dev *
-gpiosim_dev_new(struct gpiosim_ctx *ctx, const char *name);
+gpiosim_dev_new(struct gpiosim_ctx *ctx);
struct gpiosim_dev *gpiosim_dev_ref(struct gpiosim_dev *dev);
void gpiosim_dev_unref(struct gpiosim_dev *dev);
struct gpiosim_ctx *gpiosim_dev_get_ctx(struct gpiosim_dev *dev);
@@ -47,7 +47,7 @@ int gpiosim_dev_disable(struct gpiosim_dev *dev);
bool gpiosim_dev_is_live(struct gpiosim_dev *dev);
struct gpiosim_bank*
-gpiosim_bank_new(struct gpiosim_dev *dev, const char *name);
+gpiosim_bank_new(struct gpiosim_dev *dev);
struct gpiosim_bank *gpiosim_bank_ref(struct gpiosim_bank *bank);
void gpiosim_bank_unref(struct gpiosim_bank *bank);
struct gpiosim_dev *gpiosim_bank_get_dev(struct gpiosim_bank *bank);
None of the test suites use the random name generation at this point so it's very much dead code and also every test-suite implements its own deterministic way of assigning file names to configfs attributes while also doing it wrong (as is evident as soon as we try to remove one simulator but not all of them and then create another one). This removes the 'name' argument from gpiosim_dev_new() and gpiosim_bank_new() and makes the generation of the file names for configfs attributes deterministic at the libgpiosim level. The names are created from the program invocation name, the PID and an ID allocated using a binary search tree in a similar manner to kernel's IDA API (find the lowest available integer for a new name). The ID pool is global within the library code and as such has protection using a mutex (unlike the context object and its children which are expected to be protected by the user if needed). Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl> --- tests/gpiod-test-sim.c | 9 +- tests/gpiosim/Makefile.am | 2 +- tests/gpiosim/gpiosim-selftest.c | 18 +-- tests/gpiosim/gpiosim.c | 222 +++++++++++++++++++++++-------- tests/gpiosim/gpiosim.h | 4 +- 5 files changed, 180 insertions(+), 75 deletions(-)