GNOME.org
 

[tracker] libtracker-common: removed NFS locking config options

commit 81856126150d7dc308ac2e0dd2b47e17e2008ddb
Author: Martyn Russell <martyn imendio com>
Date:   Fri Jul 10 11:45:58 2009 +0100

    libtracker-common: removed NFS locking config options

 .../libtracker-common-sections.txt                 |   10 ----
 src/libtracker-common/tracker-config.c             |   57 --------------------
 src/libtracker-common/tracker-config.h             |    3 -
 src/tracker-store/tracker-main.c                   |   15 +----
 4 files changed, 3 insertions(+), 82 deletions(-)
---
diff --git a/docs/reference/libtracker-common/libtracker-common-sections.txt b/docs/reference/libtracker-common/libtracker-common-sections.txt
index 70da729..14ab82a 100644
--- a/docs/reference/libtracker-common/libtracker-common-sections.txt
+++ b/docs/reference/libtracker-common/libtracker-common-sections.txt
@@ -281,16 +281,6 @@ tracker_module_config_get_monitor_directories
 tracker_module_config_get_monitor_recurse_directories
 </SECTION>
 
-<INCLUDE>libtracker-common/tracker-nfs-lock.h</INCLUDE>
-<SECTION>
-<FILE>tracker-nfs-lock</FILE>
-<TITLE>NFS Locking</TITLE>
-tracker_nfs_lock_init
-tracker_nfs_lock_obtain
-tracker_nfs_lock_release
-tracker_nfs_lock_shutdown
-</SECTION>
-
 <INCLUDE>libtracker-common/tracker-ontology.h</INCLUDE>
 <SECTION>
 <FILE>tracker-ontology</FILE>
diff --git a/src/libtracker-common/tracker-config.c b/src/libtracker-common/tracker-config.c
index c0dfbf3..eefb4c0 100644
--- a/src/libtracker-common/tracker-config.c
+++ b/src/libtracker-common/tracker-config.c
@@ -40,7 +40,6 @@
 #define KEY_VERBOSITY				 "Verbosity"
 #define KEY_INITIAL_SLEEP			 "InitialSleep"
 #define KEY_LOW_MEMORY_MODE			 "LowMemoryMode"
-#define KEY_NFS_LOCKING				 "NFSLocking"
 #define GROUP_WATCHES				 "Watches"
 #define KEY_WATCH_DIRECTORY_ROOTS		 "WatchDirectoryRoots"
 #define KEY_CRAWL_DIRECTORY_ROOTS		 "CrawlDirectory"
@@ -75,7 +74,6 @@
 #define DEFAULT_VERBOSITY			 0
 #define DEFAULT_INITIAL_SLEEP			 45	  /* 0->1000 */
 #define DEFAULT_LOW_MEMORY_MODE			 FALSE
-#define DEFAULT_NFS_LOCKING			 FALSE
 #define DEFAULT_ENABLE_WATCHES			 TRUE
 #define DEFAULT_THROTTLE			 0	  /* 0->20 */
 #define DEFAULT_ENABLE_INDEXING			 TRUE
@@ -107,7 +105,6 @@ struct _TrackerConfigPrivate {
 	gint	      verbosity;
 	gint	      initial_sleep;
 	gboolean      low_memory_mode;
-	gboolean      nfs_locking;
 
 	/* Watches */
 	GSList	     *watch_directory_roots;
@@ -161,7 +158,6 @@ enum {
 	PROP_VERBOSITY,
 	PROP_INITIAL_SLEEP,
 	PROP_LOW_MEMORY_MODE,
-	PROP_NFS_LOCKING,
 
 	/* Watches */
 	PROP_WATCH_DIRECTORY_ROOTS,
@@ -234,14 +230,6 @@ tracker_config_class_init (TrackerConfigClass *klass)
 							       "expense of indexing speed",
 							       DEFAULT_LOW_MEMORY_MODE,
 							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-	g_object_class_install_property (object_class,
-					 PROP_NFS_LOCKING,
-					 g_param_spec_boolean ("nfs-locking",
-							       "Use NFS friendly location for lock file",
-							       "In NFS filesystems is not safe to have "
-							       "the lock file in the home directory",
-							       DEFAULT_NFS_LOCKING,
-							       G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	/* Watches */
 	g_object_class_install_property (object_class,
@@ -517,9 +505,6 @@ config_get_property (GObject	*object,
 	case PROP_LOW_MEMORY_MODE:
 		g_value_set_boolean (value, priv->low_memory_mode);
 		break;
-	case PROP_NFS_LOCKING:
-		g_value_set_boolean (value, priv->nfs_locking);
-		break;
 
 		/* Watches */
 	case PROP_WATCH_DIRECTORY_ROOTS:
@@ -625,10 +610,6 @@ config_set_property (GObject	  *object,
 		tracker_config_set_low_memory_mode (TRACKER_CONFIG (object),
 						    g_value_get_boolean (value));
 		break;
-	case PROP_NFS_LOCKING:
-		tracker_config_set_nfs_locking (TRACKER_CONFIG (object),
-						g_value_get_boolean (value));
-		break;
 
 		/* Watches */
 	case PROP_WATCH_DIRECTORY_ROOTS:    /* Not writable */
@@ -790,14 +771,6 @@ config_create_with_defaults (GKeyFile *key_file,
 					NULL);
 	}
 
-	if (overwrite || !g_key_file_has_key (key_file, GROUP_GENERAL, KEY_NFS_LOCKING, NULL)) {
-		g_key_file_set_boolean (key_file, GROUP_GENERAL, KEY_NFS_LOCKING, 
-					DEFAULT_NFS_LOCKING);
-		g_key_file_set_comment (key_file, GROUP_GENERAL, KEY_NFS_LOCKING,
-					" Set to TRUE when the home directory is in a NFS filesystem",
-					NULL);
-	}
-
 	/* Watches */
 	if (overwrite || !g_key_file_has_key (key_file, GROUP_WATCHES, KEY_WATCH_DIRECTORY_ROOTS, NULL)) {
 		g_key_file_set_string_list (key_file, GROUP_WATCHES, KEY_WATCH_DIRECTORY_ROOTS,
@@ -1366,7 +1339,6 @@ config_load (TrackerConfig *config)
 	config_load_int (config, "verbosity", priv->key_file, GROUP_GENERAL, KEY_VERBOSITY);
 	config_load_int (config, "initial-sleep", priv->key_file, GROUP_GENERAL, KEY_INITIAL_SLEEP);
 	config_load_boolean (config, "low-memory-mode", priv->key_file, GROUP_GENERAL, KEY_LOW_MEMORY_MODE);
-	config_load_boolean (config, "nfs-locking", priv->key_file, GROUP_GENERAL, KEY_NFS_LOCKING);
 
 	/* Watches */
 	config_load_string_list (config, "watch-directory-roots", priv->key_file, GROUP_WATCHES, KEY_WATCH_DIRECTORY_ROOTS);
@@ -1460,7 +1432,6 @@ config_save (TrackerConfig *config)
 	config_save_int (config, "verbosity", priv->key_file, GROUP_GENERAL, KEY_VERBOSITY);
 	config_save_int (config, "initial-sleep", priv->key_file, GROUP_GENERAL, KEY_INITIAL_SLEEP);
 	config_save_boolean (config, "low-memory-mode", priv->key_file, GROUP_GENERAL, KEY_LOW_MEMORY_MODE);
-	config_save_boolean (config, "nfs-locking", priv->key_file, GROUP_GENERAL, KEY_NFS_LOCKING);
 
 	/* Watches */
 	config_save_string_list (config, "watch-directory-roots", priv->key_file, GROUP_WATCHES, KEY_WATCH_DIRECTORY_ROOTS);
@@ -1642,19 +1613,6 @@ tracker_config_get_low_memory_mode (TrackerConfig *config)
 	return priv->low_memory_mode;
 }
 
-gboolean
-tracker_config_get_nfs_locking (TrackerConfig *config)
-{
-	TrackerConfigPrivate *priv;
-
-	g_return_val_if_fail (TRACKER_IS_CONFIG (config), DEFAULT_NFS_LOCKING);
-
-	priv = TRACKER_CONFIG_GET_PRIVATE (config);
-
-	return priv->nfs_locking;
-}
-
-
 GSList *
 tracker_config_get_watch_directory_roots (TrackerConfig *config)
 {
@@ -1994,21 +1952,6 @@ tracker_config_set_low_memory_mode (TrackerConfig *config,
 }
 
 void
-tracker_config_set_nfs_locking (TrackerConfig *config,
-				gboolean      value)
-{
-	TrackerConfigPrivate *priv;
-
-	g_return_if_fail (TRACKER_IS_CONFIG (config));
-
-	priv = TRACKER_CONFIG_GET_PRIVATE (config);
-
-	priv->nfs_locking = value;
-	g_object_notify (G_OBJECT (config), "nfs-locking");
-}
-
-
-void
 tracker_config_set_enable_watches (TrackerConfig *config,
 				   gboolean	  value)
 {
diff --git a/src/libtracker-common/tracker-config.h b/src/libtracker-common/tracker-config.h
index 8663f6f..58c3cef 100644
--- a/src/libtracker-common/tracker-config.h
+++ b/src/libtracker-common/tracker-config.h
@@ -57,7 +57,6 @@ gboolean       tracker_config_save                                 (TrackerConfi
 gint	       tracker_config_get_verbosity			   (TrackerConfig *config);
 gint	       tracker_config_get_initial_sleep			   (TrackerConfig *config);
 gboolean       tracker_config_get_low_memory_mode		   (TrackerConfig *config);
-gboolean       tracker_config_get_nfs_locking			   (TrackerConfig *config);
 GSList *       tracker_config_get_watch_directory_roots		   (TrackerConfig *config);
 GSList *       tracker_config_get_crawl_directory_roots		   (TrackerConfig *config);
 GSList *       tracker_config_get_no_watch_directory_roots	   (TrackerConfig *config);
@@ -88,8 +87,6 @@ void	       tracker_config_set_initial_sleep			   (TrackerConfig *config,
 								    gint	   value);
 void	       tracker_config_set_low_memory_mode		   (TrackerConfig *config,
 								    gboolean	   value);
-void	       tracker_config_set_nfs_locking			   (TrackerConfig *config,
-								    gboolean	   value);
 void	       tracker_config_set_enable_watches		   (TrackerConfig *config,
 								    gboolean	   value);
 void	       tracker_config_set_throttle			   (TrackerConfig *config,
diff --git a/src/tracker-store/tracker-main.c b/src/tracker-store/tracker-main.c
index 1b09828..0f8dcb9 100644
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@ -235,7 +235,6 @@ check_runtime_level (TrackerConfig *config,
 {
 	TrackerRunningLevel  runlevel;
 	gchar		    *lock_file;
-	gboolean	     use_nfs;
 	gint		     fd;
 
 	g_message ("Checking instances running...");
@@ -245,8 +244,6 @@ check_runtime_level (TrackerConfig *config,
 		return TRACKER_RUNNING_READONLY;
 	}
 
-	use_nfs = tracker_config_get_nfs_locking (config);
-
 	lock_file = get_lock_file ();
 	fd = g_open (lock_file, O_RDWR | O_CREAT, 0640);
 
@@ -265,15 +262,9 @@ check_runtime_level (TrackerConfig *config,
 	g_free (lock_file);
 
 	if (lockf (fd, F_TLOCK, 0) < 0) {
-		if (use_nfs) {
-			g_message ("Already running, running in "
-				   "read-only mode (with NFS)");
-			runlevel = TRACKER_RUNNING_READONLY;
-		} else {
-			g_message ("Already running, not allowed "
-				   "multiple instances (without NFS)");
-			runlevel = TRACKER_RUNNING_NON_ALLOWED;
-		}
+		g_message ("Already running, not allowed "
+			   "multiple instances (without NFS)");
+		runlevel = TRACKER_RUNNING_NON_ALLOWED;
 	} else {
 		g_message ("This is the first/main instance");
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]