[PATCH 4/5] Replace glib hash table with c specific implementation
Jeevaka Prabu Badrappan
jeevaka.badrappan at intel.com
Tue Apr 29 20:39:18 UTC 2025
Inorder to support igt build for Android(without glib), replaced
the glib hashtable function with generic hash table implementation.
Signed-off-by: Jeevaka Prabu Badrappan <jeevaka.badrappan at intel.com>
---
lib/igt_device_scan.c | 118 ++++++++++++++++++++++++++++++++----------
1 file changed, 90 insertions(+), 28 deletions(-)
diff --git a/lib/igt_device_scan.c b/lib/igt_device_scan.c
index 3f26a1737..c121e53bb 100644
--- a/lib/igt_device_scan.c
+++ b/lib/igt_device_scan.c
@@ -28,10 +28,10 @@
#include "igt_list.h"
#include "intel_chipset.h"
+#include <string.h>
#include <ctype.h>
#include <dirent.h>
#include <fcntl.h>
-#include <glib.h>
#include <libudev.h>
#ifdef __linux__
#include <linux/limits.h>
@@ -217,6 +217,18 @@ static inline bool strequal(const char *a, const char *b)
return strcmp(a, b) == 0;
}
+#define TABLE_SIZE 100
+
+typedef struct KeyValue {
+ char *key;
+ char *value;
+ struct KeyValue *next;
+} KeyValue;
+
+typedef struct {
+ KeyValue *table[TABLE_SIZE];
+} HashTable;
+
struct igt_device {
/* Filled for drm devices */
struct igt_device *parent;
@@ -224,8 +236,8 @@ struct igt_device {
/* Point to vendor spec if can be found */
/* Properties / sysattrs rewriten from udev lists */
- GHashTable *props_ht;
- GHashTable *attrs_ht;
+ HashTable *props_ht;
+ HashTable *attrs_ht;
/* Most usable variables from udev device */
char *subsystem;
@@ -261,6 +273,61 @@ static void igt_device_free(struct igt_device *dev);
typedef char *(*devname_fn)(uint16_t, uint16_t);
typedef enum dev_type (*devtype_fn)(uint16_t, uint16_t, const char *);
+static unsigned int hash(const char *key)
+{
+ unsigned int hash = 0;
+ while (*key) {
+ hash = (hash << 5) + *key++;
+ }
+ return hash % TABLE_SIZE;
+}
+
+static HashTable *create_table(void)
+{
+ HashTable *table = malloc(sizeof(HashTable));
+ for (int i = 0; i < TABLE_SIZE; i++) {
+ table->table[i] = NULL;
+ }
+ return table;
+}
+
+static void insert_table(HashTable *table, const char *key, const char *value)
+{
+ unsigned int index = hash(key);
+ KeyValue *new_pair = malloc(sizeof(KeyValue));
+ new_pair->key = strdup(key);
+ new_pair->value = strdup(value);
+ new_pair->next = table->table[index];
+ table->table[index] = new_pair;
+}
+
+static char *search_table(HashTable *table, const char *key)
+{
+ unsigned int index = hash(key);
+ KeyValue *pair = table->table[index];
+ while (pair) {
+ if (strcmp(pair->key, key) == 0) {
+ return pair->value;
+ }
+ pair = pair->next;
+ }
+ return NULL;
+}
+
+static void free_table(HashTable *table) {
+ for (int i = 0; i < TABLE_SIZE; i++) {
+ KeyValue *pair = table->table[i];
+ while (pair) {
+ KeyValue *temp = pair;
+ pair = pair->next;
+ free(temp->key);
+ free(temp->value);
+ free(temp);
+ }
+ }
+ free(table);
+}
+
static char *devname_hex(uint16_t vendor, uint16_t device)
{
char *s;
@@ -472,10 +539,8 @@ static struct igt_device *igt_device_new(void)
if (!dev)
return NULL;
- dev->attrs_ht = g_hash_table_new_full(g_str_hash, g_str_equal,
- free, free);
- dev->props_ht = g_hash_table_new_full(g_str_hash, g_str_equal,
- free, free);
+ dev->attrs_ht = create_table();
+ dev->props_ht = create_table();
if (dev->attrs_ht && dev->props_ht)
return dev;
@@ -491,7 +556,7 @@ static void igt_device_add_prop(struct igt_device *dev,
if (!key || !value)
return;
- g_hash_table_insert(dev->props_ht, strdup(key), strdup(value));
+ insert_table(dev->props_ht, key, value);
}
static void igt_device_add_attr(struct igt_device *dev,
@@ -525,7 +590,7 @@ static void igt_device_add_attr(struct igt_device *dev,
v++;
}
- g_hash_table_insert(dev->attrs_ht, strdup(key), strdup(v));
+ insert_table(dev->attrs_ht, key, v);
}
/* Iterate over udev properties list and rewrite it to igt_device properties
@@ -585,13 +650,13 @@ static void get_attrs_limited(struct udev_device *dev, struct igt_device *idev)
}
}
-#define get_prop(dev, prop) ((char *) g_hash_table_lookup(dev->props_ht, prop))
-#define get_attr(dev, attr) ((char *) g_hash_table_lookup(dev->attrs_ht, attr))
+#define get_prop(dev, prop) ((char *) search_table(dev->props_ht, prop))
+#define get_attr(dev, attr) ((char *) search_table(dev->attrs_ht, attr))
#define get_prop_subsystem(dev) get_prop(dev, "SUBSYSTEM")
#define is_drm_subsystem(dev) (strequal(get_prop_subsystem(dev), "drm"))
#define is_pci_subsystem(dev) (strequal(get_prop_subsystem(dev), "pci"))
-static void print_ht(GHashTable *ht);
+static void print_ht(HashTable *ht);
static void dump_props_and_attrs(const struct igt_device *dev)
{
printf("\n[properties]\n");
@@ -949,7 +1014,7 @@ static struct igt_device *duplicate_device(struct igt_device *dev) {
return dup;
}
-static gint devs_compare(const void *a, const void *b)
+static int devs_compare(const void *a, const void *b)
{
struct igt_device *dev1, *dev2;
int ret;
@@ -1088,8 +1153,8 @@ static void igt_device_free(struct igt_device *dev)
free(dev->device);
free(dev->driver);
free(dev->pci_slot_name);
- g_hash_table_destroy(dev->attrs_ht);
- g_hash_table_destroy(dev->props_ht);
+ free_table(dev->attrs_ht);
+ free_table(dev->props_ht);
}
void igt_devices_free(void)
@@ -1258,7 +1323,7 @@ igt_devs_print_user(struct igt_list_head *view,
if (!dev->drm_card || dev->drm_render)
continue;
- drm_name = rindex(dev->drm_card, '/');
+ drm_name = strrchr(dev->drm_card, '/');
if (!drm_name || !*++drm_name)
continue;
@@ -1306,7 +1371,7 @@ igt_devs_print_user(struct igt_list_head *view,
if (strcmp(dev2->parent->syspath, dev->parent->syspath))
continue;
- drm_name = rindex(dev2->drm_render, '/');
+ drm_name = strrchr(dev2->drm_render, '/');
if (!drm_name || !*++drm_name)
continue;
@@ -1328,19 +1393,16 @@ static inline void _print_key_value(const char* k, const char *v)
printf("%-32s: %s\n", k, v);
}
-static void print_ht(GHashTable *ht)
+static void print_ht(HashTable *table)
{
- GList *keys = g_hash_table_get_keys(ht);
-
- keys = g_list_sort(keys, (GCompareFunc) strcmp);
- while (keys) {
- char *k = (char *) keys->data;
- char *v = g_hash_table_lookup(ht, k);
-
- _print_key_value(k, v);
- keys = g_list_next(keys);
+ for (int i = 0; i < TABLE_SIZE; i++) {
+ KeyValue *pair = table->table[i];
+ printf("Index %d:\n", i);
+ while (pair) {
+ printf(" Key: %s, Value: %s\n", pair->key, pair->value);
+ pair = pair->next;
+ }
}
- g_list_free(keys);
}
static void
--
2.49.0
More information about the igt-dev
mailing list