dbus/bus Makefile.am, 1.39, 1.40 dir-watch-default.c, NONE,
1.1 dir-watch-dnotify.c, NONE, 1.1 dir-watch-kqueue.c, NONE,
1.1 dir-watch.c, 1.1, NONE
John Palmieri
johnp at kemper.freedesktop.org
Tue Aug 8 15:08:41 PDT 2006
Update of /cvs/dbus/dbus/bus
In directory kemper:/tmp/cvs-serv8965/bus
Modified Files:
Makefile.am
Added Files:
dir-watch-default.c dir-watch-dnotify.c dir-watch-kqueue.c
Removed Files:
dir-watch.c
Log Message:
* 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>)
Index: Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/bus/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Makefile.am 8 Aug 2006 21:30:31 -0000 1.39
+++ Makefile.am 8 Aug 2006 22:08:39 -0000 1.40
@@ -23,6 +23,16 @@
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 @@
connection.h \
desktop-file.c \
desktop-file.h \
- dir-watch.c \
+ $(DIR_WATCH_SOURCE) \
dir-watch.h \
dispatch.c \
dispatch.h \
--- NEW FILE: dir-watch-default.c ---
/* -*- 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)
{
}
--- NEW FILE: dir-watch-dnotify.c ---
/* -*- mode: C; c-file-style: "gnu" -*- */
/* dir-watch-dnotify.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>
#define _GNU_SOURCE
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <dbus/dbus-internals.h>
#include "dir-watch.h"
#define MAX_DIRS_TO_WATCH 128
/* use a static array to avoid handling OOM */
static int fds[MAX_DIRS_TO_WATCH];
static int num_fds = 0;
void
bus_watch_directory (const char *dir, void *userdata)
{
int fd;
_dbus_assert (dir != NULL);
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;
}
if (fcntl (fd, F_NOTIFY, DN_DELETE|DN_RENAME|DN_MODIFY) == -1)
{
_dbus_warn ("Cannot setup D_NOTIFY for '%s' error '%s'\n", dir, _dbus_strerror (errno));
close (fd);
goto out;
}
fds[num_fds++] = fd;
_dbus_verbose ("Added watch on config directory '%s'\n", dir);
out:
;
}
void
bus_drop_all_directory_watches (void)
{
_dbus_verbose ("Dropping all watches on config directories\n");
int i;
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;
}
--- NEW FILE: dir-watch-kqueue.c ---
/* -*- 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;
}
--- dir-watch.c DELETED ---
More information about the dbus-commit
mailing list