Changeset 7464

Timestamp:

Dec 22, 2008, 5:39:03 AM (14 years ago)

Author:

charles

Message:

(trunk gtk) #1585: use g_timeout_add_seconds() where appropriate to group timers together for fewer scheduled wakeups

Location:

trunk/gtk

Files:

• details.c (modified) (2 diffs)
• file-list.c (modified) (1 diff)
• main.c (modified) (1 diff)
• msgwin.c (modified) (1 diff)
• stats.c (modified) (1 diff)
• tr-core.c (modified) (1 diff)
• tr-icon.c (modified) (2 diffs)
• tr-prefs.c (modified) (1 diff)
• tracker-list.c (modified) (1 diff)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

trunk/gtk/details.c

@@ -29 +29 @@
 #include "util.h"
 
-#define UPDATE_INTERVAL_MSEC 2000
+#define UPDATE_INTERVAL_SECONDS 2
 
 /****
@@ -1530 +1530 @@
     gtk_box_pack_start( GTK_BOX( GTK_DIALOG( d )->vbox ), n, TRUE, TRUE, 0 );
 
-    tag = g_timeout_add ( UPDATE_INTERVAL_MSEC, periodic_refresh, d );
+    tag = gtr_timeout_add_seconds( UPDATE_INTERVAL_SECONDS, periodic_refresh, d );
     g_object_set_data_full ( G_OBJECT( d ), "tag",
                              GUINT_TO_POINTER( tag ), remove_tag );

trunk/gtk/file-list.c

@@ -484 +484 @@
         refresh( data );
 
-        data->timeout_tag = g_timeout_add( 2500, refreshModel, data );
+        data->timeout_tag = gtr_timeout_add_seconds( 2, refreshModel, data );
     }
 

trunk/gtk/main.c

@@ -613 +613 @@
     /* start scheduled rate timer */
     updateScheduledLimits ( tr_core_session( cbdata->core ) );
-    g_timeout_add( 60 * 1000, updateScheduledLimits,
-                  tr_core_session( cbdata->core ) );
+    gtr_timeout_add_seconds( 60, updateScheduledLimits, tr_core_session( cbdata->core ) );
 
     /* either show the window or iconify it */

trunk/gtk/msgwin.c

@@ -544 +544 @@
     gtk_container_add( GTK_CONTAINER( win ), vbox );
 
-    data->refresh_tag = g_timeout_add( 1666, onRefresh, data );
+    data->refresh_tag = gtr_timeout_add_seconds( 2, onRefresh, data );
     g_object_weak_ref( G_OBJECT( win ), onWindowDestroyed, data );
 

trunk/gtk/stats.c

@@ -170 +170 @@
     g_object_set_data_full( G_OBJECT( d ), "data", ui, g_free );
     g_signal_connect( d, "response", G_CALLBACK( dialogResponse ), ui );
-    i = g_timeout_add( 1000, updateStats, ui );
+    i = gtr_timeout_add_seconds( 1, updateStats, ui );
     g_object_weak_ref( G_OBJECT( d ), dialogDestroyed, GUINT_TO_POINTER( i ) );
     return d;

trunk/gtk/tr-core.c

@@ -499 +499 @@
                 g_slist_append( p->monitor_files, g_strdup( filename ) );
         if( !p->monitor_idle_tag )
-            p->monitor_idle_tag = g_timeout_add( 1000, watchFolderIdle,
-                                                 core );
+            p->monitor_idle_tag = gtr_timeout_add_seconds( 1, watchFolderIdle, core );
     }
 }

trunk/gtk/tr-icon.c

@@ -27 +27 @@
 #else
 
- #define UPDATE_INTERVAL 2500
+#define UPDATE_INTERVAL_SECONDS 2
 
 static void
@@ -91 +91 @@
     g_signal_connect( icon, "activate", G_CALLBACK( activated ), NULL );
     g_signal_connect( icon, "popup-menu", G_CALLBACK( popup ), NULL );
-    id = g_timeout_add( UPDATE_INTERVAL, refresh_tooltip_cb, icon );
+    id = gtr_timeout_add_seconds( UPDATE_INTERVAL_SECONDS, refresh_tooltip_cb, icon );
     g_object_set_data( G_OBJECT( icon ), "tr-core", core );
     g_object_set_data_full( G_OBJECT(

trunk/gtk/tr-prefs.c

@@ -1243 +1243 @@
         data->label = ndata->label;
         data->alive = ndata->alive;
-        g_timeout_add( 3000, testing_port_begin, data );
+        gtr_timeout_add_seconds( 3, testing_port_begin, data );
     }
 }

trunk/gtk/tracker-list.c

@@ -29 +29 @@
 #include "util.h"
 
-#define UPDATE_INTERVAL_MSEC 2000
 #define PAGE_KEY "page"
 

trunk/gtk/util.c

@@ -642 +642 @@
 }
 
+/***
+****
+***/
+
+guint
+gtr_timeout_add_seconds( guint        interval,
+                         GSourceFunc  function,
+                         gpointer     data )
+{
+#if GLIB_CHECK_VERSION( 2,14,0 )
+    return g_timeout_add_seconds( interval, function, data );
+#else
+    return g_timeout_add( interval*1000, function, data );
+#endif
+}

trunk/gtk/util.h

@@ -96 +96 @@
                                        const char * mnemonic );
 
+guint       gtr_timeout_add_seconds( guint       interval,
+                                     GSourceFunc function,
+                                     gpointer    data );
+
 void        addTorrentErrorDialog( GtkWidget *  window_or_child,
                                    int          err,