Changeset d97865b

Timestamp:

04/11/05 12:00:19 (16 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

be02abd

Parents:

001fbb6

Message:

seems to return at about the right rate now.

Location:

examples/event

Files:

• Makefile (modified) (2 diffs)
• rate-tracetime.c (added)
• rate.c (modified) (4 diffs)

examples/event/Makefile

@@ -9 +9 @@
 LDLIBS = $(libdir) -lpcap -lz
 
-BINS = rate 
+BINS = rate rate-tracetime
 .PHONY: all clean distclean install depend
 
@@ -15 +15 @@
 
 rate: rate.c ../../lib/.libs/libtrace.a
+
+rate-tracetime: rate-tracetime.c ../../lib/.libs/libtrace.a
 
 clean:

examples/event/rate.c

@@ -70 +70 @@
 int32_t counter[MAXCOUNTERTYPE][MAXCOUNTERFRAME];
 
+int32_t event_read_packet(struct libtrace_t *trace, struct libtrace_packet_t *packet);
+
 struct timeval current,last,diff,total;
 
@@ -104 +106 @@
         struct libtrace_ip *ipptr = 0;
         struct libtrace_packet_t packet;
-        struct libtrace_eventobj_t obj;
 
         struct itimerval itv;
-        struct timeval etv;
-        uint32_t sleepsec = 0;
-        fd_set rfds;
-
-        FD_ZERO(&rfds);
 
         /* 
@@ -141 +137 @@
 
         for (;;) {
-                obj = trace_event(trace,&packet);
-        //      printf("event.type = %d\n",obj.type);   
-                
-                if (obj.type == TRACE_EVENT_TERMINATE) {
+                if ((psize = event_read_packet(trace,&packet)) < 0) {
                         break;
                 }
-
-                if (obj.type == TRACE_EVENT_IOWAIT) {
-                        // sleep on fd
-                        FD_ZERO(&rfds);
-                        FD_SET(obj.fd,&rfds);
-                        select(obj.fd + 1, &rfds,NULL,NULL,0);
+                if (psize == 0) {
                         continue;
-                } else if (obj.type == TRACE_EVENT_SLEEP) {
-                        // sleep on seconds
-                        //
-                        etv.tv_sec = (int) obj.seconds;
-                        etv.tv_usec = (int) (obj.seconds - etv.tv_sec) * 1000000;
-
-        /*              printf("waiting for %ld.%ld (%f)usec\n",
-                                        etv.tv_sec,
-                                        etv.tv_usec,
-                                        obj.seconds);
-                                        */
-                        select(0,NULL,NULL,NULL,&etv);
-                        continue;
-
-
-
-                                
-                } else if (obj.type == TRACE_EVENT_PACKET) {
-                        if (packet.size < 0) {
-                                break;
-                        } else if (packet.size == 0) {
-                                continue;
-                        }
-                } else {
-                        fprintf(stderr,"Unknown event type %d\n",obj.type);
-                        break;
                 }
-                //printf("packet.size = %d\n",packet.size);     
-                //printf("foo\n");
 
                 if((ipptr = trace_get_ip(&packet)) == 0) {
@@ -201 +161 @@
         return 0;
 }
+
+
+int32_t event_read_packet(struct libtrace_t *trace, struct libtrace_packet_t *packet) {
+        struct libtrace_eventobj_t obj;
+        struct timeval etv;
+        int32_t sleepusec = 0;
+        fd_set rfds;
+
+        FD_ZERO(&rfds);
+
+        for (;;) {
+                obj = trace_event(trace,packet);
+                if (obj.size <= 0) {
+                        return obj.size;
+                }
+                if (obj.type == TRACE_EVENT_IOWAIT) {
+                        // select() on fd
+                        FD_ZERO(&rfds);
+                        FD_SET(obj.fd,&rfds);
+                        select(obj.fd + 1, &rfds,NULL,NULL,0);
+                        continue;
+                } else if (obj.type == TRACE_EVENT_SLEEP) {
+                        // sleep on seconds
+                        // Use select for better precision.
+                        etv.tv_sec = (int) obj.seconds;
+                        etv.tv_usec = (int) ((obj.seconds - etv.tv_sec) * 1000000.0);
+                        select(0,NULL,NULL,NULL,&etv);
+                        continue;
+                } else if (obj.type == TRACE_EVENT_PACKET) {
+                        return packet->size;
+                } else {
+                        fprintf(stderr,"Unknown event type %d\n",obj.type);
+                        return -1;
+                }
+        }
+
+}