tracker r2035 - in branches/indexer-split: . src/libtracker-common src/tracker-indexer src/trackerd

[mr svn gnome org]

Author: mr
Date: Fri Aug  8 10:00:32 2008
New Revision: 2035
URL: http://svn.gnome.org/viewvc/tracker?rev=2035&view=rev

Log:
	* src/libtracker-common/Makefile.am:
	* src/libtracker-common/tracker-ioprio.[ch]:
	* src/tracker-indexer/Makefile.am:
	* src/tracker-indexer/tracker-ioprio.[ch]:
	* src/tracker-indexer/tracker-main.c:
	* src/trackerd/tracker-main.c: (main): Moved tracker_ioprio_init()
	to libtracker-common and use it in the daemon.


Added:
   branches/indexer-split/src/libtracker-common/tracker-ioprio.c
      - copied unchanged from r2034, /branches/indexer-split/src/tracker-indexer/tracker-ioprio.c
   branches/indexer-split/src/libtracker-common/tracker-ioprio.h
      - copied, changed from r2034, /branches/indexer-split/src/tracker-indexer/tracker-ioprio.h
Removed:
   branches/indexer-split/src/tracker-indexer/tracker-ioprio.c
   branches/indexer-split/src/tracker-indexer/tracker-ioprio.h
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/src/libtracker-common/Makefile.am
   branches/indexer-split/src/tracker-indexer/Makefile.am
   branches/indexer-split/src/tracker-indexer/tracker-main.c
   branches/indexer-split/src/trackerd/tracker-main.c

Modified: branches/indexer-split/src/libtracker-common/Makefile.am
==============================================================================
--- branches/indexer-split/src/libtracker-common/Makefile.am	(original)
+++ branches/indexer-split/src/libtracker-common/Makefile.am	Fri Aug  8 10:00:32 2008
@@ -38,6 +38,8 @@
 	tracker-field-data.h			\
 	tracker-file-utils.c			\
 	tracker-file-utils.h			\
+	tracker-ioprio.c			\
+	tracker-ioprio.h			\
 	tracker-language.c			\
 	tracker-language.h			\
 	tracker-log.c	 			\

Copied: branches/indexer-split/src/libtracker-common/tracker-ioprio.h (from r2034, /branches/indexer-split/src/tracker-indexer/tracker-ioprio.h)
==============================================================================
--- /branches/indexer-split/src/tracker-indexer/tracker-ioprio.h	(original)
+++ branches/indexer-split/src/libtracker-common/tracker-ioprio.h	Fri Aug  8 10:00:32 2008
@@ -18,8 +18,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKER_IOPRIO_H__
-#define __TRACKER_IOPRIO_H__
+#ifndef __LIBTRACKER_IOPRIO_H__
+#define __LIBTRACKER_IOPRIO_H__
 
 G_BEGIN_DECLS
 
@@ -27,4 +27,4 @@
 
 G_END_DECLS
 
-#endif /* __TRACKER_IOPRIO_H__ */
+#endif /* __LIBTRACKER_IOPRIO_H__ */

Modified: branches/indexer-split/src/tracker-indexer/Makefile.am
==============================================================================
--- branches/indexer-split/src/tracker-indexer/Makefile.am	(original)
+++ branches/indexer-split/src/tracker-indexer/Makefile.am	Fri Aug  8 10:00:32 2008
@@ -15,8 +15,6 @@
 tracker_indexer_SOURCES =						\
 	tracker-dbus.c							\
 	tracker-dbus.h							\
-	tracker-ioprio.c						\
-	tracker-ioprio.h						\
 	tracker-indexer.c						\
 	tracker-indexer.h						\
 	tracker-indexer-db.c						\

Modified: branches/indexer-split/src/tracker-indexer/tracker-main.c
==============================================================================
--- branches/indexer-split/src/tracker-indexer/tracker-main.c	(original)
+++ branches/indexer-split/src/tracker-indexer/tracker-main.c	Fri Aug  8 10:00:32 2008
@@ -31,6 +31,7 @@
 #include <glib-object.h>
 
 #include <libtracker-common/tracker-config.h>
+#include <libtracker-common/tracker-ioprio.h>
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-ontology.h>
 #include <libtracker-common/tracker-module-config.h>
@@ -42,10 +43,6 @@
 #include "tracker-indexer.h"
 #include "tracker-indexer-db.h"
 
-#ifdef HAVE_IOPRIO
-#include "tracker-ioprio.h"
-#endif
-
 #define ABOUT								\
 	"Tracker " VERSION "\n"						\
 	"Copyright (c) 2005-2008 Jamie McCracken (jamiemcc gnome org)\n" 

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	Fri Aug  8 10:00:32 2008
@@ -39,13 +39,14 @@
 #include <glib/gpattern.h>
 
 #include <libtracker-common/tracker-config.h>
+#include <libtracker-common/tracker-file-utils.h>
+#include <libtracker-common/tracker-hal.h>
+#include <libtracker-common/tracker-ioprio.h>
 #include <libtracker-common/tracker-language.h>
 #include <libtracker-common/tracker-log.h>
-#include <libtracker-common/tracker-hal.h>
 #include <libtracker-common/tracker-module-config.h>
-#include <libtracker-common/tracker-ontology.h>
-#include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-nfs-lock.h>
+#include <libtracker-common/tracker-ontology.h>
 
 #include <libtracker-db/tracker-db-manager.h>
 #include <libtracker-db/tracker-db-index.h>
@@ -595,6 +596,9 @@
 
 	initialize_signal_handler ();
 
+	/* Set IO priority */
+	tracker_ioprio_init ();
+
         /* nice() uses attribute "warn_unused_result" and so complains
 	 * if we do not check its returned value. But it seems that
 	 * since glibc 2.2.4, nice() can return -1 on a successful