Changeset 5baec88

Timestamp:

02/07/06 11:54:30 (15 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:

bb09ce4

Parents:

9c87732

Message:

Added append option to erf output

erf output doesn't open the output file until the first packet is to be
written

Added non-blocking dag read function

File:

• lib/format_erf.c (modified) (10 diffs)

lib/format_erf.c

@@ -127 +127 @@
         } conn_info;
 
+
+
         union {
                 struct {
                         int level;
+                        int append;
                 } erf;
                 
@@ -321 +324 @@
 
 static int erf_init_output(struct libtrace_out_t *libtrace) {
-        char *filemode = 0;
         int fd;
         libtrace->format_data = (struct libtrace_format_data_out_t *)
@@ -327 +329 @@
 
         OPTIONS.erf.level = 0;
+        OPTIONS.erf.append = 0;
+        OUTPUT.file = 0;
+
+        return 1;
+}
+
+static int erf_open_output(struct libtrace_out_t *libtrace) {
+        char *filemode;
+        int trunc_flag = O_TRUNC;
+        int fd;
+
 #if HAVE_ZLIB
-        asprintf(&filemode,"wb%d",OPTIONS.erf.level);
+        asprintf(&filemode,"wb%d",OPTIONS.erf.level);
 #else
-        asprintf(&filemode,"w");
-#endif
-
-        if (!strncmp(libtrace->uridata,"-",1)) {
+        asprintf(&filemode,"w");
+#endif
+
+        if (OPTIONS.erf.append) {
+                trunc_flag = O_APPEND;
+        }               
+
+        if (!strncmp(libtrace->uridata,"-",1)) {
                 // STDOUT
-                OUTPUT.file = LIBTRACE_FDOPEN(fileno(stdout),filemode);
-        }
-        else {
-                // TRACE
-                fd = open(libtrace->uridata, O_CREAT | O_LARGEFILE | O_WRONLY, S_IRUSR 
-                                | S_IWUSR | S_IRGRP | S_IWGRP);
-                if (fd <= 0) {
-                        return 0;
-                }
-                OUTPUT.file = LIBTRACE_FDOPEN(fd,filemode);
-                 
-        }
-        free(filemode); 
+                OUTPUT.file = LIBTRACE_FDOPEN(fileno(stdout),filemode);
+        }
+        else {
+                // TRACE
+                fd = open(libtrace->uridata, O_CREAT | O_LARGEFILE | O_WRONLY | trunc_flag, 
+                                S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
+                if (fd <= 0) {
+                        return 0;
+                }
+                OUTPUT.file = LIBTRACE_FDOPEN(fd,filemode);
+
+        }
+        free(filemode);
         return 1;
 }
 
 static int erf_config_output(struct libtrace_out_t *libtrace, int argc, char *argv[]) {
-#if HAVE_ZLIB
         int opt;
         int level = OPTIONS.erf.level;
@@ -358 +374 @@
 
 
-        while ((opt = getopt(argc, argv, "z:")) != EOF) {
+        while ((opt = getopt(argc, argv, "z:a")) != EOF) {
                 switch (opt) {
                         case 'z':
                                 level = atoi(optarg);
+                                break;
+                        case 'a':
+                                OPTIONS.erf.append = 1;
                                 break;
                         default:
@@ -369 +388 @@
                 }
         }
-        if (level != OPTIONS.erf.level) {
-                if (level > 9 || level < 0) {
-                        // retarded level choice
-                        printf("Compression level must be between 0 and 9 inclusive - you selected %i \n", level);
-                        
-                } else {
-                        OPTIONS.erf.level = level;
-                        return gzsetparams(OUTPUT.file, level, Z_DEFAULT_STRATEGY);
-                }
-        }
-#endif
+        
         return 0;
 
@@ -409 +418 @@
 }
  
-
-
 #if HAVE_DAG
-static int dag_read(struct libtrace_t *libtrace, void *buffer, size_t len) {
+static int dag_read(struct libtrace_t *libtrace, void *buffer, size_t len, int block_flag) {
         int numbytes;
         static short lctr = 0;
@@ -425 +432 @@
                         INPUT.fd,
                         &(DAG.bottom),
-                        0);
+                        block_flag);
         DAG.diff = DAG.top -
                 DAG.bottom;
@@ -452 +459 @@
    
         if (DAG.diff == 0) {
-                if ((numbytes = dag_read(libtrace,buf,RP_BUFSIZE)) <= 0) 
+                if ((numbytes = dag_read(libtrace,buf,RP_BUFSIZE, 0)) <= 0) 
                         return numbytes;
         }
@@ -484 +491 @@
         return (size);
 }
+
+
+// Lots of repeated code in here - could easily be tidied up
+static int dag_read_packet_nb(struct libtrace_t *libtrace, struct libtrace_packet_t *packet) {
+        int numbytes;
+        int size;
+        char buf[RP_BUFSIZE];
+        dag_record_t *erfptr;
+        void *buffer = packet->buffer;
+        void *buffer2 = buffer;
+        int rlen;
+
+        if (packet->buf_control == PACKET) {
+                packet->buf_control = EXTERNAL;
+                free(packet->buffer);
+                packet->buffer = 0;
+        }
+
+        if (DAG.diff == 0) {
+                if ((numbytes = dag_read(libtrace,buf,RP_BUFSIZE, DAGF_NONBLOCK)) <= 0)
+                        return numbytes;
+        }
+
+        //DAG always gives us whole packets
+        erfptr = (dag_record_t *) ((void *)DAG.buf +
+                        (DAG.bottom + DAG.offset));
+        size = ntohs(erfptr->rlen);
+
+        if ( size  > LIBTRACE_PACKET_BUFSIZE) {
+                assert( size < LIBTRACE_PACKET_BUFSIZE);
+        }
+
+        packet->buffer = erfptr;
+        packet->header = erfptr;
+        if (((dag_record_t *)buffer)->flags.rxerror == 1) {
+                packet->payload = NULL;
+        } else {
+                packet->payload = packet->buffer + erf_get_framing_length(packet);
+        }
+
+
+        packet->status.type = RT_DATA;
+        packet->status.message = 0;
+        packet->size = size;
+        DAG.offset += size;
+        DAG.diff -= size;
+
+        assert(DAG.diff >= 0);
+
+        return (size);
+}
+
 #endif
 
@@ -702 +761 @@
         dag_record_t *dag_hdr = (dag_record_t *)packet->header;
         void *payload = packet->payload;
+
+        /* Because of configuration, we don't actually open the output file
+           until we get the first packet. Not ideal, but it'll do for now */
+        if (!OUTPUT.file) {
+                if (erf_open_output(libtrace) <= 0) { 
+                        perror("erf_open_output");
+                        return -1;
+                }
+        }
 
         pad = erf_get_padding(packet);