From 18b28a37724e208b7ab3eee9d15f500d3c4bbd52 Mon Sep 17 00:00:00 2001 From: Laurent MAZET Date: Mon, 6 Oct 2025 11:28:49 +0200 Subject: [PATCH] set excange message to 128 characters --- mq_lat.c | 8 +++++--- mq_rtt.c | 15 +++++++++------ pipe_lat.c | 9 +++++---- pipe_rtt.c | 15 +++++++++------ udp_lat.c | 9 +++++---- udp_rtt.c | 15 +++++++++------ 6 files changed, 42 insertions(+), 29 deletions(-) diff --git a/mq_lat.c b/mq_lat.c index 15aa7b2..63b1145 100644 --- a/mq_lat.c +++ b/mq_lat.c @@ -1,6 +1,6 @@ /* depend: */ /* cflags: */ -/* linker: mtime.o test.o stat.o -lm -lpthread -lrt */ +/* linker: msg.o mtime.o test.o stat.o -lm -lpthread -lrt */ #include #include @@ -13,6 +13,7 @@ #include #include +#include "msg.h" #include "mtime.h" #include "test.h" @@ -25,6 +26,7 @@ char *message = "Message queue latency"; void (*usage_ext) (FILE *) = NULL; int (*parse_arg_ext) (char *) = NULL; +#define MSGLEN 128 #define MAXBUF 1024 #define TIMER 1000 @@ -64,8 +66,8 @@ void *ping (__attribute__((unused)) void *arg) pthread_mutex_unlock (&mutex); sys_timestamp (&ts1); - char *buffer = "ping"; - if (mq_send (mq, buffer, strlen (buffer) + 1, 0) == -1) { + char *msg = get_msg (MSGLEN); + if (mq_send (mq, msg, MSGLEN, 0) == -1) { fprintf (stderr, "ping error: mq_send (%d)\n", try); rc = 1; pthread_exit (NULL); diff --git a/mq_rtt.c b/mq_rtt.c index d387063..5f4ad41 100644 --- a/mq_rtt.c +++ b/mq_rtt.c @@ -1,6 +1,6 @@ /* depend: */ /* cflags: */ -/* linker: mtime.o test.o stat.o -lm -lrt */ +/* linker: msg.o mtime.o test.o stat.o -lm -lrt */ #include #include @@ -14,6 +14,7 @@ #include #include +#include "msg.h" #include "mtime.h" #include "test.h" @@ -26,6 +27,7 @@ char *message = "Message queue RTT"; void (*usage_ext) (FILE *) = NULL; int (*parse_arg_ext) (char *) = NULL; +#define MSGLEN 128 #define MAXBUF 1024 int ping (mqd_t mq) @@ -34,19 +36,19 @@ int ping (mqd_t mq) printf ("Sending ping...\n"); for (int i = 0; i < nb_measurements; i++) { + char *msg = get_msg (MSGLEN); char buffer[MAXBUF] = { 0 }; - sprintf (buffer, "ping %d", i); ts_t ts1; sys_timestamp (&ts1); - if (mq_send (mq, buffer, strlen (buffer) + 1, 0) == -1) { + if (mq_send (mq, msg, MSGLEN, 0) == -1) { fprintf (stderr, "ping error: mq_send (%d)\n", i); return 1; } //printf ("send '%s'\n", buffer); - if (mq_receive (mq, buffer, sizeof(buffer), NULL) == -1) { + if (mq_receive (mq, buffer, sizeof(buffer) - 1, NULL) == -1) { fprintf (stderr, "ping error: mq_receive (%d)\n", i); return 1; } @@ -66,15 +68,16 @@ int pong (mqd_t mq) printf ("Responding pong...\n"); for (int i = 0; i < nb_measurements; i++) { + char *msg = get_msg (MSGLEN); char buffer[MAXBUF] = { 0 }; - if (mq_receive (mq, buffer, sizeof(buffer), NULL) == -1) { + if (mq_receive (mq, buffer, sizeof(buffer) - 1, NULL) == -1) { fprintf (stderr, "pong error: mq_receive (%d)\n", i); return 1; } //printf ("receive '%s'\n", buffer); - if (mq_send (mq, buffer, strlen (buffer) + 1, 0) == -1) { + if (mq_send (mq, msg, MSGLEN, 0) == -1) { fprintf (stderr, "pong error: mq_send (%d)\n", i); return 1; } diff --git a/pipe_lat.c b/pipe_lat.c index b4137b1..b30397b 100644 --- a/pipe_lat.c +++ b/pipe_lat.c @@ -1,6 +1,6 @@ /* depend: */ /* cflags: */ -/* linker: mtime.o test.o stat.o -lm -lpthread -lrt */ +/* linker: msg.o mtime.o test.o stat.o -lm -lpthread -lrt */ #include #include @@ -9,6 +9,7 @@ #include #include +#include "msg.h" #include "mtime.h" #include "test.h" @@ -21,6 +22,7 @@ char *message = "Pipe latency"; void (*usage_ext) (FILE *) = NULL; int (*parse_arg_ext) (char *) = NULL; +#define MSGLEN 128 #define MAXBUF 1024 #define TIMER 100 @@ -44,14 +46,13 @@ void *ping (__attribute__((unused)) void *arg) for (int i = 0; i < nb_measurements; i++) { - char buffer[MAXBUF] = { 0 }; - sprintf (buffer, "ping %d", i); + char *msg = get_msg (MSGLEN); pthread_mutex_lock (&mutex); pthread_mutex_unlock (&mutex); sys_timestamp (&ts1); - if (write (fdout, buffer, strlen (buffer) + 1) == -1) { + if (write (fdout, msg, MSGLEN) == -1) { fprintf (stderr, "ping error: write (%d)\n", i); rc = 1; pthread_exit (NULL); diff --git a/pipe_rtt.c b/pipe_rtt.c index 30a7679..29a365d 100644 --- a/pipe_rtt.c +++ b/pipe_rtt.c @@ -1,6 +1,6 @@ /* depend: */ /* cflags: */ -/* linker: mtime.o test.o stat.o -lm -lrt */ +/* linker: msg.o mtime.o test.o stat.o -lm -lrt */ #include #include @@ -10,6 +10,7 @@ #include #include +#include "msg.h" #include "mtime.h" #include "test.h" @@ -22,6 +23,7 @@ char *message = "Pipe RTT"; void (*usage_ext) (FILE *) = NULL; int (*parse_arg_ext) (char *) = NULL; +#define MSGLEN 128 #define MAXBUF 1024 int ping (int fdin, int fdout) @@ -30,19 +32,19 @@ int ping (int fdin, int fdout) printf ("Sending ping...\n"); for (int i = 0; i < nb_measurements; i++) { + char *msg = get_msg (MSGLEN); char buffer[MAXBUF] = { 0 }; - sprintf (buffer, "ping %d", i); ts_t ts1; sys_timestamp (&ts1); - if (write (fdout, buffer, strlen (buffer) + 1) == -1) { + if (write (fdout, msg, MSGLEN) == -1) { fprintf (stderr, "ping error: write (%d)\n", i); return 1; } //printf ("write '%s'\n", buffer); - if (read (fdin, buffer, sizeof(buffer)) == -1) { + if (read (fdin, buffer, sizeof(buffer) - 1) == -1) { fprintf (stderr, "ping error: read (%d)\n", i); return 1; } @@ -62,15 +64,16 @@ int pong (int fdin, int fdout) printf ("Responding pong...\n"); for (int i = 0; i < nb_measurements; i++) { + char *msg = get_msg (MSGLEN); char buffer[MAXBUF] = { 0 }; - if (read (fdin, buffer, sizeof(buffer)) == -1) { + if (read (fdin, buffer, sizeof(buffer) - 1) == -1) { fprintf (stderr, "ping error: read (%d)\n", i); return 1; } //printf ("read '%s'\n", buffer); - if (write (fdout, buffer, strlen (buffer) + 1) == -1) { + if (write (fdout, msg, MSGLEN) == -1) { fprintf (stderr, "ping error: write (%d)\n", i); return 1; } diff --git a/udp_lat.c b/udp_lat.c index 2d7c744..ab7499e 100644 --- a/udp_lat.c +++ b/udp_lat.c @@ -1,6 +1,6 @@ /* depend: */ /* cflags: */ -/* linker: mtime.o test.o stat.o -lm -lpthread -lrt */ +/* linker: msg.o mtime.o test.o stat.o -lm -lpthread -lrt */ #include #include @@ -13,6 +13,7 @@ #include #include +#include "msg.h" #include "mtime.h" #include "test.h" @@ -47,6 +48,7 @@ int _parse_arg_ext (char *arg) } int (*parse_arg_ext) (char *) = _parse_arg_ext; +#define MSGLEN 128 #define MAXBUF 1024 #define TIMER 1000 @@ -88,14 +90,13 @@ void *ping (__attribute__((unused)) void *arg) for (int i = 0; i < nb_measurements; i++) { - char buffer[MAXBUF] = { 0 }; - sprintf (buffer, "ping %d", i); + char *msg = get_msg (MSGLEN); pthread_mutex_lock (&mutex); pthread_mutex_unlock (&mutex); sys_timestamp (&ts1); - if (sendto (sock, buffer, strlen (buffer) + 1, 0, (struct sockaddr *)&remote, sizeof (remote)) == -1) { + if (sendto (sock, msg, MSGLEN, 0, (struct sockaddr *)&remote, sizeof (remote)) == -1) { fprintf (stderr, "ping error: sendto (%d)\n", i); rc = 1; pthread_exit (NULL); diff --git a/udp_rtt.c b/udp_rtt.c index de97b85..cbb545c 100644 --- a/udp_rtt.c +++ b/udp_rtt.c @@ -1,6 +1,6 @@ /* depend: */ /* cflags: */ -/* linker: mtime.o test.o stat.o -lm -lrt */ +/* linker: msg.o mtime.o test.o stat.o -lm -lrt */ #include #include @@ -14,6 +14,7 @@ #include #include +#include "msg.h" #include "mtime.h" #include "test.h" @@ -60,6 +61,7 @@ int _parse_arg_ext (char *arg) } int (*parse_arg_ext) (char *) = _parse_arg_ext; +#define MSGLEN 128 #define MAXBUF 1024 int ping (int local_port, int remote_addr, int remote_port) @@ -89,19 +91,19 @@ int ping (int local_port, int remote_addr, int remote_port) printf ("Sending ping...\n"); for (int i = 0; i < nb_measurements; i++) { + char *msg = get_msg (MSGLEN); char buffer[MAXBUF] = { 0 }; - sprintf (buffer, "ping %d", i); ts_t ts1; sys_timestamp (&ts1); - if (sendto (sock, buffer, strlen (buffer) + 1, 0, (struct sockaddr *)&remote, sizeof (remote)) == -1) { + if (sendto (sock, msg, MSGLEN, 0, (struct sockaddr *)&remote, sizeof (remote)) == -1) { fprintf (stderr, "ping error: sendto (%d)\n", i); return 1; } //printf ("sendto '%s'\n", buffer); - int len = recv (sock, buffer, MAXBUF, 0); + int len = recv (sock, buffer, sizeof (buffer) - 1, 0); if (len == -1) { fprintf (stderr, "ping error: recv_from (%d)\n", i); return 1; @@ -145,16 +147,17 @@ int pong (int local_port, int remote_addr, int remote_port) printf ("Sending pong...\n"); for (int i = 0; i < nb_measurements; i++) { + char *msg = get_msg (MSGLEN); char buffer[MAXBUF] = { 0 }; - int len = recv (sock, buffer, MAXBUF, 0); + int len = recv (sock, buffer, sizeof (buffer) - 1, 0); if (len == -1) { fprintf (stderr, "pong error: recv_from (%d)\n", i); return 1; } //printf ("recv_from '%s'\n", buffer); - if (sendto (sock, buffer, len, 0, (struct sockaddr *)&remote, sizeof (remote)) == -1) { + if (sendto (sock, msg, MSGLEN, 0, (struct sockaddr *)&remote, sizeof (remote)) == -1) { fprintf (stderr, "pong error: sendto (%d)\n", i); return 1; } -- 2.30.2