commit patches sent in by Radek. refs #443

appneta · Aug 21, 2010 · 42722b8 · 42722b8
1 parent 8619602
commit 42722b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/common/utils.c b/src/common/utils.c
@@ -141,14 +141,14 @@ packet_stats(struct timeval *begin, struct timeval *end,
     if (timerisset(&diff)) {
         if (bytes_sent){
             bytes_sec = bytes_sent / frac_sec;
-            mb_sec = (bytes_sec * 8) / (1024 * 1024);
+            mb_sec = (bytes_sec * 8) / (1000 * 1000);
         }
         if (pkts_sent)
             pkts_sec = pkts_sent / frac_sec;
     }
-    printf("Actual: " COUNTER_SPEC " packets (" COUNTER_SPEC " bytes) sent in %.02f seconds.",
+    printf("Actual: " COUNTER_SPEC " packets (" COUNTER_SPEC " bytes) sent in %.02f seconds.\n",
             pkts_sent, bytes_sent, frac_sec);
-    printf("\t\tRated: %.1f bps, %.2f Mbps, %.2f pps\n",
+    printf("Rated: %.1f Bps, %.2f Mbps, %.2f pps\n",
            bytes_sec, mb_sec, pkts_sec);
 
     if (failed)

diff --git a/src/send_packets.c b/src/send_packets.c
@@ -618,7 +618,7 @@ do_sleep(struct timeval *time, struct timeval *last, int len, int accurate,
          * a constant 'rate' (bytes per second).
          */
         if (pkts_sent != 0) {
-            n = (float)len / (options.speed.speed * 1024 * 1024 / 8); /* convert Mbps to bps */
+            n = (float)len / (options.speed.speed * 1000 * 1000 / 8); /* convert Mbps to bps */
             nap.tv_sec = n;
             nap.tv_nsec = (n - nap.tv_sec)  * 1000000000;