Changeset 2056

Timestamp:

02/21/10 05:52:19 (5 months ago)

Author:

tpgww

Message:

use atomic changes for some static blockers and flags

Location:

trunk/src

Files:

• config/e2_option_tree.c (modified) (7 diffs)
• dialogs/e2_config_dialog.c (modified) (5 diffs)
• e2_filelist.c (modified) (13 diffs)
• e2_main.c (modified) (4 diffs)
• e2_task.c (modified) (6 diffs)
• e2_toolbar.c (modified) (16 diffs)

trunk/src/config/e2_option_tree.c

@@ -1 +1 @@
 /* $Id$
 
-Copyright (C) 2003-2009 tooar <tooar@emelfm2.net>
+Copyright (C) 2003-2010 tooar <tooar@emelfm2.net>
 
 This file is part of emelFM2.
@@ -781 +781 @@
 typedef struct _E2_KeyBlock
 {
-        gboolean blocked;
+        gint blocked; //flag for preventing re-entrance
         E2_KeyChangeData *data;
 } E2_KeyBlock;
 //static data used cuz only one config dialog can exist
 //Otherwise need to send variable data to callback via each relevant button
-E2_KeyBlock blocknow = {FALSE, NULL};
+E2_KeyBlock blocknow = {0, NULL};
 
 #define KEYCHANGEKEY "_e2-binding-key_"
@@ -807 +807 @@
         printd (DEBUG, "_e2_option_tree_mnemonic_cb");
 //      E2_KeyBlock *bdata = g_object_get_data (G_OBJECT(button), KEYCHANGEKEY);
-        if (bdata != NULL && bdata->blocked && bdata->data != NULL)
+        if (bdata != NULL && bdata->data != NULL && g_atomic_int_get (&bdata->blocked) != 0)
         {
                 GList *child, *all = gtk_widget_list_mnemonic_labels (button);
@@ -823 +823 @@
                                 e2_keybinding_unblock (config_dialog, NULL);
                                 //unblock all button-mnemonics
-                                bdata->blocked = FALSE;
+                                g_atomic_int_set (&bdata->blocked, 0);
                                 bdata->data = NULL; //will have been cleared downstream
                                 break;
@@ -832 +832 @@
         }
         else if (bdata != NULL)
-                return bdata->blocked;
+                return (g_atomic_int_get (&bdata->blocked) != 0);
         else
                 return FALSE;
@@ -872 +872 @@
 {
 //      printd (DEBUG, "_e2_option_tree_unblock_mnemonics");
-        blocknow.blocked = FALSE;
+        g_atomic_int_set (&blocknow.blocked, 0);
         if (blocknow.data != NULL)
         {
@@ -914 +914 @@
                 e2_keybinding_block (config_dialog, NULL);
                 //or of any dialog-button mnemonic
-                blocknow.blocked = TRUE;
+                g_atomic_int_set (&blocknow.blocked, 1);
                 blocknow.data = data;
 /* if static data not viable

trunk/src/dialogs/e2_config_dialog.c

@@ -1 +1 @@
 /* $Id$
 
-Copyright (C) 2003-2009 tooar <tooar@emelfm2.net>
+Copyright (C) 2003-2010 tooar <tooar@emelfm2.net>
 Portions copyright (C) 1999 Michael Clark
 
@@ -819 +819 @@
 } */
 
-//this flag is ok because only 1 config dialog, and only 1 edit, at any time
-static gboolean cancel_blocked = FALSE;
+//this static flag is ok because only 1 config dialog, and only 1 edit, at any time
+static gint cancel_blocked = 0;
 /**
 @brief allow <Esc> press to cancel editing of the entry text without closing the dialog
@@ -833 +833 @@
         E2_OptionSet *set)
 {
-        if (!cancel_blocked)
+        if (g_atomic_int_get (&cancel_blocked) == 0)
         {
                 g_signal_handlers_block_by_func (G_OBJECT (config_dialog),
                         e2_dialog_key_neg_cb, config_dialog);
-                cancel_blocked = TRUE;
+                g_atomic_int_set (&cancel_blocked, 1);
         }
         else if (event->keyval == GDK_Escape
@@ -853 +853 @@
                 g_signal_handlers_unblock_by_func (G_OBJECT (config_dialog),
                         e2_dialog_key_neg_cb, config_dialog);
-                cancel_blocked = FALSE;
+                g_atomic_int_set (&cancel_blocked, 0);
                 return (event->keyval == GDK_Escape);
         }
@@ -872 +872 @@
         gpointer data)
 {
-        if (cancel_blocked)
+        if (g_atomic_int_get (&cancel_blocked) != 0)
         {
                 g_signal_handlers_unblock_by_func (G_OBJECT (config_dialog),
                         e2_dialog_key_neg_cb, config_dialog);
-                cancel_blocked = FALSE;
+                g_atomic_int_set (&cancel_blocked, 0);
         }
         return FALSE;

trunk/src/e2_filelist.c

@@ -1 +1 @@
 /* $Id$
 
-Copyright (C) 2004-2009 tooar <tooar@emelfm2.net>.
+Copyright (C) 2004-2010 tooar <tooar@emelfm2.net>.
 
 This file is part of emelFM2.
@@ -49 +49 @@
 
 //disable-refresh counter for both filelists
-gint refresh_refcount;
+volatile gint refresh_refcount;
 //disable-refresh counter for single filelists
-static gint refresh_active_refcount;
-static gint refresh_inactive_refcount;
+static volatile gint refresh_active_refcount;
+static volatile gint refresh_inactive_refcount;
 //refresh deferral counters
 static gint pane1repeats = 0;
@@ -95 +95 @@
         if (_e2_filelist_check_active_pane (pane))
         {
-                refresh_active_refcount++;
-                if (refresh_active_refcount == 1)
+                if (g_atomic_int_exchange_and_add (&refresh_active_refcount, 1) == 0)
                 {
                         LISTS_LOCK
@@ -105 +104 @@
         else
         {
-                refresh_inactive_refcount++;
-                if (refresh_inactive_refcount == 1)
+                if (g_atomic_int_exchange_and_add (&refresh_inactive_refcount, 1) == 0)
                 {
                         LISTS_LOCK
@@ -125 +123 @@
         if (_e2_filelist_check_active_pane (pane))
         {
-                refresh_active_refcount--;
-                if (refresh_active_refcount == 0 && refresh_refcount == 0)
+                if (g_atomic_int_exchange_and_add (&refresh_active_refcount, -1) == 1
+                        && g_atomic_int_get (&refresh_refcount) == 0)
                 {
                         LISTS_LOCK
@@ -133 +131 @@
                 }
                 if (refresh_active_refcount < 0)
-                        refresh_active_refcount = 0;
+                        g_atomic_int_set (&refresh_active_refcount, 0);
         }
         else
         {
-                refresh_inactive_refcount--;
-                if (refresh_inactive_refcount == 0 && refresh_refcount == 0)
+                if (g_atomic_int_exchange_and_add (&refresh_inactive_refcount, -1) == 1
+                        && g_atomic_int_get (&refresh_refcount) == 0)
                 {
                         LISTS_LOCK
@@ -145 +143 @@
                 }
                 if (refresh_inactive_refcount < 0)
-                        refresh_inactive_refcount = 0;
+                        g_atomic_int_set (&refresh_inactive_refcount, 0);
         }
 }
@@ -181 +179 @@
 void e2_filelist_reset_refresh (void)
 {
-        if (refresh_refcount != 0)
-        {
-                refresh_refcount = 1;
+        if (g_atomic_int_get (&refresh_refcount) != 0)
+        {
+                g_atomic_int_set (&refresh_refcount, 1);
                 e2_filelist_enable_refresh ();
         }
@@ -194 +192 @@
 @brief  disable refreshing of pane filelists and config data
 
-Increase ref count, if == 1, stop the timer process which calls the refresh fns
+Increases the ref-count, then if 1, stop the timer process which calls the refresh fns
 Why is config data check bundled here ?
 Expects BGL open?
@@ -202 +200 @@
 void e2_filelist_disable_refresh (void)
 {
-        refresh_refcount++;
+        gint preinc = g_atomic_int_exchange_and_add (&refresh_refcount, 1);
 #ifdef E2_REFRESH_DEBUG
-        printd (DEBUG, "disable refresh, refresh ref now = %d", refresh_refcount);
-#endif
-        if (refresh_refcount == 1)
+        printd (DEBUG, "disable refresh, refresh ref now = %d", preinc + 1);
+#endif
+        if (preinc == 0)
         {
                 if (app.timers[REFRESHBEGIN_T] > 0)
@@ -242 +240 @@
 @brief re-enable polling of pane filelists and config data
 
-Decrease ref count, if == 0, re-enable/restart the processes which detect
+Decreases the ref-count, then if 0, re-enable/restart the processes which detect
 changes of filelist content and/or config data
 Config timer is bundled here because the same func refreshes the panes
@@ -251 +249 @@
 void e2_filelist_enable_refresh (void)
 {
-        refresh_refcount--;
+        gint predec = g_atomic_int_exchange_and_add (&refresh_refcount, -1);
 #ifdef E2_REFRESH_DEBUG
-        printd (DEBUG, "enable refresh, refresh ref now = %d", refresh_refcount);
-#endif
-        if (refresh_refcount < 0)
-        {
-                printd (WARN, "The auto-refresh refresh count is < 0");
-                gdk_threads_enter ();
-                e2_window_output_show (NULL, NULL);
-                e2_output_print_error (
-                _("Something is wrong with the auto-refresh mechanism"), FALSE);
-                gdk_threads_leave ();
-        }
-
-        if (refresh_refcount == 0)
+        printd (DEBUG, "enable refresh, refresh ref now = %d", predec - 1);
+#endif
+        if (predec == 1)
         {
                 if (e2_option_bool_get ("auto-refresh"))
@@ -287 +275 @@
                 e2_window_enable_status_update (-1);
 #endif
+        }
+        else if (predec < 1)
+        {
+                printd (WARN, "The auto-refresh refresh count is < 0");
+                gdk_threads_enter ();
+                e2_window_output_show (NULL, NULL);
+                e2_output_print_error (
+                _("Something is wrong with the auto-refresh mechanism"), FALSE);
+                gdk_threads_leave ();
         }
 }

trunk/src/e2_main.c

@@ -1 +1 @@
 /* $Id$
 
-Copyright (C) 2003-2009 tooar <tooar@emelfm2.net>
+Copyright (C) 2003-2010 tooar <tooar@emelfm2.net>
 Portions copyright (C) 1999 Michael Clark.
 
@@ -127 +127 @@
 #define UPGRADE_PNAME "e2p_upgrade.so"
 
-extern gint refresh_refcount;
+extern volatile gint refresh_refcount;
 extern GList *open_history;
 #ifdef USE_GLIB2_10
@@ -472 +472 @@
         pthread_cleanup_push ((gpointer)e2_filelist_reset_refresh, NULL);
                 //enable refresh
-                saverefcount = refresh_refcount;
+                saverefcount = g_atomic_int_get (&refresh_refcount);
                 if (saverefcount > 0)
                 {
@@ -785 +785 @@
 #endif
         //set refresh counter to its real initial value
-        refresh_refcount = 0;
+        g_atomic_int_set (&refresh_refcount, 0);
 #ifdef E2_REFRESH_DEBUG
         printd (DEBUG, "disable refresh, session start before filelists built");

trunk/src/e2_task.c

@@ -1 +1 @@
 /* $Id$
 
-Copyright (C) 2003-2009 tooar <tooar@emelfm2.net>
+Copyright (C) 2003-2010 tooar <tooar@emelfm2.net>
 
 This file is part of emelFM2.
@@ -39 +39 @@
 
 GList *open_history = NULL;  //history list for open-with dialog
-extern gint refresh_refcount;
+extern volatile gint refresh_refcount;
 
 pthread_mutex_t task_mutex = PTHREAD_MUTEX_INITIALIZER; //PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP not needed
@@ -231 +231 @@
 E2_TaskRuntime *e2_task_set_data (glong pid, E2_TaskDataType mode, gchar *command)
 {
-        static gboolean blocked = FALSE;
-        if (blocked)
+        static gint blocked = 0;
+
+        if (!g_atomic_int_compare_and_exchange (&blocked, 0, 1))
                 return NULL;
-        else
-                blocked = TRUE;
 
         E2_TaskRuntime *rt = e2_task_find_running_task (pid);
@@ -249 +248 @@
                 {
                         printd (WARN, "not enough memory for task history data");
-                        blocked = FALSE;
+                        g_atomic_int_set (&blocked, 0);
                         return GINT_TO_POINTER (1);
                 }
@@ -297 +296 @@
                         printd (WARN, "tried to register a process with bad mode flag");
                         DEALLOCATE (E2_TaskRuntime, rt);
-                        blocked = FALSE;
+                        g_atomic_int_set (&blocked, 0);
                         return GINT_TO_POINTER (1);
                 }
@@ -314 +313 @@
         {       //found an entry with matching pid
                 printd (DEBUG, "tried to re-register a process");
-                blocked = FALSE;
-                return GINT_TO_POINTER (1);
-        }
-
-        blocked = FALSE;
+                rt = GINT_TO_POINTER (1);
+        }
+
+        g_atomic_int_set (&blocked, 0);
         return rt;
 }

trunk/src/e2_toolbar.c

@@ -1 +1 @@
 /* $Id$
 
-Copyright (C) 2003-2009 tooar <tooar@emelfm2.net>
+Copyright (C) 2003-2010 tooar <tooar@emelfm2.net>
 
 This file is part of emelFM2.
@@ -90 +90 @@
 static void _e2_toolbar_hide_cb (GtkMenuItem *menuitem, E2_ToolbarRuntime *rt)
 {
-        if (!rt->blocked)  //bar's menu is not now being created
+        if (g_atomic_int_get (&rt->blocked) == 0)  //bar's menu is not now being created
         {
                 e2_option_bool_toggle_direct (rt->show);  //now FALSE
@@ -108 +108 @@
 static void _e2_toolbar_toggle_tt_cb (GtkMenuItem *menuitem, E2_ToolbarRuntime *rt)
 {
-        if (!rt->blocked) //bar's menu is not now being created
+        if (g_atomic_int_get (&rt->blocked) == 0) //bar's menu is not now being created
         {
                 gtk_toolbar_set_tooltips (GTK_TOOLBAR (rt->toolbar),
@@ -128 +128 @@
 static void _e2_toolbar_update_space_cb (GtkMenuItem *menuitem, E2_ToolbarRuntime *rt)
 {
-        if (!rt->blocked) //bar's menu is not now being created
+        if (g_atomic_int_get (&rt->blocked) == 0) //bar's menu is not now being created
         {
                 GSList *group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
@@ -152 +152 @@
 static void _e2_toolbar_toggle_hori_cb (GtkMenuItem *menuitem, E2_ToolbarRuntime *rt)
 {
-        if (!rt->blocked) //bar's menu is not now being created
+        if (g_atomic_int_get (&rt->blocked) == 0) //bar's menu is not now being created
         {
                 e2_option_bool_toggle_direct (rt->hori);
@@ -172 +172 @@
 static void _e2_toolbar_update_type_cb (GtkMenuItem *menuitem, E2_ToolbarRuntime *rt)
 {
-        if (!rt->blocked) //bar's menu is not now being created
+        if (g_atomic_int_get (&rt->blocked) == 0) //bar's menu is not now being created
         {
                 GSList *group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
@@ -196 +196 @@
 static void _e2_toolbar_increase_priority_cb (GtkMenuItem *menuitem, E2_ToolbarRuntime *rt)
 {
-        if (!rt->blocked) //bar's menu is not now being created
+        if (g_atomic_int_get (&rt->blocked) == 0) //bar's menu is not now being created
         {
                 gint i = e2_option_int_get_direct (rt->priority);
@@ -217 +217 @@
 static void _e2_toolbar_decrease_priority_cb (GtkMenuItem *menuitem, E2_ToolbarRuntime *rt)
 {
-        if (!rt->blocked) //bar's menu is not now being created
+        if (g_atomic_int_get (&rt->blocked) == 0) //bar's menu is not now being created
         {
                 gint i = e2_option_int_get_direct (rt->priority);
@@ -237 +237 @@
 static void _e2_toolbar_reset_priority_cb (GtkMenuItem *menuitem, E2_ToolbarRuntime *rt)
 {
-        if (!rt->blocked && (e2_option_int_get_direct (rt->priority) != 0))
+        if (g_atomic_int_get (&rt->blocked) == 0 //bar's menu is not now being created
+        && (e2_option_int_get_direct (rt->priority) != 0))
         {
                 e2_option_int_set_direct (rt->priority, 0);
@@ -256 +257 @@
 static void _e2_toolbar_toggle_relief_cb (GtkCheckMenuItem *menuitem, E2_ToolbarRuntime *rt)
 {
-        if (!rt->blocked) //bar's menu is not now being created
+        if (g_atomic_int_get (&rt->blocked) == 0) //bar's menu is not now being created
         {
                 e2_option_bool_toggle_direct (rt->relief);
@@ -275 +276 @@
 static void _e2_toolbar_toggle_same_cb (GtkMenuItem *menuitem, E2_ToolbarRuntime *rt)
 {
-        if (!rt->blocked) //bar's menu is not now being created
+        if (g_atomic_int_get (&rt->blocked) == 0) //bar's menu is not now being created
         {
                 e2_option_bool_toggle_direct (rt->same);
@@ -296 +297 @@
 static void _e2_toolbar_update_style_cb (GtkMenuItem *menuitem, E2_ToolbarRuntime *rt)
 {
-        if (!rt->blocked) //bar's menu is not now being created
+        if (g_atomic_int_get (&rt->blocked) == 0) //bar's menu is not now being created
         {
                 GSList *group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
@@ -320 +321 @@
 static void _e2_toolbar_update_isize_cb (GtkMenuItem *menuitem, E2_ToolbarRuntime *rt)
 {
-        if (!rt->blocked) //bar's menu is not now being created
+        if (g_atomic_int_get (&rt->blocked) == 0) //bar's menu is not now being created
         {
                 GSList *group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (menuitem));
@@ -356 +357 @@
            )
         {
+                GtkWidget *menu, *submenu;
                 //block local callbacks while the menu is being constructed
-                rt->blocked = TRUE;
-                GtkWidget *menu, *submenu;
+                if (!g_atomic_int_compare_and_exchange (&rt->blocked, 0, 1))
+                        return FALSE;
                 menu = gtk_menu_new ();
                 e2_menu_add_check (menu, _("Show _bar"),
@@ -444 +446 @@
 
                 e2_menu_popup (menu, 3, event->time);
-                rt->blocked = FALSE;
+                g_atomic_int_set (&rt->blocked, 0);
                 return TRUE;
         }
@@ -2680 +2682 @@
         rt->name = barname;
 //      rt->public_name = app.bars[barnum]->public_name;
-        rt->blocked = FALSE;
+        rt->blocked = 0;
         rt->hidden = FALSE;
         rt->has_toggle = FALSE;