tracker r1430 - in branches/xesam-support: . src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Wed May 14 11:37:41 2008
New Revision: 1430
URL: http://svn.gnome.org/viewvc/tracker?rev=1430&view=rev

Log:
2008-05-14  Philip Van Hoof  <pvanhoof gnome org>

        * Merged xesam-support with indexer-split
        * svn merge -r 1427:1429 ../indexer-split/
        * Important crash-fix by Martyn in indexer-split



Modified:
   branches/xesam-support/ChangeLog
   branches/xesam-support/src/trackerd/tracker-email.c
   branches/xesam-support/src/trackerd/tracker-email.h
   branches/xesam-support/src/trackerd/tracker-main.h
   branches/xesam-support/src/trackerd/tracker-process-files.c

Modified: branches/xesam-support/src/trackerd/tracker-email.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-email.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-email.c	Wed May 14 11:37:41 2008
@@ -117,7 +117,7 @@
 	if (g_module_symbol (module, "tracker_email_init", (gpointer *) &func)) {
 		g_mime_init (0);
 
-		result = (func) ();
+		result = (func) (config);
 	}
 
 	g_free (module_name);

Modified: branches/xesam-support/src/trackerd/tracker-email.h
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-email.h	(original)
+++ branches/xesam-support/src/trackerd/tracker-email.h	Wed May 14 11:37:41 2008
@@ -31,11 +31,11 @@
 
 G_BEGIN_DECLS
 
-typedef gboolean      (* TrackerMailInit)          (void);
+typedef gboolean      (* TrackerMailInit)          (TrackerConfig     *config);
 typedef void          (* TrackerMailFinalize)      (void);
-typedef void          (* TrackerMailWatchEmails)   (DBConnection *db_con);
-typedef gboolean      (* TrackerMailIndexFile)     (DBConnection *db_con,
-						    TrackerDBFileInfo     *info);
+typedef void          (* TrackerMailWatchEmails)   (DBConnection      *db_con);
+typedef gboolean      (* TrackerMailIndexFile)     (DBConnection      *db_con,
+						    TrackerDBFileInfo *info);
 typedef const gchar * (* TrackerMailGetName)       (void);
 
 gboolean     tracker_email_init                    (TrackerConfig     *config);

Modified: branches/xesam-support/src/trackerd/tracker-main.h
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-main.h	(original)
+++ branches/xesam-support/src/trackerd/tracker-main.h	Wed May 14 11:37:41 2008
@@ -88,7 +88,6 @@
 	/* Table of stop words that are to be ignored by the parser */
 	gboolean          first_time_index; 
 	
-	time_t            index_time_start; 
 	gint              folders_count;  
 	gint              folders_processed;
 	gint              mbox_count; 

Modified: branches/xesam-support/src/trackerd/tracker-process-files.c
==============================================================================
--- branches/xesam-support/src/trackerd/tracker-process-files.c	(original)
+++ branches/xesam-support/src/trackerd/tracker-process-files.c	Wed May 14 11:37:41 2008
@@ -57,6 +57,7 @@
 static GSList       *crawl_directories;
         
 static gchar       **ignore_pattern;
+static GTimer       *index_duration;
 
 static const gchar  *ignore_suffix[] = {
         "~", ".o", ".la", ".lo", ".loT", ".in", 
@@ -1186,10 +1187,12 @@
                 
                 tracker->first_time_index = FALSE;
 		
-                time_taken = time (NULL) - tracker->index_time_start;
-                g_signal_emit_by_name (object, 
-                                       "index-finished", 
-                                       time_taken);
+                time_taken = (gint) g_timer_elapsed (index_duration, NULL);
+                g_timer_destroy (index_duration);
+                index_duration = NULL;
+
+                tracker_log ("Indexing finished in %d seconds", time_taken);
+                g_signal_emit_by_name (object, "index-finished", time_taken);
 
                 tracker_db_set_option_int (db_con, "InitialIndex", 0);
                 
@@ -1482,14 +1485,14 @@
 gpointer
 tracker_process_files (gpointer data)
 {
-	Tracker      *tracker;
+	Tracker  *tracker;
         GObject  *object;
-	GSList	     *moved_from_list; /* List to hold moved_from
-                                        * events whilst waiting for a
-                                        * matching moved_to event.
-                                        */
-	gboolean      pushed_events;
-        gboolean      first_run;
+	GSList	 *moved_from_list; /* List to hold moved_from
+                                    * events whilst waiting for a
+                                    * matching moved_to event.
+                                    */
+	gboolean  pushed_events;
+        gboolean  first_run;
         gint      initial_sleep;
 
         process_block_signals (); 
@@ -1573,7 +1576,11 @@
 
 	tracker_log ("Starting indexing...");
 
-	tracker->index_time_start = time (NULL);
+        if (index_duration) {
+                g_timer_destroy (index_duration);
+        }
+
+        index_duration = g_timer_new ();
 
 	while (TRUE) {
 		TrackerDBFileInfo *info;