libsystemd: add sd-device library
This provides equivalent functionality to libudev-device, but in the systemd style. The public API only caters to creating sd_device objects from for devices that already exist in /sys, there is no support for listening for monitoring events or creating devices received over the udev netlink protocol. The private API contains the necessary functionality to make sd-device a drop-in replacement for libudev-device, but which we would not otherwise want to export.
This commit is contained in:
Tom Gundersen
+8
-1
@@ -231,6 +231,7 @@ AM_CPPFLAGS = \
|
||||
-I $(top_srcdir)/src/libsystemd/sd-rtnl \
|
||||
-I $(top_srcdir)/src/libsystemd/sd-network \
|
||||
-I $(top_srcdir)/src/libsystemd/sd-hwdb \
|
||||
-I $(top_srcdir)/src/libsystemd/sd-device \
|
||||
-I $(top_srcdir)/src/libsystemd-network \
|
||||
-I $(top_srcdir)/src/libsystemd-terminal \
|
||||
$(OUR_CPPFLAGS)
|
||||
@@ -2918,6 +2919,7 @@ libsystemd_internal_la_SOURCES = \
|
||||
src/systemd/sd-path.h \
|
||||
src/systemd/sd-network.h \
|
||||
src/systemd/sd-hwdb.h \
|
||||
src/systemd/sd-device.h \
|
||||
src/libsystemd/sd-bus/sd-bus.c \
|
||||
src/libsystemd/sd-bus/bus-control.c \
|
||||
src/libsystemd/sd-bus/bus-control.h \
|
||||
@@ -2981,7 +2983,12 @@ libsystemd_internal_la_SOURCES = \
|
||||
src/libsystemd/sd-network/network-util.c \
|
||||
src/libsystemd/sd-hwdb/sd-hwdb.c \
|
||||
src/libsystemd/sd-hwdb/hwdb-util.h \
|
||||
src/libsystemd/sd-hwdb/hwdb-internal.h
|
||||
src/libsystemd/sd-hwdb/hwdb-intenal.h \
|
||||
src/libsystemd/sd-device/device-internal.h \
|
||||
src/libsystemd/sd-device/device-util.h \
|
||||
src/libsystemd/sd-device/sd-device.c \
|
||||
src/libsystemd/sd-device/device-private.c \
|
||||
src/libsystemd/sd-device/device-private.h
|
||||
|
||||
nodist_libsystemd_internal_la_SOURCES = \
|
||||
src/libsystemd/libsystemd.sym
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
|
||||
Copyright 2014 Tom Gundersen <teg@jklm.no>
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "hashmap.h"
|
||||
#include "set.h"
|
||||
|
||||
struct sd_device {
|
||||
uint64_t n_ref;
|
||||
|
||||
sd_device *parent;
|
||||
bool parent_set; /* no need to try to reload parent */
|
||||
|
||||
OrderedHashmap *properties;
|
||||
Iterator properties_iterator;
|
||||
uint64_t properties_generation; /* changes whenever the properties are changed */
|
||||
uint64_t properties_iterator_generation; /* generation when iteration was started */
|
||||
|
||||
/* the subset of the properties that should be written to the db*/
|
||||
OrderedHashmap *properties_db;
|
||||
|
||||
Hashmap *sysattr_values; /* cached sysattr values */
|
||||
|
||||
Set *sysattrs; /* names of sysattrs */
|
||||
Iterator sysattrs_iterator;
|
||||
bool sysattrs_read; /* don't try to re-read sysattrs once read */
|
||||
|
||||
Set *tags;
|
||||
Iterator tags_iterator;
|
||||
uint64_t tags_generation; /* changes whenever the tags are changed */
|
||||
uint64_t tags_iterator_generation; /* generation when iteration was started */
|
||||
bool property_tags_outdated; /* need to update TAGS= property */
|
||||
|
||||
Set *devlinks;
|
||||
Iterator devlinks_iterator;
|
||||
uint64_t devlinks_generation; /* changes whenever the devlinks are changed */
|
||||
uint64_t devlinks_iterator_generation; /* generation when iteration was started */
|
||||
bool property_devlinks_outdated; /* need to update DEVLINKS= property */
|
||||
int devlink_priority;
|
||||
|
||||
char **properties_strv; /* the properties hashmap as a strv */
|
||||
uint8_t *properties_nulstr; /* the same as a nulstr */
|
||||
size_t properties_nulstr_len;
|
||||
bool properties_buf_outdated; /* need to reread hashmap */
|
||||
|
||||
int watch_handle;
|
||||
|
||||
char *syspath;
|
||||
const char *devpath;
|
||||
const char *sysnum;
|
||||
char *sysname;
|
||||
bool sysname_set; /* don't reread sysname */
|
||||
|
||||
char *devtype;
|
||||
int ifindex;
|
||||
char *devname;
|
||||
dev_t devnum;
|
||||
|
||||
char *subsystem;
|
||||
bool subsystem_set; /* don't reread subsystem */
|
||||
char *driver;
|
||||
bool driver_set; /* don't reread driver */
|
||||
|
||||
char *id_filename;
|
||||
|
||||
bool is_initialized;
|
||||
uint64_t usec_initialized;
|
||||
|
||||
mode_t devmode;
|
||||
uid_t devuid;
|
||||
gid_t devgid;
|
||||
|
||||
bool uevent_loaded; /* don't reread uevent */
|
||||
bool db_loaded; /* don't reread db */
|
||||
|
||||
bool sealed; /* don't read more information from uevent/db */
|
||||
bool db_persist; /* don't clean up the db when switching from initrd to real root */
|
||||
};
|
||||
|
||||
typedef enum DeviceAction {
|
||||
DEVICE_ACTION_ADD,
|
||||
DEVICE_ACTION_REMOVE,
|
||||
DEVICE_ACTION_CHANGE,
|
||||
DEVICE_ACTION_MOVE,
|
||||
DEVICE_ACTION_ONLINE,
|
||||
DEVICE_ACTION_OFFLINE,
|
||||
_DEVICE_ACTION_MAX,
|
||||
_DEVICE_ACTION_INVALID = -1,
|
||||
} DeviceAction;
|
||||
|
||||
int device_new_aux(sd_device **ret);
|
||||
int device_add_property_aux(sd_device *device, const char *key, const char *value, bool db);
|
||||
int device_add_property_internal(sd_device *device, const char *key, const char *value);
|
||||
int device_read_uevent_file(sd_device *device);
|
||||
|
||||
int device_set_syspath(sd_device *device, const char *_syspath, bool verify);
|
||||
int device_set_ifindex(sd_device *device, const char *ifindex);
|
||||
int device_set_devmode(sd_device *device, const char *devmode);
|
||||
int device_set_devname(sd_device *device, const char *_devname);
|
||||
int device_set_devtype(sd_device *device, const char *_devtype);
|
||||
int device_set_devnum(sd_device *device, const char *major, const char *minor);
|
||||
int device_set_subsystem(sd_device *device, const char *_subsystem);
|
||||
int device_set_driver(sd_device *device, const char *_driver);
|
||||
int device_set_usec_initialized(sd_device *device, const char *initialized);
|
||||
|
||||
DeviceAction device_action_from_string(const char *s) _pure_;
|
||||
const char *device_action_to_string(DeviceAction a) _const_;
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,63 @@
|
||||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
#pragma once
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2014 Tom Gundersen <teg@jklm.no>
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
int device_new_from_nulstr(sd_device **ret, uint8_t *nulstr, size_t len);
|
||||
int device_new_from_strv(sd_device **ret, char **strv);
|
||||
|
||||
int device_get_id_filename(sd_device *device, const char **ret);
|
||||
|
||||
int device_get_devlink_priority(sd_device *device, int *priority);
|
||||
int device_get_watch_handle(sd_device *device, int *handle);
|
||||
int device_get_devnode_mode(sd_device *device, mode_t *mode);
|
||||
int device_get_devnode_uid(sd_device *device, uid_t *uid);
|
||||
int device_get_devnode_gid(sd_device *device, gid_t *gid);
|
||||
|
||||
void device_seal(sd_device *device);
|
||||
void device_set_is_initialized(sd_device *device);
|
||||
void device_set_watch_handle(sd_device *device, int fd);
|
||||
void device_set_db_persist(sd_device *device);
|
||||
void device_set_devlink_priority(sd_device *device, int priority);
|
||||
int device_ensure_usec_initialized(sd_device *devcie, sd_device *device_old);
|
||||
int device_add_devlink(sd_device *device, const char *devlink);
|
||||
int device_add_property(sd_device *device, const char *property, const char *value);
|
||||
int device_add_tag(sd_device *device, const char *tag);
|
||||
void device_remove_tag(sd_device *device, const char *tag);
|
||||
void device_cleanup_tags(sd_device *device);
|
||||
void device_cleanup_devlinks(sd_device *device);
|
||||
|
||||
uint64_t device_get_properties_generation(sd_device *device);
|
||||
uint64_t device_get_tags_generation(sd_device *device);
|
||||
uint64_t device_get_devlinks_generation(sd_device *device);
|
||||
|
||||
int device_get_properties_nulstr(sd_device *device, const uint8_t **nulstr, size_t *len);
|
||||
int device_get_properties_strv(sd_device *device, char ***strv);
|
||||
|
||||
int device_rename(sd_device *device, const char *name);
|
||||
int device_shallow_clone(sd_device *old_device, sd_device **new_device);
|
||||
int device_clone_with_db(sd_device *old_device, sd_device **new_device);
|
||||
int device_copy_properties(sd_device *device_dst, sd_device *device_src);
|
||||
int device_new_from_synthetic_event(sd_device **new_device, const char *syspath, const char *action);
|
||||
|
||||
int device_tag_index(sd_device *dev, sd_device *dev_old, bool add);
|
||||
int device_update_db(sd_device *device);
|
||||
int device_delete_db(sd_device *device);
|
||||
@@ -0,0 +1,48 @@
|
||||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
#pragma once
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2014 Tom Gundersen <teg@jklm.no>
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "util.h"
|
||||
|
||||
DEFINE_TRIVIAL_CLEANUP_FUNC(sd_device*, sd_device_unref);
|
||||
|
||||
#define _cleanup_device_unref_ _cleanup_(sd_device_unrefp)
|
||||
|
||||
#define FOREACH_DEVICE_PROPERTY(device, key, value) \
|
||||
for (key = sd_device_get_property_first(device, &(value)); \
|
||||
key; \
|
||||
key = sd_device_get_property_next(device, &(value)))
|
||||
|
||||
#define FOREACH_DEVICE_TAG(device, tag) \
|
||||
for (tag = sd_device_get_tag_first(device); \
|
||||
tag; \
|
||||
tag = sd_device_get_tag_next(device))
|
||||
|
||||
#define FOREACH_DEVICE_SYSATTR(device, attr) \
|
||||
for (attr = sd_device_get_sysattr_first(device); \
|
||||
attr; \
|
||||
attr = sd_device_get_sysattr_next(device))
|
||||
|
||||
#define FOREACH_DEVICE_DEVLINK(device, devlink) \
|
||||
for (devlink = sd_device_get_devlink_first(device); \
|
||||
devlink; \
|
||||
devlink = sd_device_get_devlink_next(device))
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,77 @@
|
||||
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
|
||||
|
||||
#ifndef foosddevicehfoo
|
||||
#define foosddevicehfoo
|
||||
|
||||
/***
|
||||
This file is part of systemd.
|
||||
|
||||
Copyright 2008-2012 Kay Sievers <kay@vrfy.org>
|
||||
Copyright 2014 Tom Gundersen <teg@jklm.no>
|
||||
|
||||
systemd is free software; you can redistribute it and/or modify it
|
||||
under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2.1 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
systemd is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#include "_sd-common.h"
|
||||
|
||||
_SD_BEGIN_DECLARATIONS;
|
||||
|
||||
typedef struct sd_device sd_device;
|
||||
|
||||
sd_device *sd_device_ref(sd_device *device);
|
||||
sd_device *sd_device_unref(sd_device *device);
|
||||
|
||||
int sd_device_new_from_syspath(sd_device **ret, const char *syspath);
|
||||
int sd_device_new_from_devnum(sd_device **ret, char type, dev_t devnum);
|
||||
int sd_device_new_from_subsystem_sysname(sd_device **ret, const char *subsystem, const char *sysname);
|
||||
int sd_device_new_from_device_id(sd_device **ret, const char *id);
|
||||
|
||||
int sd_device_get_parent(sd_device *child, sd_device **ret);
|
||||
int sd_device_get_parent_with_subsystem_devtype(sd_device *child, const char *subsystem, const char *devtype, sd_device **ret);
|
||||
|
||||
int sd_device_get_syspath(sd_device *device, const char **ret);
|
||||
int sd_device_get_subsystem(sd_device *device, const char **ret);
|
||||
int sd_device_get_devtype(sd_device *device, const char **ret);
|
||||
int sd_device_get_devnum(sd_device *device, dev_t *devnum);
|
||||
int sd_device_get_ifindex(sd_device *device, int *ifindex);
|
||||
int sd_device_get_driver(sd_device *device, const char **ret);
|
||||
int sd_device_get_devpath(sd_device *device, const char **ret);
|
||||
int sd_device_get_devname(sd_device *device, const char **ret);
|
||||
int sd_device_get_sysname(sd_device *device, const char **ret);
|
||||
int sd_device_get_sysnum(sd_device *device, const char **ret);
|
||||
|
||||
int sd_device_get_is_initialized(sd_device *device, int *initialized);
|
||||
int sd_device_get_usec_since_initialized(sd_device *device, uint64_t *usec);
|
||||
|
||||
const char *sd_device_get_tag_first(sd_device *device);
|
||||
const char *sd_device_get_tag_next(sd_device *device);
|
||||
const char *sd_device_get_devlink_first(sd_device *device);
|
||||
const char *sd_device_get_devlink_next(sd_device *device);
|
||||
const char *sd_device_get_property_first(sd_device *device, const char **value);
|
||||
const char *sd_device_get_property_next(sd_device *device, const char **value);
|
||||
const char *sd_device_get_sysattr_first(sd_device *device);
|
||||
const char *sd_device_get_sysattr_next(sd_device *device);
|
||||
|
||||
int sd_device_has_tag(sd_device *device, const char *tag);
|
||||
int sd_device_get_property_value(sd_device *device, const char *key, const char **value);
|
||||
int sd_device_get_sysattr_value(sd_device *device, const char *sysattr, const char **_value);
|
||||
|
||||
int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, char *value);
|
||||
|
||||
_SD_END_DECLARATIONS;
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user