tracker r1607 - in branches/indexer-split: . src/trackerd

[mr svn gnome org]

Author: mr
Date: Mon Jun  9 14:17:02 2008
New Revision: 1607
URL: http://svn.gnome.org/viewvc/tracker?rev=1607&view=rev

Log:
	* src/trackerd/tracker-daemon.c:
	* src/trackerd/tracker-files.c:
	* src/trackerd/tracker-keywords.c:
	* src/trackerd/tracker-main.[ch]:
	* src/trackerd/tracker-metadata.c: 
	* src/trackerd/tracker-utils.c: 
	* src/trackerd/tracker-watcher-inotify.c: Removed unused threading code.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/trackerd/tracker-daemon.c
   branches/indexer-split/src/trackerd/tracker-files.c
   branches/indexer-split/src/trackerd/tracker-keywords.c
   branches/indexer-split/src/trackerd/tracker-main.c
   branches/indexer-split/src/trackerd/tracker-main.h
   branches/indexer-split/src/trackerd/tracker-metadata.c
   branches/indexer-split/src/trackerd/tracker-utils.c
   branches/indexer-split/src/trackerd/tracker-watcher-inotify.c

Modified: branches/indexer-split/src/trackerd/tracker-daemon.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-daemon.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-daemon.c	Mon Jun  9 14:17:02 2008
@@ -446,10 +446,6 @@
 				       tracker_config_get_enable_indexing (priv->config));
 	}
 
-	tracker_notify_file_data_available ();
-
-	tracker_dbus_request_success (request_id);
-
 	return TRUE;
 }
 
@@ -490,8 +486,6 @@
 		g_message ("Maxinum number of unique words set to %d", value);
 	} 
 
-	tracker_notify_file_data_available ();
-
 	tracker_dbus_request_success (request_id);
 
 	return TRUE;

Modified: branches/indexer-split/src/trackerd/tracker-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-files.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-files.c	Mon Jun  9 14:17:02 2008
@@ -215,7 +215,6 @@
 						"File:Format",
 						mime, 
 						FALSE);
-		tracker_notify_file_data_available ();
 
 		g_free (size_str);
 		g_free (mtime_str);

Modified: branches/indexer-split/src/trackerd/tracker-keywords.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-keywords.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-keywords.c	Mon Jun  9 14:17:02 2008
@@ -266,8 +266,6 @@
 				 TRUE);
 	g_free (id);
 
-	tracker_notify_file_data_available ();
-
 	for (p = values; *p; p++) {
 		g_message ("Added keyword %s to %s with ID %s", *p, uri, id);
 		g_signal_emit (object, signals[KEYWORD_ADDED], 0, service, uri, *p);
@@ -327,15 +325,10 @@
 		return FALSE;
 	}
 
-	tracker_notify_file_data_available ();
-
 	for (p = values; *p; p++) {
 		g_message ("Removed keyword %s from %s with ID %s", *p, uri, id);
 		tracker_db_metadata_delete_value (iface, service, id, "User:Keywords", *p);
 
-		/* FIXME: Should we be doing this for EACH keyword? */
-		tracker_notify_file_data_available ();
-
 		g_signal_emit (object, signals[KEYWORD_REMOVED], 0, service, uri, *p);
 	}
 
@@ -399,8 +392,6 @@
 				    TRUE);
 	g_free (id);
 
-	tracker_notify_file_data_available ();
-
 	tracker_dbus_request_success (request_id);
 
 	return TRUE;

Modified: branches/indexer-split/src/trackerd/tracker-main.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-main.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-main.c	Mon Jun  9 14:17:02 2008
@@ -527,18 +527,6 @@
 }
 
 static void
-initialise_threading (void)
-{
-	tracker->files_check_mutex = g_mutex_new ();
-	tracker->files_signal_mutex = g_mutex_new ();
-	tracker->files_signal_cond = g_cond_new ();
-
-	tracker->metadata_check_mutex = g_mutex_new ();
-	tracker->metadata_signal_mutex = g_mutex_new ();
-	tracker->metadata_signal_cond = g_cond_new ();
-}
-
-static void
 initialise_databases (gboolean need_index)
 {
 	Indexer  *index;
@@ -623,65 +611,6 @@
 	/* db_con->word_index = tracker->file_index; */
 }
 
-static void
-shutdown_threads (GThread *thread_to_join)
-{
-	g_message ("Shutting down threads");
-
-	/* Wait for files thread to sleep */
-	while (!g_mutex_trylock (tracker->files_signal_mutex)) {
-		g_usleep (100);
-	}
-
-	g_mutex_unlock (tracker->files_signal_mutex);
-
-	while (!g_mutex_trylock (tracker->metadata_signal_mutex)) {
-		g_usleep (100);
-	}
-
-	g_mutex_unlock (tracker->metadata_signal_mutex);
-
-	/* Send signals to each thread to wake them up and then stop
-	 * them.
-	 */
-	g_mutex_lock (tracker->metadata_signal_mutex);
-	g_cond_signal (tracker->metadata_signal_cond);
-	g_mutex_unlock (tracker->metadata_signal_mutex);
-
-	g_mutex_unlock (tracker->files_check_mutex);
-
-	g_mutex_lock (tracker->files_signal_mutex);
-	g_cond_signal (tracker->files_signal_cond);
-	g_mutex_unlock (tracker->files_signal_mutex);
-
-	/* Wait for threads to exit and unlock check mutexes to
-	 * prevent any deadlocks 
-	 */
-	g_mutex_unlock (tracker->metadata_check_mutex);
-	g_mutex_unlock (tracker->files_check_mutex);
-
-#if 0
-	/* We wait now for the thread to exit and join, then clean up
-	 * the mutexts and conds. 
-	 */
-	g_message ("Waiting for thread to finish");
-	g_thread_join (thread_to_join);
-#endif
-
-	/* Clean up */
-#if 0
-	g_message ("Waiting for file check/signal mutexes to unlock before cleaning up...");
-	g_mutex_free (tracker->files_check_mutex); 
-	g_mutex_free (tracker->files_signal_mutex);
-	g_cond_free (tracker->files_signal_cond);
-
-	g_message ("Waiting for metadata check/signal mutexes to unlock before cleaning up...");
-	g_mutex_free (tracker->metadata_check_mutex);
-	g_mutex_free (tracker->metadata_signal_mutex);
-	g_cond_free (tracker->metadata_signal_cond);
-#endif
-}
-
 static gboolean
 check_multiple_instances (void)
 {
@@ -761,7 +690,6 @@
 {
 	GOptionContext *context = NULL;
 	GError         *error = NULL;
-	GThread        *thread; 
 	GSList         *l;
 	gchar          *example;
 	gboolean        need_index;
@@ -909,7 +837,6 @@
  	tracker->hal = tracker_hal_new ();
 #endif /* HAVE_HAL */
 
-	initialise_threading ();
 
 	umask (077);
 
@@ -992,7 +919,6 @@
 
 	shutdown_indexer ();
 	shutdown_databases ();
-	shutdown_threads (thread);
 	shutdown_directories ();
 
 	/* Shutdown major subsystems */

Modified: branches/indexer-split/src/trackerd/tracker-main.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-main.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-main.h	Mon Jun  9 14:17:02 2008
@@ -101,14 +101,6 @@
 	gint              word_detail_count; 
 	gint              word_count;
 	gint              word_update_count; 
-
-	GMutex           *files_check_mutex;
-	GMutex           *files_signal_mutex;
-	GCond            *files_signal_cond;
-
-	GMutex           *metadata_check_mutex;
-	GMutex           *metadata_signal_mutex;
-	GCond            *metadata_signal_cond;
 } Tracker;
 
 void         tracker_shutdown        (void);

Modified: branches/indexer-split/src/trackerd/tracker-metadata.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-metadata.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-metadata.c	Mon Jun  9 14:17:02 2008
@@ -273,7 +273,6 @@
 						key, 
 						value, 
 						TRUE);
-		tracker_notify_file_data_available ();
 	}
 	
 	g_free (service_id);

Modified: branches/indexer-split/src/trackerd/tracker-utils.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-utils.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-utils.c	Mon Jun  9 14:17:02 2008
@@ -66,56 +66,6 @@
 }
 
 void
-tracker_notify_file_data_available (void)
-{
-	gint revs = 0;
-
-	if (!tracker->is_running) {
-		return;
-	}
-
-	/* If file thread is asleep then we just need to wake it up! */
-	if (g_mutex_trylock (tracker->files_signal_mutex)) {
-		g_cond_signal (tracker->files_signal_cond);
-		g_mutex_unlock (tracker->files_signal_mutex);
-		return;
-	}
-
-	/* If busy - check if async queue has new stuff as we do not need to notify then */
-	if (tracker_process_files_process_queue_length () > 1) {
-		return;
-	}
-
-	/* If file thread not in check phase then we need do nothing */
-	if (g_mutex_trylock (tracker->files_check_mutex)) {
-		g_mutex_unlock (tracker->files_check_mutex);
-		return;
-	}
-
-	/* We are in check phase - we need to wait until either
-	 * check_mutex is unlocked or file thread is asleep then
-	 * awaken it.
-	 */
-	while (revs < 100000) {
-		if (g_mutex_trylock (tracker->files_check_mutex)) {
-			g_mutex_unlock (tracker->files_check_mutex);
-			return;
-		}
-
-		if (g_mutex_trylock (tracker->files_signal_mutex)) {
-			g_cond_signal (tracker->files_signal_cond);
-			g_mutex_unlock (tracker->files_signal_mutex);
-			return;
-		}
-
-		g_thread_yield ();
-		g_usleep (10);
-
-		revs++;
-	}
-}
-
-void
 tracker_add_metadata_to_table (GHashTable  *meta_table, 
 			       const gchar *key, 
 			       const gchar *value)

Modified: branches/indexer-split/src/trackerd/tracker-watcher-inotify.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-watcher-inotify.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-watcher-inotify.c	Mon Jun  9 14:17:02 2008
@@ -147,7 +147,6 @@
 
 		if (tracker_file_is_valid (parent)) {
                         tracker_process_files_process_queue_push (info);
-			tracker_notify_file_data_available ();
 		} else {
 			tracker_db_file_info_free (info);
                         info = NULL;