]> rtime.felk.cvut.cz Git - can-benchmark.git/blobdiff - latester/latester.c
Fix warnings in latester when compiled with -Wall
[can-benchmark.git] / latester / latester.c
index a5a7c474dbd837073a932e8bc9ac4fbf39d3bb1f..67e1dcb1f6d17ede19d5c02c4c97bba238f46945 100644 (file)
@@ -1,9 +1,10 @@
-/**************************************************************************/
-/* CAN latency tester                                                     */
-/* Copyright (C) 2010, 2011, 2012 Michal Sojka, DCE FEE CTU Prague        */
-/* License: GPLv2                                                        */
-/**************************************************************************/
+/*******************************************************************************/
+/* CAN latency tester                                                          */
+/* Copyright (C) 2010, 2011, 2012, 2013, 2014 Michal Sojka, DCE FEE CTU Prague */
+/* License: GPLv2                                                             */
+/*******************************************************************************/
 
+#define _GNU_SOURCE
 #include <ctype.h>
 #include <errno.h>
 #include <error.h>
@@ -30,6 +31,7 @@
 #include <talloc.h>
 #include <unistd.h>
 
+#include "canframelen.h"
 #include <linux/can.h>
 #include <linux/can/raw.h>
 
@@ -160,161 +162,7 @@ static inline char *tstamp_str(const void *ctx, struct timespec *tstamp)
                               tstamp->tv_sec, tstamp->tv_nsec/1000);
 }
 
-/* Functions and types for CRC checks.
- *
- * Generated on Wed Sep 21 22:30:11 2011,
- * by pycrc v0.7.8, http://www.tty1.net/pycrc/
- * using the configuration:
- *    Width        = 15
- *    Poly         = 0x4599
- *    XorIn        = 0x0000
- *    ReflectIn    = False
- *    XorOut       = 0x0000
- *    ReflectOut   = False
- *    Algorithm    = table-driven
- *****************************************************************************/
-typedef uint16_t crc_t;
-
-static const crc_t crc_table[2] = {
-    0x0000, 0x4599
-};
-
-crc_t crc_update(crc_t crc, uint32_t data, size_t bit_len)
-{
-    unsigned int tbl_idx;
-/*     crc_t bc = crc; */
-/*     uint32_t bd = data; */
-/*     size_t bl = bit_len; */
-
-    while (bit_len--) {
-        tbl_idx = (crc >> 14) ^ (data >> 31);
-        crc = crc_table[tbl_idx & 0x01] ^ (crc << 1);
-       data <<= 1;
-    }
-    crc = crc & 0x7fff;
-/*     printf("crc: 0x%04x -> 0x%04x  data: 0x%08x  len: %d\n", */
-/*        bc, crc, bd, bl); */
-    return crc;
-}
-
-uint32_t calc_bitmap_crc(uint32_t *bitmap, unsigned start, unsigned end)
-{
-    crc_t crc = 0;
-    crc = crc_update(crc, bitmap[0] << start, 32 - start);
-    crc = crc_update(crc, bitmap[1], 32);
-    crc = crc_update(crc, bitmap[2], end - 64 > 32 ? 32 : end - 64);
-    crc = crc_update(crc, bitmap[3], end > 96 ? end - 96 : 0);
-    return (uint32_t)htons(crc) << 17;
-}
-
-void write_crc_to_bitmap(uint32_t crc, uint32_t *bitmap, struct can_frame *frame)
-{
-    unsigned index = frame->can_id & CAN_EFF_FLAG ? 2 : 1;
-    if (frame->can_dlc < 4)
-        bitmap[index] |= crc >> (frame->can_dlc*8);
-    if (frame->can_dlc == 3)
-        bitmap[index + 1] |= crc << 8;
-    if (frame->can_dlc >= 4 && frame->can_dlc < 8)
-    {
-        bitmap[index + 1] |= crc >> (frame->can_dlc*8);
-        if (frame->can_dlc == 7)
-            bitmap[index + 2] = crc << 8;
-    }
-    else if (frame->can_dlc == 8)
-        bitmap[index + 2] = crc;
-}
-
-unsigned calc_stuff_bits(struct can_frame *frame) {
-       uint32_t bitmap[4];
-       unsigned start = 0, end;
-       uint32_t mask, ones = 0, basemask = 0xf8000000;
-       unsigned stuffed = 0;
-       memset(bitmap, 0, sizeof(bitmap));
-       uint32_t crc;
-
-/*     char received[64]; */
-/*     sprint_canframe(received, frame, true); */
-/*     printf("Frame: %s\n", received); */
-       
-       if (frame->can_id & CAN_EFF_FLAG) {
-               bitmap[0] =
-                       ((frame->can_id & CAN_EFF_MASK) >> 25);
-               bitmap[1] =
-                       ((frame->can_id & CAN_EFF_MASK) >> 18) << 25    |
-                       3 << 23                                         |
-                       ((frame->can_id & CAN_EFF_MASK) & 0x3ffff) << 7 |
-                       (!!(frame->can_id & CAN_RTR_FLAG)) << 6         |
-                       0 << 4                                          |
-                       frame->can_dlc & 0xf;
-               bitmap[2] = htonl(((uint32_t*)frame->data)[0]);
-               bitmap[3] = htonl(((uint32_t*)frame->data)[1]);
-               start = 27;
-               end = 64 + 8*frame->can_dlc;
-       } else {
-               bitmap[0] =
-                       (frame->can_id << 7) |
-                       (!!(frame->can_id & CAN_RTR_FLAG)) << 6 |
-                       0 << 4                                  |
-                       frame->can_dlc & 0xf;
-               bitmap[1] = htonl(((uint32_t*)frame->data)[0]);
-               bitmap[2] = htonl(((uint32_t*)frame->data)[1]);
-               start = 13;
-               end = 32 + 8*frame->can_dlc;
-       }
-        crc = calc_bitmap_crc(bitmap, start, end);
-        write_crc_to_bitmap(crc, bitmap, frame);
-        end += 15;
-
-       while (start < end) {
-               mask = basemask >> (start & 0x1f);
-               while (1) {
-                       ones = ones ? mask : 0;
-                       uint32_t chunk = (bitmap[start >> 5] & mask) ^ ones;
-                       //printf("start=%d  bitmap=0x%08x  mask=0x%08x  ones=0x%08x  chunk=0x%08x\n", start, bitmap[start >> 5], mask, ones, chunk);
-                       if (chunk) {
-                               unsigned change = __builtin_clz(chunk);
-                               start = start & ~0x1f | change;
-                               basemask = 0xf8000000;
-                       } else {
-                               unsigned oldstart = start;
-                               start += __builtin_popcount(mask);
-                               mask = (oldstart & 0x1f) ? basemask << (-oldstart & 0x1f) : 0;
-                               //printf("oldstart=%d  shl=%d  mask=0x%08x\n", oldstart, -oldstart & 0x1f, mask);
-                               if (mask && start < end)
-                                       continue;
-                               if (start <= end && !mask) {
-                                       stuffed++;
-                                       basemask = 0xf0000000;
-                                       //printf("stuffed %d\n", !ones);
-                               }
-                       }
-                       break;
-               }
-               ones = !ones;
-       }
-       //printf ("STUFFED %d BITS\n", stuffed);
-       return stuffed;
-}
-
-unsigned calc_frame_txtime_us(struct can_frame *frame) {
-       return calc_stuff_bits(frame) +
-               1 +             /* SOF */
-               11 +            /* ID A */
-               ((frame->can_id & CAN_EFF_FLAG) ?
-                1 +            /* SRR */
-                1 +            /* IDE */
-                18 +           /* ID B */
-                1 +            /* RTR */
-                2              /* r1, r0 */
-                :
-                1 +            /* rtr */
-                2) +           /* ide, r0 */
-               4 +             /* dlc */
-               8*frame->can_dlc +
-               15 +            /* CRC */
-               3 +             /* CRC del, ACK, ACK del */
-               7;              /* EOF */
-}
+int timespec_subtract (struct timespec *result, struct timespec *x, struct timespec *yy);
 
 void msg_info_print(FILE *f, struct msg_info *mi)
 {
@@ -411,7 +259,7 @@ static inline void calc_msg_latencies(struct msg_info *mi)
                return;
        }
        mi->lat_measured_us = diff.tv_sec * 1000000 + diff.tv_nsec/1000;
-       mi->tx_time_us = calc_frame_txtime_us(&mi->received);
+       mi->tx_time_us = calc_frame_length(&mi->received);
 }
 
 void set_sched_policy_and_prio(int policy, int rtprio)
@@ -446,7 +294,7 @@ static inline int sock_get_if_index(int s, const char *if_name)
        return ifr.ifr_ifindex;
 }
 
-static inline get_tstamp(struct timespec *ts)
+static inline void get_tstamp(struct timespec *ts)
 {
        clock_gettime(CLOCK_REALTIME, ts);
 }
@@ -455,7 +303,7 @@ static inline get_tstamp(struct timespec *ts)
 int trace_fd = -1;
 int marker_fd = -1;
 
-int init_ftrace()
+void init_ftrace()
 {
 #ifdef FTRACE
        char *debugfs;
@@ -557,7 +405,7 @@ int send_frame(int socket)
        return ret;
 }
 
-static inline send_and_check(int s)
+static inline void send_and_check(int s)
 {
        int ret;
        ret = send_frame(s);
@@ -635,9 +483,12 @@ void receive(int s, struct can_frame *frame, struct timespec *ts_kern, struct ti
             cmsg && (cmsg->cmsg_level == SOL_SOCKET);
             cmsg = CMSG_NXTHDR(&msg,cmsg)) {
                if (cmsg->cmsg_type == SO_TIMESTAMPNS)
-                       *ts_kern = *(struct timespec *)CMSG_DATA(cmsg);
-               else if (cmsg->cmsg_type == SO_RXQ_OVFL)
-                       dropcnt += *(__u32 *)CMSG_DATA(cmsg);
+                       memcpy(ts_kern, CMSG_DATA(cmsg), sizeof(struct timespec));
+               else if (cmsg->cmsg_type == SO_RXQ_OVFL) {
+                       uint32_t ovfl;
+                       memcpy(&ovfl, CMSG_DATA(cmsg), sizeof(ovfl));
+                       dropcnt += ovfl;
+               }
        }
 
 }
@@ -649,7 +500,7 @@ void process_tx(int s)
 
 void process_on_wire_rx(int s)
 {
-       struct timespec ts_kern, ts_user, ts_diff;
+       struct timespec ts_kern, ts_user;
        struct can_frame frame;
        struct msg_info *mi;
        receive(s, &frame, &ts_kern, &ts_user);
@@ -664,7 +515,7 @@ void process_on_wire_rx(int s)
 
 void process_final_rx(int s)
 {
-       struct timespec ts_kern, ts_user, ts_diff;
+       struct timespec ts_kern, ts_user;
        struct can_frame frame;
        struct msg_info *mi;
        int ret;
@@ -691,7 +542,6 @@ void *measure_thread(void *arg)
        struct pollfd pfd[3];
        struct timespec timeout;
        struct sockaddr_can addr;
-       sigset_t set;
        int consecutive_timeouts = 0;
 
        MEMSET_ZERO(pfd);
@@ -797,7 +647,7 @@ void *measure_thread(void *arg)
                                }
                        }
                        if (pfd[i].revents & ~POLLIN)
-                               error(1, 0, "Unexpected pfd[%d].revents: 0x%04x\n", pfd[i].revents);
+                               error(1, 0, "Unexpected pfd[%d].revents: 0x%04x\n", i, pfd[i].revents);
                }
        }
 
@@ -900,7 +750,6 @@ void print_progress()
 int main(int argc, const char *argv[])
 {
        pthread_t thread;
-       sigset_t set;
        int ret, i;
 
        parse_options(argc, argv);