Changeset 8882

Timestamp:

Aug 7, 2009, 8:49:06 PM (13 years ago)

Author:

charles

Message:

(trunk gtk) fix #2292: wrong speed in bottom bar

Location:

trunk/gtk

Files:

• torrent-cell-renderer.c (modified) (15 diffs)
• tr-core.c (modified) (5 diffs)
• tr-core.h (modified) (1 diff)
• tr-window.c (modified) (2 diffs)

trunk/gtk/torrent-cell-renderer.c

@@ -28 +28 @@
 {
     P_TORRENT = 1,
+    P_UPLOAD_SPEED,
+    P_DOWNLOAD_SPEED,
     P_BAR_HEIGHT,
     P_MINIMAL
@@ -129 +131 @@
 static char*
 getShortTransferString( const tr_stat * torStat,
-                        char *          buf,
+                        double          uploadSpeed,
+                        double          downloadSpeed,
+                        char          * buf,
                         size_t          buflen )
 {
@@ -137 +141 @@
 
     if( haveDown )
-        tr_strlspeed( downStr, torStat->pieceDownloadSpeed, sizeof( downStr ) );
+        tr_strlspeed( downStr, downloadSpeed, sizeof( downStr ) );
     if( haveUp )
-        tr_strlspeed( upStr, torStat->pieceUploadSpeed, sizeof( upStr ) );
+        tr_strlspeed( upStr, uploadSpeed, sizeof( upStr ) );
 
     if( haveDown && haveUp )
@@ -161 +165 @@
 
 static char*
-getShortStatusString( const tr_stat * torStat )
+getShortStatusString( const tr_stat * torStat,
+                      double          uploadSpeed,
+                      double          downloadSpeed )
 {
     GString * gstr = g_string_new( NULL );
@@ -191 +197 @@
                 g_string_append( gstr, ", " );
             }
-            getShortTransferString( torStat, buf, sizeof( buf ) );
+            getShortTransferString( torStat, uploadSpeed, downloadSpeed, buf, sizeof( buf ) );
             g_string_append( gstr, buf );
             break;
@@ -204 +210 @@
 
 static char*
-getStatusString( const tr_stat * torStat )
+getStatusString( const tr_stat * torStat,
+                 const double    uploadSpeed,
+                 const double    downloadSpeed )
 {
     const int isActive = torStat->activity != TR_STATUS_STOPPED;
@@ -225 +233 @@
             case TR_STATUS_CHECK:
             {
-                char * pch = getShortStatusString( torStat );
+                char * pch = getShortStatusString( torStat, uploadSpeed, downloadSpeed );
                 g_string_assign( gstr, pch );
                 g_free( pch );
@@ -255 +263 @@
     {
         char buf[256];
-        getShortTransferString( torStat, buf, sizeof( buf ) );
+        getShortTransferString( torStat, uploadSpeed, downloadSpeed, buf, sizeof( buf ) );
         g_string_append_printf( gstr, " - %s", buf );
     }
@@ -275 +283 @@
     GtkCellRenderer  * progress_renderer;
     GtkCellRenderer  * icon_renderer;
-    int                bar_height;
-    gboolean           minimal;
+    int bar_height;
+
+    /* use this instead of tr_stat.pieceUploadSpeed so that the model can
+       control when the speed displays get updated.  this is done to keep
+       the individual torrents' speeds and the status bar's overall speed
+       in sync even if they refresh at slightly different times */
+    int upload_speed;
+
+    /* @see upload_speed */
+    int download_speed;
+
+    gboolean minimal;
 };
 
@@ -328 +346 @@
     icon = get_icon( tor, MINIMAL_ICON_SIZE, widget );
     name = tr_torrentInfo( tor )->name;
-    status = getShortStatusString( st );
+    status = getShortStatusString( st, p->upload_speed, p->download_speed );
 
     /* get the idealized cell dimensions */
@@ -385 +403 @@
     icon = get_icon( tor, FULL_ICON_SIZE, widget );
     name = inf->name;
-    status = getStatusString( st );
+    status = getStatusString( st, p->upload_speed, p->download_speed );
     progress = getProgressString( tor, inf, st );
 
@@ -488 +506 @@
     icon = get_icon( tor, MINIMAL_ICON_SIZE, widget );
     name = tr_torrentInfo( tor )->name;
-    status = getShortStatusString( st );
+    status = getShortStatusString( st, p->upload_speed, p->download_speed );
 
     /* get the cell dimensions */
@@ -583 +601 @@
     icon = get_icon( tor, FULL_ICON_SIZE, widget );
     name = inf->name;
-    status = getStatusString( st );
+    status = getStatusString( st, p->upload_speed, p->download_speed );
     progress = getProgressString( tor, inf, st );
 
@@ -692 +710 @@
 
 static void
-torrent_cell_renderer_set_property( GObject *      object,
+torrent_cell_renderer_set_property( GObject      * object,
                                     guint          property_id,
                                     const GValue * v,
-                                    GParamSpec *   pspec )
-{
-    TorrentCellRenderer *               self = TORRENT_CELL_RENDERER(
-        object );
+                                    GParamSpec   * pspec )
+{
+    TorrentCellRenderer * self = TORRENT_CELL_RENDERER( object );
     struct TorrentCellRendererPrivate * p = self->priv;
 
     switch( property_id )
     {
-        case P_TORRENT:
-            p->tor = g_value_get_pointer( v ); break;
-
-        case P_BAR_HEIGHT:
-            p->bar_height = g_value_get_int( v ); break;
-
-        case P_MINIMAL:
-            p->minimal  = g_value_get_boolean( v ); break;
-
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID( object, property_id, pspec );
-            break;
-    }
-}
-
-static void
-torrent_cell_renderer_get_property( GObject *    object,
-                                    guint        property_id,
-                                    GValue *     v,
-                                    GParamSpec * pspec )
-{
-    const TorrentCellRenderer *         self = TORRENT_CELL_RENDERER(
-        object );
+        case P_TORRENT:        p->tor            = g_value_get_pointer( v ); break;
+        case P_UPLOAD_SPEED:   p->upload_speed   = g_value_get_int( v ); break;
+        case P_DOWNLOAD_SPEED: p->download_speed = g_value_get_int( v ); break;
+        case P_BAR_HEIGHT:     p->bar_height     = g_value_get_int( v ); break;
+        case P_MINIMAL:        p->minimal        = g_value_get_boolean( v ); break;
+        default: G_OBJECT_WARN_INVALID_PROPERTY_ID( object, property_id, pspec ); break;
+    }
+}
+
+static void
+torrent_cell_renderer_get_property( GObject     * object,
+                                    guint         property_id,
+                                    GValue      * v,
+                                    GParamSpec  * pspec )
+{
+    const TorrentCellRenderer * self = TORRENT_CELL_RENDERER( object );
     struct TorrentCellRendererPrivate * p = self->priv;
 
     switch( property_id )
     {
-        case P_TORRENT:
-            g_value_set_pointer( v, p->tor ); break;
-
-        case P_BAR_HEIGHT:
-            g_value_set_int( v, p->bar_height ); break;
-
-        case P_MINIMAL:
-            g_value_set_boolean( v, p->minimal ); break;
-
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID( object, property_id, pspec );
-            break;
+        case P_TORRENT:        g_value_set_pointer( v, p->tor ); break;
+        case P_UPLOAD_SPEED:   g_value_set_int( v, p->upload_speed ); break;
+        case P_DOWNLOAD_SPEED: g_value_set_int( v, p->download_speed ); break;
+        case P_BAR_HEIGHT:     g_value_set_int( v, p->bar_height ); break;
+        case P_MINIMAL:        g_value_set_boolean( v, p->minimal ); break;
+        default: G_OBJECT_WARN_INVALID_PROPERTY_ID( object, property_id, pspec ); break;
     }
 }
@@ -785 +789 @@
                                                           "tr_torrent*",
                                                           G_PARAM_READWRITE ) );
+
+    g_object_class_install_property( gobject_class, P_UPLOAD_SPEED,
+                                    g_param_spec_int( "piece-upload-speed", NULL,
+                                                      "tr_stat.pieceUploadSpeed",
+                                                      0, INT_MAX, 0,
+                                                      G_PARAM_READWRITE ) );
+
+    g_object_class_install_property( gobject_class, P_DOWNLOAD_SPEED,
+                                    g_param_spec_int( "piece-download-speed", NULL,
+                                                      "tr_stat.pieceDownloadSpeed",
+                                                      0, INT_MAX, 0,
+                                                      G_PARAM_READWRITE ) );
 
     g_object_class_install_property( gobject_class, P_BAR_HEIGHT,

trunk/gtk/tr-core.c

@@ -257 +257 @@
                    gpointer       user_data UNUSED )
 {
-    int            i;
-    tr_torrent *   ta, *tb;
+    int i, aUp, aDown, bUp, bDown;
+    tr_torrent *ta, *tb;
     const tr_stat *sa, *sb;
 
-    gtk_tree_model_get( model, a, MC_TORRENT_RAW, &ta, -1 );
-    gtk_tree_model_get( model, b, MC_TORRENT_RAW, &tb, -1 );
+    gtk_tree_model_get( model, a, MC_SPEED_UP, &aUp,
+                                  MC_SPEED_DOWN, &aDown,
+                                  MC_TORRENT_RAW, &ta,
+                                  -1 );
+    gtk_tree_model_get( model, b, MC_SPEED_UP, &bUp,
+                                  MC_SPEED_DOWN, &bDown,
+                                  MC_TORRENT_RAW, &tb,
+                                  -1 );
+
+    if(( i = ((aUp+aDown)-(bUp+bDown)) ))
+        return i;
 
     sa = tr_torrentStatCached( ta );
     sb = tr_torrentStatCached( tb );
-
-    if( ( i = compareDouble( sa->pieceUploadSpeed + sa->pieceDownloadSpeed,
-                             sb->pieceUploadSpeed + sb->pieceDownloadSpeed ) ) )
-        return i;
-
     if( sa->uploadedEver != sb->uploadedEver )
         return sa->uploadedEver < sa->uploadedEver ? -1 : 1;
@@ -609 +613 @@
               gpointer g_class UNUSED )
 {
-    TrCore *               self = (TrCore *) instance;
-    GtkListStore *         store;
+    GtkListStore * store;
     struct TrCorePrivate * p;
+    TrCore * self = (TrCore *) instance;
 
     /* column types for the model used to store torrent information */
     /* keep this in sync with the enum near the bottom of tr_core.h */
-    GType                  types[] = {
-        G_TYPE_STRING,    /* name */
-        G_TYPE_STRING,    /* collated name */
-        TR_TORRENT_TYPE,  /* TrTorrent object */
-        G_TYPE_POINTER,   /* tr_torrent* */
-        G_TYPE_INT        /* tr_stat()->status */
-    };
+    GType types[] = { G_TYPE_STRING,    /* name */
+                      G_TYPE_STRING,    /* collated name */
+                      TR_TORRENT_TYPE,  /* TrTorrent object */
+                      G_TYPE_POINTER,   /* tr_torrent* */
+                      G_TYPE_INT,       /* tr_stat.pieceUploadSpeed */
+                      G_TYPE_INT,       /* tr_stat.pieceDownloadSpeed */
+                      G_TYPE_INT };     /* tr_stat.status */
 
     p = self->priv = G_TYPE_INSTANCE_GET_PRIVATE( self,
@@ -752 +756 @@
 {
     const tr_info * inf = tr_torrent_info( gtor );
-    const tr_stat * torStat = tr_torrent_stat( gtor );
+    const tr_stat * st = tr_torrent_stat( gtor );
     tr_torrent *    tor = tr_torrent_handle( gtor );
     char *          collated = doCollate( inf->name );
@@ -763 +767 @@
                                        MC_TORRENT,       gtor,
                                        MC_TORRENT_RAW,   tor,
-                                       MC_ACTIVITY,      torStat->activity,
+                                       MC_SPEED_UP,      (int)st->pieceUploadSpeed,
+                                       MC_SPEED_DOWN,    (int)st->pieceDownloadSpeed,
+                                       MC_ACTIVITY,      st->activity,
                                        -1 );
 
@@ -1024 +1030 @@
 
 static gboolean
-update_foreach( GtkTreeModel *      model,
+update_foreach( GtkTreeModel * model,
                 GtkTreePath  * path UNUSED,
-                GtkTreeIter *       iter,
+                GtkTreeIter  * iter,
                 gpointer       data UNUSED )
 {
-    int         oldActivity;
-    int         newActivity;
+    int oldActivity, newActivity;
+    int oldUpSpeed, newUpSpeed;
+    int oldDownSpeed, newDownSpeed;
+    const tr_stat * st;
     TrTorrent * gtor;
 
-    /* maybe update the status column in the model */
+    /* get the old states */
     gtk_tree_model_get( model, iter,
                         MC_TORRENT, &gtor,
                         MC_ACTIVITY, &oldActivity,
+                        MC_SPEED_UP, &oldUpSpeed,
+                        MC_SPEED_DOWN, &oldDownSpeed,
                         -1 );
-    newActivity = tr_torrentGetActivity( tr_torrent_handle( gtor ) );
-    if( newActivity != oldActivity )
+
+    /* get the new states */
+    st = tr_torrentStat( tr_torrent_handle( gtor ) );
+    newActivity = st->activity;
+    newUpSpeed = st->pieceUploadSpeed;
+    newDownSpeed = st->pieceDownloadSpeed;
+
+    /* updating the model triggers off resort/refresh,
+       so don't do it unless something's actually changed... */
+    if( ( newActivity != oldActivity ) ||
+        ( newUpSpeed != oldUpSpeed ) ||
+        ( newDownSpeed != oldDownSpeed ) )
+    {
         gtk_list_store_set( GTK_LIST_STORE( model ), iter,
                             MC_ACTIVITY, newActivity,
+                            MC_SPEED_UP, newUpSpeed,
+                            MC_SPEED_DOWN, newDownSpeed,
                             -1 );
+    }
 
     /* cleanup */

trunk/gtk/tr-core.h

@@ -200 +200 @@
     MC_TORRENT,
     MC_TORRENT_RAW,
+    MC_SPEED_UP,
+    MC_SPEED_DOWN,
     MC_ACTIVITY,
     MC_ROW_COUNT

trunk/gtk/tr-window.c

@@ -197 +197 @@
     gtk_tree_view_column_pack_start( col, r, FALSE );
     gtk_tree_view_column_add_attribute( col, r, "torrent", MC_TORRENT_RAW );
+    gtk_tree_view_column_add_attribute( col, r, "piece-upload-speed", MC_SPEED_UP );
+    gtk_tree_view_column_add_attribute( col, r, "piece-download-speed", MC_SPEED_DOWN );
     
     gtk_tree_view_append_column( GTK_TREE_VIEW( view ), col );
@@ -1153 +1155 @@
     {
         char buf[128];
-        double d;
-
-        d = tr_sessionGetPieceSpeed( session, TR_DOWN );
-        tr_strlspeed( buf, d, sizeof( buf ) );
+        int up=0, down=0;
+        GtkTreeIter iter;
+        GtkTreeModel * model = tr_core_model( p->core );
+
+        if( gtk_tree_model_get_iter_first( model, &iter ) ) do
+        {
+            int u, d;
+            gtk_tree_model_get( model, &iter, MC_SPEED_UP, &u,
+                                              MC_SPEED_DOWN, &d,
+                                              -1 );
+            up += u;
+            down += d;
+        }
+        while( gtk_tree_model_iter_next( model, &iter ) );
+
+        tr_strlspeed( buf, down, sizeof( buf ) );
         gtk_label_set_text( GTK_LABEL( p->dl_lb ), buf );
-        g_object_set( p->dl_hbox, "visible", d>=0.01, NULL );
-
-        d = tr_sessionGetPieceSpeed( session, TR_UP );
-        tr_strlspeed( buf, d, sizeof( buf ) );
+        g_object_set( p->dl_hbox, "visible", down>0, NULL );
+
+        tr_strlspeed( buf, up, sizeof( buf ) );
         gtk_label_set_text( GTK_LABEL( p->ul_lb ), buf );
-        g_object_set( p->ul_hbox, "visible", d>=0.01, NULL );
+        g_object_set( p->ul_hbox, "visible", up>0, NULL );
     }
 }