wme_test: Added missing \n in help message

[frescor/fwp.git] / wme_test / wclient.c

diff --git a/wme_test/wclient.c b/wme_test/wclient.c
index 5d56436da7204ec2cf4c84007cd800844f2f097e..4508169275ad8c47fbf90311232595f4d777015c 100644 (file)
--- a/wme_test/wclient.c
+++ b/wme_test/wclient.c
@@ -20,6 +20,7 @@
 #include <semaphore.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
+#include <inttypes.h>
 
 #ifdef WITH_FWP
 #include <fwp_confdefs.h>
@@ -45,7 +46,7 @@ bool opt_wait_for_queue_is_full; /* Don't gather any statistics until any queue
 char *opt_comment = NULL;
 
 bool some_queue_is_full = false;
-struct timespec reset_timestamp;
+uint64_t reset_timestamp; /* [nsec] */
 
 bool some_contract_not_accepted = false;
 
@@ -186,7 +187,7 @@ void stream_to_text(char *stream_desc, size_t n, struct stream *stream, long lon
                real[0]=0;
        }
        
-       snprintf(stream_desc, n, "%d: %s %s (%d bytes per %s +-%s, %d packets/s)%s",
+       snprintf(stream_desc, n, "%"PRIdPTR": %s %s (%d bytes per %s +-%s, %d packets/s)%s",
                 stream-streams, ac_to_text[stream->ac], bandwidth_to_text(buf[0], stream->bandwidth_bps),
                 stream->packet_size, usec_to_text(buf[1], stream->period_usec),
                 usec_to_text(buf[2], stream->jitter*stream->period_usec/100),
@@ -302,7 +303,7 @@ void save_results(int argc, char *argv[], int useconds)
        exit(0);
 }
 
-int create_ac_socket(unsigned int ac) 
+int create_ac_socket(intptr_t ac) 
 {
        int sockfd;
        unsigned int yes=1, tos;
@@ -348,6 +349,7 @@ void empty_handler()
 void reset_statistics()
 {
        int i;
+       struct timespec ts;
        for (i = 0; i < nr_streams; i++) {
                pthread_mutex_lock(&streams[i].mutex);
                streams[i].sent = 0;
@@ -356,13 +358,14 @@ void reset_statistics()
                pthread_mutex_unlock(&streams[i].mutex);
        }
        pthread_mutex_lock(&delay_stats_mutex);
-       clock_gettime(CLOCK_REALTIME, &reset_timestamp);
+       clock_gettime(CLOCK_REALTIME, &ts);
+       reset_timestamp = ts.tv_sec*1000000000LL + ts.tv_nsec;
        memset(delay_stats, 0, sizeof(delay_stats));
        pthread_mutex_unlock(&delay_stats_mutex);
 }
 
 #ifndef WITH_FWP
-int recv_packet_native(unsigned ac, struct msg_t *msg)
+int recv_packet_native(intptr_t ac, struct msg_t *msg)
 {
        int     mlen, ret;
        fd_set fdset;
@@ -400,9 +403,10 @@ void* receiver(void* arg)
        struct msg_t    msg;
        long long int trans_time_usec, client_to_server_usec, server_to_client_usec;
        long long int min_trans_time;
-       struct timespec send_timestamp, server_timestamp, recv_timestamp;
-       int     mlen, ret;
-       unsigned ac;
+       struct timespec ts;
+       uint64_t send_timestamp, server_timestamp, recv_timestamp;
+       int     mlen;
+       intptr_t ac;
        
        min_trans_time = ~0;
        
@@ -415,7 +419,7 @@ void* receiver(void* arg)
                ac = stream->ac;
                mlen = recv_packet_fwp(stream, &msg);
 #else
-               ac = (unsigned)arg;
+               ac = (intptr_t)arg;
                mlen = recv_packet_native(ac, &msg);
 #endif
                if (mlen < 0) {
@@ -423,19 +427,20 @@ void* receiver(void* arg)
                                error(0, errno, "receive_packet error");
                        goto out;
                }       
-               clock_gettime(CLOCK_REALTIME,&recv_timestamp);
+               clock_gettime(CLOCK_REALTIME,&ts);
+               recv_timestamp = ts.tv_sec*1000000000LL + ts.tv_nsec;
                send_timestamp = msg.send_timestamp;
                server_timestamp = msg.sendback_timestamp;
 
                /* Check whether this message was sent after reset_statistics() */
 
-               if ((ret = timespec_sub_usec(&send_timestamp, &reset_timestamp)) < 0) {
+               if (send_timestamp < reset_timestamp) {
                        continue; /* If so, don't count it */
                }
 
-               trans_time_usec = timespec_sub_usec(&recv_timestamp ,&send_timestamp) / 2;
-               client_to_server_usec = timespec_sub_usec(&server_timestamp, &send_timestamp);
-               server_to_client_usec = timespec_sub_usec(&recv_timestamp, &server_timestamp);
+               trans_time_usec = (recv_timestamp - send_timestamp) / 2 / 1000;
+               client_to_server_usec = (server_timestamp - send_timestamp) / 1000;
+               server_to_client_usec = (recv_timestamp - server_timestamp) / 1000;
 
                pthread_mutex_lock(&delay_stats_mutex);
                if (trans_time_usec < MAX_DELAY_US && trans_time_usec >= 0) {
@@ -559,6 +564,7 @@ void* sender(void* arg)
        union msg_buff buff;
        unsigned long int seqn;
        struct stream* stream = (struct stream*) arg;
+       struct timespec ts;
        int ret;
 
 #ifndef WITH_FWP
@@ -580,7 +586,8 @@ void* sender(void* arg)
 /*             buff.msg.tos = ac_to_tos[stream->ac]; */
                buff.msg.stream = stream-streams;
                
-               clock_gettime(CLOCK_REALTIME,&buff.msg.send_timestamp);
+               clock_gettime(CLOCK_REALTIME,&ts);
+               buff.msg.send_timestamp = ts.tv_sec*1000000000LL + ts.tv_nsec;
 
                ret = send_packet(stream, &buff);
                if (ret < 0) {
@@ -598,7 +605,7 @@ void* sender(void* arg)
                fflush(stdout);
 #endif
 
-               wait_for_next_send(stream, &buff.msg.send_timestamp);
+               wait_for_next_send(stream, &ts);
        }
 out:
        sem_post(&sem_thread_finished);
@@ -739,7 +746,7 @@ calc_stream_params(struct stream *stream)
        }
 
        if (packet_size < sizeof(struct msg_t)) {
-               error(1, 0, "Packet size too small (min %d)", sizeof(struct msg_t));
+               error(1, 0, "Packet size too small (min %zd)", sizeof(struct msg_t));
        }
 
        stream->packet_size = packet_size;
@@ -979,7 +986,7 @@ int main(int argc, char *argv[])
                                fprintf(stderr, "    -C  comment (added to header)\n");
                                fprintf(stderr, "    -c  count (number of seconds to run)\n");
                                fprintf(stderr, "    -g  histogram granularity [usec]\n");
-                               fprintf(stderr, "    -I  <interface> send packets from this interface");
+                               fprintf(stderr, "    -I  <interface> send packets from this interface\n");
                                fprintf(stderr, "    -j  send jitter (0-100) [%%]\n");
                                fprintf(stderr, "    -o  output filename (.dat will be appended)\n");
                                fprintf(stderr, "    -q  gather statistics only after some queue becomes full\n");
@@ -1035,7 +1042,7 @@ int main(int argc, char *argv[])
                error(1, errno, "FWP initialization failed");
        }
 #else
-       int ac;
+       intptr_t ac;
        /* create four receivers each per AC */
        for (ac = AC_NUM - 1; ac >= 0; ac--) {
                ac_sockfd[ac] = create_ac_socket(ac);
@@ -1079,7 +1086,11 @@ int main(int argc, char *argv[])
                seconds = 1;
                frames=0;
                while (!exit_flag) {
+#ifdef WITH_FWP
                        usleep(40000);
+#else
+                       sleep(1);
+#endif
                        frames++;
                        if (frames>=25) {
                                seconds++;
@@ -1098,11 +1109,13 @@ int main(int argc, char *argv[])
        fprintf(stderr, "\nWaiting for threads to finish\n");
        wait_for_all_threads_to_finish();
 
-       struct timespec end_timestamp, measure_length;
-       clock_gettime(CLOCK_REALTIME,&end_timestamp);
-       timespec_sub(&measure_length, &end_timestamp, &reset_timestamp);
+       struct timespec ts;
+       uint64_t end_timestamp, measure_length;
+       clock_gettime(CLOCK_REALTIME,&ts);
+       end_timestamp = ts.tv_sec*1000000000LL+ts.tv_nsec;
+       measure_length = end_timestamp - reset_timestamp;
 
-       save_results(argc, argv, timespec2usec(&measure_length));
+       save_results(argc, argv, measure_length/1000);
 #endif
 
        return 0;