Changeset 4482

Timestamp:

Jan 4, 2008, 7:13:30 PM (14 years ago)

Author:

charles

Message:

tr_stat.ratio now returns TR_RATIO_INF when appropriate

Location:

trunk/libtransmission

Files:

• stats.c (modified) (1 diff)
• torrent.c (modified) (1 diff)
• transmission.h (modified) (2 diffs)
• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)

trunk/libtransmission/stats.c

@@ -136 +136 @@
 updateRatio( tr_session_stats * setme )
 {
-    if( setme->downloadedBytes )
-        setme->ratio = setme->uploadedBytes / (double)setme->downloadedBytes;
-    else if( setme->uploadedBytes )
-        setme->ratio = TR_RATIO_INF;
-    else
-        setme->ratio = TR_RATIO_NA;
+    setme->ratio = tr_getRatio( setme->uploadedBytes, setme->downloadedBytes );
 }
 

trunk/libtransmission/torrent.c

@@ -662 +662 @@
         tr_bitfieldFree( availablePieces );
     }
-   
-    s->ratio = ( s->downloadedEver || s->haveValid )
-      ? s->uploadedEver / (float)(MAX(s->downloadedEver,s->haveValid))
-      : TR_RATIO_NA;
+
+    s->ratio = tr_getRatio( s->uploadedEver, MAX( s->downloadedEver, s->haveValid ) );
     
     tr_torrentUnlock( tor );

trunk/libtransmission/transmission.h

@@ -134 +134 @@
     uint64_t uploadedBytes;   /* total up */
     uint64_t downloadedBytes; /* total down */
-    double ratio;             /* total up / total down */
+    double ratio;             /* TR_RATIO_INF, TR_RATIO_NA, or total up/down */
     uint64_t filesAdded;      /* number of files added */
     uint64_t sessionCount;    /* program started N times */
@@ -765 +765 @@
 #define TR_RATIO_NA  -1
 #define TR_RATIO_INF -2
+    /* TR_RATIO_INF, TR_RATIO_NA, or a regular ratio */
     float               ratio;
     

trunk/libtransmission/utils.c

@@ -843 +843 @@
 
 #endif /* HAVE_STRLCAT */
+
+/***
+****
+***/
+
+double
+tr_getRatio( double numerator, double denominator )
+{
+    double ratio;
+
+    if( denominator )
+        ratio = numerator / denominator;
+    else if( numerator )
+        ratio = TR_RATIO_INF;
+    else
+        ratio = TR_RATIO_NA;
+
+    return ratio;
+}

trunk/libtransmission/utils.h

@@ -151 +151 @@
 tr_bitfield* tr_bitfieldOr( tr_bitfield*, const tr_bitfield* );
 
+double tr_getRatio( double numerator, double denominator );
+
 #endif