2003-10-17 12:40:02 +04:00
# Makefile for udev
2005-04-27 07:59:47 +04:00
#
2003-10-17 12:40:02 +04:00
# Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
2005-04-27 07:59:47 +04:00
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License.
#
# This program 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
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
[PATCH] add udev logging to info log
On Thu, Jan 15, 2004 at 05:14:16AM +0100, Kay Sievers wrote:
> On Wed, Jan 14, 2004 at 01:10:43PM -0800, Greg KH wrote:
> > On Wed, Jan 14, 2004 at 02:34:26PM -0600, Clay Haapala wrote:
> > > On Wed, 14 Jan 2004, Chris Friesen spake thusly:
> > > >
> > > > Maybe for ones with a matching rule, you could print something like:
> > > >
> > > >
> > > Is the act of printing/syslogging a rule in an of itself?
> >
> > No, as currently the only way stuff ends up in the syslog is if
> > DEBUG=true is used on the build line.
> >
> > But it's sounding like we might want to change that... :)
>
> How about this in the syslog after connect/disconnect?
>
> Jan 15 05:07:45 pim udev[28007]: configured rule in '/etc/udev/udev.rules' at line 17 applied, 'video*' becomes 'video/webcam%n'
> Jan 15 05:07:45 pim udev[28007]: creating device node '/udev/video/webcam0'
> Jan 15 05:07:47 pim udev[28015]: removing device node '/udev/video/webcam0'
Here is a slightly better version. I've created a logging.h file and
moved the debug macros from udev.h in there.
If you type:
'make' - you will get a binary that prints one or two lines to syslog
if a device node is created or deleted
'make LOG=false' - you get a binary that prints asolutely nothing
'make DEBUG=true' - the same as today, it will print all debug lines
2004-01-16 08:53:20 +03:00
# Set the following to control the use of syslog
# Set it to `false' to remove all logging
2004-01-16 09:00:58 +03:00
USE_LOG = true
[PATCH] add udev logging to info log
On Thu, Jan 15, 2004 at 05:14:16AM +0100, Kay Sievers wrote:
> On Wed, Jan 14, 2004 at 01:10:43PM -0800, Greg KH wrote:
> > On Wed, Jan 14, 2004 at 02:34:26PM -0600, Clay Haapala wrote:
> > > On Wed, 14 Jan 2004, Chris Friesen spake thusly:
> > > >
> > > > Maybe for ones with a matching rule, you could print something like:
> > > >
> > > >
> > > Is the act of printing/syslogging a rule in an of itself?
> >
> > No, as currently the only way stuff ends up in the syslog is if
> > DEBUG=true is used on the build line.
> >
> > But it's sounding like we might want to change that... :)
>
> How about this in the syslog after connect/disconnect?
>
> Jan 15 05:07:45 pim udev[28007]: configured rule in '/etc/udev/udev.rules' at line 17 applied, 'video*' becomes 'video/webcam%n'
> Jan 15 05:07:45 pim udev[28007]: creating device node '/udev/video/webcam0'
> Jan 15 05:07:47 pim udev[28015]: removing device node '/udev/video/webcam0'
Here is a slightly better version. I've created a logging.h file and
moved the debug macros from udev.h in there.
If you type:
'make' - you will get a binary that prints one or two lines to syslog
if a device node is created or deleted
'make LOG=false' - you get a binary that prints asolutely nothing
'make DEBUG=true' - the same as today, it will print all debug lines
2004-01-16 08:53:20 +03:00
# Set the following to `true' to log the debug
# and make a unstripped, unoptimized binary.
2005-04-27 07:59:47 +04:00
# Leave this set to `false' for production use.
2003-12-03 05:41:29 +03:00
DEBUG = false
2005-04-27 07:59:47 +04:00
[PATCH] D-BUS patch for udev-008
Attached is a patch against udev-008 to send out a D-BUS message when a
device node is added or removed.
Using D-BUS lingo, udev acquires the org.kernel.udev service and sends
out a NodeCreated or NodeDeleted signal on the
org.kernel.udev.NodeMonitor interface. Each signal carries two
parameters: the node in question and the corresponding sysfs path.
[Note: the D-BUS concepts of service, interface, object can be a bit
confusing at first glance]
An example program listening for these messages looks like this
#!/usr/bin/python
import dbus
import gtk
def udev_signal_received(dbus_iface, member, service, object_path, message):
[filename, sysfs_path] = message.get_args_list()
if member=='NodeCreated':
print 'Node %s created for %s'%(filename, sysfs_path)
elif member=='NodeDeleted':
print 'Node %s deleted for %s'%(filename, sysfs_path)
def main():
bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
bus.add_signal_receiver(udev_signal_received,
'org.kernel.udev.NodeMonitor', # interface
'org.kernel.udev', # service
'/org/kernel/udev/NodeMonitor') # object
gtk.mainloop()
if __name__ == '__main__':
main()
and this is the output when hot-plugging some usb-storage.
[david@laptop udev-008]$ ~/node_monitor.py
Node /udev/sda created for /block/sda
Node /udev/sda1 created for /block/sda/sda1
Node /udev/sda1 deleted for /block/sda/sda1
Node /udev/sda deleted for /block/sda
The patch requires D-BUS 0.20 or later while the python example program
requires D-BUS from CVS as I only recently applied a patch against the
python bindings.
2003-12-08 20:19:19 +03:00
# Set the following to `true' to make udev emit a D-BUS signal when a
# new node is created.
2003-12-17 10:41:59 +03:00
USE_DBUS = false
[PATCH] D-BUS patch for udev-008
Attached is a patch against udev-008 to send out a D-BUS message when a
device node is added or removed.
Using D-BUS lingo, udev acquires the org.kernel.udev service and sends
out a NodeCreated or NodeDeleted signal on the
org.kernel.udev.NodeMonitor interface. Each signal carries two
parameters: the node in question and the corresponding sysfs path.
[Note: the D-BUS concepts of service, interface, object can be a bit
confusing at first glance]
An example program listening for these messages looks like this
#!/usr/bin/python
import dbus
import gtk
def udev_signal_received(dbus_iface, member, service, object_path, message):
[filename, sysfs_path] = message.get_args_list()
if member=='NodeCreated':
print 'Node %s created for %s'%(filename, sysfs_path)
elif member=='NodeDeleted':
print 'Node %s deleted for %s'%(filename, sysfs_path)
def main():
bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
bus.add_signal_receiver(udev_signal_received,
'org.kernel.udev.NodeMonitor', # interface
'org.kernel.udev', # service
'/org/kernel/udev/NodeMonitor') # object
gtk.mainloop()
if __name__ == '__main__':
main()
and this is the output when hot-plugging some usb-storage.
[david@laptop udev-008]$ ~/node_monitor.py
Node /udev/sda created for /block/sda
Node /udev/sda1 created for /block/sda/sda1
Node /udev/sda1 deleted for /block/sda/sda1
Node /udev/sda deleted for /block/sda
The patch requires D-BUS 0.20 or later while the python example program
requires D-BUS from CVS as I only recently applied a patch against the
python bindings.
2003-12-08 20:19:19 +03:00
2005-04-27 07:59:47 +04:00
ROOT = udev
[PATCH] spilt udev into pieces
On Thu, Jan 22, 2004 at 01:27:45AM +0100, Kay Sievers wrote:
> On Wed, Jan 21, 2004 at 02:38:25PM +0100, Kay Sievers wrote:
> > On Thu, Jan 15, 2004 at 01:45:10PM -0800, Greg KH wrote:
> > > On Thu, Jan 15, 2004 at 10:36:25PM +0800, Ling, Xiaofeng wrote:
> > > > Hi, Greg
> > > > I wrote a simple implementation for the two pieces
> > > > of send and receive hotplug event,
> > > > use a message queue and a list for the out of order
> > > > hotplug event. It also has a timeout timer of 3 seconds.
> > > > They are now separate program. the file nseq is the test script.
> > > > Could you have a look to see wether it is feasible?
> > > > If so, I'll continue to merge with udev.
> > >
> > > Yes, very nice start. Please continue on.
> > >
> > > One minor comment, please stick with the kernel coding style when you
> > > are writing new code for udev.
> >
> > I took the code from Xiaofeng, cleaned the whitespace, renamed some bits,
> > tweaked the debugging, added the udev exec and created a patch for the current tree.
> >
> > It seems functional now, by simply executing our current udev (dirty hack).
> > It reorders the incoming events and if one is missing it delays the
> > execution of the following ones up to a maximum of 10 seconds.
> >
> > Test script is included, but you can't mix hotplug sequence numbers and
> > test script numbers, it will result in waiting for the missing numbers :)
>
> Hey, nobody want's to play with me?
> So here I'm chatting with myself :)
>
> This is the next version with signal handling for resetting the expected
> signal number. I changed the behaviour of the timeout to skip all
> missing events at once and to proceed with the next event in the queue.
>
> So it's now possible to use the test script at any time, cause it resets
> the daemon, if real hotplug event coming in later all missing nimbers will
> be skipped after a timeout of 10 seconds and the queued events are applied.
Here is the next updated updated version to apply to the lastet udev.
I've added infrastructure for getting the state of the IPC queue in the
sender and set the program to exec by the daemon. Also the magic key id
is replaced by the usual key generation by path/nr.
It looks promising, I use it on my machine and my 4in1 USB-flash-reader
connect/disconnect emits the events "randomly" but udevd is able to
reorder it and calls our normal udev in the right order.
2004-01-23 11:28:57 +03:00
DAEMON = udevd
SENDER = udevsend
2004-01-27 06:32:01 +03:00
HELPER = udevinfo
2004-02-13 07:19:21 +03:00
TESTER = udevtest
2004-02-17 05:27:46 +03:00
VERSION = 017_bk
2005-04-27 07:59:47 +04:00
INSTALL_DIR = /usr/local/bin
2003-04-10 22:25:55 +04:00
RELEASE_NAME = $( ROOT) -$( VERSION)
2004-01-01 07:35:02 +03:00
LOCAL_CFG_DIR = etc/udev
2004-02-02 19:00:07 +03:00
HOTPLUG_EXEC = $( ROOT)
2005-04-27 07:59:47 +04:00
2003-10-30 09:26:35 +03:00
DESTDIR =
2004-02-03 11:51:51 +03:00
KERNEL_DIR = /lib/modules/${ shell uname -r } /build
2003-10-16 10:50:13 +04:00
# override this to make udev look in a different location for it's config files
2003-10-17 08:18:40 +04:00
prefix =
exec_prefix = ${ prefix }
etcdir = ${ prefix } /etc
sbindir = ${ exec_prefix } /sbin
mandir = ${ prefix } /usr/share/man
hotplugdir = ${ etcdir } /hotplug.d/default
[PATCH] D-BUS patch for udev-008
Attached is a patch against udev-008 to send out a D-BUS message when a
device node is added or removed.
Using D-BUS lingo, udev acquires the org.kernel.udev service and sends
out a NodeCreated or NodeDeleted signal on the
org.kernel.udev.NodeMonitor interface. Each signal carries two
parameters: the node in question and the corresponding sysfs path.
[Note: the D-BUS concepts of service, interface, object can be a bit
confusing at first glance]
An example program listening for these messages looks like this
#!/usr/bin/python
import dbus
import gtk
def udev_signal_received(dbus_iface, member, service, object_path, message):
[filename, sysfs_path] = message.get_args_list()
if member=='NodeCreated':
print 'Node %s created for %s'%(filename, sysfs_path)
elif member=='NodeDeleted':
print 'Node %s deleted for %s'%(filename, sysfs_path)
def main():
bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
bus.add_signal_receiver(udev_signal_received,
'org.kernel.udev.NodeMonitor', # interface
'org.kernel.udev', # service
'/org/kernel/udev/NodeMonitor') # object
gtk.mainloop()
if __name__ == '__main__':
main()
and this is the output when hot-plugging some usb-storage.
[david@laptop udev-008]$ ~/node_monitor.py
Node /udev/sda created for /block/sda
Node /udev/sda1 created for /block/sda/sda1
Node /udev/sda1 deleted for /block/sda/sda1
Node /udev/sda deleted for /block/sda
The patch requires D-BUS 0.20 or later while the python example program
requires D-BUS from CVS as I only recently applied a patch against the
python bindings.
2003-12-08 20:19:19 +03:00
dbusdir = ${ etcdir } /dbus-1/system.d
2003-10-17 08:18:40 +04:00
configdir = ${ etcdir } /udev/
2003-12-16 09:22:34 +03:00
initdir = ${ etcdir } /init.d/
2003-10-17 08:18:40 +04:00
srcdir = .
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${ INSTALL }
INSTALL_DATA = ${ INSTALL } -m 644
INSTALL_SCRIPT = ${ INSTALL_PROGRAM }
2003-12-07 20:04:49 +03:00
# To build any of the extras programs, run with:
# make EXTRAS="extras/a extras/b"
EXTRAS =
2003-10-16 10:50:13 +04:00
# place to put our device nodes
2003-12-11 19:00:40 +03:00
udevdir = ${ prefix } /udev
2005-04-27 07:59:47 +04:00
# Comment out this line to build with something other
# than the local version of klibc
2003-12-17 10:41:59 +03:00
#USE_KLIBC = true
2005-04-27 07:59:47 +04:00
# If you are running a cross compiler, you may want to set this
2004-01-10 12:19:57 +03:00
# to something more interesting, like "arm-linux-". If you want
2005-04-27 07:59:47 +04:00
# to compile vs uClibc, that can be done here as well.
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
CC = $( CROSS) gcc
2003-11-25 09:10:23 +03:00
LD = $( CROSS) gcc
2005-04-27 07:59:47 +04:00
AR = $( CROSS) ar
STRIP = $( CROSS) strip
2003-08-05 12:10:01 +04:00
RANLIB = $( CROSS) ranlib
2005-04-27 07:59:47 +04:00
2003-12-07 20:04:49 +03:00
export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0
2005-04-27 07:59:47 +04:00
# code taken from uClibc to determine the current arch
ARCH := ${ shell $( CC) -dumpmachine | sed -e s '/-.*//' -e 's/i.86/i386/' -e 's/sparc.*/sparc/' \
2003-12-02 11:44:48 +03:00
-e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/powerpc/ppc/g' }
2005-04-27 07:59:47 +04:00
# code taken from uClibc to determine the gcc include dir
GCCINCDIR := ${ shell $( CC) -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp" }
# code taken from uClibc to determine the libgcc.a filename
GCC_LIB := $( shell $( CC) -print-libgcc-file-name )
# use '-Os' optimization if available, else use -O2
OPTIMIZATION := ${ shell if $( CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>&1; \
then echo "-Os" ; else echo "-O2" ; fi }
2003-10-22 11:18:49 +04:00
# add -Wredundant-decls when libsysfs gets cleaned up
2004-01-27 05:10:53 +03:00
WARNINGS := -Wall
2005-04-27 07:59:47 +04:00
# Some nice architecture specific optimizations
i f e q ( $( strip $ ( TARGET_ARCH ) ) , a r m )
OPTIMIZATION += -fstrict-aliasing
e n d i f
i f e q ( $( strip $ ( TARGET_ARCH ) ) , i 3 8 6 )
OPTIMIZATION += -march= i386
OPTIMIZATION += ${ shell if $( CC) -mpreferred-stack-boundary=2 -S -o /dev/null -xc \
/dev/null >/dev/null 2>& 1; then echo "-mpreferred-stack-boundary=2" ; fi }
OPTIMIZATION += ${ shell if $( CC) -malign-functions=0 -malign-jumps=0 -S -o /dev/null -xc \
/dev/null >/dev/null 2>& 1; then echo "-malign-functions=0 -malign-jumps=0" ; fi }
CFLAGS += -pipe
e l s e
CFLAGS += -pipe
e n d i f
2004-01-16 09:00:58 +03:00
i f e q ( $( strip $ ( USE_LOG ) ) , t r u e )
[PATCH] add udev logging to info log
On Thu, Jan 15, 2004 at 05:14:16AM +0100, Kay Sievers wrote:
> On Wed, Jan 14, 2004 at 01:10:43PM -0800, Greg KH wrote:
> > On Wed, Jan 14, 2004 at 02:34:26PM -0600, Clay Haapala wrote:
> > > On Wed, 14 Jan 2004, Chris Friesen spake thusly:
> > > >
> > > > Maybe for ones with a matching rule, you could print something like:
> > > >
> > > >
> > > Is the act of printing/syslogging a rule in an of itself?
> >
> > No, as currently the only way stuff ends up in the syslog is if
> > DEBUG=true is used on the build line.
> >
> > But it's sounding like we might want to change that... :)
>
> How about this in the syslog after connect/disconnect?
>
> Jan 15 05:07:45 pim udev[28007]: configured rule in '/etc/udev/udev.rules' at line 17 applied, 'video*' becomes 'video/webcam%n'
> Jan 15 05:07:45 pim udev[28007]: creating device node '/udev/video/webcam0'
> Jan 15 05:07:47 pim udev[28015]: removing device node '/udev/video/webcam0'
Here is a slightly better version. I've created a logging.h file and
moved the debug macros from udev.h in there.
If you type:
'make' - you will get a binary that prints one or two lines to syslog
if a device node is created or deleted
'make LOG=false' - you get a binary that prints asolutely nothing
'make DEBUG=true' - the same as today, it will print all debug lines
2004-01-16 08:53:20 +03:00
CFLAGS += -DLOG
e n d i f
2005-04-27 07:59:47 +04:00
# if DEBUG is enabled, then we do not strip or optimize
i f e q ( $( strip $ ( DEBUG ) ) , t r u e )
2004-01-27 05:10:53 +03:00
CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE
2005-04-27 07:59:47 +04:00
LDFLAGS += -Wl,-warn-common
STRIPCMD = /bin/true -Since_we_are_debugging
e l s e
2004-01-27 05:10:53 +03:00
CFLAGS += $( OPTIMIZATION) -fomit-frame-pointer -D_GNU_SOURCE
2005-04-27 07:59:47 +04:00
LDFLAGS += -s -Wl,-warn-common
STRIPCMD = $( STRIP) -s --remove-section= .note --remove-section= .comment
e n d i f
2004-01-01 06:11:04 +03:00
# If we are using our version of klibc, then we need to build, link it, and then
# link udev against it statically.
# Otherwise, use glibc and link dynamically.
2003-12-17 10:41:59 +03:00
i f e q ( $( strip $ ( USE_KLIBC ) ) , t r u e )
2003-12-07 20:04:49 +03:00
KLIBC_BASE = $( PWD) /klibc
KLIBC_DIR = $( KLIBC_BASE) /klibc
2005-04-27 07:59:47 +04:00
INCLUDE_DIR := $( KLIBC_DIR) /include
2004-02-03 11:51:51 +03:00
LINUX_INCLUDE_DIR := $( KERNEL_DIR) /include
# LINUX_INCLUDE_DIR := $(KLIBC_BASE)/linux/include
2003-11-25 09:10:23 +03:00
include $( KLIBC_DIR) /arch/$( ARCH) /MCONFIG
2005-04-27 07:59:47 +04:00
# arch specific objects
ARCH_LIB_OBJS = \
2003-12-07 20:04:49 +03:00
$( KLIBC_DIR) /libc.a
2005-04-27 07:59:47 +04:00
2003-10-25 11:21:18 +04:00
CRT0 = $( KLIBC_DIR) /crt0.o
2003-11-25 09:10:23 +03:00
LIBC = $( ARCH_LIB_OBJS) $( LIB_OBJS) $( CRT0)
2004-01-27 05:10:53 +03:00
CFLAGS += $( WARNINGS) -nostdinc \
-D__KLIBC__ -fno-builtin-printf \
-I$( INCLUDE_DIR) \
-I$( KLIBC_DIR) /arch/$( ARCH) /include \
-I$( INCLUDE_DIR) /bits$( BITSIZE) \
-I$( GCCINCDIR) \
-I$( LINUX_INCLUDE_DIR)
2003-10-25 11:21:18 +04:00
LIB_OBJS =
2003-12-02 11:59:36 +03:00
LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
2005-04-27 07:59:47 +04:00
e l s e
2004-01-27 05:10:53 +03:00
WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
2003-10-25 11:21:18 +04:00
CRT0 =
2005-04-27 07:59:47 +04:00
LIBC =
2004-01-27 05:10:53 +03:00
CFLAGS += $( WARNINGS) -I$( GCCINCDIR)
2005-04-27 07:59:47 +04:00
LIB_OBJS = -lc
2004-01-01 06:11:04 +03:00
LDFLAGS =
2005-04-27 07:59:47 +04:00
e n d i f
2003-12-07 20:04:49 +03:00
CFLAGS += -I$( PWD) /libsysfs
2004-02-13 07:19:21 +03:00
all : $( ROOT ) $( SENDER ) $( DAEMON ) $( HELPER ) $( TESTER )
2003-12-18 05:32:53 +03:00
@extras= " $( EXTRAS) " ; for target in $$ extras ; do \
2003-12-07 20:04:49 +03:00
echo $$ target ; \
2004-02-03 11:51:51 +03:00
$( MAKE) prefix = $( prefix) \
LD = " $( LD) " \
SYSFS = " $( SYSFS) " \
KERNEL_DIR = " $( KERNEL_DIR) " \
2003-12-07 20:04:49 +03:00
-C $$ target $@ ; \
done ; \
2005-04-27 07:59:47 +04:00
2003-12-02 10:50:09 +03:00
$(ARCH_LIB_OBJS) : $( CRT 0)
$(CRT0) :
2004-02-03 11:51:51 +03:00
$( MAKE) -C klibc KERNEL_DIR = $( KERNEL_DIR)
2005-04-27 07:59:47 +04:00
2003-10-23 06:40:52 +04:00
TDB = tdb/tdb.o \
tdb/spinlock.o
2003-12-07 20:04:49 +03:00
SYSFS = $( PWD) /libsysfs/sysfs_bus.o \
$( PWD) /libsysfs/sysfs_class.o \
$( PWD) /libsysfs/sysfs_device.o \
$( PWD) /libsysfs/sysfs_dir.o \
$( PWD) /libsysfs/sysfs_driver.o \
$( PWD) /libsysfs/sysfs_utils.o \
$( PWD) /libsysfs/dlist.o
2003-08-06 11:03:30 +04:00
2004-01-27 05:55:37 +03:00
OBJS = udev_config.o \
2003-07-21 07:48:48 +04:00
udev-add.o \
udev-remove.o \
2003-08-06 11:03:30 +04:00
udevdb.o \
namedev.o \
2003-12-03 05:38:30 +03:00
namedev_parse.o \
2003-10-23 06:40:52 +04:00
$( SYSFS) \
2003-08-06 11:03:30 +04:00
$( TDB)
2003-07-19 09:43:45 +04:00
2004-01-27 06:21:12 +03:00
HEADERS = udev.h \
2004-01-27 05:55:37 +03:00
namedev.h \
udev_version.h \
udev_dbus.h \
udevdb.h \
klibc_fixups.h \
logging.h \
list.h
2003-12-17 10:41:59 +03:00
i f e q ( $( strip $ ( USE_KLIBC ) ) , t r u e )
2003-11-24 07:56:52 +03:00
OBJS += klibc_fixups.o
e n d i f
2003-12-17 10:41:59 +03:00
i f e q ( $( USE_DBUS ) , t r u e )
2003-12-09 05:01:56 +03:00
CFLAGS += -DUSE_DBUS
CFLAGS += $( shell pkg-config --cflags dbus-1)
2003-12-10 12:02:03 +03:00
LDFLAGS += $( shell pkg-config --libs dbus-1)
2003-12-09 05:01:56 +03:00
OBJS += udev_dbus.o
e n d i f
2005-04-27 07:59:47 +04:00
# header files automatically generated
GEN_HEADERS = udev_version.h
# Rules on how to create the generated header files
udev_version.h :
2003-10-16 10:50:13 +04:00
@echo \# define UDEV_VERSION \" $( VERSION) \" > $@
2003-12-11 19:00:40 +03:00
@echo \# define UDEV_ROOT \" $( udevdir) /\" >> $@
@echo \# define UDEV_DB \" $( udevdir) /\. udev.tdb\" >> $@
2003-12-03 19:13:11 +03:00
@echo \# define UDEV_CONFIG_DIR \" $( configdir) \" >> $@
@echo \# define UDEV_CONFIG_FILE \" $( configdir) \u dev.conf\" >> $@
@echo \# define UDEV_RULES_FILE \" $( configdir) \u dev.rules\" >> $@
@echo \# define UDEV_PERMISSION_FILE \" $( configdir) \u dev.permissions\" >> $@
2004-02-12 06:42:51 +03:00
@echo \# define UDEV_LOG_DEFAULT \" yes\" >> $@
2004-02-02 19:00:07 +03:00
@echo \# define UDEV_BIN \" $( DESTDIR) $( sbindir) /udev\" >> $@
@echo \# define UDEVD_BIN \" $( DESTDIR) $( sbindir) /udevd\" >> $@
2005-04-27 07:59:47 +04:00
2003-12-11 19:12:29 +03:00
# config files automatically generated
2004-01-01 07:35:02 +03:00
GEN_CONFIGS = $( LOCAL_CFG_DIR) /udev.conf
2003-12-11 19:12:29 +03:00
# Rules on how to create the generated config files
2004-01-01 07:35:02 +03:00
$(LOCAL_CFG_DIR)/udev.conf :
sed -e " s:@udevdir@: $( udevdir) : " < $( LOCAL_CFG_DIR) /udev.conf.in > $@
2003-12-11 19:12:29 +03:00
2003-12-02 10:50:09 +03:00
$(OBJS) : $( GEN_HEADERS )
2004-02-13 07:19:21 +03:00
$(ROOT).o : $( GEN_HEADERS )
$(TESTER).o : $( GEN_HEADERS )
$(HELPER).o : $( GEN_HEADERS )
$(DAEMON).o : $( GEN_HEADERS )
$(SENDER).o : $( GEN_HEADERS )
2005-04-27 07:59:47 +04:00
2004-02-13 07:19:21 +03:00
$(ROOT) : $( ROOT ) .o $( OBJS ) $( HEADERS ) $( LIBC )
2004-01-27 05:55:37 +03:00
$( LD) $( LDFLAGS) -o $@ $( CRT0) udev.o $( OBJS) $( LIB_OBJS) $( ARCH_LIB_OBJS)
$( STRIPCMD) $@
2004-02-13 07:19:21 +03:00
$(TESTER) : $( TESTER ) .o $( OBJS ) $( HEADERS ) $( LIBC )
$( LD) $( LDFLAGS) -o $@ $( CRT0) udevtest.o $( OBJS) $( LIB_OBJS) $( ARCH_LIB_OBJS)
$( STRIPCMD) $@
$(HELPER) : $( HELPER ) .o $( OBJS ) $( HEADERS ) $( LIBC )
2004-02-02 19:19:41 +03:00
$( LD) $( LDFLAGS) -o $@ $( CRT0) udevinfo.o udev_config.o udevdb.o $( SYSFS) $( TDB) $( LIB_OBJS) $( ARCH_LIB_OBJS)
2004-01-27 05:55:37 +03:00
$( STRIPCMD) $@
2005-04-27 07:59:47 +04:00
2004-02-13 07:19:21 +03:00
$(DAEMON) : $( DAEMON ) .o udevd .h $( LIBC )
[PATCH] convert udevsend/udevd to DGRAM and single-threaded
On Fri, Feb 06, 2004 at 01:08:24AM -0500, Chris Friesen wrote:
>
> Kay, you said "unless we can get rid of _all_ the threads or at least
> getting faster, I don't want to change it."
>
> Well how about we get rid of all the threads, *and* we get faster?
Yes, we are twice as fast now on my box :)
> This patch applies to current bk trees, and does the following:
>
> 1) Switch to DGRAM sockets rather than STREAM. This simplifies things
> as mentioned in the previous message.
>
> 2) Invalid sequence numbers are mapped to -1 rather than zero, since
> zero is a valid sequence number (I think). Also, this allows for real
> speed tests using scripts starting at a zero sequence number, since that
> is what the initial expected sequence number is.
>
> 3) Get rid of all threading. This is the biggie. Some highlights:
> a) timeout using setitimer() and SIGALRM
> b) async child death notification via SIGCHLD
> c) these two signal handlers do nothing but raise volatile flags,
> all the
> work is done in the main loop
> d) locking no longer required
I cleaned up the rest of the comments, the whitespace and a few names to match
the whole thing. Please recheck it. Test script is switched to work on subsystem
'test' to let udev ignore it.
2004-02-07 09:21:15 +03:00
$( LD) $( LDFLAGS) -o $@ $( CRT0) udevd.o $( LIB_OBJS) $( ARCH_LIB_OBJS)
2004-01-27 05:55:37 +03:00
$( STRIPCMD) $@
[PATCH] spilt udev into pieces
On Thu, Jan 22, 2004 at 01:27:45AM +0100, Kay Sievers wrote:
> On Wed, Jan 21, 2004 at 02:38:25PM +0100, Kay Sievers wrote:
> > On Thu, Jan 15, 2004 at 01:45:10PM -0800, Greg KH wrote:
> > > On Thu, Jan 15, 2004 at 10:36:25PM +0800, Ling, Xiaofeng wrote:
> > > > Hi, Greg
> > > > I wrote a simple implementation for the two pieces
> > > > of send and receive hotplug event,
> > > > use a message queue and a list for the out of order
> > > > hotplug event. It also has a timeout timer of 3 seconds.
> > > > They are now separate program. the file nseq is the test script.
> > > > Could you have a look to see wether it is feasible?
> > > > If so, I'll continue to merge with udev.
> > >
> > > Yes, very nice start. Please continue on.
> > >
> > > One minor comment, please stick with the kernel coding style when you
> > > are writing new code for udev.
> >
> > I took the code from Xiaofeng, cleaned the whitespace, renamed some bits,
> > tweaked the debugging, added the udev exec and created a patch for the current tree.
> >
> > It seems functional now, by simply executing our current udev (dirty hack).
> > It reorders the incoming events and if one is missing it delays the
> > execution of the following ones up to a maximum of 10 seconds.
> >
> > Test script is included, but you can't mix hotplug sequence numbers and
> > test script numbers, it will result in waiting for the missing numbers :)
>
> Hey, nobody want's to play with me?
> So here I'm chatting with myself :)
>
> This is the next version with signal handling for resetting the expected
> signal number. I changed the behaviour of the timeout to skip all
> missing events at once and to proceed with the next event in the queue.
>
> So it's now possible to use the test script at any time, cause it resets
> the daemon, if real hotplug event coming in later all missing nimbers will
> be skipped after a timeout of 10 seconds and the queued events are applied.
Here is the next updated updated version to apply to the lastet udev.
I've added infrastructure for getting the state of the IPC queue in the
sender and set the program to exec by the daemon. Also the magic key id
is replaced by the usual key generation by path/nr.
It looks promising, I use it on my machine and my 4in1 USB-flash-reader
connect/disconnect emits the events "randomly" but udevd is able to
reorder it and calls our normal udev in the right order.
2004-01-23 11:28:57 +03:00
2004-02-13 07:19:21 +03:00
$(SENDER) : $( SENDER ) .o udevd .h $( LIBC )
2004-02-02 19:19:41 +03:00
$( LD) $( LDFLAGS) -o $@ $( CRT0) udevsend.o $( LIB_OBJS) $( ARCH_LIB_OBJS)
2004-01-27 05:55:37 +03:00
$( STRIPCMD) $@
[PATCH] spilt udev into pieces
On Thu, Jan 22, 2004 at 01:27:45AM +0100, Kay Sievers wrote:
> On Wed, Jan 21, 2004 at 02:38:25PM +0100, Kay Sievers wrote:
> > On Thu, Jan 15, 2004 at 01:45:10PM -0800, Greg KH wrote:
> > > On Thu, Jan 15, 2004 at 10:36:25PM +0800, Ling, Xiaofeng wrote:
> > > > Hi, Greg
> > > > I wrote a simple implementation for the two pieces
> > > > of send and receive hotplug event,
> > > > use a message queue and a list for the out of order
> > > > hotplug event. It also has a timeout timer of 3 seconds.
> > > > They are now separate program. the file nseq is the test script.
> > > > Could you have a look to see wether it is feasible?
> > > > If so, I'll continue to merge with udev.
> > >
> > > Yes, very nice start. Please continue on.
> > >
> > > One minor comment, please stick with the kernel coding style when you
> > > are writing new code for udev.
> >
> > I took the code from Xiaofeng, cleaned the whitespace, renamed some bits,
> > tweaked the debugging, added the udev exec and created a patch for the current tree.
> >
> > It seems functional now, by simply executing our current udev (dirty hack).
> > It reorders the incoming events and if one is missing it delays the
> > execution of the following ones up to a maximum of 10 seconds.
> >
> > Test script is included, but you can't mix hotplug sequence numbers and
> > test script numbers, it will result in waiting for the missing numbers :)
>
> Hey, nobody want's to play with me?
> So here I'm chatting with myself :)
>
> This is the next version with signal handling for resetting the expected
> signal number. I changed the behaviour of the timeout to skip all
> missing events at once and to proceed with the next event in the queue.
>
> So it's now possible to use the test script at any time, cause it resets
> the daemon, if real hotplug event coming in later all missing nimbers will
> be skipped after a timeout of 10 seconds and the queued events are applied.
Here is the next updated updated version to apply to the lastet udev.
I've added infrastructure for getting the state of the IPC queue in the
sender and set the program to exec by the daemon. Also the magic key id
is replaced by the usual key generation by path/nr.
It looks promising, I use it on my machine and my 4in1 USB-flash-reader
connect/disconnect emits the events "randomly" but udevd is able to
reorder it and calls our normal udev in the right order.
2004-01-23 11:28:57 +03:00
2005-04-27 07:59:47 +04:00
clean :
-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
| xargs rm -f
2004-01-27 07:04:26 +03:00
-rm -f core $( ROOT) $( GEN_HEADERS) $( GEN_CONFIGS) $( HELPER) $( DAEMON) $( SENDER)
2005-04-27 07:59:47 +04:00
$( MAKE) -C klibc clean
2003-12-18 05:32:53 +03:00
@extras= " $( EXTRAS) " ; for target in $$ extras ; do \
2003-12-07 20:04:49 +03:00
echo $$ target ; \
$( MAKE) prefix = $( prefix) LD = " $( LD) " SYSFS = " $( SYSFS) " \
-C $$ target $@ ; \
done ; \
2005-04-27 07:59:47 +04:00
2004-01-10 12:19:57 +03:00
DISTFILES = $( shell find . \( -not -name '.' \) -print | grep -v -e CVS -e " \.tar\.gz $" -e "\/\." -e releases -e BitKeeper -e SCCS -e " \.tdb $" -e test/sys | sort )
2005-04-27 07:59:47 +04:00
DISTDIR := $( RELEASE_NAME)
srcdir = .
2003-11-19 08:35:44 +03:00
release : clean
2004-02-12 10:23:17 +03:00
-rm -rf $( DISTDIR)
mkdir $( DISTDIR)
chmod 777 $( DISTDIR)
bk export $( DISTDIR)
tar -c $( DISTDIR) | gzip -9 > $( RELEASE_NAME) .tar.gz
rm -rf $( DISTDIR)
@echo " $( RELEASE_NAME) .tar.gz created "
2003-11-19 08:35:44 +03:00
small_release : $( DISTFILES ) clean
2005-04-27 07:59:47 +04:00
# @echo $(DISTFILES)
@-rm -rf $( DISTDIR)
@mkdir $( DISTDIR)
@-chmod 777 $( DISTDIR)
@for file in $( DISTFILES) ; do \
if test -d $$ file; then \
mkdir $( DISTDIR) /$$ file; \
else \
cp -p $$ file $( DISTDIR) /$$ file; \
fi ; \
done
@tar -c $( DISTDIR) | gzip -9 > $( RELEASE_NAME) .tar.gz
@rm -rf $( DISTDIR)
@echo " Built $( RELEASE_NAME) .tar.gz "
2003-10-17 08:18:40 +04:00
2003-12-17 10:41:59 +03:00
i f e q ( $( USE_DBUS ) , t r u e )
[PATCH] D-BUS patch for udev-008
Attached is a patch against udev-008 to send out a D-BUS message when a
device node is added or removed.
Using D-BUS lingo, udev acquires the org.kernel.udev service and sends
out a NodeCreated or NodeDeleted signal on the
org.kernel.udev.NodeMonitor interface. Each signal carries two
parameters: the node in question and the corresponding sysfs path.
[Note: the D-BUS concepts of service, interface, object can be a bit
confusing at first glance]
An example program listening for these messages looks like this
#!/usr/bin/python
import dbus
import gtk
def udev_signal_received(dbus_iface, member, service, object_path, message):
[filename, sysfs_path] = message.get_args_list()
if member=='NodeCreated':
print 'Node %s created for %s'%(filename, sysfs_path)
elif member=='NodeDeleted':
print 'Node %s deleted for %s'%(filename, sysfs_path)
def main():
bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
bus.add_signal_receiver(udev_signal_received,
'org.kernel.udev.NodeMonitor', # interface
'org.kernel.udev', # service
'/org/kernel/udev/NodeMonitor') # object
gtk.mainloop()
if __name__ == '__main__':
main()
and this is the output when hot-plugging some usb-storage.
[david@laptop udev-008]$ ~/node_monitor.py
Node /udev/sda created for /block/sda
Node /udev/sda1 created for /block/sda/sda1
Node /udev/sda1 deleted for /block/sda/sda1
Node /udev/sda deleted for /block/sda
The patch requires D-BUS 0.20 or later while the python example program
requires D-BUS from CVS as I only recently applied a patch against the
python bindings.
2003-12-08 20:19:19 +03:00
install-dbus-policy :
$( INSTALL) -d $( DESTDIR) $( dbusdir)
2004-01-01 07:38:14 +03:00
$( INSTALL_DATA) etc/dbus-1/system.d/udev_sysbus_policy.conf $( DESTDIR) $( dbusdir)
[PATCH] D-BUS patch for udev-008
Attached is a patch against udev-008 to send out a D-BUS message when a
device node is added or removed.
Using D-BUS lingo, udev acquires the org.kernel.udev service and sends
out a NodeCreated or NodeDeleted signal on the
org.kernel.udev.NodeMonitor interface. Each signal carries two
parameters: the node in question and the corresponding sysfs path.
[Note: the D-BUS concepts of service, interface, object can be a bit
confusing at first glance]
An example program listening for these messages looks like this
#!/usr/bin/python
import dbus
import gtk
def udev_signal_received(dbus_iface, member, service, object_path, message):
[filename, sysfs_path] = message.get_args_list()
if member=='NodeCreated':
print 'Node %s created for %s'%(filename, sysfs_path)
elif member=='NodeDeleted':
print 'Node %s deleted for %s'%(filename, sysfs_path)
def main():
bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
bus.add_signal_receiver(udev_signal_received,
'org.kernel.udev.NodeMonitor', # interface
'org.kernel.udev', # service
'/org/kernel/udev/NodeMonitor') # object
gtk.mainloop()
if __name__ == '__main__':
main()
and this is the output when hot-plugging some usb-storage.
[david@laptop udev-008]$ ~/node_monitor.py
Node /udev/sda created for /block/sda
Node /udev/sda1 created for /block/sda/sda1
Node /udev/sda1 deleted for /block/sda/sda1
Node /udev/sda deleted for /block/sda
The patch requires D-BUS 0.20 or later while the python example program
requires D-BUS from CVS as I only recently applied a patch against the
python bindings.
2003-12-08 20:19:19 +03:00
uninstall-dbus-policy :
- rm $( DESTDIR) $( dbusdir) /udev_sysbus_policy.conf
e l s e
install-dbus-policy :
-
uninstall-dbus-policy :
-
e n d i f
2003-12-20 05:29:05 +03:00
install-config : $( GEN_CONFIGS )
2003-10-30 09:26:35 +03:00
$( INSTALL) -d $( DESTDIR) $( configdir)
2003-12-20 05:29:05 +03:00
@if [ ! -r $( DESTDIR) $( configdir) udev.conf ] ; then \
2004-01-01 07:35:02 +03:00
echo $( INSTALL_DATA) $( LOCAL_CFG_DIR) /udev.conf $( DESTDIR) $( configdir) ; \
$( INSTALL_DATA) $( LOCAL_CFG_DIR) /udev.conf $( DESTDIR) $( configdir) ; \
2003-12-20 05:29:05 +03:00
fi
@if [ ! -r $( DESTDIR) $( configdir) udev.rules ] ; then \
2004-01-01 07:35:02 +03:00
echo $( INSTALL_DATA) $( LOCAL_CFG_DIR) /udev.rules $( DESTDIR) $( configdir) ; \
$( INSTALL_DATA) $( LOCAL_CFG_DIR) /udev.rules $( DESTDIR) $( configdir) ; \
2003-12-20 05:29:05 +03:00
fi
@if [ ! -r $( DESTDIR) $( configdir) udev.permissions ] ; then \
2004-01-01 07:35:02 +03:00
echo $( INSTALL_DATA) $( LOCAL_CFG_DIR) /udev.permissions $( DESTDIR) $( configdir) ; \
$( INSTALL_DATA) $( LOCAL_CFG_DIR) /udev.permissions $( DESTDIR) $( configdir) ; \
2003-12-20 05:29:05 +03:00
fi
install : install -config install -dbus -policy all
$( INSTALL) -d $( DESTDIR) $( udevdir)
2003-10-30 09:26:35 +03:00
$( INSTALL) -d $( DESTDIR) $( hotplugdir)
$( INSTALL_PROGRAM) -D $( ROOT) $( DESTDIR) $( sbindir) /$( ROOT)
2004-02-02 19:00:07 +03:00
$( INSTALL_PROGRAM) -D $( DAEMON) $( DESTDIR) $( sbindir) /$( DAEMON)
$( INSTALL_PROGRAM) -D $( SENDER) $( DESTDIR) $( sbindir) /$( SENDER)
2004-01-27 06:32:01 +03:00
$( INSTALL_PROGRAM) -D $( HELPER) $( DESTDIR) $( sbindir) /$( HELPER)
2004-02-17 05:32:20 +03:00
$( INSTALL_PROGRAM) -D $( TESTER) $( DESTDIR) $( sbindir) /$( TESTER)
2004-01-10 12:19:57 +03:00
@if [ " x $( USE_LSB) " = "xtrue" ] ; then \
2004-01-13 08:17:22 +03:00
$( INSTALL_PROGRAM) -D etc/init.d/udev.init.LSB $( DESTDIR) $( initdir) /udev; \
2004-01-28 05:54:24 +03:00
ln -s $( DESTDIR) $( initdir) /udev $( sbindir) /rcudev; \
2004-01-13 08:17:22 +03:00
else \
$( INSTALL_PROGRAM) -D etc/init.d/udev $( DESTDIR) $( initdir) /udev; \
2004-01-10 12:19:57 +03:00
fi
2003-10-30 09:26:35 +03:00
$( INSTALL_DATA) -D udev.8 $( DESTDIR) $( mandir) /man8/udev.8
2004-01-27 06:56:19 +03:00
$( INSTALL_DATA) -D udevinfo.8 $( DESTDIR) $( mandir) /man8/udevinfo.8
2004-02-18 05:17:50 +03:00
$( INSTALL_DATA) -D udevd.8 $( DESTDIR) $( mandir) /man8/udevd.8
- ln -f -s ./udevd.8 $( DESTDIR) $( mandir) /man8/udevsend.8
2004-02-03 12:29:20 +03:00
- rm -f $( DESTDIR) $( hotplugdir) /$( ROOT) .hotplug
2004-02-13 10:20:50 +03:00
- rm -f $( udevdir) /.udev.tdb
2004-02-03 12:29:20 +03:00
- ln -f -s $( sbindir) /$( SENDER) $( DESTDIR) $( hotplugdir) /$( ROOT) .hotplug
2003-12-18 05:32:53 +03:00
@extras= " $( EXTRAS) " ; for target in $$ extras ; do \
2003-12-07 20:04:49 +03:00
echo $$ target ; \
$( MAKE) prefix = $( prefix) LD = " $( LD) " SYSFS = " $( SYSFS) " \
-C $$ target $@ ; \
done ; \
2003-10-17 11:19:04 +04:00
[PATCH] D-BUS patch for udev-008
Attached is a patch against udev-008 to send out a D-BUS message when a
device node is added or removed.
Using D-BUS lingo, udev acquires the org.kernel.udev service and sends
out a NodeCreated or NodeDeleted signal on the
org.kernel.udev.NodeMonitor interface. Each signal carries two
parameters: the node in question and the corresponding sysfs path.
[Note: the D-BUS concepts of service, interface, object can be a bit
confusing at first glance]
An example program listening for these messages looks like this
#!/usr/bin/python
import dbus
import gtk
def udev_signal_received(dbus_iface, member, service, object_path, message):
[filename, sysfs_path] = message.get_args_list()
if member=='NodeCreated':
print 'Node %s created for %s'%(filename, sysfs_path)
elif member=='NodeDeleted':
print 'Node %s deleted for %s'%(filename, sysfs_path)
def main():
bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
bus.add_signal_receiver(udev_signal_received,
'org.kernel.udev.NodeMonitor', # interface
'org.kernel.udev', # service
'/org/kernel/udev/NodeMonitor') # object
gtk.mainloop()
if __name__ == '__main__':
main()
and this is the output when hot-plugging some usb-storage.
[david@laptop udev-008]$ ~/node_monitor.py
Node /udev/sda created for /block/sda
Node /udev/sda1 created for /block/sda/sda1
Node /udev/sda1 deleted for /block/sda/sda1
Node /udev/sda deleted for /block/sda
The patch requires D-BUS 0.20 or later while the python example program
requires D-BUS from CVS as I only recently applied a patch against the
python bindings.
2003-12-08 20:19:19 +03:00
uninstall : uninstall -dbus -policy
2003-10-17 11:19:04 +04:00
- rm $( hotplugdir) /udev.hotplug
2003-10-22 09:08:03 +04:00
- rm $( configdir) /udev.permissions
2003-12-03 12:08:46 +03:00
- rm $( configdir) /udev.rules
- rm $( configdir) /udev.conf
2003-12-17 10:30:15 +03:00
- rm $( initdir) /udev
2003-10-17 11:19:04 +04:00
- rm $( mandir) /man8/udev.8
2004-01-27 06:56:19 +03:00
- rm $( mandir) /man8/udevinfo.8
2003-10-17 11:19:04 +04:00
- rm $( sbindir) /$( ROOT)
2004-02-02 19:00:07 +03:00
- rm $( sbindir) /$( DAEMON)
- rm $( sbindir) /$( SENDER)
2004-01-27 06:32:01 +03:00
- rm $( sbindir) /$( HELPER)
2003-10-17 11:19:04 +04:00
- rmdir $( hotplugdir)
- rmdir $( configdir)
2004-02-13 10:20:50 +03:00
- rm $( udevdir) /.udev.tdb
2003-10-17 11:19:04 +04:00
- rmdir $( udevdir)
2003-12-18 05:32:53 +03:00
@extras= " $( EXTRAS) " ; for target in $$ extras ; do \
2003-12-07 20:04:49 +03:00
echo $$ target ; \
$( MAKE) prefix = $( prefix) LD = " $( LD) " SYSFS = " $( SYSFS) " \
-C $$ target $@ ; \
done ; \