Changeset 33dff53 for tools/tracereport

Timestamp:

04/03/07 10:48:24 (15 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:

6b6ede6

Parents:

d36a8c6

Message:

Don't preallocate 768MB of BSS, it kills macs.

File:

• tools/tracereport/port_report.c (modified) (6 diffs)

tools/tracereport/port_report.c

@@ -9 +9 @@
 #include "contain.h"
 
-stat_t ports[3][256][65536]={{{{0,0}}}};
+stat_t *ports[3][256] = {{NULL}};
 char protn[256]={0};
 static bool suppress[3] = {true,true,true};
@@ -31 +31 @@
                 : trace_get_destination_port(packet);
 
+        if (!ports[dir][proto])
+                ports[dir][proto]=calloc(65536,sizeof(stat_t));
         ports[dir][proto][port].bytes+=trace_get_wire_length(packet);
         ports[dir][proto][port].count++;
@@ -76 +78 @@
                 printf("%20s:",ent->s_name);
                 for(k=0;k<3;k++){
-                        if (ports[k][i][j].count==0){
+                        if (!ports[k][i] || ports[k][i][j].count==0){
                                 if(!suppress[k])
                                         printf("\t%24s"," ");
@@ -90 +92 @@
                 printf("%20i:",j);
                 for(k=0;k<3;k++){
-                        if (ports[k][i][j].count==0){
+                        if (!ports[k][i] || ports[k][i][j].count==0){
                                 if(!suppress[k])
                                         printf("\t%24s"," ");
@@ -112 +114 @@
         for(j=0;j<65536;++j) {
                 for(k=0;k<3;k++){
-                        if (ports[k][i][j].count) {
+                        if (ports[k][i] && ports[k][i][j].count) {
                                 port_port(i,ent?ent->p_name:"",j);
                                 break;
@@ -130 +132 @@
                 if (protn[i]) {
                         port_protocol(i);
+                        free(ports[0][i]);
+                        free(ports[1][i]);
+                        free(ports[2][i]);
                 }
         }