]> rtime.felk.cvut.cz Git - canping.git/blobdiff - src/vca_canping.c
Call vca_open_handle() with "D" flag to setup filters correctly for socketcan
[canping.git] / src / vca_canping.c
index ca4e5ac6b6bbd4c309724c44d80090a66a917a23..e468c4da56519f5f0f298fb8409e5b1e06f250da 100644 (file)
@@ -45,6 +45,7 @@
 
 #ifdef WITH_RTPRIO
 #include <sched.h>
+#include <sys/mman.h>
 
 int sched_policy = SCHED_OTHER;
 int sched_rtprio;
@@ -102,7 +103,8 @@ int option_open_once = 0;
 int option_synch_start = 0;
 bool option_background = false;
 char *option_histogram = NULL;
-
+int option_msg_to_ignore = 0;
+char *option_save_all_times = NULL;
 /* Lists */
 typedef struct threads {
        ul_list_head_t head;
@@ -126,6 +128,7 @@ typedef struct thread_data {
        int timeout;            /* number of timeouts */
 
        struct histogram hist;
+       unsigned *times;        /* Array of all measured times */
 
        ul_list_node_t node;
 } thread_data_t;
@@ -167,8 +170,12 @@ void histogram_fprint(struct histogram *h, FILE *f)
                sum += h->data[i];
        cum = sum;
        for (i = 0; i < h->allocated; i++) {
-               if (h->data[i] != 0)
-                       fprintf(f, "%d %lld\n", i*h->resolution, cum);
+               if (h->data[i] != 0) {
+                       if (!getenv("CANPING_MS"))
+                               fprintf(f, "%d %lld\n", i*h->resolution, cum);
+                       else
+                               fprintf(f, "%g %lld\n", 1e-3*(i*h->resolution), cum);
+               }
                cum -= h->data[i];
        }
 }
@@ -241,8 +248,9 @@ void *master_thread(void *arg)
        struct canfilt_t canfilt; /* filter for received messages */
 
        if (!option_open_once) {
-               /* Open can driver */
-               if(vca_open_handle(&vcah, option_device, NULL, 0) < 0) {
+               /* Open the CAN driver and disable (D) reception of
+                * all messages until we setup a filter below. */
+               if(vca_open_handle(&vcah, option_device, "D", 0) < 0) {
                        perror("open");
                        fprintf(stderr, "Error opening %s (for id %d)\n", option_device, ping_id);
                        exit(EXIT_CANNOT_OPEN); 
@@ -268,6 +276,12 @@ void *master_thread(void *arg)
 
        if (option_histogram)
                histogram_init(&td->hist, 1000*1000/*max [us]*/, 5/*resolution [us]*/);
+
+       if (option_save_all_times) {
+               td->times = malloc(sizeof(*td->times)*option_count);
+               if (!td->times)
+                       error(1, errno, "malloc times");
+       }
        
        /* Prepare data structures for the select syscall. */
        FD_ZERO (&rdset);
@@ -282,7 +296,7 @@ void *master_thread(void *arg)
                pthread_mutex_unlock(&mut_start);
        }
 
-       while (!IS_FINISH_FLAG() && (option_count == 0 || ping_count++ < option_count)) {
+       while (!IS_FINISH_FLAG() && (option_count == 0 || ping_count++ < option_count + option_msg_to_ignore)) {
                /* Send a ping message */
                pingmsg.flags=0;
                pingmsg.id=ping_id;
@@ -335,21 +349,25 @@ void *master_thread(void *arg)
                                        printf("%d:%ld\n", ping_id, time); 
                                        break;
                                case 3:
-                                       printf("Pong response for id %d received in %ld us\n", ping_id, time);
+                                       printf("Pong response %d for id %d received in %ld us\n", ping_count, ping_id, time);
                                        break;
                                }
                                /* Update statistics */
-                               td->count++;
-                               td->mean = 
-                                       td->mean * ((double)(td->count - 1) / td->count) + 
-                                       (double)time / td->count;
-                               td->moment2nd = 
-                                       td->moment2nd * ((double)(td->count - 1) / td->count) + 
-                                       (double)time*time  / td->count;
-                               if (time > td->max) td->max = time;
-                               if (time < td->min) td->min = time;
-                               if (option_histogram)
-                                       histogram_add(&td->hist, time);
+                               if (ping_count > option_msg_to_ignore) {
+                                       td->count++;
+                                       td->mean = 
+                                               td->mean * ((double)(td->count - 1) / td->count) + 
+                                               (double)time / td->count;
+                                       td->moment2nd = 
+                                               td->moment2nd * ((double)(td->count - 1) / td->count) + 
+                                               (double)time*time  / td->count;
+                                       if (time > td->max) td->max = time;
+                                       if (time < td->min) td->min = time;
+                                       if (option_histogram)
+                                               histogram_add(&td->hist, time);
+                                       if (option_save_all_times)
+                                               td->times[ping_count - 1 - option_msg_to_ignore] = time;
+                               }
                                total_count++;
                        } /* read */
                } 
@@ -383,6 +401,21 @@ void *master_thread(void *arg)
                fclose(f);
        }
 
+       if (option_save_all_times) {
+               FILE *f;
+               char buf[100];
+               int i;
+               snprintf(buf, sizeof(buf), "%s-%d.dat", option_save_all_times, ping_id);
+               f = fopen(buf, "w");
+               for (i=0; i<option_count; i++) {
+                       if (!getenv("CANPING_MS")) 
+                               fprintf(f, "%u\n", td->times[i]);
+                       else
+                               fprintf(f, "%g\n", 1e-3*td->times[i]);
+               }
+               fclose(f);
+       }
+
        sem_post(&finish_sem);
        return (void *)ret;
 }
@@ -434,8 +467,9 @@ void *slave_thread(void *arg)
        struct canfilt_t canfilt; /* filter for received messages */
 
        if (!option_open_once) {
-               /* Open the CAN driver */
-               if(vca_open_handle(&vcah, option_device, NULL, 0) < 0) {
+               /* Open the CAN driver and disable (D) reception of
+                * all messages until we setup a filter below. */
+               if(vca_open_handle(&vcah, option_device, "D", 0) < 0) {
                        perror("open");
                        printf("Error opening %s (for id %d)\n", option_device, ping_id);
                        exit(EXIT_CANNOT_OPEN); 
@@ -574,10 +608,12 @@ void print_help(void)
               "  -b            go to background (fork) after initialization, prints child PID\n"
               "  -c count      how many messages each master sends\n"
               "  -d dev        device (e.g. /dev/can1)\n"
+              "  -e prefix     save all measured times in file <prefix>-<id>.dat\n"
               "  -g prefix     store cumulative histogram in file <prefix>-<id>.dat\n"
               "  -h            print this help\n"
               "  -i id         id of first master message\n"
               "  -l length     length of the messages (0..8)\n"
+              "  -n number     ignore first <number> messages\n"
               "  -o            open a device only once for all threads (doesn't work)\n" /* due to filters */
               "  -t timeout    timeout in seconds (default 4 s)\n"
               "  -v            be verbose (use more than once to increase verbosity)\n"
@@ -598,7 +634,7 @@ int parse_options(int argc, char *argv[])
        int c;
        
        opterr = 0;
-       while ((c = getopt (argc, argv, "bc:d:g:h:i:l:m:os:t:vw:yrR:")) != -1)
+       while ((c = getopt (argc, argv, "bc:d:e:g:hi:l:m:n:os:t:vw:yrR:")) != -1)
                switch (c)
                {
                case 'b':
@@ -610,6 +646,9 @@ int parse_options(int argc, char *argv[])
                case 'd':
                        option_device = optarg;
                        break;
+               case 'e':
+                       option_save_all_times = optarg;
+                       break;
                case 'g':
                        option_histogram = optarg;
                        break;
@@ -628,6 +667,9 @@ int parse_options(int argc, char *argv[])
                case 'm':
                        option_masters = atoi(optarg);
                        break;
+               case 'n':
+                       option_msg_to_ignore = atoi(optarg);
+                       break;
                case 'o':
                        option_open_once = 1;
                        break;
@@ -762,9 +804,11 @@ int main(int argc, char *argv[])
        parse_options(argc, argv);
 
 #ifdef WITH_RTPRIO
-       if(sched_policy != SCHED_OTHER)
+       if(sched_policy != SCHED_OTHER) {
                if(set_sched_policy_and_prio(sched_policy, sched_rtprio) <0)
                        exit(EXIT_BAD_PARAM);
+               mlockall(MCL_CURRENT | MCL_FUTURE);
+       }
 #endif