mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-05 01:48:00 +02:00
* dbus/dbus-sysdeps.h:
* dbus/dbus-sysdeps.c: * dbus/dbus-string.c: s/_dbus_printf_length/_dbus_printf_string_upper_bound to comform with GLib's function which does the same thing * configure.in: * bus/Makefile.am: * bus/dir-watch-default.c: * bus/dir-watch-dnotify.c: * bus/dir-watch-kqueue.c: Add kqueue directory watching for freebsd and split the directory watching code into seperate files per method/arch (patches from Timothy Redaelli <drizzt at gufi dotorg>)
This commit is contained in:
John (J5) Palmieri
parent
aaa432b064
commit
d387411488
9 changed files with 277 additions and 27 deletions
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
2006-08-08 John (J5) Palmieri <johnp@redhat.com>
|
||||
|
||||
* dbus/dbus-sysdeps.h:
|
||||
* dbus/dbus-sysdeps.c:
|
||||
* dbus/dbus-string.c:
|
||||
s/_dbus_printf_length/_dbus_printf_string_upper_bound to comform with
|
||||
GLib's function which does the same thing
|
||||
|
||||
* configure.in:
|
||||
* bus/Makefile.am:
|
||||
* bus/dir-watch-default.c:
|
||||
* bus/dir-watch-dnotify.c:
|
||||
* bus/dir-watch-kqueue.c:
|
||||
Add kqueue directory watching for freebsd and split the directory
|
||||
watching code into seperate files per method/arch
|
||||
(patches from Timothy Redaelli <drizzt at gufi dotorg>)
|
||||
|
||||
2006-08-08 John (J5) Palmieri <johnp@redhat.com>
|
||||
|
||||
* configure.in:
|
||||
|
|
|
|||
|
|
@ -23,6 +23,16 @@ if DBUS_USE_EXPAT
|
|||
XML_SOURCES=config-loader-expat.c
|
||||
endif
|
||||
|
||||
if DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD
|
||||
DIR_WATCH_SOURCE=dir-watch-kqueue.c
|
||||
else
|
||||
if DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX
|
||||
DIR_WATCH_SOURCE=dir-watch-dnotify.c
|
||||
else
|
||||
DIR_WATCH_SOURCE=dir-watch-default.c
|
||||
endif
|
||||
endif
|
||||
|
||||
BUS_SOURCES= \
|
||||
activation.c \
|
||||
activation.h \
|
||||
|
|
@ -34,7 +44,7 @@ BUS_SOURCES= \
|
|||
connection.h \
|
||||
desktop-file.c \
|
||||
desktop-file.h \
|
||||
dir-watch.c \
|
||||
$(DIR_WATCH_SOURCE) \
|
||||
dir-watch.h \
|
||||
dispatch.c \
|
||||
dispatch.h \
|
||||
|
|
|
|||
40
bus/dir-watch-default.c
Normal file
40
bus/dir-watch-default.c
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
/* -*- mode: C; c-file-style: "gnu" -*- */
|
||||
/* dir-watch-default.c OS specific directory change notification for message bus
|
||||
*
|
||||
* Copyright (C) 2003 Red Hat, Inc.
|
||||
*
|
||||
* Licensed under the Academic Free License version 2.1
|
||||
*
|
||||
* 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; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* 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
|
||||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <dbus/dbus-internals.h>
|
||||
#include "dir-watch.h"
|
||||
|
||||
|
||||
/* NoOp */
|
||||
|
||||
void
|
||||
bus_drop_all_directory_watches (void)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
bus_watch_directory (const char *dir, void *userdata)
|
||||
{
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/* -*- mode: C; c-file-style: "gnu" -*- */
|
||||
/* dir-watch.c OS specific directory change notification for message bus
|
||||
/* dir-watch-dnotify.c OS specific directory change notification for message bus
|
||||
*
|
||||
* Copyright (C) 2003 Red Hat, Inc.
|
||||
*
|
||||
|
|
@ -23,20 +23,14 @@
|
|||
|
||||
#include <config.h>
|
||||
|
||||
#ifdef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX
|
||||
#define _GNU_SOURCE
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#endif /* DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX */
|
||||
|
||||
#include <dbus/dbus-internals.h>
|
||||
#include "dir-watch.h"
|
||||
|
||||
|
||||
/* D_NOTIFY is available on Linux 2.4 or greater - the actual SIGIO signal is handled in main.c:signal_handler() */
|
||||
#ifdef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX
|
||||
|
||||
#define MAX_DIRS_TO_WATCH 128
|
||||
|
||||
/* use a static array to avoid handling OOM */
|
||||
|
|
@ -94,17 +88,3 @@ bus_drop_all_directory_watches (void)
|
|||
|
||||
num_fds = 0;
|
||||
}
|
||||
|
||||
#else /* fallback to NOP */
|
||||
|
||||
void
|
||||
bus_drop_all_directory_watches (void)
|
||||
{
|
||||
}
|
||||
|
||||
void
|
||||
bus_watch_directory (const char *dir, void *userdata)
|
||||
{
|
||||
}
|
||||
|
||||
#endif
|
||||
177
bus/dir-watch-kqueue.c
Normal file
177
bus/dir-watch-kqueue.c
Normal file
|
|
@ -0,0 +1,177 @@
|
|||
/* -*- mode: C; c-file-style: "gnu" -*- */
|
||||
/* dir-watch-kqueue.c OS specific directory change notification for message bus
|
||||
*
|
||||
* Copyright (C) 2003 Red Hat, Inc.
|
||||
*
|
||||
* Licensed under the Academic Free License version 2.1
|
||||
*
|
||||
* 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; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* 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
|
||||
*
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/event.h>
|
||||
#include <sys/time.h>
|
||||
#include <signal.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
#include "bus.h"
|
||||
#include <dbus/dbus-watch.h>
|
||||
|
||||
#include <dbus/dbus-internals.h>
|
||||
#include "dir-watch.h"
|
||||
|
||||
#define MAX_DIRS_TO_WATCH 128
|
||||
|
||||
static int kq = -1;
|
||||
static int fds[MAX_DIRS_TO_WATCH];
|
||||
static int num_fds = 0;
|
||||
static DBusWatch *watch = NULL;
|
||||
static DBusLoop *loop = NULL;
|
||||
|
||||
static dbus_bool_t
|
||||
_kqueue_watch_callback (DBusWatch *watch, unsigned int condition, void *data)
|
||||
{
|
||||
return dbus_watch_handle (watch, condition);
|
||||
}
|
||||
|
||||
static dbus_bool_t
|
||||
_handle_kqueue_watch (DBusWatch *watch, unsigned int flags, void *data)
|
||||
{
|
||||
struct kevent ev;
|
||||
struct timespec nullts = { 0, 0 };
|
||||
int res;
|
||||
pid_t pid;
|
||||
|
||||
res = kevent (kq, NULL, 0, &ev, 1, &nullts);
|
||||
|
||||
/* Sleep for half a second to avoid a race when files are install(1)'d
|
||||
* to system.d. */
|
||||
usleep(500000);
|
||||
|
||||
if (res > 0)
|
||||
{
|
||||
pid = getpid ();
|
||||
_dbus_verbose ("Sending SIGHUP signal on reception of a kevent\n");
|
||||
(void) kill (pid, SIGHUP);
|
||||
}
|
||||
else if (res < 0 && errno == EBADF)
|
||||
{
|
||||
kq = -1;
|
||||
if (watch != NULL)
|
||||
{
|
||||
_dbus_loop_remove_watch (loop, watch, _kqueue_watch_callback, NULL);
|
||||
_dbus_watch_unref (watch);
|
||||
watch = NULL;
|
||||
}
|
||||
pid = getpid ();
|
||||
_dbus_verbose ("Sending SIGHUP signal since kqueue has been closed\n");
|
||||
(void) kill (pid, SIGHUP);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
bus_watch_directory (const char *dir, void *userdata)
|
||||
{
|
||||
int fd;
|
||||
struct kevent ev;
|
||||
|
||||
_dbus_assert (dir != NULL);
|
||||
|
||||
if (kq < 0)
|
||||
{
|
||||
|
||||
kq = kqueue ();
|
||||
if (kq < 0)
|
||||
{
|
||||
_dbus_warn ("Cannot create kqueue; error '%s'\n", _dbus_strerror (errno));
|
||||
goto out;
|
||||
}
|
||||
|
||||
loop = userdata;
|
||||
|
||||
watch = _dbus_watch_new (kq, DBUS_WATCH_READABLE, TRUE,
|
||||
_handle_kqueue_watch, NULL, NULL);
|
||||
|
||||
if (watch == NULL)
|
||||
{
|
||||
_dbus_warn ("Unable to create kqueue watch\n");
|
||||
close (kq);
|
||||
kq = -1;
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!_dbus_loop_add_watch (loop, watch, _kqueue_watch_callback,
|
||||
NULL, NULL))
|
||||
{
|
||||
_dbus_warn ("Unable to add reload watch to main loop");
|
||||
close (kq);
|
||||
kq = -1;
|
||||
_dbus_watch_unref (watch);
|
||||
watch = NULL;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
if (num_fds >= MAX_DIRS_TO_WATCH )
|
||||
{
|
||||
_dbus_warn ("Cannot watch config directory '%s'. Already watching %d directories\n", dir, MAX_DIRS_TO_WATCH);
|
||||
goto out;
|
||||
}
|
||||
|
||||
fd = open (dir, O_RDONLY);
|
||||
if (fd < 0)
|
||||
{
|
||||
_dbus_warn ("Cannot open directory '%s'; error '%s'\n", dir, _dbus_strerror (errno));
|
||||
goto out;
|
||||
}
|
||||
|
||||
EV_SET (&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
|
||||
NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0);
|
||||
if (kevent (kq, &ev, 1, NULL, 0, NULL) == -1)
|
||||
{
|
||||
_dbus_warn ("Cannot setup a kevent for '%s'; error '%s'\n", dir, _dbus_strerror (errno));
|
||||
close (fd);
|
||||
goto out;
|
||||
}
|
||||
|
||||
fds[num_fds++] = fd;
|
||||
_dbus_verbose ("Added kqueue watch on config directory '%s'\n", dir);
|
||||
|
||||
out:
|
||||
;
|
||||
}
|
||||
|
||||
void
|
||||
bus_drop_all_directory_watches (void)
|
||||
{
|
||||
int i;
|
||||
|
||||
_dbus_verbose ("Dropping all watches on config directories\n");
|
||||
|
||||
for (i = 0; i < num_fds; i++)
|
||||
{
|
||||
if (close (fds[i]) != 0)
|
||||
{
|
||||
_dbus_verbose ("Error closing fd %d for config directory watch\n", fds[i]);
|
||||
}
|
||||
}
|
||||
|
||||
num_fds = 0;
|
||||
}
|
||||
24
configure.in
24
configure.in
|
|
@ -57,6 +57,7 @@ AC_ARG_ENABLE(gcov, AS_HELP_STRING([--enable-gcov],[compile with coverage profil
|
|||
AC_ARG_ENABLE(abstract-sockets, AS_HELP_STRING([--enable-abstract-sockets],[use abstract socket namespace (linux only)]),enable_abstract_sockets=$enableval,enable_abstract_sockets=auto)
|
||||
AC_ARG_ENABLE(selinux, AS_HELP_STRING([--enable-selinux],[build with SELinux support]),enable_selinux=$enableval,enable_selinux=auto)
|
||||
AC_ARG_ENABLE(dnotify, AS_HELP_STRING([--enable-dnotify],[build with dnotify support (linux only)]),enable_dnotify=$enableval,enable_dnotify=auto)
|
||||
AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support (FreeBSD only)]),enable_kqueue=$enableval,enable_kqueue=auto)
|
||||
AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto)
|
||||
|
||||
AC_ARG_WITH(xml, AS_HELP_STRING([--with-xml=[libxml/expat]],[XML library to use]))
|
||||
|
|
@ -713,6 +714,29 @@ if test x$have_dnotify = xyes; then
|
|||
AC_DEFINE(DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX,1,[Use dnotify on Linux])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX, test x$have_dnotify = xyes)
|
||||
|
||||
# kqueue checks
|
||||
if test x$enable_kqueue = xno ; then
|
||||
have_kqueue=no;
|
||||
else
|
||||
case "${target_os}" in
|
||||
freebsd*)
|
||||
have_kqueue=yes;
|
||||
;;
|
||||
*)
|
||||
have_kqueue=no;
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
dnl check if kqueue backend is enabled
|
||||
if test x$have_kqueue = xyes; then
|
||||
AC_DEFINE(DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD,1,[Use kqueue on FreeBSD])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD, test x$have_kqueue = xyes)
|
||||
|
||||
dnl console owner file
|
||||
if test x$enable_console_owner_file = xno ; then
|
||||
have_console_owner_file=no;
|
||||
|
|
|
|||
|
|
@ -1200,7 +1200,7 @@ _dbus_string_append_printf_valist (DBusString *str,
|
|||
DBUS_VA_COPY (args_copy, args);
|
||||
|
||||
/* Measure the message length without terminating nul */
|
||||
len = _dbus_printf_length (format, args);
|
||||
len = _dbus_printf_string_upper_bound (format, args);
|
||||
|
||||
if (!_dbus_string_lengthen (str, len))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2988,8 +2988,8 @@ _dbus_full_duplex_pipe (int *fd1,
|
|||
/**
|
||||
* Measure the message length without terminating nul
|
||||
*/
|
||||
int _dbus_printf_length (const char *format,
|
||||
va_list args)
|
||||
int _dbus_printf_string_upper_bound (const char *format,
|
||||
va_list args)
|
||||
{
|
||||
char c;
|
||||
return vsnprintf (&c, 1, format, args);
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@
|
|||
/* and it would just be annoying to abstract this */
|
||||
#include <errno.h>
|
||||
|
||||
#include <stdarg.h>
|
||||
|
||||
DBUS_BEGIN_DECLS
|
||||
|
||||
/* The idea of this file is to encapsulate everywhere that we're
|
||||
|
|
@ -272,8 +274,8 @@ void _dbus_fd_set_close_on_exec (int fd);
|
|||
|
||||
void _dbus_exit (int code) _DBUS_GNUC_NORETURN;
|
||||
|
||||
int _dbus_printf_length (const char *format,
|
||||
va_list args);
|
||||
int _dbus_printf_string_upper_bound (const char *format,
|
||||
va_list args);
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue