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

[mr svn gnome org]

Author: mr
Date: Fri May 23 08:36:34 2008
New Revision: 1470
URL: http://svn.gnome.org/viewvc/tracker?rev=1470&view=rev

Log:
	* src/trackerd/tracker-cache.c: 
	* src/trackerd/tracker-db.c: 
	* src/trackerd/tracker-inotify.c:
	* src/trackerd/tracker-main.h: Removed tracker->request_waiting,
	it was only ever set, not used. Moved
	tracker->black_list_timer_active, it is only used in the
	tracker-db module.


Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/trackerd/tracker-cache.c
   branches/indexer-split/src/trackerd/tracker-db.c
   branches/indexer-split/src/trackerd/tracker-inotify.c
   branches/indexer-split/src/trackerd/tracker-main.h

Modified: branches/indexer-split/src/trackerd/tracker-cache.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-cache.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-cache.c	Fri May 23 08:36:34 2008
@@ -454,8 +454,6 @@
 		if (tracker->grace_period > 1) {
 			g_message ("Pausing indexer while client requests/disk I/O take place");
 
-			tracker->request_waiting = FALSE;
-
 			if (db_con) {
 				tracker_db_end_index_transaction (db_con);
 				stopped_trans = TRUE;

Modified: branches/indexer-split/src/trackerd/tracker-db.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db.c	Fri May 23 08:36:34 2008
@@ -53,7 +53,8 @@
 	GHashTable	*table;
 } DatabaseAction;
 
-GQueue *file_change_queue;
+static GQueue   *file_change_queue;
+static gboolean  black_list_timer_active;
 
 static void
 free_metadata_list (GSList *list) 
@@ -670,7 +671,7 @@
 
         tracker_process_files_set_temp_black_list (NULL);
 	
-	tracker->black_list_timer_active = FALSE;
+	black_list_timer_active = FALSE;
 	
 	return FALSE;
 
@@ -724,9 +725,11 @@
 			
                         tracker_process_files_append_temp_black_list (change->uri);
 			
-			if (!tracker->black_list_timer_active) {
-				tracker->black_list_timer_active = TRUE;
-				g_timeout_add_seconds (BLACK_LIST_SECONDS, (GSourceFunc) index_black_list, NULL);
+			if (!black_list_timer_active) {
+				black_list_timer_active = TRUE;
+				g_timeout_add_seconds (BLACK_LIST_SECONDS, 
+						       (GSourceFunc) index_black_list, 
+						       NULL);
 			}
 			
 			g_queue_remove_all (file_change_queue, change);

Modified: branches/indexer-split/src/trackerd/tracker-inotify.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-inotify.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-inotify.c	Fri May 23 08:36:34 2008
@@ -179,7 +179,6 @@
                                            moved_to_info->uri);
 
 				tracker->grace_period = 2;
-				tracker->request_waiting = TRUE;
 
 				if (!tracker_file_is_directory (moved_to_info->uri)) {
 					tracker_db_insert_pending_file (main_thread_db_con, moved_from_info->file_id, moved_from_info->uri, moved_to_info->uri, moved_from_info->mime, 0, TRACKER_DB_ACTION_FILE_MOVED_FROM, FALSE, TRUE, -1);

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	Fri May 23 08:36:34 2008
@@ -84,15 +84,11 @@
 	gint              mbox_processed;
 
 	gint	          grace_period; 
-	gboolean          request_waiting;
 
 	/* Email config options */
 	gint              email_service_min;
 	gint              email_service_max; 
 
-	/* Queue for recorad file changes */
-	gboolean          black_list_timer_active;
-	
 	/* Progress info for merges */
 	gboolean          in_merge; 
 	gint              merge_count;