Use correct format specifiers

rigtorp · Jul 26, 2021 · 332f02e · 332f02e
1 parent a522235
commit 332f02e
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 32 deletions.
diff --git a/src/pipe_lat.c b/src/pipe_lat.c
@@ -26,6 +26,8 @@
     OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -67,7 +69,7 @@ int main(int argc, char *argv[]) {
   }
 
   printf("message size: %i octets\n", size);
-  printf("roundtrip count: %li\n", count);
+  printf("roundtrip count: %" PRId64 "\n", count);
 
   if (pipe(ofds) == -1) {
     perror("pipe");
@@ -139,7 +141,7 @@ int main(int argc, char *argv[]) {
 
 #endif
 
-    printf("average latency: %li ns\n", delta / (count * 2));
+    printf("average latency: %" PRId64 " ns\n", delta / (count * 2));
   }
 
   return 0;

diff --git a/src/pipe_thr.c b/src/pipe_thr.c
@@ -26,6 +26,8 @@
     OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -66,7 +68,7 @@ int main(int argc, char *argv[]) {
   }
 
   printf("message size: %i octets\n", size);
-  printf("message count: %li\n", count);
+  printf("message count: %" PRId64 "\n", count);
 
   if (pipe(fds) == -1) {
     perror("pipe");
@@ -124,8 +126,9 @@ int main(int argc, char *argv[]) {
 
 #endif
 
-    printf("average throughput: %li msg/s\n", (count * 1000000) / delta);
-    printf("average throughput: %li Mb/s\n",
+    printf("average throughput: %" PRId64 " msg/s\n",
+           (count * 1000000) / delta);
+    printf("average throughput: %" PRId64 " Mb/s\n",
            (((count * 1000000) / delta) * size * 8) / 1000000);
   }
 

diff --git a/src/tcp_lat.c b/src/tcp_lat.c
@@ -26,6 +26,8 @@
     OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include <netdb.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -86,7 +88,7 @@ int main(int argc, char *argv[]) {
   }
 
   printf("message size: %i octets\n", size);
-  printf("roundtrip count: %li\n", count);
+  printf("roundtrip count: %" PRId64 "\n", count);
 
   if (!fork()) { /* child */
 
@@ -199,7 +201,7 @@ int main(int argc, char *argv[]) {
 
 #endif
 
-    printf("average latency: %li ns\n", delta / (count * 2));
+    printf("average latency: %" PRId64 " ns\n", delta / (count * 2));
   }
 
   return 0;

diff --git a/src/tcp_local_lat.c b/src/tcp_local_lat.c
@@ -26,6 +26,8 @@
     OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include <netdb.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -68,7 +70,7 @@ int main(int argc, char *argv[]) {
   }
 
   printf("message size: %i octets\n", size);
-  printf("roundtrip count: %li\n", count);
+  printf("roundtrip count: %" PRId64 "\n", count);
 
   memset(&hints, 0, sizeof hints);
   hints.ai_family = AF_UNSPEC; // use IPv4 or IPv6, whichever

diff --git a/src/tcp_remote_lat.c b/src/tcp_remote_lat.c
@@ -26,6 +26,8 @@
     OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include <netdb.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -66,7 +68,7 @@ int main(int argc, char *argv[]) {
   }
 
   printf("message size: %i octets\n", size);
-  printf("roundtrip count: %li\n", count);
+  printf("roundtrip count: %" PRId64 "\n", count);
 
   memset(&hints, 0, sizeof hints);
   hints.ai_family = AF_UNSPEC; // use IPv4 or IPv6, whichever
@@ -119,10 +121,10 @@ int main(int argc, char *argv[]) {
 
   gettimeofday(&stop, NULL);
 
-  delta =
-      (stop.tv_sec - start.tv_sec) * 1000000000 + (stop.tv_usec - start.tv_usec) * 1000;
+  delta = (stop.tv_sec - start.tv_sec) * 1000000000 +
+          (stop.tv_usec - start.tv_usec) * 1000;
 
-  printf("average latency: %li ns\n", delta / (count * 2));
+  printf("average latency: %" PRId64 " ns\n", delta / (count * 2));
 
   return 0;
 }
diff --git a/src/tcp_thr.c b/src/tcp_thr.c
@@ -26,6 +26,8 @@
     OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include <netdb.h>
 #include <netinet/tcp.h>
 #include <stdint.h>
@@ -87,7 +89,7 @@ int main(int argc, char *argv[]) {
   }
 
   printf("message size: %i octets\n", size);
-  printf("message count: %li\n", count);
+  printf("message count: %" PRId64 "\n", count);
 
   if (!fork()) {
     /* child */
@@ -189,8 +191,9 @@ int main(int argc, char *argv[]) {
 
 #endif
 
-    printf("average throughput: %li msg/s\n", (count * 1000000) / delta);
-    printf("average throughput: %li Mb/s\n",
+    printf("average throughput: %" PRId64 " msg/s\n",
+           (count * 1000000) / delta);
+    printf("average throughput: %" PRId64 " Mb/s\n",
            (((count * 1000000) / delta) * size * 8) / 1000000);
   }
 

diff --git a/src/udp_lat.c b/src/udp_lat.c
@@ -26,6 +26,8 @@
     OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include <netdb.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -89,12 +91,12 @@ int main(int argc, char *argv[]) {
   }
 
   printf("message size: %i octets\n", size);
-  printf("roundtrip count: %lli\n", count);
+  printf("roundtrip count: %" PRId64 "\n", count);
 
   if (!fork()) { /* child */
 
-    if ((sockfd = socket(resChild->ai_family, resChild->ai_socktype, resChild->ai_protocol)) ==
-        -1) {
+    if ((sockfd = socket(resChild->ai_family, resChild->ai_socktype,
+                         resChild->ai_protocol)) == -1) {
       perror("socket");
       return 1;
     }
@@ -112,15 +114,17 @@ int main(int argc, char *argv[]) {
     for (i = 0; i < count; i++) {
 
       for (sofar = 0; sofar < size;) {
-        len = recvfrom(sockfd, buf, size - sofar, 0, resParent->ai_addr, &resParent->ai_addrlen);
+        len = recvfrom(sockfd, buf, size - sofar, 0, resParent->ai_addr,
+                       &resParent->ai_addrlen);
         if (len == -1) {
           perror("recvfrom");
           return 1;
         }
         sofar += len;
       }
 
-      if (sendto(sockfd, buf, size, 0, resParent->ai_addr, resParent->ai_addrlen) != size) {
+      if (sendto(sockfd, buf, size, 0, resParent->ai_addr,
+                 resParent->ai_addrlen) != size) {
         perror("sendto");
         return 1;
       }
@@ -129,8 +133,8 @@ int main(int argc, char *argv[]) {
 
     sleep(1);
 
-    if ((sockfd = socket(resParent->ai_family, resParent->ai_socktype, resParent->ai_protocol)) ==
-        -1) {
+    if ((sockfd = socket(resParent->ai_family, resParent->ai_socktype,
+                         resParent->ai_protocol)) == -1) {
       perror("socket");
       return 1;
     }
@@ -159,13 +163,15 @@ int main(int argc, char *argv[]) {
 
     for (i = 0; i < count; i++) {
 
-      if (sendto(sockfd, buf, size, 0, resChild->ai_addr, resChild->ai_addrlen) != size) {
+      if (sendto(sockfd, buf, size, 0, resChild->ai_addr,
+                 resChild->ai_addrlen) != size) {
         perror("sendto");
         return 1;
       }
 
       for (sofar = 0; sofar < size;) {
-        len = recvfrom(sockfd, buf, size - sofar, 0, resChild->ai_addr, &resChild->ai_addrlen);
+        len = recvfrom(sockfd, buf, size - sofar, 0, resChild->ai_addr,
+                       &resChild->ai_addrlen);
         if (len == -1) {
           perror("read");
           return 1;
@@ -189,12 +195,12 @@ int main(int argc, char *argv[]) {
       return 1;
     }
 
-    delta =
-        (stop.tv_sec - start.tv_sec) * 1000000000 + (stop.tv_usec - start.tv_usec) * 1000;
+    delta = (stop.tv_sec - start.tv_sec) * 1000000000 +
+            (stop.tv_usec - start.tv_usec) * 1000;
 
 #endif
 
-    printf("average latency: %lli ns\n", delta / (count * 2));
+    printf("average latency: %" PRId64 " ns\n", delta / (count * 2));
   }
 
   return 0;

diff --git a/src/unix_lat.c b/src/unix_lat.c
@@ -26,6 +26,8 @@
     OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -65,7 +67,7 @@ int main(int argc, char *argv[]) {
   }
 
   printf("message size: %i octets\n", size);
-  printf("roundtrip count: %li\n", count);
+  printf("roundtrip count: %" PRId64 "\n", count);
 
   if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv) == -1) {
     perror("socketpair");
@@ -132,7 +134,7 @@ int main(int argc, char *argv[]) {
 
 #endif
 
-    printf("average latency: %li ns\n", delta / (count * 2));
+    printf("average latency: %" PRId64 " ns\n", delta / (count * 2));
   }
 
   return 0;

diff --git a/src/unix_thr.c b/src/unix_thr.c
@@ -26,6 +26,8 @@
     OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#define __STDC_FORMAT_MACROS
+#include <inttypes.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -65,7 +67,7 @@ int main(int argc, char *argv[]) {
   }
 
   printf("message size: %i octets\n", size);
-  printf("message count: %li\n", count);
+  printf("message count: %" PRId64 "\n", count);
 
   if (socketpair(AF_UNIX, SOCK_STREAM, 0, fds) == -1) {
     perror("socketpair");
@@ -123,8 +125,9 @@ int main(int argc, char *argv[]) {
 
 #endif
 
-    printf("average throughput: %li msg/s\n", (count * 1000000) / delta);
-    printf("average throughput: %li Mb/s\n",
+    printf("average throughput: %" PRId64 " msg/s\n",
+           (count * 1000000) / delta);
+    printf("average throughput: %" PRId64 " Mb/s\n",
            (((count * 1000000) / delta) * size * 8) / 1000000);
   }