Changeset 2ffda28 for lib

Timestamp:

03/19/06 15:27:22 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

25efeac

Parents:

eea0f87

Message:

Make sure we do large reads in format_rt to keep system % cpu down.

File:

• lib/format_rt.c (modified) (12 diffs)

lib/format_rt.c

@@ -96 +96 @@
         int input_fd;
         int reliable;
-
+        char *pkt_buffer;
+        char *buf_current;
+        int buf_left;
+
+        
         struct libtrace_t *dummy_erf;
         struct libtrace_t *dummy_pcap;
@@ -158 +162 @@
                 case RT_HELLO:
                         /* do something with options */
-                        printf("Hello\n");      
                         if (recv(RT_INFO->input_fd, &hello_opts, 
                                                 sizeof(rt_hello_t), 0)
@@ -189 +192 @@
         RT_INFO->dummy_pcap = NULL;
         RT_INFO->dummy_wag = NULL;
+        RT_INFO->pkt_buffer = NULL;
+        RT_INFO->buf_current = NULL;
+        RT_INFO->buf_left = 0;
         
         if (strlen(uridata) == 0) {
@@ -219 +225 @@
         start_msg.length = sizeof(rt_start_t);
 
-        printf("Sending start - len: %d\n", start_msg.length);
         
         /* Need to send start message to server */
@@ -257 +262 @@
 }
 
-static int rt_read(struct libtrace_t *libtrace, void *buffer, size_t len) {
+#define RT_BUF_SIZE 4000
+
+static int rt_read(struct libtrace_t *libtrace, void **buffer, size_t len) {
         int numbytes;
 
-        while(1) {
+        assert(len <= RT_BUF_SIZE);
+        
+        if (!RT_INFO->pkt_buffer) {
+                RT_INFO->pkt_buffer = malloc(RT_BUF_SIZE);
+                RT_INFO->buf_current = RT_INFO->pkt_buffer;
+                RT_INFO->buf_left = 0;
+        }
+
+        
+        if (len > RT_INFO->buf_left) {
+                memcpy(RT_INFO->pkt_buffer, RT_INFO->buf_current, 
+                                RT_INFO->buf_left);
+                RT_INFO->buf_current = RT_INFO->pkt_buffer;
+
 #ifndef MSG_NOSIGNAL
 #  define MSG_NOSIGNAL 0
 #endif
-                if ((numbytes = recv(RT_INFO->input_fd,
-                                                buffer,
-                                                len,
+                while (len > RT_INFO->buf_left) {
+                        if ((numbytes = recv(RT_INFO->input_fd,
+                                                RT_INFO->pkt_buffer + 
+                                                RT_INFO->buf_left,
+                                                RT_BUF_SIZE-RT_INFO->buf_left,
                                                 MSG_NOSIGNAL)) == -1) {
-                        if (errno == EINTR) {
-                                /* ignore EINTR in case
-                                 * a caller is using signals
-                                 */
-                                continue;
-                        }
-                        perror("recv");
-                        return -1;
-                }
-                break;
+                                if (errno == EINTR) {
+                                        /* ignore EINTR in case
+                                         * a caller is using signals
+                                         */
+                                        continue;
+                                }
+                                perror("recv");
+                                return -1;
+                        }
+                        RT_INFO->buf_left+=numbytes;
+                }
 
         }
-        return numbytes;
+        *buffer = RT_INFO->buf_current;
+        RT_INFO->buf_current += len;
+        RT_INFO->buf_left -= len;
+        assert(RT_INFO->buf_left >= 0);
+        return len;
 }
 
@@ -385 +412 @@
         
 static int rt_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet) {
-        
-        rt_header_t pkt_hdr;
+        rt_header_t rt_hdr;
+        rt_header_t *pkt_hdr = &rt_hdr;
         int pkt_size = 0;
         
-        void *buffer = 0;
-
+        
         if (packet->buf_control == TRACE_CTRL_EXTERNAL || !packet->buffer) {
                 packet->buf_control = TRACE_CTRL_PACKET;
@@ -396 +422 @@
         } 
 
-        buffer = packet->buffer;
         packet->header = packet->buffer;
 
         /* FIXME: Better error handling required */
-        if (rt_read(libtrace, &pkt_hdr, sizeof(rt_header_t)) !=
+        if (rt_read(libtrace, (void **)&pkt_hdr, sizeof(rt_header_t)) !=
                         sizeof(rt_header_t)) {
                 printf("Error receiving rt header\n");
@@ -406 +431 @@
         }
 
-        packet->type = pkt_hdr.type;
-        pkt_size = pkt_hdr.length;
-        packet->size = pkt_hdr.length;
+        packet->type = pkt_hdr->type;
+        pkt_size = pkt_hdr->length;
+        packet->size = pkt_hdr->length;
 
         if (packet->type >= RT_DATA_SIMPLE) {
-                if (rt_read(libtrace, buffer, pkt_size) != pkt_size) {
+                if (rt_read(libtrace, &packet->buffer, pkt_size) != pkt_size) {
                         printf("Error receiving packet\n");
                         return -1;
@@ -423 +448 @@
                 if (reliability > 0) {
                         
-                        if (rt_send_ack(libtrace, pkt_hdr.sequence) 
+                        if (rt_send_ack(libtrace, pkt_hdr->sequence) 
                                         == -1)
                         {
@@ -433 +458 @@
                         case RT_STATUS:
                         case RT_DUCK:
-                                if (rt_read(libtrace, buffer, pkt_size) !=
+                                if (rt_read(libtrace, &packet->buffer, 
+                                                        pkt_size) !=
                                                 pkt_size) {
                                         printf("Error receiving status packet\n");
@@ -439 +465 @@
                                 }
                                 packet->header = 0;
-                                packet->payload = buffer;
+                                packet->payload = packet->buffer;
                                 break;
                         case RT_END_DATA:
@@ -453 +479 @@
                         default:
                                 printf("Bad rt type for client receipt: %d\n",
-                                        pkt_hdr.type);
+                                        pkt_hdr->type);
                 }
         }