From 6a50dc511ba994b49244b10f232ed1fcb6bfdccb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 11 Sep 2012 20:22:26 -0400 Subject: [PATCH] Drop GVFS_INOTIFY_DIAG debug feature Just not a good idea to have this in production code. --- docs/reference/gio/overview.xml | 11 ----- gio/inotify/Makefile.am | 2 - gio/inotify/inotify-diag.c | 74 --------------------------------- gio/inotify/inotify-diag.h | 29 ------------- gio/inotify/inotify-helper.c | 2 - 5 files changed, 118 deletions(-) delete mode 100644 gio/inotify/inotify-diag.c delete mode 100644 gio/inotify/inotify-diag.h diff --git a/docs/reference/gio/overview.xml b/docs/reference/gio/overview.xml index bde9b6f70..29087ca48 100644 --- a/docs/reference/gio/overview.xml +++ b/docs/reference/gio/overview.xml @@ -262,17 +262,6 @@ - - <envar>GVFS_INOTIFY_DIAG</envar> - - - When this environment variable is set and GIO has been built - with inotify support, a dump of diagnostic inotify information - will be written every 20 seconds to a file named - /tmp/gvfsdid.pid. - - - <envar>GIO_EXTRA_MODULES</envar> diff --git a/gio/inotify/Makefile.am b/gio/inotify/Makefile.am index 8eb9e9122..22351268b 100644 --- a/gio/inotify/Makefile.am +++ b/gio/inotify/Makefile.am @@ -10,8 +10,6 @@ libinotify_la_SOURCES = \ inotify-path.c \ inotify-missing.c \ inotify-helper.c \ - inotify-diag.c \ - inotify-diag.h \ inotify-kernel.h \ inotify-missing.h \ inotify-path.h \ diff --git a/gio/inotify/inotify-diag.c b/gio/inotify/inotify-diag.c deleted file mode 100644 index 937ebd702..000000000 --- a/gio/inotify/inotify-diag.c +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 8 -*- */ - -/* inotify-helper.c - Gnome VFS Monitor based on inotify. - - Copyright (C) 2005 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - Authors: - John McCutchan -*/ - -#include "config.h" -#include -#include -#include -#include "inotify-missing.h" -#include "inotify-path.h" -#include "inotify-diag.h" - -#define DIAG_DUMP_TIME 20000 /* 20 seconds */ - -G_LOCK_EXTERN (inotify_lock); - -static gboolean -id_dump (gpointer userdata) -{ - GIOChannel *ioc; - pid_t pid; - char *fname; - G_LOCK (inotify_lock); - ioc = NULL; - pid = getpid (); - - fname = g_strdup_printf ("/tmp/gvfsid.%d", pid); - ioc = g_io_channel_new_file (fname, "w", NULL); - g_free (fname); - - if (!ioc) - { - G_UNLOCK (inotify_lock); - return TRUE; - } - - _im_diag_dump (ioc); - - g_io_channel_shutdown (ioc, TRUE, NULL); - g_io_channel_unref (ioc); - - G_UNLOCK (inotify_lock); - return TRUE; -} - -void -_id_startup (void) -{ - if (!g_getenv ("GVFS_INOTIFY_DIAG")) - return; - - g_timeout_add (DIAG_DUMP_TIME, id_dump, NULL); -} diff --git a/gio/inotify/inotify-diag.h b/gio/inotify/inotify-diag.h deleted file mode 100644 index f818f1616..000000000 --- a/gio/inotify/inotify-diag.h +++ /dev/null @@ -1,29 +0,0 @@ -/* inotify-helper.h - GNOME VFS Monitor using inotify - - Copyright (C) 2006 John McCutchan - - The Gnome Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The Gnome Library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the Gnome Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. - - Author: John McCutchan -*/ - - -#ifndef __INOTIFY_DIAG_H -#define __INOTIFY_DIAG_H - -void _id_startup (void); - -#endif /* __INOTIFY_DIAG_H */ diff --git a/gio/inotify/inotify-helper.c b/gio/inotify/inotify-helper.c index 6ee0b4b83..b1a9cf153 100644 --- a/gio/inotify/inotify-helper.c +++ b/gio/inotify/inotify-helper.c @@ -36,7 +36,6 @@ #include "inotify-helper.h" #include "inotify-missing.h" #include "inotify-path.h" -#include "inotify-diag.h" static gboolean ih_debug_enabled = FALSE; #define IH_W if (ih_debug_enabled) g_warning @@ -87,7 +86,6 @@ _ih_startup (void) return FALSE; } _im_startup (ih_not_missing_callback); - _id_startup (); IH_W ("started gvfs inotify backend\n");