chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] udevd race conditions and performance, assorted cleanups - take 2
[elogind.git]
/
udev.h
diff --git
a/udev.h
b/udev.h
index 8b3f305d34effbe8d654a5094be98e00182a86ea..eb42edce10211dbc9e5e6974aeadfc75377e4779 100644
(file)
--- a/
udev.h
+++ b/
udev.h
@@
-20,20
+20,25
@@
*
*/
*
*/
-#ifndef
UDEV_H
-#define
UDEV_H
+#ifndef
_UDEV_H_
+#define
_UDEV_H_
-#include "libsysfs/libsysfs.h"
#include <sys/param.h>
#include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.h"
#define COMMENT_CHARACTER '#'
#define COMMENT_CHARACTER '#'
-#define NAME_SIZE 100
-#define OWNER_SIZE 30
-#define GROUP_SIZE 30
-#define MODE_SIZE 8
-#define BOOL_SIZE 5 /* 'yes', 'no' and possibly 'true' or 'false'
- in future */
+#define NAME_SIZE 256
+#define OWNER_SIZE 30
+#define GROUP_SIZE 30
+#define MODE_SIZE 8
+
+#define ACTION_SIZE 30
+#define DEVPATH_SIZE 255
+#define SUBSYSTEM_SIZE 30
+
+/* length of public data */
+#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
struct udevice {
char name[NAME_SIZE];
struct udevice {
char name[NAME_SIZE];
@@
-42,26
+47,25
@@
struct udevice {
char type;
int major;
int minor;
char type;
int major;
int minor;
- mode_t mode;
+ unsigned int mode; /* not mode_t due to conflicting definitions in different libcs */
char symlink[NAME_SIZE];
char symlink[NAME_SIZE];
+ int partitions;
+ int config_line;
+ char config_file[NAME_SIZE];
+ time_t config_time;
- /*
fields
that help us in building strings */
-
unsigned
char bus_id[SYSFS_NAME_LEN];
-
unsigned
char program_result[NAME_SIZE];
-
unsigned
char kernel_number[NAME_SIZE];
-
unsigned
char kernel_name[NAME_SIZE];
+ /*
private data
that help us in building strings */
+ char bus_id[SYSFS_NAME_LEN];
+ char program_result[NAME_SIZE];
+ char kernel_number[NAME_SIZE];
+ char kernel_name[NAME_SIZE];
};
};
-#define strfieldcpy(to, from) \
-do { \
- to[sizeof(to)-1] = '\0'; \
- strncpy(to, from, sizeof(to)-1); \
-} while (0)
-
-extern int udev_add_device(char *path, char *subsystem);
+extern int udev_add_device(char *path, char *subsystem, int fake);
extern int udev_remove_device(char *path, char *subsystem);
extern void udev_init_config(void);
extern int parse_get_pair(char **orig_string, char **left, char **right);
extern int udev_remove_device(char *path, char *subsystem);
extern void udev_init_config(void);
extern int parse_get_pair(char **orig_string, char **left, char **right);
+extern void dev_d_send(struct udevice *dev, char *subsystem);
extern char **main_argv;
extern char **main_envp;
extern char **main_argv;
extern char **main_envp;
@@
-74,6
+78,7
@@
extern char udev_rules_filename[PATH_MAX+NAME_MAX];
extern char default_mode_str[MODE_SIZE];
extern char default_owner_str[OWNER_SIZE];
extern char default_group_str[GROUP_SIZE];
extern char default_mode_str[MODE_SIZE];
extern char default_owner_str[OWNER_SIZE];
extern char default_group_str[GROUP_SIZE];
-extern char udev_log_str[BOOL_SIZE];
+extern int udev_log;
+extern int udev_sleep;
#endif
#endif