Merge branch 'master' of molnam1@rtime.felk.cvut.cz:/var/git/frescor

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

diff --git a/wme_test/wserver.c b/wme_test/wserver.c
index 27e1a34841f4757b0aa527179b89b2a257b480ab..f292085f004fcc5acfb2a3f75741d8dfe4a0b083 100644 (file)
--- a/wme_test/wserver.c
+++ b/wme_test/wserver.c
@@ -15,19 +15,19 @@
 #include <pthread.h>
 #include "common.h"
 
-int ac_sockfd[AC_QUEUES];
+int ac_sockfd[AC_NUM];
 
 struct receiver {
        unsigned received, last_received;
-} receivers[AC_QUEUES];
+} receivers[AC_NUM];
 
 
 void stopper()
 {
        int i;
 
-       for (i = 0 ; i < AC_QUEUES; i++) 
-               close(ac_sockfd[AC_QUEUES]);
+       for (i = 0 ; i < AC_NUM; i++) 
+               close(ac_sockfd[AC_NUM]);
 
        exit(0);
 }
@@ -62,7 +62,7 @@ int create_ac_socket(unsigned int ac)
                return -1;
        }
        
-       //tos = ((AC_QUEUES - ac) *2 - 1)*32;
+       //tos = ((AC_NUM - ac) *2 - 1)*32;
        tos = ac_to_tos[ac];
        if (setsockopt(sockfd, SOL_IP, IP_TOS, &tos, sizeof(tos))) {
                perror("Unable to set TOS");
@@ -75,7 +75,7 @@ int create_ac_socket(unsigned int ac)
 
 void* qhandler(void* queue)
 {
-       char    buff[BUFFSIZE];
+       union msg_buff buff;
        struct  sockaddr_in rem_addr;
        int     mlen;
        unsigned int ac, rem_addr_length; 
@@ -88,7 +88,7 @@ void* qhandler(void* queue)
        set_rt_prio(90-ac);
 
        while (1) {
-               while ((mlen = recvfrom(ac_sockfd[ac], buff, sizeof(buff) , 0, \
+               while ((mlen = recvfrom(ac_sockfd[ac], &buff, sizeof(buff) , 0, \
                        (struct sockaddr*)&rem_addr, &rem_addr_length)) < 0) {
                            if (errno == EINTR) continue;
                            perror("Chyba pri prijimani pozadavku");
@@ -100,7 +100,8 @@ void* qhandler(void* queue)
                fflush(stdout);
 #endif
                receivers[ac].received++;
-               while (sendto(ac_sockfd[ac], buff, mlen,0 ,(struct sockaddr*)&rem_addr, \
+/*             clock_gettime(CLOCK_MONOTONIC, &buff.msg.sendback_timestamp); */
+               while (sendto(ac_sockfd[ac], &buff, mlen,0 ,(struct sockaddr*)&rem_addr, \
                        sizeof(rem_addr)) < 0){
                            if (errno == EINTR) continue;
                            perror("Chyba pri zapisu");
@@ -128,7 +129,7 @@ int main(int argc, char *argv[])
                exit(1);
        }
 
-       for (ac = 0; ac < AC_QUEUES; ac++) {
+       for (ac = 0; ac < AC_NUM; ac++) {
                ac_sockfd[ac] = create_ac_socket(ac);
                rc = pthread_create(&thread, &attr, qhandler, (void*) ac); 
 
@@ -136,10 +137,10 @@ int main(int argc, char *argv[])
        
        while (1) {
                printf("\r");
-               for (ac = 0; ac<AC_QUEUES; ac++) {
+               for (ac = 0; ac < AC_NUM; ac++) {
                        int delta = receivers[ac].received - receivers[ac].last_received;
                        receivers[ac].last_received = receivers[ac].received;
-                       printf("%s: %5d (+%4d)  ", ac_to_text[ac], receivers[ac].received, delta);
+                       fprintf(stderr, "%s %5d %4d/s ", ac_to_text[ac], receivers[ac].received, delta);
                }
                fflush(stdout);
                sleep(1);