View | Details | Raw Unified | Return to bug 433
Collapse All | Expand All

(-)common.orig/data-rate.cc (-10 / +50 lines)
 Lines 36-79    Link Here 
36 
    std::string trailer = s.substr(n, std::string::npos);
 36 
    std::string trailer = s.substr(n, std::string::npos);
37 
    if (trailer == "bps")
 37 
    if (trailer == "bps")
38 
      {
 38 
      {
39 
        // Bit/s
 39 
        // bit/s
40 
        *v = (uint64_t)r;
 40 
        *v = (uint64_t)r;
41 
      }
 41 
      }
42 
    else if (trailer == "b/s")
 42 
    else if (trailer == "b/s")
43 
      {
 43 
      {
44 
        // Bit/s
 44 
        // bit/s
45 
        *v = (uint64_t)r;
 45 
        *v = (uint64_t)r;
46 
      }
 46 
      }
47 
    else if (trailer == "Bps")
 47 
    else if (trailer == "Bps")
48 
      {
 48 
      {
49 
        // Byte/s
 49 
        // byte/s
50 
        *v = (uint64_t)(r * 8);
 50 
        *v = (uint64_t)(r * 8);
51 
      }
 51 
      }
52 
    else if (trailer == "B/s")
52 
    else if (trailer == "B/s")
53 
      {
 53 
      {
54 
        // Byte/s
 54 
        // byte/s
55 
        *v = (uint64_t)(r * 8);
 55 
        *v = (uint64_t)(r * 8);
56 
      }
 56 
      }
57 
    else if (trailer == "kbps")
 57 
    else if (trailer == "kbps")
58 
      {
 58 
      {
59 
        // KiloBit/s
 59 
        // kilobits/s
60 
        *v = (uint64_t)(r * 1000);
 60 
        *v = (uint64_t)(r * 1000);
61 
      }
 61 
      }
62 
    else if (trailer == "kb/s")
 62 
    else if (trailer == "kb/s")
63 
      {
 63 
      {
64 
        // KiloBit/s
 64 
        // kilobits/s
65 
        *v = (uint64_t)(r * 1000);
 65 
        *v = (uint64_t)(r * 1000);
66 
      }
 66 
      }
67 
    else if (trailer == "kBps")
 67 
    else if (trailer == "Kbps")
68 
      {
 68 
      {
69 
        // KiloBit/s
 69 
        // kilobits/s
70 
        *v = (uint64_t)(r * 1000);
 70 
        *v = (uint64_t)(r * 1000);
71 
      }
 71 
      }
72 
    else if (trailer == "kB/s")
 72 
    else if (trailer == "Kb/s")
73 
      {
 73 
      {
74 
        // KiloBit/s
 74 
        // kilobits/s
75 
        *v = (uint64_t)(r * 1000);
 75 
        *v = (uint64_t)(r * 1000);
76 
      }
 76 
      }
77 
    else if (trailer == "kBps")
78 
      {
79 
        // kiloByte/s
80 
        *v = (uint64_t)(r * 8000);
81 
      }
82 
    else if (trailer == "kB/s")
83 
      {
84 
        // KiloByte/s
85 
        *v = (uint64_t)(r * 8000);
86 
      }
87 
    else if (trailer == "kibps")
88 
      {
89 
        // kibibits/s
90 
        *v = (uint64_t)(r * 1024);
91 
      }
92 
    else if (trailer == "kib/s")
93 
      {
94 
        // kibibits/s
95 
        *v = (uint64_t)(r * 1024);
96 
      }
97 
    else if (trailer == "Kibps")
98 
      {
99 
        // kibibits/s
100 
        *v = (uint64_t)(r * 1024);
101 
      }
102 
    else if (trailer == "Kib/s")
103 
      {
104 
        // kibibits/s
105 
        *v = (uint64_t)(r * 1024);
106 
      }
107 
    else if (trailer == "KiBps")
108 
      {
109 
        // kibibits/s
110 
        *v = (uint64_t)(r * 8192);
111 
      }
112 
    else if (trailer == "KiB/s")
113 
      {
114 
        // kibibits/s
115 
        *v = (uint64_t)(r * 8192);
116 
      }
77 
    else if (trailer == "Mbps")
 117 
    else if (trailer == "Mbps")
78 
      {
 118 
      {
79 
        // MegaBit/s
 119 
        // MegaBit/s
(-)common.orig/data-rate.h (+12 lines)
 Lines 48-53    Link Here 
48 
 * \endcode
 48 
 * \endcode
49 
 * This class also supports the regular comparison operators <, >, <=, >=, ==,
 49 
 * This class also supports the regular comparison operators <, >, <=, >=, ==,
50 
 * and !=
 50 
 * and !=
51 
 *
52 
 * Conventions used:
53 
 * "b" stands for bits, "B" for bytes (8 bits)
54 
 * "k" stands for 1000, "K" also stands for 1000, "Ki" stands for 1024
55 
 * "m" and "M" stand for 1000000, "Mi" stands for 1024 kibibits, or 1048576
56 
 * ...
57 
 *
58 
 * Examples:
59 
 * "56kbps" = 56,000 bits/s
60 
 * "128kb/s" = 128,000 bits/s
61 
 * "8Kib/s" = 1 KiB/s = 8192 bits/s
62 
 * "1kB/s" = 8000 bits/s
51 
 */
 63 
 */
52 
class DataRate
 64 
class DataRate
53 
{
 65 
{

Return to bug 433