Changeset 0a6638f for lib/trace.c

Timestamp:

02/20/06 18:36:13 (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:

5b91b48

Parents:

8ee7caa

Message:

Fixed up erf output
Force trace_create_packet to be called, don't let people cheat.

File:

• lib/trace.c (modified) (6 diffs)

lib/trace.c

@@ -331 +331 @@
  */
         
-struct libtrace_out_t *trace_create_output(const char *uri) {
+libtrace_out_t *trace_create_output(const char *uri) {
         struct libtrace_out_t *libtrace = malloc(sizeof(struct libtrace_out_t));
         
@@ -382 +382 @@
         assert( libtrace->fifo);
         free(scan);
+        libtrace->started=false;
         return libtrace;
 }
@@ -403 +404 @@
 
         libtrace->started=true;
+        return 0;
+}
+
+int trace_start_output(libtrace_out_t *libtrace) 
+{
+        assert(libtrace);
+        if (libtrace->format->start_output) {
+                int ret=libtrace->format->start_output(libtrace);
+                if (ret < 0) {
+                        return ret;
+                }
+        }
+
+        libtrace->started=false;
         return 0;
 }
@@ -495 +510 @@
 libtrace_packet_t *trace_create_packet() {
         libtrace_packet_t *packet = calloc(1,sizeof(libtrace_packet_t));
-        /* This used to malloc a packet!  Why do we need to malloc a packet
-         * if we're doing zero copy?
-         */
+        packet->buf_control=PACKET;
         return packet;
 }
@@ -525 +538 @@
         assert(libtrace->started && "BUG: You must call libtrace_start() before trace_read_packet()\n");
         assert(packet);
+        assert((packet->buf_control==PACKET || packet->buf_control==EXTERNAL)&&
+                "BUG: You must allocate a packet using packet_create()");
       
         /* Store the trace we are reading from into the packet opaque 
@@ -1555 +1570 @@
  * @param errcode either an Econstant from libc, or a LIBTRACE_ERROR
  * @param msg a plaintext error message
+ * @internal
  */
 void trace_set_err(int errcode,const char *msg,...)