Changeset 13722

Timestamp:

Dec 30, 2012, 10:06:45 PM (9 years ago)

Author:

jordan

Message:

make tr_info.webseedCount and tr_info.trackerCount unsigned.

Location:

trunk

Files:

• gtk/details.c (modified) (3 diffs)
• gtk/filter.c (modified) (1 diff)
• gtk/tr-core.c (modified) (1 diff)
• libtransmission/metainfo.c (modified) (1 diff)
• libtransmission/peer-mgr.c (modified) (2 diffs)
• libtransmission/rpcimpl.c (modified) (1 diff)
• libtransmission/torrent-magnet.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• qt/app.cc (modified) (1 diff)
• qt/my-valgrind.sh (modified) (1 diff)
• qt/torrent.cc (modified) (1 diff)
• utils/show.c (modified) (3 diffs)

trunk/gtk/details.c

@@ -1352 +1352 @@
     /* step 2: add any new webseeds */
     for (i=0; i<n; ++i) {
-        int j;
+        unsigned int j;
         const tr_torrent * tor = torrents[i];
         const tr_info * inf = tr_torrentInfo (tor);
@@ -1376 +1376 @@
     /* step 3: update the webseeds */
     for (i=0; i<n; ++i) {
-        int j;
+        unsigned int j;
         tr_torrent * tor = torrents[i];
         const tr_info * inf = tr_torrentInfo (tor);
@@ -2160 +2160 @@
 get_editable_tracker_list (GString * gstr, const tr_torrent * tor)
 {
-    int i;
+    unsigned int i;
     int tier = 0;
     const tr_info * inf = tr_torrentInfo (tor);

trunk/gtk/filter.c

@@ -553 +553 @@
 
         case CAT_FILTER_TYPE_HOST: {
-            int i;
+            unsigned int i;
             char tmp[1024];
             for (i=0; i<inf->trackerCount; ++i) {

trunk/gtk/tr-core.c

@@ -1012 +1012 @@
 build_torrent_trackers_hash (tr_torrent * tor)
 {
-  int i;
+  unsigned int i;
   const char * pch;
   uint64_t hash = 0;

trunk/libtransmission/metainfo.c

@@ -546 +546 @@
 tr_metainfoFree (tr_info * inf)
 {
-  int i;
+  unsigned int i;
   tr_file_index_t ff;
 

trunk/libtransmission/peer-mgr.c

@@ -514 +514 @@
 rebuildWebseedArray (Torrent * t, tr_torrent * tor)
 {
-    int i;
+    unsigned int i;
     const tr_info * inf = &tor->info;
 
@@ -2689 +2689 @@
 tr_peerMgrWebSpeeds_KBps (const tr_torrent * tor)
 {
-  int i;
-  int webseedCount;
+  unsigned int i;
+  unsigned int webseedCount;
   const Torrent * t;
   const tr_webseed ** webseeds;

trunk/libtransmission/rpcimpl.c

@@ -447 +447 @@
 
 static void
-addWebseeds (const tr_info * info,
-             tr_variant *       webseeds)
-{
-    int i;
-
-    for (i = 0; i < info->webseedCount; ++i)
-        tr_variantListAddStr (webseeds, info->webseeds[i]);
+addWebseeds (const tr_info  * info,
+             tr_variant     * webseeds)
+{
+  unsigned int i;
+
+  for (i=0; i< info->webseedCount; ++i)
+    tr_variantListAddStr (webseeds, info->webseeds[i]);
 }
 
 static void
-addTrackers (const tr_info * info,
-             tr_variant *       trackers)
-{
-    int i;
-
-    for (i = 0; i < info->trackerCount; ++i)
-    {
-        const tr_tracker_info * t = &info->trackers[i];
-        tr_variant *               d = tr_variantListAddDict (trackers, 4);
-        tr_variantDictAddStr (d, TR_KEY_announce, t->announce);
-        tr_variantDictAddInt (d, TR_KEY_id, t->id);
-        tr_variantDictAddStr (d, TR_KEY_scrape, t->scrape);
-        tr_variantDictAddInt (d, TR_KEY_tier, t->tier);
+addTrackers (const tr_info  * info,
+             tr_variant     * trackers)
+{
+  unsigned int i;
+
+  for (i=0; i<info->trackerCount; ++i)
+    {
+      const tr_tracker_info * t = &info->trackers[i];
+      tr_variant * d = tr_variantListAddDict (trackers, 4);
+      tr_variantDictAddStr (d, TR_KEY_announce, t->announce);
+      tr_variantDictAddInt (d, TR_KEY_id, t->id);
+      tr_variantDictAddStr (d, TR_KEY_scrape, t->scrape);
+      tr_variantDictAddInt (d, TR_KEY_tier, t->tier);
     }
 }

trunk/libtransmission/torrent-magnet.c

@@ -374 +374 @@
 tr_torrentInfoGetMagnetLink (const tr_info * inf)
 {
-    int i;
+    unsigned int i;
     const char * name;
     struct evbuffer * s = evbuffer_new ();

trunk/libtransmission/torrent.c

@@ -1257 +1257 @@
           }
 
-        if ((s->leftUntilDone > s->desiredAvailable) && (tor->info.webseedCount < 0))
+        if ((s->leftUntilDone > s->desiredAvailable) && (tor->info.webseedCount < 1))
           s->eta = TR_ETA_NOT_AVAIL;
         else if (tor->etaDLSpeed_KBps < 1)

trunk/libtransmission/transmission.h

@@ -1725 +1725 @@
     time_t             dateCreated;
 
-    int                trackerCount;
-    int                webseedCount;
+    unsigned int       trackerCount;
+    unsigned int       webseedCount;
     tr_file_index_t    fileCount;
     uint32_t           pieceSize;

trunk/qt/app.cc

@@ -470 +470 @@
 main( int argc, char * argv[] )
 {
+std::cerr << "sizeof double " << sizeof(double) << std::endl;
+std::cerr << "sizeof Speed " << sizeof(Speed) << std::endl;
+std::cerr << "sizeof int " << sizeof(int) << std::endl;
+std::cerr << "sizeof bool " << sizeof(bool) << std::endl;
+std::cerr << "sizeof uint64_t " << sizeof(uint64_t) << std::endl;
+std::cerr << "sizeof QString is " << sizeof(QString) << std::endl;
+std::cerr << "sizeof TrFile is " << sizeof(struct TrFile) << std::endl;
+std::cerr << "sizeof Peer is " << sizeof(Peer) << std::endl;
+std::cerr << "sizeof TrackerStat is " << sizeof(TrackerStat) << std::endl;
+
     // find .torrents, URLs, magnet links, etc in the command-line args
     int c;

trunk/qt/my-valgrind.sh

@@ -1 +1 @@
 #/bin/sh
-valgrind --tool=cachegrind ./transmission-qt 2>&1 | tee runlog
+#valgrind --tool=cachegrind ./transmission-qt 2>&1 | tee runlog
+valgrind --tool=massif --threshold=0.2 ./transmission-qt 2>&1 | tee runlog
 #valgrind --tool=memcheck --leak-check=full --leak-resolution=high --num-callers=48 --log-file=x-valgrind --show-reachable=no ./transmission-qt 2>&1 | tee runlog

trunk/qt/torrent.cc

@@ -556 +556 @@
 
       myFiles.clear ();
+      myFiles.reserve (tr_variantListSize (files));
 
       while ((child = tr_variantListChild (files, i)))

trunk/utils/show.c

@@ -123 +123 @@
 showInfo (const tr_info * inf)
 {
-  int i;
+  unsigned int i;
   char buf[128];
   tr_file ** files;
@@ -186 +186 @@
   printf ("\nFILES\n\n");
   files = tr_new (tr_file*, inf->fileCount);
-  for (i=0; i< (int)inf->fileCount; ++i)
+  for (i=0; i<inf->fileCount; ++i)
     files[i] = &inf->files[i];
   qsort (files, inf->fileCount, sizeof (tr_file*), compare_files_by_name);
-  for (i=0; i< (int)inf->fileCount; ++i)
+  for (i=0; i<inf->fileCount; ++i)
     printf ("  %s (%s)\n", files[i]->name, tr_formatter_size_B (buf, files[i]->length, sizeof (buf)));
   tr_free (files);
@@ -218 +218 @@
 doScrape (const tr_info * inf)
 {
-  int i;
+  unsigned int i;
 
   for (i=0; i<inf->trackerCount; ++i)