Changeset 3899

Timestamp:

Nov 20, 2007, 3:01:59 AM (15 years ago)

Author:

charles

Message:

finish backport the speed/stability improvements from trunk to 0.9x.
sync some text strings in the gtk+ client up with the mac client.

Location:

branches/0.9x

Files:

• daemon/client.c (modified) (2 diffs)
• daemon/client.h (modified) (1 diff)
• daemon/remote.c (modified) (5 diffs)
• daemon/server.c (modified) (4 diffs)
• daemon/torrents.c (modified) (6 diffs)
• daemon/torrents.h (modified) (1 diff)
• gtk/actions.c (modified) (2 diffs)
• gtk/main.c (modified) (7 diffs)
• gtk/msgwin.c (modified) (2 diffs)
• gtk/torrent-inspector.c (modified) (16 diffs)
• gtk/tr_core.c (modified) (4 diffs)
• gtk/tr_core.h (modified) (2 diffs)
• gtk/tr_torrent.c (modified) (1 diff)
• gtk/tr_window.c (modified) (2 diffs)
• gtk/ui.h (modified) (2 diffs)
• gtk/util.c (modified) (1 diff)
• gtk/util.h (modified) (1 diff)
• libtransmission/crypto.c (modified) (1 diff)
• libtransmission/ratecontrol.c (modified) (6 diffs)
• libtransmission/ratecontrol.h (modified) (1 diff)
• libtransmission/tracker.c (modified) (7 diffs)
• libtransmission/utils.c (modified) (2 diffs)
• libtransmission/utils.h (modified) (1 diff)

branches/0.9x/daemon/client.c

@@ -492 +492 @@
 
     req->str = dircpy;
+
+    return 0;
+}
+
+int
+client_crypto( const char * mode )
+{
+    struct req * req;
+    char       * modecpy;
+
+    modecpy = strdup( mode );
+    if( NULL == modecpy )
+    {
+        mallocmsg( strlen( mode ) );
+        return -1;
+    }
+
+    req = addreq( IPC_MSG_CRYPTO, -1, NULL );
+    if( NULL == req )
+    {
+        free( modecpy );
+        return -1;
+    }
+
+    req->str = modecpy;
 
     return 0;
@@ -801 +826 @@
                 buf = ipc_mkint( con->ipc, &buflen, req->id, -1, req->num );
                 break;
+            case IPC_MSG_CRYPTO:
             case IPC_MSG_DIR:
                 buf = ipc_mkstr( con->ipc, &buflen, req->id, -1, req->str );

branches/0.9x/daemon/client.h

@@ -65 +65 @@
 int  client_uplimit  ( int );
 int  client_dir      ( const char * );
+int  client_crypto   ( const char * );
 int  client_start    ( size_t, const int * );
 int  client_stop     ( size_t, const int * );

branches/0.9x/daemon/remote.c

@@ -73 +73 @@
     char              dir[MAXPATHLEN];
     int               pex;
+    const char *      crypto;
 };
 
@@ -175 +176 @@
         ( '\0' != o.dir[0]          &&   0 > client_dir      ( o.dir     ) ) ||
         ( !SLIST_EMPTY( &o.files )  &&   0 > client_addfiles ( &o.files  ) ) ||
+        ( o.crypto                  &&   0 > client_crypto   ( o.crypto  ) ) ||
         ( o.startall                &&   0 > client_start    ( 0, NULL   ) ) ||
         ( o.stopall                 &&   0 > client_stop     ( 0, NULL   ) ) ||
@@ -230 +232 @@
   "\n"
   "  -a --add <torrent>        Add a torrent\n"
+  "  -c --encryption preferred Prefer peers to use encryption\n"
+  "  -c --encryption required  Require encryption for all peers\n"
   "  -d --download-limit <int> Max download rate in KiB/s\n"
   "  -D --download-unlimited   No download rate limit\n"
@@ -261 +265 @@
 readargs( int argc, char ** argv, struct opts * opts )
 {
-    char optstr[] = "a:d:DeEf:hilmMp:qr:s:S:t:u:Ux";
+    char optstr[] = "a:c:d:DeEf:hilmMp:qr:s:S:t:u:Ux";
     struct option longopts[] =
     {
         { "add",                required_argument, NULL, 'a' },
+        { "encryption",         required_argument, NULL, 'c' },
         { "download-limit",     required_argument, NULL, 'd' },
         { "download-unlimited", no_argument,       NULL, 'D' },
@@ -307 +312 @@
                     return -1;
                 }
+                break;
+            case 'c':
+                if(!strcasecmp(optarg, "preferred"))
+                    opts->crypto = "preferred";
+                else if(!strcasecmp(optarg, "required"))
+                    opts->crypto = "required";
+                else
+                    usage("invalid encryption mode: %s", optarg);
                 break;
             case 'd':

branches/0.9x/daemon/server.c

@@ -105 +105 @@
         0 > ipc_addmsg( gl_tree, IPC_MSG_AUTOMAP,      intmsg  ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_AUTOSTART,    intmsg  ) ||
+        0 > ipc_addmsg( gl_tree, IPC_MSG_CRYPTO,       strmsg  ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_DOWNLIMIT,    intmsg  ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_DIR,          strmsg  ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_GETAUTOMAP,   prefmsg ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_GETAUTOSTART, prefmsg ) ||
+        0 > ipc_addmsg( gl_tree, IPC_MSG_GETCRYPTO,    prefmsg ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_GETDOWNLIMIT, prefmsg ) ||
         0 > ipc_addmsg( gl_tree, IPC_MSG_GETDIR,       prefmsg ) ||
@@ -636 +638 @@
     switch( id )
     {
+        case IPC_MSG_CRYPTO:
+            if(!strcasecmp(val->val.s.s, "preferred"))
+                torrent_set_encryption(TR_ENCRYPTION_PREFERRED);
+            else if(!strcasecmp(val->val.s.s, "required"))
+                torrent_set_encryption(TR_ENCRYPTION_REQUIRED);
+            else
+            {
+                msgresp(client, tag, IPC_MSG_BAD);
+                return;
+            }
+            break;
         case IPC_MSG_DIR:
             torrent_set_directory( val->val.s.s );
@@ -903 +916 @@
     uint8_t       * buf;
     size_t          buflen;
+    const char    * strval;
 
     switch( id )
@@ -913 +927 @@
             buf = ipc_mkint( client->ipc, &buflen, IPC_MSG_AUTOSTART, tag,
                              torrent_get_autostart() );
+            break;
+        case IPC_MSG_GETCRYPTO:
+            switch(torrent_get_encryption())
+            {
+                case TR_ENCRYPTION_PREFERRED:
+                    strval = "preferred";
+                    break;
+                case TR_ENCRYPTION_REQUIRED:
+                    strval = "required";
+                    break;
+                default:
+                    assert(0);
+                    return;
+            }
+            buf = ipc_mkstr(client->ipc, &buflen, IPC_MSG_CRYPTO, tag, strval);
             break;
         case IPC_MSG_GETDIR:

branches/0.9x/daemon/torrents.c

@@ -98 +98 @@
 static int                 gl_downlimit = -1;
 static char                gl_dir[MAXPATHLEN];
+static tr_encryption_mode  gl_crypto    = TR_ENCRYPTION_PREFERRED;
 
 RB_GENERATE_STATIC( tortree, tor, idlinks, toridcmp )
@@ -466 +467 @@
 {
     return gl_dir;
+}
+
+void
+torrent_set_encryption(tr_encryption_mode mode)
+{
+    tr_setEncryptionMode(gl_handle, mode);
+    gl_crypto = mode;
+    savestate();
+}
+
+tr_encryption_mode
+torrent_get_encryption(void)
+{
+    return tr_getEncryptionMode(gl_handle);
 }
 
@@ -738 +753 @@
     }
 
+    str = tr_bencDictFind( &top, "encryption-mode" );
+    if( NULL != str && TYPE_STR == str->type )
+    {
+        if(!strcasecmp(str->val.s.s, "preferred"))
+            gl_crypto = TR_ENCRYPTION_PREFERRED;
+        else if(!strcasecmp(str->val.s.s, "required"))
+            gl_crypto = TR_ENCRYPTION_REQUIRED;
+    }
+
+    tr_setEncryptionMode(gl_handle, gl_crypto);
+
     list = tr_bencDictFind( &top, "torrents" );
     if( NULL == list || TYPE_LIST != list->type )
@@ -795 +821 @@
 
     tr_bencInit( &top, TYPE_DICT );
-    if( tr_bencDictReserve( &top, 8 ) )
+    if( tr_bencDictReserve( &top, 9 ) )
     {
       nomem:
@@ -810 +836 @@
     tr_bencInitStr( tr_bencDictAdd( &top, "default-directory" ),
                     gl_dir, -1, 1 );
+    if(TR_ENCRYPTION_REQUIRED == gl_crypto)
+        tr_bencInitStr(tr_bencDictAdd(&top, "encryption-mode"), "required", -1, 1);
+    else
+        tr_bencInitStr(tr_bencDictAdd(&top, "encryption-mode"), "preferred", -1, 1);
     list = tr_bencDictAdd( &top, "torrents" );
     tr_bencInit( list, TYPE_LIST );
@@ -849 +879 @@
     }
 
-    buf = ( uint8_t * )tr_bencSaveMalloc( &top, &len );
+    buf = ( uint8_t * )tr_bencSave( &top, &len );
     SAFEBENCFREE( &top );
     if( NULL == buf )

branches/0.9x/daemon/torrents.h

@@ -58 +58 @@
 void         torrent_set_directory       ( const char * );
 const char * torrent_get_directory       ( void );
+void         torrent_set_encryption      ( tr_encryption_mode );
+tr_encryption_mode torrent_get_encryption      ( void );
 
 #endif /* TR_DAEMON_TORRENTS_H */

branches/0.9x/gtk/actions.c

@@ -58 +58 @@
   { "toggle-main-window", NULL, 
     N_("Show _Main Window"), NULL, NULL, G_CALLBACK(action_cb), TRUE }, 
-  { "toggle-debug-window", NULL,
-    N_("Show _Debug Window"), NULL, NULL, G_CALLBACK(action_cb), FALSE }
+  { "toggle-message-log", NULL,
+    N_("Show Message _Log"), NULL, NULL, G_CALLBACK(action_cb), FALSE }
 };
 
@@ -72 +72 @@
     N_("_Start"), "<control>S", NULL, G_CALLBACK(action_cb) },
   { "verify-torrent", NULL,
-    N_("_Verify Local Files"), NULL, NULL, G_CALLBACK(action_cb) },
+    N_("_Verify Local Data"), NULL, NULL, G_CALLBACK(action_cb) },
   { "pause-torrent", GTK_STOCK_MEDIA_PAUSE,
     N_("_Pause"), "<control>P", NULL, G_CALLBACK(action_cb) },

branches/0.9x/gtk/main.c

@@ -111 +111 @@
 };
 
-struct exitdata {
-    struct cbdata * cbdata;
-    time_t          started;
-    guint           timer;
-};
-
-#define CBDATA_PTR              "callback-data-pointer"
+#define CBDATA_PTR "callback-data-pointer"
 
 static GtkUIManager * myUIManager = NULL;
@@ -134 +128 @@
 static void
 wannaquit( void * vdata );
-static gboolean
-exitcheck(gpointer gdata);
 static void
 setupdrag(GtkWidget *widget, struct cbdata *data);
@@ -256 +248 @@
 
     /* initialize gtk */
+    g_thread_init( NULL );
     gtk_init_with_args( &argc, &argv, _("[torrent files]"), entries, domain, NULL );
     myUIManager = gtk_ui_manager_new ();
@@ -413 +406 @@
 }
 
+static gpointer
+quitThreadFunc( gpointer gdata )
+{
+    struct cbdata * cbdata = gdata;
+
+    tr_close( tr_core_handle( cbdata->core ) );
+
+    /* shutdown the gui */
+    if( cbdata->prefs )
+        gtk_widget_destroy( GTK_WIDGET( cbdata->prefs ) );
+    if( cbdata->wind )
+        gtk_widget_destroy( GTK_WIDGET( cbdata->wind ) );
+    g_object_unref( cbdata->core );
+    if( cbdata->icon )
+        g_object_unref( cbdata->icon );
+    if( cbdata->errqueue ) {
+        g_list_foreach( cbdata->errqueue, (GFunc)g_free, NULL );
+        g_list_free( cbdata->errqueue );
+    }
+    g_free( cbdata );
+
+    /* exit the gtk main loop */
+    gtk_main_quit( );
+    return NULL;
+}
+
 static void
 wannaquit( void * vdata )
 {
-  struct cbdata * data;
-  struct exitdata *edata;
-
-  data = vdata;
-  if( data->closing )
-  {
-      return;
-  }
-  data->closing = TRUE;
-
-  /* stop the update timer */
-  if(0 < data->timer)
-    g_source_remove(data->timer);
-  data->timer = 0;
-
-  /* pause torrents and stop nat traversal */
-  tr_core_shutdown( data->core );
-
-  /* set things up to wait for torrents to stop */
-  edata = g_new0(struct exitdata, 1);
-  edata->cbdata = data;
-  edata->started = time(NULL);
-  /* check if torrents are still running */
-  if(exitcheck(edata)) {
-    /* yes, start the exit timer and disable widgets */
-    edata->timer = g_timeout_add(EXIT_CHECK_INTERVAL, exitcheck, edata);
-    if( NULL != data->wind )
-    {
-        gtk_widget_set_sensitive( GTK_WIDGET( data->wind ), FALSE );
-    }
-  }
-}
-
-static gboolean
-exitcheck( gpointer gdata )
-{
-    struct exitdata    * edata;
-    struct cbdata      * cbdata;
-
-    edata  = gdata;
-    cbdata = edata->cbdata;
-
-    /* keep waiting until we're ready to quit or we hit the exit timeout */
-    if( time( NULL ) - edata->started < TRACKER_EXIT_TIMEOUT )
-    {
-        if( !tr_core_quiescent( cbdata->core ) )
-        {
-            updatemodel( cbdata );
-            return TRUE;
-        }
-    }
-
-    /* exit otherwise */
-    if( 0 < edata->timer )
-    {
-        g_source_remove( edata->timer );
-    }
-    g_free( edata );
-    /* note that cbdata->prefs holds a reference to cbdata->core, and
-       it's destruction may trigger callbacks that use cbdata->core */
-    if( NULL != cbdata->prefs )
-    {
-        gtk_widget_destroy( GTK_WIDGET( cbdata->prefs ) );
-    }
-    if( NULL != cbdata->wind )
-    {
-        gtk_widget_destroy( GTK_WIDGET( cbdata->wind ) );
-    }
-    g_object_unref( cbdata->core );
-    if( NULL != cbdata->icon )
-    {
-        g_object_unref( cbdata->icon );
-    }
-    g_assert( 0 == cbdata->timer );
-    if( NULL != cbdata->errqueue )
-    {
-        g_list_foreach( cbdata->errqueue, (GFunc) g_free, NULL );
-        g_list_free( cbdata->errqueue );
-    }
-    g_free( cbdata );
-    gtk_main_quit();
-
-    return FALSE;
+    struct cbdata * cbdata = vdata;
+
+    /* stop the update timer */
+    if( cbdata->timer ) {
+        g_source_remove( cbdata->timer );
+        cbdata->timer = 0;
+    }
+
+    /* clear the UI */
+    gtk_list_store_clear( GTK_LIST_STORE( tr_core_model( cbdata->core ) ) );
+    gtk_widget_set_sensitive( GTK_WIDGET( cbdata->wind ), FALSE );
+
+    /* shut down libT */
+    g_thread_create( quitThreadFunc, vdata, TRUE, NULL );
 }
 
@@ -895 +845 @@
 msgwinclosed()
 {
-  action_toggle( "toggle-debug-window", FALSE );
+  action_toggle( "toggle-message-log", FALSE );
   return FALSE;
 }
@@ -989 +939 @@
         }
     }
-    else if (!strcmp (action_name, "toggle-debug-window"))
+    else if (!strcmp (action_name, "toggle-message-log"))
     {
         if( !data->msgwin )
@@ -1000 +950 @@
         else
         {
-            action_toggle("toggle-debug-window", FALSE);
+            action_toggle("toggle-message-log", FALSE);
             gtk_widget_destroy( data->msgwin );
             data->msgwin = NULL;

branches/0.9x/gtk/msgwin.c

@@ -188 +188 @@
 {
   GtkWindow * window = GTK_WINDOW( gtk_widget_get_toplevel( w ) );
-  GtkWidget * d = gtk_file_chooser_dialog_new( _("Save Debug Log"), window,
+  GtkWidget * d = gtk_file_chooser_dialog_new( _("Save Log"), window,
                                                GTK_FILE_CHOOSER_ACTION_SAVE,
                                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -230 +230 @@
 
   win = gtk_window_new( GTK_WINDOW_TOPLEVEL );
-  gtk_window_set_title( GTK_WINDOW( win ), _( "Debug Window" ) );
+  gtk_window_set_title( GTK_WINDOW( win ), _( "Message Log" ) );
   gtk_window_set_default_size( GTK_WINDOW( win ), 600, 400 );
-  gtk_window_set_role( GTK_WINDOW( win ), "debug-window" );
+  gtk_window_set_role( GTK_WINDOW( win ), "message-log" );
   vbox = gtk_vbox_new( FALSE, 0 );
 

branches/0.9x/gtk/torrent-inspector.c

@@ -37 +37 @@
 #include "util.h"
 
-#define UPDATE_INTERVAL_MSEC 1500
+#define UPDATE_INTERVAL_MSEC 2000
 
 /****
@@ -240 +240 @@
   PEER_COL_IS_UPLOADING,
   PEER_COL_UPLOAD_RATE,
+  PEER_COL_STATUS,
   N_PEER_COLS
 };
@@ -253 +254 @@
   N_("DL Rate"),
   N_("Uploading"),
-  N_("UL Rate")
+  N_("UL Rate"),
+  N_("Status")
 };
 
@@ -289 +291 @@
                       PEER_COL_IS_UPLOADING, peer->isUploading,
                       PEER_COL_UPLOAD_RATE, peer->uploadToRate,
+                      PEER_COL_STATUS, peer->status,
                       -1);
 }
@@ -317 +320 @@
                                          G_TYPE_FLOAT,   /* downloadFromRate */
                                          G_TYPE_BOOLEAN, /* isUploading */
-                                         G_TYPE_FLOAT);  /* uploadToRate */
+                                         G_TYPE_FLOAT,   /* uploadToRate */
+                                         G_TYPE_INT );   /* tr_peer_status */
 
   int n_peers = 0;
@@ -341 +345 @@
                           "stock-id", (is_encrypted ? "transmission-lock" : NULL),
                           NULL);
+}
+
+static void
+render_status( GtkTreeViewColumn  * column UNUSED,
+               GtkCellRenderer    * renderer,
+               GtkTreeModel       * tree_model,
+               GtkTreeIter        * iter,
+               gpointer             data UNUSED )
+{
+    int status;
+    const char * text;
+    gtk_tree_model_get( tree_model, iter, PEER_COL_STATUS, &status, -1 );
+    switch( status )
+    {
+        case TR_PEER_STATUS_HANDSHAKE:            text = _( "Handshaking" ); break;
+        case TR_PEER_STATUS_PEER_IS_CHOKED:       text = _( "Peer is Choked" ); break;
+        case TR_PEER_STATUS_CLIENT_IS_CHOKED:     text = _( "Choked" ); break;
+        case TR_PEER_STATUS_CLIENT_IS_INTERESTED: text = _( "Choked & Interested" ); break;
+        case TR_PEER_STATUS_READY:                text = _( "Ready" ); break;
+        case TR_PEER_STATUS_REQUEST_SENT:         text = _( "Request Sent" ); break;
+        case TR_PEER_STATUS_ACTIVE           :    text = _( "Active" ); break;
+        case TR_PEER_STATUS_ACTIVE_AND_CHOKED:    text = _( "Active & Choked" ); break;
+        default:                                  text = "BUG"; break;
+    }
+    g_object_set (renderer, "text", text, NULL);
 }
 
@@ -478 +507 @@
   fmtpeercount (p->completed_lb, stat->completedFromTracker );
 
-  free (peers);
+  free( peers );
 }
 
@@ -496 +525 @@
                          PEER_COL_IS_ENCRYPTED,
                          PEER_COL_UPLOAD_RATE,
-                         PEER_COL_DOWNLOAD_RATE };
+                         PEER_COL_DOWNLOAD_RATE
+#if 0
+                         , PEER_COL_STATUS
+#endif
+                       };
 
   m  = peer_model_new (tor);
@@ -569 +602 @@
                                                  NULL, NULL);
         break;
+
+      case PEER_COL_STATUS:
+        r = gtk_cell_renderer_text_new( );
+        c = gtk_tree_view_column_new_with_attributes (t, r, "text", col, NULL);
+        gtk_tree_view_column_set_cell_data_func (c, r, render_status, NULL, NULL);
+        break;
+        
 
       default:
@@ -779 +819 @@
 {
   GtkWidget * state_lb;
-  GtkWidget * corrupt_dl_lb;
-  GtkWidget * valid_dl_lb;
+  GtkWidget * progress_lb;
+  GtkWidget * have_lb;
   GtkWidget * dl_lb;
   GtkWidget * ul_lb;
+  GtkWidget * failed_lb;
   GtkWidget * ratio_lb;
   GtkWidget * err_lb;
-  GtkWidget * remaining_lb;
   GtkWidget * swarm_lb;
   GtkWidget * date_added_lb;
@@ -799 +839 @@
   Activity * a = (Activity*) g_object_get_data (G_OBJECT(top), "activity-data");
   const tr_stat * stat = tr_torrent_stat( a->gtor );
-  char *pch;
+  char *pch, *pch2, *pch3;
 
   pch = tr_torrent_status_str( a->gtor );
@@ -805 +845 @@
   g_free (pch);
 
-  pch = readablesize (stat->corruptEver);
-  gtk_label_set_text (GTK_LABEL(a->corrupt_dl_lb), pch);
+  pch = g_strdup_printf( "%.1f%% (%.1f%% selected)", stat->percentComplete*100.0, stat->percentDone*100.0 );
+  gtk_label_set_text (GTK_LABEL(a->progress_lb), pch);
   g_free (pch);
 
-  pch = readablesize (stat->haveValid);
-  gtk_label_set_text (GTK_LABEL(a->valid_dl_lb), pch);
-  g_free (pch);
+  pch = readablesize( stat->haveValid + stat->haveUnchecked );
+  pch2 = readablesize( stat->haveValid );
+  pch3 = g_strdup_printf( _("%s (%s verified)"), pch, pch2 );
+  gtk_label_set_text( GTK_LABEL( a->have_lb ), pch3 );
+  g_free( pch3 );
+  g_free( pch2 );
+  g_free( pch );
 
   pch = readablesize (stat->downloadedEver);
@@ -821 +865 @@
   g_free (pch);
 
-  pch = ratiostr (stat->downloadedEver, stat->uploadedEver);
+  pch = readablesize (stat->corruptEver);
+  gtk_label_set_text (GTK_LABEL(a->failed_lb), pch);
+  g_free (pch);
+
+  pch = g_strdup_printf( "%.1f", stat->ratio );
   gtk_label_set_text (GTK_LABEL(a->ratio_lb), pch);
   g_free (pch);
@@ -827 +875 @@
   pch = readablespeed (stat->swarmspeed);
   gtk_label_set_text (GTK_LABEL(a->swarm_lb), pch);
-  g_free (pch);
-
-  pch = readablesize (stat->leftUntilDone);
-  gtk_label_set_text (GTK_LABEL(a->remaining_lb), pch);
   g_free (pch);
 
@@ -870 +914 @@
     hig_workarea_add_row (t, &row, name, l, NULL);
 
-    g_snprintf (name, sizeof(name), namefmt, _("Corrupt DL"));
-    l = a->corrupt_dl_lb = gtk_label_new (NULL);
+    g_snprintf (name, sizeof(name), namefmt, _("Progress"));
+    l = a->progress_lb = gtk_label_new (NULL);
     hig_workarea_add_row (t, &row, name, l, NULL);
 
-    g_snprintf (name, sizeof(name), namefmt, _("Valid DL"));
-    l = a->valid_dl_lb = gtk_label_new (NULL);
+    g_snprintf (name, sizeof(name), namefmt, _("Have") );
+    l = a->have_lb = gtk_label_new (NULL);
     hig_workarea_add_row (t, &row, name, l, NULL);
 
@@ -886 +930 @@
     hig_workarea_add_row (t, &row, name, l, NULL);
 
+    g_snprintf (name, sizeof(name), namefmt, _("Failed DL"));
+    l = a->failed_lb = gtk_label_new (NULL);
+    hig_workarea_add_row (t, &row, name, l, NULL);
+
     g_snprintf (name, sizeof(name), namefmt, _("Ratio"));
     l = a->ratio_lb = gtk_label_new (NULL);
-    hig_workarea_add_row (t, &row, name, l, NULL);
-
-    g_snprintf (name, sizeof(name), namefmt, _("Remaining"));
-    l = a->remaining_lb = gtk_label_new (NULL);
     hig_workarea_add_row (t, &row, name, l, NULL);
 

branches/0.9x/gtk/tr_core.c

@@ -123 +123 @@
     TrCore       * self = (TrCore *) obj;
     GObjectClass * parent;
-    GtkTreeIter    iter;
-    TrTorrent    * tor;
 
     if( self->disposed )
-    {
         return;
-    }
+
     self->disposed = TRUE;
-
     pref_save( NULL );
-
-#ifdef REFDBG
-    fprintf( stderr, "core    %p dispose\n", self );
-#endif
-
-    /* sever all remaining torrents in the model */
-    if( gtk_tree_model_get_iter_first( self->model, &iter ) ) do
-    {
-        gtk_tree_model_get( self->model, &iter, MC_TORRENT, &tor, -1 );
-        tr_torrent_sever( tor );
-        g_object_unref( tor );
-    }
-    while( gtk_tree_model_iter_next( self->model, &iter ) );
-    g_object_unref( self->model );
-
-#ifdef REFDBG
-    fprintf( stderr, "core    %p dead\n", self );
-#endif
-
-    /* close the libtransmission instance */
-    tr_close( self->handle );
-
-    /* Chain up to the parent class */
     parent = g_type_class_peek( g_type_parent( TR_CORE_TYPE ) );
     parent->dispose( obj );
@@ -297 +270 @@
         /* leechers, completedFromTracker, downloaded,    uploaded */
         G_TYPE_INT,  G_TYPE_INT,           G_TYPE_UINT64, G_TYPE_UINT64,
-        /* left,       TrTorrent object, ID for IPC */
-        G_TYPE_UINT64, TR_TORRENT_TYPE,  G_TYPE_INT,
+        /* ratio,      left,          TrTorrent object, ID for IPC */
+        G_TYPE_FLOAT,  G_TYPE_UINT64, TR_TORRENT_TYPE,  G_TYPE_INT,
     };
 
@@ -372 +345 @@
 
     return self->disposed ? NULL : self->handle;
-}
-
-void
-tr_core_shutdown( TrCore * self )
-{
-    GtkTreeIter iter;
-
-    TR_IS_CORE( self );
-
-    if( self->disposed )
-        return;
-
-    g_assert( !self->quitting );
-    self->quitting = TRUE;
-
-    /* try to stop all the torrents nicely */
-    if ( gtk_tree_model_get_iter_first( self->model, &iter) ) do {
-        TrTorrent * tor;
-        gtk_tree_model_get( self->model, &iter, MC_TORRENT, &tor, -1 );
-        tr_torrent_sever( tor );
-        g_object_unref( tor );
-    } while( gtk_list_store_remove( GTK_LIST_STORE(self->model), &iter ) );
-
-    /* shut down nat traversal */
-    tr_natTraversalEnable( self->handle, 0 );
-}
-
-gboolean
-tr_core_quiescent( TrCore * self )
-{
-    const tr_handle_status * hstat;
-
-    TR_IS_CORE( self );
-    g_assert( self->quitting );
-
-    if( self->disposed )
-        return TRUE;
-
-    if ( tr_torrentCount( self->handle ) != 0 )
-        return FALSE;
-
-    hstat = tr_handleStatus( self->handle );
-    return TR_NAT_TRAVERSAL_DISABLED == hstat->natTraversalStatus;
 }
 
@@ -633 +563 @@
                             MC_DOWN,        st->downloadedEver,
                             MC_UP,          st->uploadedEver,
+                            MC_RATIO,       st->ratio,
                             MC_LEFT,        st->leftUntilDone,
                             -1 );

branches/0.9x/gtk/tr_core.h

@@ -110 +110 @@
 tr_core_handle( TrCore * self );
 
-/* Try to politely stop all torrents and nat traversal */
-void
-tr_core_shutdown( TrCore * self );
-
-/* Returns true if the shutdown has completed */
-gboolean
-tr_core_quiescent( TrCore * self );
-
 /* Load saved state, return number of torrents added. May trigger one
    or more "error" signals with TR_CORE_ERR_ADD_TORRENT */
@@ -190 +182 @@
   MC_PROG_C, MC_PROG_D, MC_DRATE, MC_URATE, MC_ETA, MC_PEERS,
   MC_UPEERS, MC_DPEERS, MC_SEED, MC_LEECH, MC_DONE,
-  MC_DOWN, MC_UP, MC_LEFT, MC_TORRENT, MC_ID,
+  MC_DOWN, MC_UP, MC_RATIO, MC_LEFT, MC_TORRENT, MC_ID,
   MC_ROW_COUNT
 };

branches/0.9x/gtk/tr_torrent.c

@@ -300 +300 @@
         case TR_STATUS_CHECK_WAIT:
             prog = st->recheckProgress * 100.0; /* [0...100] */
-            top = g_strdup_printf( _("Waiting to verify local files (%.1f%% tested)"), prog );
+            top = g_strdup_printf( _("Waiting to verify local data (%.1f%% tested)"), prog );
             break;
 
         case TR_STATUS_CHECK:
             prog = st->recheckProgress * 100.0; /* [0...100] */
-            top = g_strdup_printf( _("Verifying local files (%.1f%% tested)"), prog );
+            top = g_strdup_printf( _("Verifying local data (%.1f%% tested)"), prog );
             break;
 

branches/0.9x/gtk/tr_window.c

@@ -120 +120 @@
 {
     char  * dlstr, * ulstr, * str, * marked;
-    gfloat  prog, dl, ul;
+    gfloat  prog, dl, ul, ratio;
     guint64 down, up;
 
     gtk_tree_model_get( model, iter, MC_PROG_D, &prog, MC_DRATE, &dl,
-                        MC_URATE, &ul, MC_DOWN, &down, MC_UP, &up, -1 );
+                        MC_URATE, &ul, MC_DOWN, &down, MC_UP, &up, MC_RATIO, &ratio, -1 );
     prog = MAX( prog, 0.0 );
     prog = MIN( prog, 1.0 );
@@ -131 +131 @@
     if( 1.0 == prog )
     {
-        dlstr = ratiostr( down, up );
+        dlstr = g_strdup_printf( "%.1f", ratio );
         str = g_strdup_printf( _("Ratio: %s\nUL: %s"), dlstr, ulstr );
     }

branches/0.9x/gtk/ui.h

@@ -23 +23 @@
 "    </menu>\n"
 "    <menu action='help-menu'>\n"
-"      <menuitem action='toggle-debug-window'/>\n"
+"      <menuitem action='toggle-message-log'/>\n"
 "      <separator/>\n"
 "      <menuitem action='show-about-dialog'/>\n"
@@ -53 +53 @@
 "    <separator/>\n"
 "    <menuitem action='toggle-main-window'/>\n"
-"    <menuitem action='toggle-debug-window'/>\n"
+"    <menuitem action='toggle-message-log'/>\n"
 "    <menuitem action='show-about-dialog'/>\n"
 "    <separator/>\n"

branches/0.9x/gtk/util.c

@@ -122 +122 @@
 }
 
-char *
-ratiostr(guint64 down, guint64 up) {
-  double ratio;
-
-  if(0 == up && 0 == down)
-    return g_strdup(_("N/A"));
-
-  if(0 == down)
-    /* this is a UTF-8 infinity symbol */
-    return g_strdup("\xE2\x88\x9E");
-
-  ratio = (double)up / (double)down;
-
-  return g_strdup_printf("%.*f", BESTDECIMAL(ratio), ratio);
-}
-
 gboolean
 mkdir_p(const char *name, mode_t mode)

branches/0.9x/gtk/util.h

@@ -63 +63 @@
 char *
 rfc822date (guint64 epoch_msec);
-
-/* returns a string representing the download ratio.
-   the string must be g_free()d */
-char *
-ratiostr(guint64 down, guint64 up);
 
 /* create a directory and any missing parent directories */

branches/0.9x/libtransmission/crypto.c

@@ -11 +11 @@
  */
 
+#include <sys/types.h> /* for event.h, as well as netinet/in.h on some platforms */
 #include <assert.h>
 #include <inttypes.h> /* uint8_t */
 #include <string.h> /* memcpy */
 #include <stdarg.h>
-
-#include <sys/types.h> /* for event.h, as well as netinet/in.h on some platforms */
 #include <netinet/in.h> /* struct in_addr */
 

branches/0.9x/libtransmission/ratecontrol.c

@@ -23 +23 @@
  *****************************************************************************/
 
-#include <string.h>
+#include <string.h> /* memset */
 
 #include "transmission.h"
 #include "platform.h"
 #include "ratecontrol.h"
-#include "shared.h"
 #include "utils.h"
 
 #define GRANULARITY_MSEC 250
-#define SHORT_INTERVAL_MSEC 3000
-#define LONG_INTERVAL_MSEC 20000
+#define SHORT_INTERVAL_MSEC 4000
+#define LONG_INTERVAL_MSEC 8000
 #define HISTORY_SIZE (LONG_INTERVAL_MSEC / GRANULARITY_MSEC)
 
-typedef struct
+struct tr_transfer
 {
     uint64_t date;
     uint64_t size;
-}
-tr_transfer_t;
+};
 
 struct tr_ratecontrol
@@ -48 +46 @@
     int limit;
     int newest;
-    tr_transfer_t transfers[HISTORY_SIZE];
+    struct tr_transfer transfers[HISTORY_SIZE];
 };
 
@@ -97 +95 @@
 ***/
 
-int
-tr_rcCanTransfer( const tr_ratecontrol * r )
-{
-    int ret;
-
-    if( r == NULL )
-        ret = 0;
-    else {
-        tr_lockLock( (tr_lock*)r->lock );
-        ret = rateForInterval( r, SHORT_INTERVAL_MSEC ) < r->limit;
-        tr_lockUnlock( (tr_lock*)r->lock );
-    }
-
-    return ret;
-}
-
 size_t
 tr_rcBytesLeft( const tr_ratecontrol * r )
@@ -120 +102 @@
     if( r != NULL )
     {
-        float cur, max;
-        size_t kb;
+        float cur, max, kb;
  
         tr_lockLock( (tr_lock*)r->lock );
@@ -128 +109 @@
         max = r->limit;
         kb = max>cur ? max-cur : 0;
-        bytes = kb * 1024u;
+        bytes = (size_t)(kb * 1024);
 
         tr_lockUnlock( (tr_lock*)r->lock );
@@ -183 +164 @@
     tr_lockLock( (tr_lock*)r->lock );
     r->newest = 0;
-    memset( r->transfers, 0, sizeof(tr_transfer_t) * HISTORY_SIZE );
+    memset( r->transfers, 0, sizeof(struct tr_transfer) * HISTORY_SIZE );
     tr_lockUnlock( (tr_lock*)r->lock );
 }

branches/0.9x/libtransmission/ratecontrol.h

@@ -31 +31 @@
 void             tr_rcSetLimit( tr_ratecontrol *, int );
 int              tr_rcGetLimit( const tr_ratecontrol * );
-int              tr_rcCanTransfer( const tr_ratecontrol * );
 size_t           tr_rcBytesLeft( const tr_ratecontrol * );
 void             tr_rcTransferred( tr_ratecontrol *, size_t byteCount );

branches/0.9x/libtransmission/tracker.c

@@ -18 +18 @@
 #include <libgen.h> /* basename */
 
-#include <sys/queue.h> /* libevent needs this */
-#include <sys/types.h> /* libevent needs this */
+#include <sys/queue.h> /* evhttp.h needs this */
 #include <event.h>
 #include <evhttp.h>
@@ -626 +625 @@
     
     evbuffer_add_printf( buf, "%s"
-                              "%sinfo_hash=%s"
+                              "%cinfo_hash=%s"
                               "&peer_id=%s"
                               "&port=%d"
@@ -641 +640 @@
                               "%s%s",
         ann,
-        ( strchr(ann, '?') == NULL ? "?" : "&" ),
+        strchr(ann, '?') ? '&' : '?',
         t->escaped,
         t->peer_id,
@@ -715 +714 @@
     const char * warning;
     tr_tracker * t;
-    int err = 0;
     int responseCode;
 
@@ -799 +797 @@
             tr_bencFree( &benc );
     }
-    else
-    {
-        tr_inf( "Bad response for torrent '%s' on request '%s' "
-                "... trying again in 30 seconds",
-                t->name, t->lastRequest );
-
-        err = 1;
-    }
 
     if (( warning = updateAddresses( t, req ) )) {
@@ -851 +841 @@
     else if( 500<=responseCode && responseCode<=599 )
     {
-        dbgmsg( t, "got a 5xx error... retrying in 15 seconds." );
+        dbgmsg( t, "Got a 5xx error... retrying in 15 seconds." );
 
         /* Response status codes beginning with the digit "5" indicate
@@ -864 +854 @@
     else
     {
-        dbgmsg( t, "unhandled condition... retrying in 120 seconds." );
+        dbgmsg( t, "Invalid response from tracker... retrying in 120 seconds." );
 
         /* WTF did we get?? */

branches/0.9x/libtransmission/utils.c

@@ -824 +824 @@
 
 tr_bitfield*
-tr_bitfieldAnd( tr_bitfield * a, const tr_bitfield * b )
+tr_bitfieldOr( tr_bitfield * a, const tr_bitfield * b )
 {
     uint8_t *ait;
@@ -832 +832 @@
 
     for( ait=a->bits, bit=b->bits, aend=ait+a->len; ait!=aend; ++ait, ++bit )
-        *ait &= *bit;
+        *ait |= *bit;
 
     return a;

branches/0.9x/libtransmission/utils.h

@@ -174 +174 @@
 size_t tr_bitfieldCountTrueBits( const tr_bitfield* );
 
-tr_bitfield* tr_bitfieldAnd( tr_bitfield*, const tr_bitfield* );
+tr_bitfield* tr_bitfieldOr( tr_bitfield*, const tr_bitfield* );
 
 #endif