[SSI] openssi/udev Makefile, NONE, 1.1.7.1.4.2 udevd.c, 1.1.15.1, 1.1.15.2 udevd.h, 1.1.15.1, 1.1.15.2
Roger Tsang <[email protected]> Mon, 12 Jul 2010 05:41:00 +0000
| Newsgroups | gmane.linux.cluster.ssic.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ssic-linux/openssi/udev
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv14066
Modified Files:
Tag: CENTOS
udevd.c udevd.h
Added Files:
Tag: CENTOS
Makefile
Log Message:
Import from udev-039-10.29.el4.src.rpm for CentOS 4.
--- NEW FILE: Makefile ---
# Makefile for udev
#
# Copyright (C) 2003,2004 Greg Kroah-Hartman <[email protected]>
#
# 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
#
# Set the following to control the use of syslog
# Set it to `false' to remove all logging
USE_LOG = true
# Set the following to `true' to log the debug
# and make a unstripped, unoptimized binary.
# Leave this set to `false' for production use.
DEBUG = false
# Set this to compile with Security-Enhanced Linux support.
USE_SELINUX = false
ROOT = udev
DAEMON = udevd
SENDER = udevsend
INFO = udevinfo
TESTER = udevtest
STARTER = udevstart
SETTLE = udevsettle
WAIT = wait_for_sysfs
VERSION = 039
INSTALL_DIR = /usr/local/bin
RELEASE_NAME = $(ROOT)-$(VERSION)
LOCAL_CFG_DIR = etc/udev
HOTPLUG_EXEC = $(ROOT)
DESTDIR =
KERNEL_DIR = /lib/modules/${shell uname -r}/build
# override this to make udev look in a different location for it's config files
prefix =
exec_prefix = ${prefix}
etcdir = ${prefix}/etc
sbindir = ${exec_prefix}/sbin
usrbindir = ${exec_prefix}/usr/bin
mandir = ${prefix}/usr/share/man
hotplugdir = ${etcdir}/hotplug.d/default
configdir = ${etcdir}/udev
initdir = ${etcdir}/init.d
dev_ddir = ${etcdir}/dev.d
srcdir = .
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_SCRIPT = ${INSTALL_PROGRAM}
# To build any of the extras programs, run with:
# make EXTRAS="extras/a extras/b"
EXTRAS=
# place to put our device nodes
udevdir = ${prefix}/udev
# Comment out this line to build with something other
# than the local version of klibc
#USE_KLIBC = true
# make the build silent (well, at least the udev part) Set this
# to something else to make it noisy again.
V=false
# set up PWD so that older versions of make will work with our build.
PWD = $(shell pwd)
# If you are running a cross compiler, you may want to set this
# to something more interesting, like "arm-linux-". If you want
# to compile vs uClibc, that can be done here as well.
CROSS = #/usr/i386-linux-uclibc/usr/bin/i386-uclibc-
CC = $(CROSS)gcc
LD = $(CROSS)gcc
AR = $(CROSS)ar
STRIP = $(CROSS)strip
RANLIB = $(CROSS)ranlib
HOSTCC = gcc
export CROSS CC AR STRIP RANLIB CFLAGS LDFLAGS LIB_OBJS ARCH_LIB_OBJS CRT0
# 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/' \
-e 's/arm.*/arm/g' -e 's/m68k.*/m68k/' -e 's/powerpc/ppc/g'}
# code taken from uClibc to determine the gcc include dir
GCCINCDIR := ${shell LC_ALL=C $(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}
# add -Wredundant-decls when libsysfs gets cleaned up
WARNINGS := -Wall
CFLAGS := -pipe
# set up the proper tdb spinlock code if we can
ifeq ($(strip $(ARCH)),i386)
CFLAGS += -DUSE_SPINLOCKS -DINTEL_SPINLOCKS
endif
ifeq ($(strip $(USE_LOG)),true)
CFLAGS += -DLOG
endif
# if DEBUG is enabled, then we do not strip or optimize
ifeq ($(strip $(DEBUG)),true)
CFLAGS += -O1 -g -DDEBUG -D_GNU_SOURCE
LDFLAGS += -Wl,-warn-common
STRIPCMD = /bin/true -Since_we_are_debugging
else
CFLAGS += $(OPTIMIZATION) -g -fomit-frame-pointer -D_GNU_SOURCE
LDFLAGS += -Wl,-warn-common
STRIPCMD = /bin/true -Since_we_are_debugging
endif
# 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.
ifeq ($(strip $(USE_KLIBC)),true)
KLIBC_BASE = $(PWD)/klibc
KLIBC_DIR = $(KLIBC_BASE)/klibc
INCLUDE_DIR := $(KLIBC_BASE)/include
LINUX_INCLUDE_DIR := $(KERNEL_DIR)/include
include $(KLIBC_DIR)/arch/$(ARCH)/MCONFIG
# arch specific objects
ARCH_LIB_OBJS = \
$(KLIBC_DIR)/libc.a
CRT0 = $(KLIBC_DIR)/crt0.o
LIBC = $(ARCH_LIB_OBJS) $(LIB_OBJS) $(CRT0)
CFLAGS += $(WARNINGS) -nostdinc \
$(OPTFLAGS) \
-D__KLIBC__ -fno-builtin-printf \
-I$(INCLUDE_DIR) \
-I$(INCLUDE_DIR)/arch/$(ARCH) \
-I$(INCLUDE_DIR)/bits$(BITSIZE) \
-I$(GCCINCDIR) \
-I$(LINUX_INCLUDE_DIR)
LIB_OBJS =
LDFLAGS = --static --nostdlib -nostartfiles -nodefaultlibs
else
WARNINGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
CRT0 =
LIBC =
CFLAGS += $(WARNINGS) -I$(GCCINCDIR)
LIB_OBJS = -lc
LDFLAGS =
endif
ifeq ($(strip $(USE_SELINUX)),true)
CFLAGS += -DUSE_SELINUX
LIB_OBJS += -lselinux
endif
CFLAGS += -I$(PWD)/libsysfs
# config files automatically generated
GEN_CONFIGS = $(LOCAL_CFG_DIR)/udev.conf
.PHONY: extras
all: $(ROOT) $(SENDER) $(SETTLE) $(DAEMON) $(INFO) $(TESTER) $(WAIT) $(GEN_CONFIGS) extras
extras:
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) \
LD="$(LD)" \
SYSFS="$(SYSFS)" \
KERNEL_DIR="$(KERNEL_DIR)" \
QUIET="@$(PWD)/ccdv" \
-C $$target all ; \
done ; \
$(ARCH_LIB_OBJS) : $(CRT0)
$(CRT0):
@if [ ! -r klibc/linux ]; then \
ln -f -s $(KERNEL_DIR) klibc/linux; \
fi
$(MAKE) -C klibc SUBDIRS=klibc
TDB = tdb/tdb.o \
tdb/spinlock.o
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
OBJS = udev_lib.o \
udev_config.o \
udev_add.o \
udev_remove.o \
udevdb.o \
namedev.o \
namedev_parse.o \
dev_d.o \
$(SYSFS) \
$(TDB)
HEADERS = udev.h \
udev_lib.h \
namedev.h \
udev_version.h \
udevdb.h \
klibc_fixups.h \
logging.h \
selinux.h \
list.h
ifeq ($(strip $(USE_KLIBC)),true)
OBJS += klibc_fixups.o
KLIBC_FIXUP = klibc_fixups.o
endif
ifeq ($(strip $(V)),false)
QUIET=@./ccdv
HOST_PROGS=ccdv
else
QUIET=
HOST_PROGS=
endif
# header files automatically generated
GEN_HEADERS = udev_version.h
ccdv:
@echo "Building ccdv"
@$(HOSTCC) -O1 ccdv.c -o ccdv
# Rules on how to create the generated header files
udev_version.h:
@echo "Creating udev_version.h"
@echo \#define UDEV_VERSION \"$(VERSION)\" > $@
@echo \#define UDEV_ROOT \"$(udevdir)/\" >> $@
@echo \#define UDEV_DB \"$(udevdir)/.udev.tdb\" >> $@
@echo \#define UDEV_SETTLE_FILE \"$(udevdir)/.udevsettle\" >> $@
@echo \#define UDEV_CONFIG_DIR \"$(configdir)\" >> $@
@echo \#define UDEV_CONFIG_FILE \"$(configdir)/udev.conf\" >> $@
@echo \#define UDEV_RULES_FILE \"$(configdir)/rules.d\" >> $@
@echo \#define UDEV_PERMISSION_FILE \"$(configdir)/permissions.d\" >> $@
@echo \#define UDEV_LOG_DEFAULT \"yes\" >> $@
@echo \#define UDEV_BIN \"$(DESTDIR)$(sbindir)/udev\" >> $@
@echo \#define UDEVD_BIN \"$(DESTDIR)$(sbindir)/udevd\" >> $@
# Rules on how to create the generated config files
$(LOCAL_CFG_DIR)/udev.conf:
sed -e "s:@udevdir@:$(udevdir):" -e "s:@configdir@:$(configdir):" < $(LOCAL_CFG_DIR)/udev.conf.in > $@
GEN_MANPAGES = udev.8
GEN_MANPAGESIN = udev.8.in
# Rules on how to create the man pages
$(GEN_MANPAGES): $(GEN_MANPAGESIN)
sed -e "s:@udevdir@:$(udevdir):" < [email protected] > $@
$(OBJS): $(GEN_HEADERS) $(HOST_PROGS)
$(ROOT).o: $(GEN_HEADERS) $(HOST_PROGS)
$(TESTER).o: $(GEN_HEADERS) $(HOST_PROGS)
$(INFO).o: $(GEN_HEADERS) $(HOST_PROGS)
$(DAEMON).o: $(GEN_HEADERS) $(HOST_PROGS)
$(SENDER).o: $(GEN_HEADERS) $(HOST_PROGS)
$(STARTER).o: $(GEN_HEADERS) $(HOST_PROGS)
$(SETTLE).o: $(GEN_HEADERS) $(HOST_PROGS)
$(WAIT).o: $(GEN_HEADERS) $(HOST_PROGS)
$(ROOT): $(LIBC) $(ROOT).o $(STARTER).o $(OBJS) $(HEADERS) $(GEN_MANPAGES)
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udev.o udevstart.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(TESTER): $(LIBC) $(TESTER).o $(OBJS) $(HEADERS)
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevtest.o $(OBJS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(SETTLE): $(LIBC) $(SETTLE).o $(HEADERS)
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(SETTLE).o $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(INFO): $(LIBC) $(INFO).o $(OBJS) $(HEADERS)
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevinfo.o udev_lib.o udev_config.o udevdb.o $(SYSFS) $(TDB) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(DAEMON): $(LIBC) $(DAEMON).o $(OBJS) udevd.h
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o udev_lib.o $(KLIBC_FIXUP) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(SENDER): $(LIBC) $(SENDER).o $(OBJS) udevd.h
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) udevsend.o udev_lib.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
$(WAIT): $(WAIT).o $(OBJS) $(HEADERS) $(LIBC)
$(QUIET) $(LD) $(LDFLAGS) -o $@ $(CRT0) $(WAIT).o $(SYSFS) $(LIB_OBJS) $(ARCH_LIB_OBJS)
$(QUIET) $(STRIPCMD) $@
#.c.o:
# $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) -c -o $@ $<
.c.o:
$(QUIET) $(CC) $(CFLAGS) -c -o $@ $<
clean:
-find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
| xargs rm -f
-rm -f core $(ROOT) $(GEN_HEADERS) $(GEN_CONFIGS) $(GEN_MANPAGES) $(INFO) $(DAEMON) $(SENDER) $(TESTER) $(WAIT)
-rm -f ccdv
$(MAKE) -C klibc clean
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-C $$target $@ ; \
done ; \
spotless: clean
$(MAKE) -C klibc spotless
-rm -f klibc/linux
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 )
DISTDIR := $(RELEASE_NAME)
srcdir = .
release: clean
-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"
small_release: $(DISTFILES) clean
# @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"
install-initscript: etc/init.d/udev etc/init.d/udev.init.LSB
@if [ -f /etc/redhat-release ]; then \
$(INSTALL_DATA) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
elif [ -f /etc/SuSE-release ]; then \
$(INSTALL_DATA) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
fi
install-config:
$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
$(INSTALL) -d $(DESTDIR)$(configdir)/permissions.d
@if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
fi
@if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
fi
@if [ ! -r $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions ]; then \
echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions; \
$(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.permissions $(DESTDIR)$(configdir)/permissions.d/50-udev.permissions; \
fi
install-dev.d:
$(INSTALL) -d $(DESTDIR)$(dev_ddir)/default
$(INSTALL_PROGRAM) -D etc/dev.d/net/hotplug.dev $(DESTDIR)$(dev_ddir)/net/hotplug.dev
uninstall-dev.d:
- rm $(dev_ddir)/net/hotplug.dev
- rmdir $(dev_ddir)/net
- rmdir $(dev_ddir)/default
- rmdir $(dev_ddir)
install-man:
$(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
$(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
$(INSTALL_DATA) -D udevtest.8 $(DESTDIR)$(mandir)/man8/udevtest.8
$(INSTALL_DATA) -D udevstart.8 $(DESTDIR)$(mandir)/man8/udevstart.8
$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8
- ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevsend.8
uninstall-man:
- rm $(mandir)/man8/udev.8
- rm $(mandir)/man8/udevinfo.8
- rm $(mandir)/man8/udevtest.8
- rm $(mandir)/man8/udevstart.8
- rm $(mandir)/man8/udevd.8
- rm $(mandir)/man8/udevsend.8
install: install-initscript install-config install-man install-dev.d all
$(INSTALL) -d $(DESTDIR)$(udevdir)
$(INSTALL) -d $(DESTDIR)$(hotplugdir)
$(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
$(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
$(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
$(INSTALL_PROGRAM) -D $(SETTLE) $(DESTDIR)$(sbindir)/$(SETTLE)
$(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
$(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
$(INSTALL_PROGRAM) -D $(WAIT) $(DESTDIR)$(sbindir)/$(WAIT)
- ln -f -s $(sbindir)/udev $(DESTDIR)$(sbindir)/$(STARTER)
- ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
- ln -f -s $(sbindir)/$(WAIT) $(DESTDIR)$(hotplugdir)/05-wait_for_sysfs.hotplug
ifndef DESTDIR
- killall udevd
- rm -f $(udevdir)/.udev.tdb
endif
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-C $$target install ; \
done ; \
uninstall: uninstall-man uninstall-dev.d
- rm $(hotplugdir)/10-udev.hotplug
- rm $(hotplugdir)/05-wait_for_sysfs.hotplug
- rm $(configdir)/rules.d/50-udev.rules
- rm $(configdir)/permissions.d/50-udev.permissions
- rm $(configdir)/udev.conf
- rmdir $(configdir)/rules.d
- rmdir $(configdir)/permissions.d
- rmdir $(configdir)
- rm $(initdir)/udev
- rm $(sbindir)/$(ROOT)
- rm $(sbindir)/$(DAEMON)
- rm $(sbindir)/$(SENDER)
- rm $(sbindir)/$(STARTER)
- rm $(usrbindir)/$(INFO)
- rm $(usrbindir)/$(TESTER)
- rm $(usrbindir)/$(WAIT)
- rmdir $(hotplugdir)
- rm $(udevdir)/.udev.tdb
- rmdir $(udevdir)
@extras="$(EXTRAS)" ; for target in $$extras ; do \
echo $$target ; \
$(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
-C $$target $@ ; \
done ; \
Index: udevd.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/udev/udevd.h,v
retrieving revision 1.1.15.1
retrieving revision 1.1.15.2
diff -u -d -r1.1.15.1 -r1.1.15.2
--- udevd.h 4 Jul 2010 20:33:24 -0000 1.1.15.1
+++ udevd.h 12 Jul 2010 05:40:57 -0000 1.1.15.2
@@ -29,6 +29,11 @@
#define UDEVSEND_CONNECT_RETRY 20 /* x 100 millisec */
#define UDEVD_SOCK_PATH "udevd"
+/* maximum limit of forked childs */
+#define UDEVD_MAX_CHILDS 256
+/* start to throttle forking if maximum number of running childs in our session is reached */
+#define UDEVD_MAX_CHILDS_RUNNING 16
+
struct hotplug_msg {
char magic[20];
struct list_head list;
Index: udevd.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/udev/udevd.c,v
retrieving revision 1.1.15.1
retrieving revision 1.1.15.2
diff -u -d -r1.1.15.1 -r1.1.15.2
--- udevd.c 4 Jul 2010 20:33:24 -0000 1.1.15.1
+++ udevd.c 12 Jul 2010 05:40:57 -0000 1.1.15.2
@@ -36,6 +36,8 @@
#include "klibc_fixups.h"
#include <sys/sysinfo.h>
#include <sys/stat.h>
+#include <ctype.h>
+#include <dirent.h>
#include "list.h"
#include "udev.h"
@@ -50,6 +52,10 @@
static volatile int run_msg_q;
static volatile int sig_flag;
static int run_exec_q;
+static int max_childs = 0;
+static int max_childs_running = 0;
+static int childs_running = 0;
+static pid_t sid;
static LIST_HEAD(msg_list);
static LIST_HEAD(exec_list);
@@ -100,6 +106,8 @@
static void run_queue_delete(struct hotplug_msg *msg)
{
list_del(&msg->list);
+ if (childs_running > 0)
+ childs_running--;
free(msg);
}
@@ -129,6 +137,138 @@
return ;
}
+
+static int mem_size_mb(void)
+{
+ FILE* f;
+ char buf[4096];
+ long int memsize = -1;
+
+ f = fopen("/proc/meminfo", "r");
+ if (f == NULL)
+ return -1;
+
+ while (fgets(buf, sizeof(buf), f) != NULL) {
+ long int value;
+
+ if (sscanf(buf, "MemTotal: %ld kB", &value) == 1) {
+ memsize = value / 1024;
+ break;
+ }
+ }
+
+ fclose(f);
+ return memsize;
+}
+
+static int cpu_count(void)
+{
+ FILE* f;
+ char buf[4096];
+ int count = 0;
+
+ f = fopen("/proc/stat", "r");
+ if (f == NULL)
+ return -1;
+
+ while (fgets(buf, sizeof(buf), f) != NULL) {
+ if (strncmp(buf, "cpu", 3) == 0 && isdigit(buf[3]))
+ count++;
+ }
+
+ fclose(f);
+ if (count == 0)
+ return -1;
+ return count;
+}
+
+static int running_processes(void)
+{
+ FILE* f;
+ char buf[4096];
+ int running = -1;
+
+ f = fopen("/proc/stat", "r");
+ if (f == NULL)
+ return -1;
+
+ while (fgets(buf, sizeof(buf), f) != NULL) {
+ int value;
+
+ if (sscanf(buf, "procs_running %u", &value) == 1) {
+ running = value;
+ break;
+ }
+ }
+
+ fclose(f);
+ return running;
+}
+
+/* return the number of process es in our session, count only until limit */
+static int running_processes_in_session(pid_t session, int limit)
+{
+ DIR *dir;
+ struct dirent *dent;
+ int running = 0;
+
+ dir = opendir("/proc");
+ if (!dir)
+ return -1;
+
+ /* read process info from /proc */
+ for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
+ int f;
+ char procdir[64];
+ char line[256];
+ const char *pos;
+ char state;
+ pid_t ppid, pgrp, sess;
+ int len;
+
+ if (!isdigit(dent->d_name[0]))
+ continue;
+
+ snprintf(procdir, sizeof(procdir), "/proc/%s/stat", dent->d_name);
+ procdir[sizeof(procdir)-1] = '\0';
+
+ f = open(procdir, O_RDONLY);
+ if (f == -1)
+ continue;
+
+ len = read(f, line, sizeof(line)-1);
+ close(f);
+
+ if (len <= 0)
+ continue;
+ else
+ line[len] = '\0';
+
+ /* skip ugly program name */
+ pos = strrchr(line, ')') + 2;
+ if (pos == NULL)
+ continue;
+
+ if (sscanf(pos, "%c %d %d %d ", &state, &ppid, &pgrp, &sess) != 4)
+ continue;
+
+ /* count only processes in our session */
+ if (sess != session)
+ continue;
+
+ /* count only running, no sleeping processes */
+ if (state != 'R')
+ continue;
+
+ running++;
+ if (limit > 0 && running >= limit)
+ break;
+ }
+ closedir(dir);
+
+ return running;
+}
+
/* forks event and removes event from run queue when finished */
static void udev_run(struct hotplug_msg *msg)
{
@@ -180,16 +320,41 @@
static void exec_queue_manager()
{
struct hotplug_msg *loop_msg;
+ struct hotplug_msg *nloop_msg;
struct hotplug_msg *tmp_msg;
struct hotplug_msg *msg;
+ int running;
+
+ running = running_processes();
+
+ dbg("%d processes runnning on system", running);
+ if (running < 0)
+ running = max_childs_running;
list_for_each_entry_safe(loop_msg, tmp_msg, &exec_list, list) {
+ dbg("%d processes runnning on system", running);
msg = running_with_devpath(loop_msg);
if (!msg) {
+ if (running >= max_childs_running) {
+ running = running_processes_in_session(sid, max_childs_running+10);
+ dbg("at least %d processes running in session", running);
+ if (running >= max_childs_running) {
+ dbg("delay seq %llu, too many processes already running", loop_msg->seqnum);
+ return;
+ }
+ }
+
+ if (max_childs && (childs_running >= max_childs)) {
+ dbg("%llu, maximum number (%i) of childs reached", loop_msg->seqnum, childs_count);
+ return;
+ }
+
/* move event to run list */
list_move_tail(&loop_msg->list, &running_list);
udev_run(loop_msg);
dbg("moved seq %llu to running list", loop_msg->seqnum);
+ running++;
+ childs_running++;
} else {
dbg("delay seq %llu, cause seq %llu already working on '%s'",
loop_msg->seqnum, msg->seqnum, msg->devpath);
@@ -402,6 +567,8 @@
const int on = 1;
struct sigaction act;
fd_set readfds;
+ int settle = 0;
+ const char *value;
logging_init("udevd");
dbg("version %s", UDEV_VERSION);
@@ -413,6 +580,11 @@
/* make sure we are at top of dir */
chdir("/");
umask( umask( 077 ) | 022 );
+
+ /* become session leader */
+ sid = setsid();
+ dbg("our session is %d", sid);
+
/* Set fds to dev/null */
fd = open( "/dev/null", O_RDWR );
if ( fd < 0 ) {
@@ -502,6 +674,33 @@
else
udev_bin = UDEV_BIN;
+ /* maximum limit of forked childs */
+ value = getenv("UDEVD_MAX_CHILDS");
+ if (value)
+ max_childs = strtoul(value, NULL, 10);
+ else {
+ int memsize = mem_size_mb();
+ if (memsize > 0)
+ max_childs = 16 + (memsize / 32);
+ else
+ max_childs = UDEVD_MAX_CHILDS;
+ }
+ info("initialize max_childs to %u", max_childs);
+
+ /* start to throttle forking if maximum number of _running_ childs is reached */
+ value = getenv("UDEVD_MAX_CHILDS_RUNNING");
+ if (value)
+ max_childs_running = strtoull(value, NULL, 10);
+ else {
+ int cpus = cpu_count();
+ if (cpus > 0)
+ max_childs_running = 8 + (8 * cpus);
+ else
+ max_childs_running = UDEVD_MAX_CHILDS_RUNNING;
+ }
+ info("initialize max_childs_running to %u", max_childs_running);
+
+
FD_ZERO(&readfds);
FD_SET(ssock, &readfds);
FD_SET(pipefds[0], &readfds);
@@ -546,6 +745,21 @@
run_exec_q = 0;
exec_queue_manager();
}
+
+ if (! FD_ISSET(ssock, &workreadfds)) {
+ if (list_empty(&running_list) && list_empty(&msg_list) && list_empty(&exec_list)) {
+ info("udev done!");
+ if(settle)
+ unlink(UDEV_SETTLE_FILE);
+ settle = 0;
+ } else if (settle == 0) {
+ int sfd;
+ sfd = creat(UDEV_SETTLE_FILE, 0600);
+ if (sfd >= 0)
+ close(sfd);
+ settle = 1;
+ }
+ }
}
exit:
close(ssock);
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first