Changeset c219603

Timestamp:

03/22/06 14:25:34 (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:

4af54d1

Parents:

9c4b5e3

Message:

Updated rate-dir and rate for libtrace 3

Location:

examples/rate

Files:

• rate-dir.c (modified) (3 diffs)
• rate.c (modified) (4 diffs)

examples/rate/rate-dir.c

@@ -118 +118 @@
         struct libtrace_ip *ipptr = 0;
         struct libtrace_packet_t *packet = trace_create_packet();
-        
+        libtrace_err_t trace_err;
+        
         uint32_t last_second = 0;
         double ts = 0.0;
@@ -128 +129 @@
         // create an trace to uri
         trace = trace_create(uri);
-
+        if (trace_is_err(trace)) {
+                trace_err = trace_get_err(trace);
+                printf("Error in trace_create: %s\n", trace_err.problem);
+                return -1;
+        }
+        trace_start(trace);
+        if (trace_is_err(trace)) {
+                trace_err = trace_get_err(trace);
+                printf("Error in trace_start: %s\n", trace_err.problem);
+                return -1;
+        }
 
         for (;;) {
-                if ((psize = trace_read_packet(trace,&packet)) == -1) {
+                if ((psize = trace_read_packet(trace,packet)) == -1) {
                         // terminate
                         break;
@@ -139 +150 @@
                 }
 
-                if((ipptr = trace_get_ip(&packet)) == 0) {
+                if((ipptr = trace_get_ip(packet)) == 0) {
                         continue;
                 }
 
-                direction = trace_get_direction(&packet);
+                direction = trace_get_direction(packet);
 
                 counter[direction][BYTES][INSTANT] += ntohs(ipptr->ip_len);
                 counter[direction][PACKETS][INSTANT] ++;
 
-                ts = trace_get_seconds(&packet);
+                ts = trace_get_seconds(packet);
                 if(last_second == 0) {
                         last_second = (int)ts;

examples/rate/rate.c

@@ -96 +96 @@
         struct libtrace_ip *ipptr = 0;
         struct libtrace_packet_t *packet = trace_create_packet();
+        libtrace_err_t trace_err;
 
         uint32_t last_second = 0;
@@ -107 +108 @@
         // create an trace to uri
         trace = trace_create(uri);
+        if (trace_is_err(trace)) {
+                trace_err = trace_get_err(trace);
+                printf("Error in trace_create: %s\n", trace_err.problem);
+                return -1;
+        }
+        trace_start(trace);
+        if (trace_is_err(trace)) {
+                trace_err = trace_get_err(trace);
+                printf("Error in trace_start: %s\n", trace_err.problem);
+                return -1;
+        }
 
 
         for (;;) {
-                if ((psize = trace_read_packet(trace,&packet)) < 1) {
+                if ((psize = trace_read_packet(trace,packet)) < 1) {
                         // terminate
                         break;
@@ -118 +130 @@
                 }
 
-                if((ipptr = trace_get_ip(&packet)) == 0) {
+                if((ipptr = trace_get_ip(packet)) == 0) {
                         continue;
                 }
@@ -125 +137 @@
                 counter[PACKETS][INSTANT] ++;
 
-                ts = trace_get_seconds(&packet);
+                ts = trace_get_seconds(packet);
                 if(last_second == 0) {
                         last_second = (int)ts;