Changeset 6245

Timestamp:

Jun 22, 2008, 1:44:50 PM (14 years ago)

Author:

charles

Message:

(RPC) make all the speed units consistent.

Location:

trunk

Files:

• doc/rpc-spec.txt (modified) (3 diffs)
• libtransmission/rpc.c (modified) (2 diffs)

trunk/doc/rpc-spec.txt

@@ -88 +88 @@
    "priority-low"             | array      indices of low-priority file(s)
    "priority-normal"          | array      indices of normal-priority file(s)
-   "speed-limit-down"         | number     maximum download speed (in KiB/s)
+   "speed-limit-down"         | number     maximum download speed (in K/s)
    "speed-limit-down-enabled" | 'boolean'  true if the download speed is limited
-   "speed-limit-up"           | number     maximum upload speed (in KiB/s)
+   "speed-limit-up"           | number     maximum upload speed (in K/s)
    "speed-limit-up-enabled"   | 'boolean'  true if the upload speed is limited
 
@@ -126 +126 @@
                       | number   | recheckProgress        | tr_stat
                       | number   | status                 | tr_stat
-                      | number   | swarmSpeed             | tr_stat
+                      | number   | swarmSpeed (K/s)       | tr_stat
                       | 'double' | uploadRatio            | tr_stat
                       | number   | webseedsSendingToUs    | tr_stat
@@ -303 +303 @@
    "port"                     | number     port number
    "port-forwarding-enabled"  | 'boolean'  true means enabled
-   "speed-limit-down"         | number     max global download speed (in KiB/s)
+   "speed-limit-down"         | number     max global download speed (in K/s)
    "speed-limit-down-enabled" | 'boolean'  true means enabled
-   "speed-limit-up"           | number     max global upload speed (in KiB/s)
+   "speed-limit-up"           | number     max global upload speed (in K/s)
    "speed-limit-up-enabled"   | 'boolean'  true means enabled
 

trunk/libtransmission/rpc.c

@@ -217 +217 @@
         tr_bencDictAddDouble( d, "recheckProgress", st->recheckProgress );
         tr_bencDictAddInt( d, "status", st->status );
-        tr_bencDictAddDouble( d, "swarmSpeed", st->swarmSpeed );
-        tr_bencDictAddDouble( d, "ratio", st->ratio );
+        tr_bencDictAddInt( d, "swarmSpeed", (int)(st->swarmSpeed*1024) );
         tr_bencDictAddInt( d, "webseedsSendingToUs", st->webseedsSendingToUs );
     }
@@ -561 +560 @@
                           tr_sessionIsPortForwardingEnabled( h ) );
     tr_bencDictAddInt( d, "speed-limit-up",
-                          tr_sessionGetSpeedLimit( h, TR_UP ) );
+                          tr_sessionGetSpeedLimit( h, TR_UP ) * 1024 );
     tr_bencDictAddInt( d, "speed-limit-up-enabled",
                           tr_sessionIsSpeedLimitEnabled( h, TR_UP ) );
     tr_bencDictAddInt( d, "speed-limit-down",
-                          tr_sessionGetSpeedLimit( h, TR_DOWN ) );
+                          tr_sessionGetSpeedLimit( h, TR_DOWN ) * 1024 );
     tr_bencDictAddInt( d, "speed-limit-down-enabled",
                           tr_sessionIsSpeedLimitEnabled( h, TR_DOWN ) );