tracker r1608 - in branches/indexer-split: . src/libtracker-db src/trackerd

[mr svn gnome org]

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

Log:
	* src/libtracker-db/tracker-db-manager.c:
	* src/trackerd/tracker-db.c: 
	* src/trackerd/tracker-indexer.c:
	* src/trackerd/tracker-main.[ch]: Removed more unused members from
	the Tracker struct.


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

Modified: branches/indexer-split/src/libtracker-db/tracker-db-manager.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-manager.c	(original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.c	Mon Jun  9 14:34:56 2008
@@ -908,25 +908,6 @@
         tracker_service_set_has_thumbs (service, has_thumbs);
 	tracker_service_set_content_metadata (service, content_metadata);
 
-#if 0
-        if (g_str_has_prefix (name, "Email") ||
-            g_str_has_suffix (name, "Emails")) {
-                tracker_service_set_db_type (service, TRACKER_DB_TYPE_EMAIL);
-
-                if (tracker->email_service_min == 0 || 
-                    id < tracker->email_service_min) {
-                        tracker->email_service_min = id;
-                }
-
-                if (tracker->email_service_max == 0 || 
-                    id > tracker->email_service_max) {
-                        tracker->email_service_max = id;
-                }
-        } else {
-                tracker_service_set_db_type (service, TRACKER_DB_TYPE_DATA);
-        }
-#endif
-
         tracker_service_set_show_service_files (service, show_service_files);
         tracker_service_set_show_service_directories (service, show_service_directories);
 

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	Mon Jun  9 14:34:56 2008
@@ -3458,8 +3458,8 @@
 
 			g_message ("Current memory usage is %d, word count %d and hits %d", 
 				   get_memory_usage (), 
-				   tracker->word_count, 
-				   tracker->word_detail_count);
+				   0,  /* was tracker->word_count, */
+				   0); /* was tracker->word_detail_count */
 		}
 
 		return TRUE;

Modified: branches/indexer-split/src/trackerd/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-indexer.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-indexer.c	Mon Jun  9 14:34:56 2008
@@ -70,6 +70,9 @@
 
 extern Tracker *tracker;
 
+static gint merge_count = 0;
+static gint merge_processed = 0;
+
 struct Indexer_ {
 	DEPOT  		*word_index;	/* file hashtable handle for the word -> {serviceID, ServiceTypeID, Score}  */
 	GMutex 		*word_mutex;
@@ -411,8 +414,8 @@
 	dpiterinit (src->word_index);
 	
 	tracker->in_merge = TRUE;
-	tracker->merge_count = 1;
-	tracker->merge_processed = 0;
+	merge_count = 1;
+	merge_processed = 0;
 	
         /* Signal progress */
         object = tracker_dbus_get_object (TRACKER_TYPE_DAEMON);
@@ -421,8 +424,8 @@
                                "Merging",
                                "",
                                tracker->index_count,
-                               tracker->merge_processed,
-                               tracker->merge_count);
+                               merge_processed,
+                               merge_count);
 	
 	while ((str = dpiternext (src->word_index, NULL))) {
 		
@@ -480,8 +483,8 @@
 	}
 	
 	tracker->in_merge = FALSE;
-	tracker->merge_count = 1;
-	tracker->merge_processed = 1;
+	merge_count = 1;
+	merge_processed = 1;
 
         /* Signal progress */
         object = tracker_dbus_get_object (TRACKER_TYPE_DAEMON);
@@ -490,8 +493,8 @@
                                "Merging",                     
                                "",
                                tracker->index_count,        
-                               tracker->merge_processed,  
-                               tracker->merge_count);     
+                               merge_processed,  
+                               merge_count);     
 }
 
 gboolean
@@ -671,8 +674,8 @@
 
 	g_message ("starting merge of %d indexes", index_count);
 	tracker->in_merge = TRUE;
-	tracker->merge_count = index_count;
-	tracker->merge_processed = 0;
+	merge_count = index_count;
+	merge_processed = 0;
 	
         /* Signal progress */
         g_signal_emit_by_name (object, 
@@ -680,8 +683,8 @@
                                "Merging",
                                "",
                                tracker->index_count,
-                               tracker->merge_processed,
-                               tracker->merge_count);
+                               merge_processed,
+                               merge_count);
 
 	if (index_count == 2 && !final_exists) {
                 Indexer *index1 = index_list->data ;
@@ -837,7 +840,7 @@
                                 GObject *object;
 
 				tracker_indexer_free (index, TRUE);
-				tracker->merge_processed++;
+				merge_processed++;
 
                                 /* Signal progress */
                                 object = tracker_dbus_get_object (TRACKER_TYPE_DAEMON);
@@ -846,8 +849,8 @@
                                                        "Merging",
                                                        "",
                                                        tracker->index_count,
-                                                       tracker->merge_processed,
-                                                       tracker->merge_count);
+                                                       merge_processed,
+                                                       merge_count);
 			}
 
 

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:34:56 2008
@@ -291,18 +291,6 @@
 
         no_index_file_types = tracker_config_get_no_index_file_types (tracker->config);
 
-	if (!tracker_config_get_low_memory_mode (tracker->config)) {
-		tracker->memory_limit = 16000 *1024;
-	
-		tracker->max_process_queue_size = 5000;
-		tracker->max_extract_queue_size = 5000;
-	} else {
-		tracker->memory_limit = 8192 * 1024;
-
-		tracker->max_process_queue_size = 500;
-		tracker->max_extract_queue_size = 500;
-	}
-
 	g_message ("Tracker configuration options:");
 	g_message ("  Verbosity  ............................  %d", 
 		   tracker_config_get_verbosity (tracker->config));
@@ -755,9 +743,6 @@
 
 	tracker->pid = getpid ();
 
-	tracker->max_process_queue_size = MAX_PROCESS_QUEUE_SIZE;
-	tracker->max_extract_queue_size = MAX_EXTRACT_QUEUE_SIZE;
-
 	/* This makes sure we have all the locations like the data
 	 * dir, user data dir, etc all configured.
 	 * 

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:34:56 2008
@@ -38,21 +38,9 @@
 
 #include "tracker-indexer.h"
 
-/* default performance options */
-#define MAX_PROCESS_QUEUE_SIZE 100
-#define MAX_EXTRACT_QUEUE_SIZE 500
-
 G_BEGIN_DECLS
 
 typedef struct {
- 	gboolean          is_running; 
-	gboolean          readonly;
-
-	gint              pid; 
-
-	gboolean          reindex;
-
-
 #ifdef HAVE_HAL
 	TrackerHal       *hal;
 #endif
@@ -60,14 +48,13 @@
         TrackerConfig    *config;
         TrackerLanguage  *language;
 
-	/* Config options */
-	guint32           watch_limit; 
+ 	gboolean          is_running; 
+	gboolean          readonly;
+
+	gint              pid; 
 
-	/* Performance and memory usage options */
-	gint              max_process_queue_size;
-	gint              max_extract_queue_size;
-	gint              memory_limit;
-     
+	gboolean          reindex;
+  
 	/* Pause/shutdown */
 	gboolean          pause_manual;
 	gboolean          pause_battery;
@@ -86,21 +73,11 @@
 	gint              mbox_count; 
 	gint              mbox_processed;
 
-	/* Email config options */
-	gint              email_service_min;
-	gint              email_service_max; 
-
 	/* Progress info for merges */
 	gboolean          in_merge; 
-	gint              merge_count; 
-	gint              merge_processed;
 	
 	/* Application run time values */
 	gint              index_count; 
-
-	gint              word_detail_count; 
-	gint              word_count;
-	gint              word_update_count; 
 } Tracker;
 
 void         tracker_shutdown        (void);