Changeset e502f76 for lib

Timestamp:

09/19/06 10:44:02 (16 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

e5222e1

Parents:

3eff1c8

Message:

Added a pause function to format_rt
Moved the rt_connect call to rt_start
Got rid of blocking in rt_read_versatile by remembering the rt header
Removed 'restrict' from trace.c as some compilers didn't like it
Fixed bugs in configure that was causing failure to detect DAG
Added a new rt type for lost connections

Location:

lib

Files:

• format_rt.c (modified) (10 diffs)
• rt_protocol.h (modified) (1 diff)
• trace.c (modified) (1 diff)

lib/format_rt.c

@@ -223 +223 @@
         }
 
-        return rt_connect(libtrace);
+        return 0;
 }
         
@@ -232 +232 @@
         start_msg.length = 0; 
 
+        if (rt_connect(libtrace) == -1)
+                return -1;
         
         /* Need to send start message to server */
@@ -240 +242 @@
         }
 
+        return 0;
+}
+
+static int rt_pause_input(libtrace_t *libtrace) {
+        close(RT_INFO->input_fd);
         return 0;
 }
@@ -478 +485 @@
 static int rt_read_packet_versatile(libtrace_t *libtrace,
                 libtrace_packet_t *packet,int blocking) {
-        rt_header_t rt_hdr;
+        static rt_header_t rt_hdr;
         static rt_header_t *pkt_hdr = 0;
-        int pkt_size = 0;
-        uint32_t seqno;
-        
-        if (pkt_hdr == 0)
+        
+        if (pkt_hdr == 0) {
+                /* first time through */
                 pkt_hdr = malloc(sizeof(rt_header_t));
+                rt_hdr.type = RT_LAST;
+        }
         
         if (packet->buf_control == TRACE_CTRL_EXTERNAL || !packet->buffer) {
@@ -491 +499 @@
         } 
 
-
-        /* FIXME: Better error handling required */
-        if (rt_read(libtrace, (void **)&pkt_hdr, sizeof(rt_header_t),blocking) !=
-                        sizeof(rt_header_t)) {
-                return -1;
-        }
-
-        /* Need to salvage these in case the next rt_read overwrites the 
-         * buffer they came from! */
-        packet->type = pkt_hdr->type;
-        pkt_size = pkt_hdr->length;
-        packet->size = pkt_hdr->length;
-        seqno = pkt_hdr->sequence;
+        /* RT_LAST means that the next bytes received should be a 
+         * rt header - I know it's hax and maybe I'll fix it later on */
+        if (rt_hdr.type == RT_LAST) {
+        
+                /* FIXME: Better error handling required */
+                if (rt_read(libtrace, (void **)&pkt_hdr, 
+                                sizeof(rt_header_t),blocking) !=
+                                sizeof(rt_header_t)) {
+                        return -1;
+                }
+
+                /* Need to salvage these in case the next rt_read overwrites 
+                 * the buffer they came from! */
+                rt_hdr.type = pkt_hdr->type;
+                rt_hdr.length = pkt_hdr->length;
+                rt_hdr.sequence = pkt_hdr->sequence;
+        }
+        packet->type = rt_hdr.type;
+        packet->size = rt_hdr.length;
 
         if (packet->type >= RT_DATA_SIMPLE) {
-                if (rt_read(libtrace, &packet->buffer, pkt_size,1) != pkt_size) {
-                        printf("Error receiving packet\n");
+                if (rt_read(libtrace, &packet->buffer, rt_hdr.length,blocking) != rt_hdr.length) {
                         return -1;
                 }
                 packet->header = packet->buffer;
                 
+                if (RT_INFO->reliable > 0) {
+                        if (rt_send_ack(libtrace, rt_hdr.sequence) 
+                                        == -1)
+                        {
+                                return -1;
+                        }
+                }
+                
+                        
                 if (rt_set_format(libtrace, packet) < 0) {
                         return -1;
                 }
                 rt_set_payload(packet);
-                if (RT_INFO->reliable > 0) {
-                        if (rt_send_ack(libtrace, seqno) 
-                                        == -1)
-                        {
-                                return -1;
-                        }
-                }
         } else {
                 switch(packet->type) {
                         case RT_STATUS:
                                 if (rt_read(libtrace, &packet->buffer, 
-                                                        pkt_size,1) !=
-                                                pkt_size) {
-                                        printf("Error receiving status packet\n");
+                                        rt_hdr.length, blocking) != 
+                                                rt_hdr.length) {
                                         return -1;
                                 }
@@ -538 +552 @@
                         case RT_DUCK_2_5:
                                 if (rt_read(libtrace, &packet->buffer,
-                                                        pkt_size, 1) !=
-                                                pkt_size) {
-                                        printf("Error receiving DUCK packet\n");
+                                        rt_hdr.length, blocking) != 
+                                                rt_hdr.length) {
                                         return -1;
                                 }
@@ -559 +572 @@
                         case RT_KEYCHANGE:
                                 break;
+                        case RT_LOSTCONN:
+                                break;
                         default:
                                 printf("Bad rt type for client receipt: %d\n",
@@ -566 +581 @@
         }
         /* Return the number of bytes read from the stream */
+        rt_hdr.type = RT_LAST;
         return packet->size; 
 }
@@ -636 +652 @@
                 }
                 else {
-                        printf("packet error\n");
+                        //printf("packet error\n");
                         event.type = TRACE_EVENT_PACKET;
                 }
@@ -670 +686 @@
         NULL,                           /* config_input */
         rt_start_input,                 /* start_input */
+        rt_pause_input,                 /* pause */
         NULL,                           /* init_output */
         NULL,                           /* config_output */
         NULL,                           /* start_output */
-        NULL,                           /* pause_output */
         rt_fin_input,                   /* fin_input */
         NULL,                           /* fin_output */

lib/rt_protocol.h

@@ -54 +54 @@
  RT_DUCK_2_4    =13,    /**< Dag 2.4 Duck */
  RT_DUCK_2_5    =14,    /**< Dag 2.5 Duck */
+ RT_LOSTCONN    =15,    /**< Lost connection to server */
  
  RT_DATA_ERF            =RT_DATA_SIMPLE + TRACE_FORMAT_ERF, 

lib/trace.c

@@ -117 +117 @@
 static char *xstrndup(const char *src,size_t n)
 {       
-        char *ret=(restrict char*)malloc(n+1);
+        char *ret=(char*)malloc(n+1);
         if (ret==NULL) {
                 fprintf(stderr,"Out of memory");