Linux-Bluetooth Archive on lore.kernel.org
 help / color / Atom feed
From: Marcel Holtmann <marcel@holtmann.org>
To: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: linux-bluetooth@vger.kernel.org
Subject: Re: [PATCH BlueZ 1/6] share/mainloop: Add handling of NOTIFY_SOCKET
Date: Mon, 26 Nov 2018 18:54:55 +0100
Message-ID: <27978B59-0DF8-42D9-90F6-086FF3FFA386@holtmann.org> (raw)
In-Reply-To: <20181126162438.27872-1-luiz.dentz@gmail.com>

Hi Luiz,

> This adds handling of systemd NOTIFY_SOCKET so application using
> mainloop instance do properly notify systemd what is their state.
> ---
> Makefile.am                  |   8 ++-
> src/shared/mainloop-glib.c   |   8 +++
> src/shared/mainloop-notify.c | 104 +++++++++++++++++++++++++++++++++++
> src/shared/mainloop-notify.h |  25 +++++++++
> src/shared/mainloop.c        |  12 ++++
> src/shared/mainloop.h        |   1 +
> 6 files changed, 156 insertions(+), 2 deletions(-)
> create mode 100644 src/shared/mainloop-notify.c
> create mode 100644 src/shared/mainloop-notify.h
> 
> diff --git a/Makefile.am b/Makefile.am
> index 0b26ccc3e..124c32482 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -130,12 +130,16 @@ endif
> src_libshared_glib_la_SOURCES = $(shared_sources) \
> 				src/shared/io-glib.c \
> 				src/shared/timeout-glib.c \
> -				src/shared/mainloop-glib.c
> +				src/shared/mainloop-glib.c \
> +				src/shared/mainloop-notify.h \
> +				src/shared/mainloop-notify.c
> 
> src_libshared_mainloop_la_SOURCES = $(shared_sources) \
> 				src/shared/io-mainloop.c \
> 				src/shared/timeout-mainloop.c \
> -				src/shared/mainloop.h src/shared/mainloop.c
> +				src/shared/mainloop.h src/shared/mainloop.c \
> +				src/shared/mainloop-notify.h \
> +				src/shared/mainloop-notify.c
> 
> if ELL
> src_libshared_ell_la_SOURCES = $(shared_sources) \
> diff --git a/src/shared/mainloop-glib.c b/src/shared/mainloop-glib.c
> index 8436969bb..9d588e8c5 100644
> --- a/src/shared/mainloop-glib.c
> +++ b/src/shared/mainloop-glib.c
> @@ -36,6 +36,7 @@
> #include <glib.h>
> 
> #include "mainloop.h"
> +#include "mainloop-notify.h"
> 
> static GMainLoop *main_loop;
> static int exit_status;
> @@ -43,6 +44,7 @@ static int exit_status;
> void mainloop_init(void)
> {
> 	main_loop = g_main_loop_new(NULL, FALSE);
> +	mainloop_notify_init();
> }
> 
> void mainloop_quit(void)
> @@ -70,11 +72,17 @@ int mainloop_run(void)
> 	if (!main_loop)
> 		return -EINVAL;
> 
> +	mainloop_notify("READY=1");
> +
> 	g_main_loop_run(main_loop);
> 
> +	mainloop_notify("STOPPING=1");
> +

I actually think this is too simple. Frankly what we want is some generic code that runs the mainloops and handles the terminations signals and also brings you onto D-Bus. And only then signal READY=1.

If you look at iwd and wired/dbus.c then I have started something in that direction with dbus_app_run. That needs to be a bit more unified and turned into l_dbus_run or some similar name.

My thinking really is that the main() function should be just deal with argument parsing and then getting you on the system or session bus. It should not be bothered with all the signal setup or the duplicated code for handling the asynchronous shutdown. And if you have that, then you do a nice integration with NOTIFY_SOCKET.

Regards

Marcel


  parent reply index

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-26 16:24 Luiz Augusto von Dentz
2018-11-26 16:24 ` [PATCH BlueZ 2/6] share/mainloop: Add watchdog support Luiz Augusto von Dentz
2018-11-26 16:24 ` [PATCH BlueZ 3/6] tool/btmon-logger: Use mainloop_notify instead of sd_notify Luiz Augusto von Dentz
2018-11-26 16:24 ` [PATCH BlueZ 4/6] core: " Luiz Augusto von Dentz
2018-11-26 16:24 ` [PATCH BlueZ 5/6] core: Remove old code related to sd_notify Luiz Augusto von Dentz
2018-11-26 16:24 ` [PATCH BlueZ 6/6] shared/timeout-glib: Check 0 id when removing timeout Luiz Augusto von Dentz
2018-11-26 17:54 ` Marcel Holtmann [this message]
2018-11-27  9:51   ` [PATCH BlueZ 1/6] share/mainloop: Add handling of NOTIFY_SOCKET Luiz Augusto von Dentz
2018-11-27 13:30     ` Marcel Holtmann
2018-11-27 15:19       ` Luiz Augusto von Dentz

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=27978B59-0DF8-42D9-90F6-086FF3FFA386@holtmann.org \
    --to=marcel@holtmann.org \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=luiz.dentz@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Bluetooth Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-bluetooth/0 linux-bluetooth/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-bluetooth linux-bluetooth/ https://lore.kernel.org/linux-bluetooth \
		linux-bluetooth@vger.kernel.org linux-bluetooth@archiver.kernel.org
	public-inbox-index linux-bluetooth


Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-bluetooth


AGPL code for this site: git clone https://public-inbox.org/ public-inbox