X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/1a18e09d192b6fb20b06700d9d196d8ec88d0d2a..e13ab673e45ea48de49661f7838e75925f405514:/src/background.c?ds=sidebyside diff --git a/src/background.c b/src/background.c index 38b0eca0..d1d0c9b5 100644 --- a/src/background.c +++ b/src/background.c @@ -20,9 +20,13 @@ */ #include +#include + #include "vikstatus.h" #include "background.h" -#include "gtkcellrendererprogress.h" + +static GThreadPool *thread_pool = NULL; +static gboolean stop_all_threads = FALSE; static GtkWidget *bgwindow = NULL; static GtkWidget *bgtreeview = NULL; @@ -34,7 +38,7 @@ static gint bgitemcount = 0; enum { - TITLE_COLUMN, + TITLE_COLUMN = 0, PROGRESS_COLUMN, DATA_COLUMN, N_COLUMNS, @@ -50,21 +54,24 @@ void a_background_update_status ( VikStatusbar *vs, gchar *str ) static void background_thread_update () { static gchar buf[20]; - g_snprintf(buf, sizeof(buf), "%d items", bgitemcount); + g_snprintf(buf, sizeof(buf), _("%d items"), bgitemcount); g_slist_foreach ( statusbars_to_update, (GFunc) a_background_update_status, buf ); } -void a_background_thread_progress ( gpointer callbackdata, gdouble fraction ) +int a_background_thread_progress ( gpointer callbackdata, gdouble fraction ) { gpointer *args = (gpointer *) callbackdata; - a_background_testcancel ( callbackdata ); - gdk_threads_enter(); - gtk_list_store_set( GTK_LIST_STORE(bgstore), (GtkTreeIter *) args[5], PROGRESS_COLUMN, fraction, -1 ); - gdk_threads_leave(); + int res = a_background_testcancel ( callbackdata ); + if (args[5] != NULL) { + gdk_threads_enter(); + gtk_list_store_set( GTK_LIST_STORE(bgstore), (GtkTreeIter *) args[5], PROGRESS_COLUMN, fraction*100, -1 ); + gdk_threads_leave(); + } args[6] = GINT_TO_POINTER(GPOINTER_TO_INT(args[6])-1); bgitemcount--; background_thread_update(); + return res; } static void thread_die ( gpointer args[6] ) @@ -81,28 +88,30 @@ static void thread_die ( gpointer args[6] ) g_free ( args[5] ); /* free iter */ g_free ( args ); - - g_thread_exit ( NULL ); } -void a_background_testcancel ( gpointer callbackdata ) +int a_background_testcancel ( gpointer callbackdata ) { gpointer *args = (gpointer *) callbackdata; - if ( args[0] ) + if ( stop_all_threads ) + return -1; + if ( args && args[0] ) { vik_thr_free_func cleanup = args[4]; if ( cleanup ) cleanup ( args[2] ); - thread_die( args ); + return -1; } + return 0; } - -void thread_helper ( gpointer args[6] ) +void thread_helper ( gpointer args[6], gpointer user_data ) { /* unpack args */ vik_thr_func func = args[1]; gpointer userdata = args[2]; + g_debug(__FUNCTION__); + func ( userdata, args ); gdk_threads_enter(); @@ -118,6 +127,8 @@ void a_background_thread ( GtkWindow *parent, const gchar *message, vik_thr_func GtkTreeIter *piter = g_malloc ( sizeof ( GtkTreeIter ) ); gpointer *args = g_malloc ( sizeof(gpointer) * 7 ); + g_debug(__FUNCTION__); + args[0] = GINT_TO_POINTER(0); args[1] = func; args[2] = userdata; @@ -129,10 +140,14 @@ void a_background_thread ( GtkWindow *parent, const gchar *message, vik_thr_func bgitemcount += number_items; gtk_list_store_append ( bgstore, piter ); - gtk_list_store_set ( bgstore, piter, TITLE_COLUMN, message, PROGRESS_COLUMN, 0.0, DATA_COLUMN, args, -1 ); + gtk_list_store_set ( bgstore, piter, + TITLE_COLUMN, message, + PROGRESS_COLUMN, 0.0, + DATA_COLUMN, args, + -1 ); /* run the thread in the background */ - g_thread_create( (GThreadFunc) thread_helper, args, FALSE, NULL ); + g_thread_pool_push( thread_pool, args, NULL ); } void a_background_show_window () @@ -143,6 +158,9 @@ void a_background_show_window () static void cancel_job_with_iter ( GtkTreeIter *piter ) { gpointer *args; + + g_debug(__FUNCTION__); + gtk_tree_model_get( GTK_TREE_MODEL(bgstore), piter, DATA_COLUMN, &args, -1 ); /* we know args still exists because it is free _after_ the list item is destroyed */ @@ -150,6 +168,7 @@ static void cancel_job_with_iter ( GtkTreeIter *piter ) args[0] = GINT_TO_POINTER(1); /* set killswitch */ gtk_list_store_remove ( bgstore, piter ); + args[5] = NULL; } static void bgwindow_response (GtkDialog *dialog, gint arg1 ) @@ -182,10 +201,17 @@ static void bgwindow_response (GtkDialog *dialog, gint arg1 ) void a_background_init() { + /* initialize thread pool */ + /* TODO parametrize this via preference and/or command line arg */ + gint max_threads = 10; /* limit maximum number of threads running at one time */ + thread_pool = g_thread_pool_new ( (GFunc) thread_helper, NULL, max_threads, FALSE, NULL ); + GtkCellRenderer *renderer; GtkTreeViewColumn *column; GtkWidget *scrolled_window; + g_debug(__FUNCTION__); + /* store & treeview */ bgstore = gtk_list_store_new ( N_COLUMNS, G_TYPE_STRING, G_TYPE_DOUBLE, G_TYPE_POINTER ); bgtreeview = gtk_tree_view_new_with_model ( GTK_TREE_MODEL(bgstore) ); @@ -195,11 +221,11 @@ void a_background_init() /* add columns */ renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes ( "Job", renderer, "text", TITLE_COLUMN, NULL ); + column = gtk_tree_view_column_new_with_attributes ( _("Job"), renderer, "text", TITLE_COLUMN, NULL ); gtk_tree_view_append_column ( GTK_TREE_VIEW(bgtreeview), column ); renderer = gtk_cell_renderer_progress_new (); - column = gtk_tree_view_column_new_with_attributes ( "Progress", renderer, "percentage", PROGRESS_COLUMN, NULL ); + column = gtk_tree_view_column_new_with_attributes ( _("Progress"), renderer, "value", PROGRESS_COLUMN, NULL ); gtk_tree_view_append_column ( GTK_TREE_VIEW(bgtreeview), column ); /* setup window */ @@ -210,7 +236,7 @@ void a_background_init() bgwindow = gtk_dialog_new_with_buttons ( "", NULL, 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_DELETE, 1, GTK_STOCK_CLEAR, 2, NULL ); gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(bgwindow)->vbox), scrolled_window, TRUE, TRUE, 0 ); gtk_window_set_default_size ( GTK_WINDOW(bgwindow), 400, 400 ); - gtk_window_set_title ( GTK_WINDOW(bgwindow), "Viking Background Jobs" ); + gtk_window_set_title ( GTK_WINDOW(bgwindow), _("Viking Background Jobs") ); /* don't destroy win */ g_signal_connect ( G_OBJECT(bgwindow), "delete-event", G_CALLBACK(gtk_widget_hide_on_delete), NULL ); @@ -218,6 +244,13 @@ void a_background_init() } +void a_background_uninit() +{ + /* wait until all running threads stop */ + stop_all_threads = TRUE; + g_thread_pool_free ( thread_pool, TRUE, TRUE ); +} + void a_background_add_status(VikStatusbar *vs) { statusbars_to_update = g_slist_prepend(statusbars_to_update,vs);