[PATCH] udevdb patch
This patch: 1) removes the three database files for just one udevdb.tdb file. 2) adds udevdb_init() and udevdb_exit() functions 3) initializes database now in main() in udev.c. Please look it over.
This commit is contained in:
dsteklof@us.ibm.com
Greg KH
parent
149f210617
commit
dbfc520c60
21
udev.c
21
udev.c
|
|
@ -31,6 +31,7 @@
|
|||
#include "udev.h"
|
||||
#include "udev_version.h"
|
||||
#include "namedev.h"
|
||||
#include "udevdb.h"
|
||||
#include "libsysfs/libsysfs.h"
|
||||
|
||||
|
||||
|
|
@ -91,17 +92,27 @@ int main(int argc, char *argv[])
|
|||
goto exit;
|
||||
}
|
||||
|
||||
/* initialize udev database */
|
||||
retval = udevdb_init(UDEVDB_DEFAULT);
|
||||
if (retval != 0) {
|
||||
dbg("Unable to initialize database.");
|
||||
goto exit;
|
||||
}
|
||||
|
||||
/* initialize the naming deamon */
|
||||
namedev_init();
|
||||
|
||||
if (strcmp(action, "add") == 0)
|
||||
return udev_add_device(device, argv[1]);
|
||||
retval = udev_add_device(device, argv[1]);
|
||||
|
||||
if (strcmp(action, "remove") == 0)
|
||||
return udev_remove_device(device, argv[1]);
|
||||
else if (strcmp(action, "remove") == 0)
|
||||
retval = udev_remove_device(device, argv[1]);
|
||||
|
||||
dbg("Unknown action: %s", action);
|
||||
retval = -EINVAL;
|
||||
else {
|
||||
dbg("Unknown action: %s", action);
|
||||
retval = -EINVAL;
|
||||
}
|
||||
udevdb_exit();
|
||||
|
||||
exit:
|
||||
return retval;
|
||||
|
|
|
|||
177
udevdb.c
177
udevdb.c
|
|
@ -12,9 +12,7 @@
|
|||
#include "udevdb.h"
|
||||
#include "tdb/tdb.h"
|
||||
|
||||
static TDB_CONTEXT *busdb;
|
||||
static TDB_CONTEXT *classdb;
|
||||
static TDB_CONTEXT *namedb;
|
||||
static TDB_CONTEXT *udevdb;
|
||||
|
||||
/**
|
||||
* busdb_record - bus and id are keys to look up name of device
|
||||
|
|
@ -48,67 +46,25 @@ struct namedb_record {
|
|||
};
|
||||
|
||||
/**
|
||||
* busdb_close: close busdb database
|
||||
* udevdb_close: close udev database
|
||||
*/
|
||||
static void busdb_close(void)
|
||||
static void udevdb_close(void)
|
||||
{
|
||||
if (busdb != NULL) {
|
||||
tdb_close(busdb);
|
||||
busdb = NULL;
|
||||
if (udevdb != NULL) {
|
||||
tdb_close(udevdb);
|
||||
udevdb = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* classdb_close: close classdb database
|
||||
* udevdb_open: opens udev's database
|
||||
* @method: database can either be in memory - UDEVDB_INTERNAL - or
|
||||
* written to a file with UDEVDB_DEFAULT.
|
||||
*/
|
||||
static void classdb_close(void)
|
||||
static int udevdb_open(int method)
|
||||
{
|
||||
if (classdb != NULL) {
|
||||
tdb_close(classdb);
|
||||
classdb = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* namedb_close: close name database
|
||||
*/
|
||||
static void namedb_close(void)
|
||||
{
|
||||
if (namedb != NULL) {
|
||||
tdb_close(namedb);
|
||||
namedb = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* busdb_open: open busdb's database
|
||||
*/
|
||||
static int busdb_open(void)
|
||||
{
|
||||
busdb = tdb_open(BUS_DB, 0, 0, O_RDWR | O_CREAT, 0644);
|
||||
if (busdb == NULL)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* classdb_open: open classdb's database
|
||||
*/
|
||||
static int classdb_open(void)
|
||||
{
|
||||
classdb = tdb_open(CLASS_DB, 0, 0, O_RDWR | O_CREAT, 0644);
|
||||
if (classdb == NULL)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* namedb_open: open name database
|
||||
*/
|
||||
static int namedb_open(void)
|
||||
{
|
||||
namedb = tdb_open(NAME_DB, 0, 0, O_RDWR | O_CREAT, 0644);
|
||||
if (namedb == NULL)
|
||||
udevdb = tdb_open(UDEVDB, 0, method, O_RDWR | O_CREAT, 0644);
|
||||
if (udevdb == NULL)
|
||||
return -1;
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -127,9 +83,6 @@ static struct busdb_record *busdb_fetch(const char *bus, const char *id)
|
|||
if (strlen(bus) >= BUS_SIZE || strlen(id) >= ID_SIZE)
|
||||
return NULL;
|
||||
|
||||
if ((busdb_open()) != 0)
|
||||
return NULL;
|
||||
|
||||
memset(keystr, 0, (BUS_SIZE+ID_SIZE+2));
|
||||
strcpy(keystr, bus);
|
||||
strcat(keystr, UDEVDB_DEL);
|
||||
|
|
@ -138,8 +91,7 @@ static struct busdb_record *busdb_fetch(const char *bus, const char *id)
|
|||
key.dptr = (void *)keystr;
|
||||
key.dsize = strlen(keystr) + 1;
|
||||
|
||||
data = tdb_fetch(busdb, key);
|
||||
busdb_close();
|
||||
data = tdb_fetch(udevdb, key);
|
||||
if (data.dptr == NULL || data.dsize == 0)
|
||||
return NULL;
|
||||
|
||||
|
|
@ -170,9 +122,6 @@ static struct classdb_record *classdb_fetch(const char *cls,
|
|||
if (strlen(cls) >= NAME_SIZE || strlen(cls_dev) >= NAME_SIZE)
|
||||
return NULL;
|
||||
|
||||
if ((classdb_open()) != 0)
|
||||
return NULL;
|
||||
|
||||
memset(keystr, 0, (NAME_SIZE+NAME_SIZE+2));
|
||||
strcpy(keystr, cls);
|
||||
strcat(keystr, UDEVDB_DEL);
|
||||
|
|
@ -181,8 +130,7 @@ static struct classdb_record *classdb_fetch(const char *cls,
|
|||
key.dptr = (void *)keystr;
|
||||
key.dsize = strlen(keystr) + 1;
|
||||
|
||||
data = tdb_fetch(classdb, key);
|
||||
classdb_close();
|
||||
data = tdb_fetch(udevdb, key);
|
||||
if (data.dptr == NULL || data.dsize == 0)
|
||||
return NULL;
|
||||
|
||||
|
|
@ -212,18 +160,13 @@ static struct namedb_record *namedb_fetch(const char *name)
|
|||
if (strlen(name) >= NAME_SIZE)
|
||||
return NULL;
|
||||
|
||||
if ((namedb_open()) != 0)
|
||||
return NULL;
|
||||
|
||||
memset(nm_keystr, 0, NAME_SIZE);
|
||||
strcpy(nm_keystr, name);
|
||||
|
||||
key.dptr = (void *)nm_keystr;
|
||||
key.dsize = strlen(nm_keystr) + 1;
|
||||
|
||||
data = tdb_fetch(namedb, key);
|
||||
namedb_close();
|
||||
|
||||
data = tdb_fetch(udevdb, key);
|
||||
if (data.dptr == NULL || data.dsize == 0)
|
||||
return NULL;
|
||||
|
||||
|
|
@ -252,9 +195,6 @@ static int busdb_store(const struct udevice *dev)
|
|||
if (dev == NULL)
|
||||
return -1;
|
||||
|
||||
if ((retval = busdb_open()) != 0)
|
||||
return -1;
|
||||
|
||||
memset(keystr, 0, (BUS_SIZE+ID_SIZE+2));
|
||||
strcpy(keystr, dev->bus_name);
|
||||
strcat(keystr, UDEVDB_DEL);
|
||||
|
|
@ -268,9 +208,7 @@ static int busdb_store(const struct udevice *dev)
|
|||
data.dptr = (void *) &rec;
|
||||
data.dsize = sizeof(rec);
|
||||
|
||||
retval = tdb_store(busdb, key, data, TDB_REPLACE);
|
||||
|
||||
busdb_close();
|
||||
retval = tdb_store(udevdb, key, data, TDB_REPLACE);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -287,9 +225,6 @@ static int classdb_store(const struct udevice *dev)
|
|||
if (dev == NULL)
|
||||
return -1;
|
||||
|
||||
if ((retval = classdb_open()) != 0)
|
||||
return -1;
|
||||
|
||||
memset(keystr, 0, (NAME_SIZE+NAME_SIZE+2));
|
||||
strcpy(keystr, dev->class_name);
|
||||
strcat(keystr, UDEVDB_DEL);
|
||||
|
|
@ -303,9 +238,7 @@ static int classdb_store(const struct udevice *dev)
|
|||
data.dptr = (void *) &rec;
|
||||
data.dsize = sizeof(rec);
|
||||
|
||||
retval = tdb_store(classdb, key, data, TDB_REPLACE);
|
||||
|
||||
classdb_close();
|
||||
retval = tdb_store(udevdb, key, data, TDB_REPLACE);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -322,9 +255,6 @@ static int namedb_store(const struct udevice *dev)
|
|||
if (dev == NULL)
|
||||
return -1;
|
||||
|
||||
if ((retval = namedb_open()) != 0)
|
||||
return -1;
|
||||
|
||||
memset(keystr, 0, NAME_SIZE);
|
||||
strcpy(keystr, dev->name);
|
||||
|
||||
|
|
@ -345,9 +275,7 @@ static int namedb_store(const struct udevice *dev)
|
|||
data.dptr = (void *) &rec;
|
||||
data.dsize = sizeof(rec);
|
||||
|
||||
retval = tdb_store(namedb, key, data, TDB_REPLACE);
|
||||
|
||||
namedb_close();
|
||||
retval = tdb_store(udevdb, key, data, TDB_REPLACE);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -365,9 +293,6 @@ static int busdb_delete(const char *bus, const char *id)
|
|||
if (strlen(bus) >= BUS_SIZE || strlen(id) >= ID_SIZE)
|
||||
return -1;
|
||||
|
||||
if ((busdb_open()) != 0)
|
||||
return -1;
|
||||
|
||||
memset(keystr, 0, (BUS_SIZE+ID_SIZE+2));
|
||||
strcpy(keystr, bus);
|
||||
strcat(keystr, UDEVDB_DEL);
|
||||
|
|
@ -376,9 +301,7 @@ static int busdb_delete(const char *bus, const char *id)
|
|||
key.dptr = (void *)keystr;
|
||||
key.dsize = strlen(keystr) + 1;
|
||||
|
||||
retval = tdb_delete(busdb, key);
|
||||
busdb_close();
|
||||
|
||||
retval = tdb_delete(udevdb, key);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -396,9 +319,6 @@ static int classdb_delete(const char *cls, const char *cls_dev)
|
|||
if (strlen(cls) >= NAME_SIZE || strlen(cls_dev) >= NAME_SIZE)
|
||||
return -1;
|
||||
|
||||
if ((classdb_open()) != 0)
|
||||
return -1;
|
||||
|
||||
memset(keystr, 0, (NAME_SIZE+NAME_SIZE+2));
|
||||
strcpy(keystr, cls);
|
||||
strcat(keystr, UDEVDB_DEL);
|
||||
|
|
@ -407,9 +327,7 @@ static int classdb_delete(const char *cls, const char *cls_dev)
|
|||
key.dptr = (void *)keystr;
|
||||
key.dsize = strlen(keystr) + 1;
|
||||
|
||||
retval = tdb_delete(classdb, key);
|
||||
classdb_close();
|
||||
|
||||
retval = tdb_delete(udevdb, key);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -427,47 +345,13 @@ static int namedb_delete(const char *name)
|
|||
if (strlen(name) >= NAME_SIZE)
|
||||
return -1;
|
||||
|
||||
if ((namedb_open()) != 0)
|
||||
return -1;
|
||||
|
||||
memset(keystr, 0, NAME_SIZE);
|
||||
strcpy(keystr, name);
|
||||
|
||||
key.dptr = (void *)keystr;
|
||||
key.dsize = strlen(keystr) + 1;
|
||||
|
||||
retval = tdb_delete(namedb, key);
|
||||
namedb_close();
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
/**
|
||||
* namedb_exists
|
||||
*/
|
||||
static int namedb_exists(const char *name)
|
||||
{
|
||||
TDB_DATA key;
|
||||
char keystr[NAME_SIZE];
|
||||
int retval = 0;
|
||||
|
||||
if (name == NULL)
|
||||
return retval;
|
||||
if (strlen(name) >= NAME_SIZE)
|
||||
return retval;
|
||||
|
||||
if ((namedb_open()) != 0)
|
||||
return retval;
|
||||
|
||||
memset(keystr, 0, NAME_SIZE);
|
||||
strcpy(keystr, name);
|
||||
|
||||
key.dptr = (void *)keystr;
|
||||
key.dsize = strlen(keystr) + 1;
|
||||
|
||||
retval = tdb_exists(namedb, key);
|
||||
namedb_close();
|
||||
|
||||
retval = tdb_delete(udevdb, key);
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
|
@ -590,3 +474,22 @@ struct udevice *udevdb_get_udevice_by_class(const char *cls,
|
|||
|
||||
return dev;
|
||||
}
|
||||
|
||||
/**
|
||||
* udevdb_exit: closes database
|
||||
*/
|
||||
void udevdb_exit(void)
|
||||
{
|
||||
udevdb_close();
|
||||
}
|
||||
|
||||
/**
|
||||
* udevdb_init: initializes database
|
||||
*/
|
||||
int udevdb_init(int init_flag)
|
||||
{
|
||||
if (init_flag != UDEVDB_DEFAULT && init_flag != UDEVDB_INTERNAL)
|
||||
return -1;
|
||||
|
||||
return udevdb_open(init_flag);
|
||||
}
|
||||
|
|
|
|||
10
udevdb.h
10
udevdb.h
|
|
@ -7,14 +7,16 @@
|
|||
#include "namedev.h"
|
||||
#include "udev.h"
|
||||
|
||||
#define BUS_DB "/home/greg/src/udev/busdb.tdb"
|
||||
#define CLASS_DB "/home/greg/src/udev/classdb.tdb"
|
||||
#define NAME_DB "/home/greg/src/udev/namedb.tdb"
|
||||
#define UDEVDB "/home/greg/src/udev/udevdb.tdb"
|
||||
|
||||
#define PATH_SIZE 256
|
||||
|
||||
#define UDEVDB_DEL "#"
|
||||
|
||||
/* Udevdb initialization flags */
|
||||
#define UDEVDB_DEFAULT 0 /* Defaults database to use file */
|
||||
#define UDEVDB_INTERNAL 1 /* Don't store db on disk, use in memory */
|
||||
|
||||
struct udevice {
|
||||
char name[NAME_SIZE];
|
||||
char sysfs_path[PATH_SIZE];
|
||||
|
|
@ -30,6 +32,8 @@ struct udevice {
|
|||
};
|
||||
|
||||
/* Function Prototypes */
|
||||
extern void udevdb_exit(void);
|
||||
extern int udevdb_init(int init_flag);
|
||||
extern int udevdb_delete_udevice(const char *name);
|
||||
extern int udevdb_add_udevice(const struct udevice *dev);
|
||||
extern struct udevice *udevdb_get_udevice(const char *name);
|
||||
|
|
|
|||
Loading…
Reference in New Issue