[make-initrd] [PATCH 2/3] Replace polld by uevent queue

[Alexey Gladkov <gladkov.alexey@gmail.com>]

Since uevent has become parallel and faster, we can return the polld
functionality back to uevent as a separate queue.

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
---
 data/etc/rc.d/init.d/poll                     | 25 ++++++-----
 data/lib/uevent/each/post/.gitignore          |  0
 data/lib/uevent/each/post/system-bootable     |  4 --
 data/lib/uevent/extenders/.gitignore          |  0
 data/lib/uevent/handlers/poll/100-extenders   | 22 +++++++++
 data/lib/uevent/handlers/poll/300-boot-method | 29 ++++++++++++
 .../poll/400-rootdelay}                       |  0
 data/sbin/polld                               | 45 -------------------
 data/sbin/process-boot-method                 | 16 -------
 .../kickstart/data/etc/rc.d/init.d/kickstart  | 10 ++---
 10 files changed, 68 insertions(+), 83 deletions(-)
 create mode 100644 data/lib/uevent/each/post/.gitignore
 delete mode 100755 data/lib/uevent/each/post/system-bootable
 create mode 100644 data/lib/uevent/extenders/.gitignore
 create mode 100755 data/lib/uevent/handlers/poll/100-extenders
 create mode 100755 data/lib/uevent/handlers/poll/300-boot-method
 rename data/lib/uevent/{extenders/100-rootdelay => handlers/poll/400-rootdelay} (100%)
 delete mode 100755 data/sbin/polld
 delete mode 100755 data/sbin/process-boot-method

diff --git a/data/etc/rc.d/init.d/poll b/data/etc/rc.d/init.d/poll
index 8c5e498b..6901f830 100755
--- a/data/etc/rc.d/init.d/poll
+++ b/data/etc/rc.d/init.d/poll
@@ -14,22 +14,23 @@
 
 . /.initrd/initenv
 . /etc/init.d/template
+. uevent-sh-functions
 
-NAME=polld
-PIDFILE="/var/run/$NAME.pid"
-ARGS="--lockfile $LOCKFILE --pidfile $PIDFILE --name $NAME --displayname $NAME"
+start()
+{
+	rmdir -- "$uevent_confdb/queue/pause/poll" 2>/dev/null ||:
 
-start() {
-	start_daemon --background $ARGS "$NAME"
-	RETVAL=$?
-	return $RETVAL
+	mkdir -p -- /.initrd/uevent/queues/poll/.tmp
+	event="$(make_event poll)"
+	release_event "periodically" "$event"
+
+	return 0
 }
 
-stop() {
-	stop_daemon $ARGS "$NAME"
-	RETVAL=$?
-	[ ! -f "$PIDFILE" ] || rm -f -- "$PIDFILE"
-	return $RETVAL
+stop()
+{
+	mkdir -p -- "$uevent_confdb/queue/pause/poll"
+	return 0
 }
 
 switch "${1-}"
diff --git a/data/lib/uevent/each/post/.gitignore b/data/lib/uevent/each/post/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/data/lib/uevent/each/post/system-bootable b/data/lib/uevent/each/post/system-bootable
deleted file mode 100755
index 54a39082..00000000
--- a/data/lib/uevent/each/post/system-bootable
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash -efu
-
-[ "$1" != udev ] ||
-	process-boot-method
diff --git a/data/lib/uevent/extenders/.gitignore b/data/lib/uevent/extenders/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/data/lib/uevent/handlers/poll/100-extenders b/data/lib/uevent/handlers/poll/100-extenders
new file mode 100755
index 00000000..2968c666
--- /dev/null
+++ b/data/lib/uevent/handlers/poll/100-extenders
@@ -0,0 +1,22 @@
+#!/bin/bash -eu
+
+. /.initrd/initenv
+
+[ "${RDLOG-}" != 'console' ] &&
+	logfile=/var/log/polld.log ||
+	logfile=/dev/console
+
+exec >"$logfile" 2>&1
+
+. shell-error
+. uevent-sh-functions
+
+message_time=1
+
+export queuedir="$1"
+export QUEUE="${queuedir##*/}"
+
+for bin in "$extendir"/*; do
+	[ ! -x "$bin" ] || "$bin" ||
+		message "$QUEUE: session=$SESSION: extender failed: $bin"
+done
diff --git a/data/lib/uevent/handlers/poll/300-boot-method b/data/lib/uevent/handlers/poll/300-boot-method
new file mode 100755
index 00000000..2057024f
--- /dev/null
+++ b/data/lib/uevent/handlers/poll/300-boot-method
@@ -0,0 +1,29 @@
+#!/bin/bash -eu
+
+. /.initrd/initenv
+
+[ "${RDLOG-}" != 'console' ] &&
+	logfile=/var/log/polld.log ||
+	logfile=/dev/console
+
+exec >"$logfile" 2>&1
+
+method=
+{ read -r method < /etc/initrd/method; } >/dev/null 2>&1 ||:
+
+cd "/lib/initrd/boot/method/$method"
+
+if [ -x ./check ] && ./check; then
+	. shell-error
+	message_time=1
+
+	queuedir="$1"
+	QUEUE="${queuedir##*/}"
+
+	message "$QUEUE: session=$SESSION: $method ready. acting!"
+
+	./action
+fi
+
+# slow down the busy loop of this queue
+sleep 0.2
diff --git a/data/lib/uevent/extenders/100-rootdelay b/data/lib/uevent/handlers/poll/400-rootdelay
similarity index 100%
rename from data/lib/uevent/extenders/100-rootdelay
rename to data/lib/uevent/handlers/poll/400-rootdelay
diff --git a/data/sbin/polld b/data/sbin/polld
deleted file mode 100755
index 1f6b05b3..00000000
--- a/data/sbin/polld
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash -eu
-
-. shell-error
-. shell-signal
-
-. /.initrd/initenv
-. uevent-sh-functions
-
-message_time=1
-pidfile="/var/run/$PROG.pid"
-logfile="/var/log/$PROG.log"
-
-exit_handler()
-{
-	local rc="$?"
-	trap - EXIT
-	rm -f -- "$pidfile"
-	exit $rc
-}
-
-[ "${RDLOG-}" != 'console' ] ||
-	logfile=/dev/console
-
-[ ! -f "$pidfile" ] ||
-	fatal "already running"
-
-set_cleanup_handler exit_handler
-echo "$$" >"$pidfile"
-
-exec >"$logfile" 2>&1
-message "starting server ..."
-
-while [ -f "$pidfile" ]; do
-	for fn in "$extendir"/*; do
-		[ -x "$fn" ] || continue
-		name="${fn##*/}"
-		name="${name#[0-9][0-9][0-9]-}"
-
-		"$fn" ||
-			message "extender failed: $fn"
-	done
-
-	process-boot-method ||:
-	sleep 1
-done
diff --git a/data/sbin/process-boot-method b/data/sbin/process-boot-method
deleted file mode 100755
index e9d3ecf2..00000000
--- a/data/sbin/process-boot-method
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash -efu
-
-. shell-error
-message_time=1
-
-method=
-{ read -r method < /etc/initrd/method; } >/dev/null 2>&1 ||:
-
-d="/lib/initrd/boot/method/$method"
-c="$d/check"
-
-[ -x "$c" ] && "$c" ||
-	exit 0
-
-message "$method ready. acting!"
-"$d/action"
diff --git a/features/kickstart/data/etc/rc.d/init.d/kickstart b/features/kickstart/data/etc/rc.d/init.d/kickstart
index 8d6e09f0..e36b9470 100755
--- a/features/kickstart/data/etc/rc.d/init.d/kickstart
+++ b/features/kickstart/data/etc/rc.d/init.d/kickstart
@@ -22,15 +22,13 @@
 	KSFILE="/etc/ks.conf.d/$KSFILE"
 
 if [ -s "$KSFILE" ]; then
-	cp -f /etc/initrd/method /etc/initrd/method.prev
-	echo none > /etc/initrd/method
+	. uevent-sh-functions
 
-	kickstart -v "$KSFILE"
+	mkdir -p -- "$uevent_confdb/queue/pause/poll"
 
-	. uevent-sh-functions
+	kickstart -v "$KSFILE"
 
+	rmdir -- "$uevent_confdb/queue/pause/poll"
 	rmdir -- "$uevent_confdb/queue/pause/udev"
 	rmdir -- "$uevent_confdb/queue/pause/md-raid-member"
-
-	cp -f /etc/initrd/method.prev /etc/initrd/method
 fi
-- 
2.33.7