Attachment 292828 Details for Bug 426060 – proposed patch

[patch] proposed patch

tracker-fix-426060.patch (text/plain), 2.32 KB, created by Zack Cerza on 2008-01-24 17:35:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zack Cerza

Created: 2008-01-24 17:35:52 UTC

Size: 2.32 KB

patch

obsolete

># Fix bug #426060 by making sure tracker_dbus_init() is not called until
># GMutexes are initialized.
>--- src/trackerd/trackerd.c	2008-01-24 12:17:31.000000000 -0500
>+++ src/trackerd/trackerd.c	2008-01-24 12:17:33.000000000 -0500
>@@ -2482,6 +2482,33 @@
> 
> 	tracker = g_new0 (Tracker, 1);
> 
>+	tracker->files_check_mutex = g_mutex_new ();
>+	tracker->metadata_check_mutex = g_mutex_new ();
>+	tracker->request_check_mutex = g_mutex_new ();
>+
>+	tracker->files_stopped_mutex = g_mutex_new ();
>+	tracker->metadata_stopped_mutex = g_mutex_new ();
>+	tracker->request_stopped_mutex = g_mutex_new ();
>+
>+	tracker->file_metadata_thread = NULL;
>+	tracker->file_process_thread = NULL;
>+	tracker->user_request_thread = NULL;;
>+
>+	tracker->file_thread_signal = g_cond_new ();
>+	tracker->metadata_thread_signal = g_cond_new ();
>+	tracker->request_thread_signal = g_cond_new ();
>+
>+	tracker->metadata_signal_mutex = g_mutex_new ();
>+	tracker->files_signal_mutex = g_mutex_new ();
>+	tracker->request_signal_mutex = g_mutex_new ();
>+
>+	tracker->log_access_mutex = g_mutex_new ();
>+	tracker->scheduler_mutex = g_mutex_new ();
>+
>+	tracker->stemmer_mutex = g_mutex_new ();
>+
>+	//tracker->cached_word_table_mutex = g_mutex_new ();
>+
> 	tracker->status = STATUS_INIT;
> 
>  	tracker->is_running = FALSE;
>@@ -2538,33 +2565,6 @@
> 
> 	tracker->shutdown = FALSE;
> 
>-	tracker->files_check_mutex = g_mutex_new ();
>-	tracker->metadata_check_mutex = g_mutex_new ();
>-	tracker->request_check_mutex = g_mutex_new ();
>-
>-	tracker->files_stopped_mutex = g_mutex_new ();
>-	tracker->metadata_stopped_mutex = g_mutex_new ();
>-	tracker->request_stopped_mutex = g_mutex_new ();
>-
>-	tracker->file_metadata_thread = NULL;
>-	tracker->file_process_thread = NULL;
>-	tracker->user_request_thread = NULL;;
>-
>-	tracker->file_thread_signal = g_cond_new ();
>-	tracker->metadata_thread_signal = g_cond_new ();
>-	tracker->request_thread_signal = g_cond_new ();
>-
>-	tracker->metadata_signal_mutex = g_mutex_new ();
>-	tracker->files_signal_mutex = g_mutex_new ();
>-	tracker->request_signal_mutex = g_mutex_new ();
>-
>-	tracker->log_access_mutex = g_mutex_new ();
>-	tracker->scheduler_mutex = g_mutex_new ();
>-
>-	tracker->stemmer_mutex = g_mutex_new ();
>-
>-	//tracker->cached_word_table_mutex = g_mutex_new ();
>-
> 	tracker->dir_queue = g_async_queue_new ();
> 
> 	tracker->xesam_dir = g_build_filename (g_get_home_dir (), ".xesam", NULL);

Actions: View | Diff

Attachments on bug 426060: 292828