VirtualBox

Changeset 20457 in vbox for trunk/src/VBox/Devices/Network


Ignore:
Timestamp:
Jun 10, 2009 4:19:12 AM (16 years ago)
Author:
vboxsync
Message:

NAT: warnings

Location:
trunk/src/VBox/Devices/Network
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Network/DrvNAT.cpp

    r20456 r20457  
    5858extern "C" void slirp_counting_counter_##name##_reset(PNATState pData); \
    5959extern "C" void slirp_counting_counter_##name##_inc(PNATState pData); \
    60 extern "C" void slirp_counting_counter_##name##_add(PNATState pData, int val)
     60extern "C" void slirp_counting_counter_##name##_add(PNATState pData, int val);
    6161/* @todo think abaout it */
    6262# define PROFILE_COUNTER(name, dsc)

  • trunk/src/VBox/Devices/Network/slirp/counters.h

    r20454 r20457  
    2626#endif
    2727
    28 PROFILE_COUNTER(Fill, "Profiling slirp fills");
    29 PROFILE_COUNTER(Poll, "Profiling slirp polls");
    30 PROFILE_COUNTER(FastTimer, "Profiling slirp fast timer");
    31 PROFILE_COUNTER(SlowTimer, "Profiling slirp slow timer");
    32 PROFILE_COUNTER(IOwrite, "Profiling IO sowrite");
    33 PROFILE_COUNTER(IOread, "Profiling IO soread");
     28PROFILE_COUNTER(Fill, "Profiling slirp fills")
     29PROFILE_COUNTER(Poll, "Profiling slirp polls")
     30PROFILE_COUNTER(FastTimer, "Profiling slirp fast timer")
     31PROFILE_COUNTER(SlowTimer, "Profiling slirp slow timer")
     32PROFILE_COUNTER(IOwrite, "Profiling IO sowrite")
     33PROFILE_COUNTER(IOread, "Profiling IO soread")
    3434
    35 COUNTING_COUTER(TCP, "TCP sockets");
    36 COUNTING_COUTER(TCPHot, "TCP sockets active");
    37 COUNTING_COUTER(UDP, "UDP sockets");
    38 COUNTING_COUTER(UDPHot, "UDP sockets active");
     35COUNTING_COUTER(TCP, "TCP sockets")
     36COUNTING_COUTER(TCPHot, "TCP sockets active")
     37COUNTING_COUTER(UDP, "UDP sockets")
     38COUNTING_COUTER(UDPHot, "UDP sockets active")
    3939
    40 COUNTING_COUTER(IORead_in_1, "SB IORead_in_1");
    41 COUNTING_COUTER(IORead_in_1_bytes, "SB IORead_in_1_bytes");
    42 COUNTING_COUTER(IORead_in_2, "SB IORead_in_2");
    43 COUNTING_COUTER(IORead_in_2_1st_bytes, "SB IORead_in_2_1st_bytes");
    44 COUNTING_COUTER(IORead_in_2_2nd_bytes, "SB IORead_in_2_2nd_bytes");
    45 COUNTING_COUTER(IOWrite_in_1, "SB IOWrite_in_1");
    46 COUNTING_COUTER(IOWrite_in_1_bytes, "SB IOWrite_in_1_bytes");
    47 COUNTING_COUTER(IOWrite_in_2, "SB IOWrite_in_2");
    48 COUNTING_COUTER(IOWrite_in_2_1st_bytes, "SB IOWrite_in_2_1st_bytes");
    49 COUNTING_COUTER(IOWrite_in_2_2nd_bytes, "SB IOWrite_in_2_2nd_bytes");
    50 COUNTING_COUTER(IOWrite_no_w, "SB IOWrite_no_w");
    51 COUNTING_COUTER(IOWrite_rest, "SB IOWrite_rest");
    52 COUNTING_COUTER(IOWrite_rest_bytes, "SB IOWrite_rest_bytes");
     40COUNTING_COUTER(IORead_in_1, "SB IORead_in_1")
     41COUNTING_COUTER(IORead_in_1_bytes, "SB IORead_in_1_bytes")
     42COUNTING_COUTER(IORead_in_2, "SB IORead_in_2")
     43COUNTING_COUTER(IORead_in_2_1st_bytes, "SB IORead_in_2_1st_bytes")
     44COUNTING_COUTER(IORead_in_2_2nd_bytes, "SB IORead_in_2_2nd_bytes")
     45COUNTING_COUTER(IOWrite_in_1, "SB IOWrite_in_1")
     46COUNTING_COUTER(IOWrite_in_1_bytes, "SB IOWrite_in_1_bytes")
     47COUNTING_COUTER(IOWrite_in_2, "SB IOWrite_in_2")
     48COUNTING_COUTER(IOWrite_in_2_1st_bytes, "SB IOWrite_in_2_1st_bytes")
     49COUNTING_COUTER(IOWrite_in_2_2nd_bytes, "SB IOWrite_in_2_2nd_bytes")
     50COUNTING_COUTER(IOWrite_no_w, "SB IOWrite_no_w")
     51COUNTING_COUTER(IOWrite_rest, "SB IOWrite_rest")
     52COUNTING_COUTER(IOWrite_rest_bytes, "SB IOWrite_rest_bytes")
    5353
    54 PROFILE_COUNTER(IOSBAppend_pf, "Profiling sbuf::append common");
    55 PROFILE_COUNTER(IOSBAppend_pf_wa, "Profiling sbuf::append all writen in network");
    56 PROFILE_COUNTER(IOSBAppend_pf_wf, "Profiling sbuf::append writen fault");
    57 PROFILE_COUNTER(IOSBAppend_pf_wp, "Profiling sbuf::append writen partly");
    58 COUNTING_COUTER(IOSBAppend, "SB: Append total");
    59 COUNTING_COUTER(IOSBAppend_wa, "SB: Append all is written to network ");
    60 COUNTING_COUTER(IOSBAppend_wf, "SB: Append nothing is written");
    61 COUNTING_COUTER(IOSBAppend_wp, "SB: Append is written partly");
    62 COUNTING_COUTER(IOSBAppend_zm, "SB: Append mbuf is zerro or less");
     54PROFILE_COUNTER(IOSBAppend_pf, "Profiling sbuf::append common")
     55PROFILE_COUNTER(IOSBAppend_pf_wa, "Profiling sbuf::append all writen in network")
     56PROFILE_COUNTER(IOSBAppend_pf_wf, "Profiling sbuf::append writen fault")
     57PROFILE_COUNTER(IOSBAppend_pf_wp, "Profiling sbuf::append writen partly")
     58COUNTING_COUTER(IOSBAppend, "SB: Append total")
     59COUNTING_COUTER(IOSBAppend_wa, "SB: Append all is written to network ")
     60COUNTING_COUTER(IOSBAppend_wf, "SB: Append nothing is written")
     61COUNTING_COUTER(IOSBAppend_wp, "SB: Append is written partly")
     62COUNTING_COUTER(IOSBAppend_zm, "SB: Append mbuf is zerro or less")
    6363
    64 COUNTING_COUTER(IOSBAppendSB, "SB: AppendSB total");
    65 COUNTING_COUTER(IOSBAppendSB_w_l_r, "SB: AppendSB (sb_wptr < sb_rptr)");
    66 COUNTING_COUTER(IOSBAppendSB_w_ge_r, "SB: AppendSB (sb_wptr >= sb_rptr)");
    67 COUNTING_COUTER(IOSBAppendSB_w_alter, "SB: AppendSB (altering of sb_wptr)");
     64COUNTING_COUTER(IOSBAppendSB, "SB: AppendSB total")
     65COUNTING_COUTER(IOSBAppendSB_w_l_r, "SB: AppendSB (sb_wptr < sb_rptr)")
     66COUNTING_COUTER(IOSBAppendSB_w_ge_r, "SB: AppendSB (sb_wptr >= sb_rptr)")
     67COUNTING_COUTER(IOSBAppendSB_w_alter, "SB: AppendSB (altering of sb_wptr)")
    6868
    69 PROFILE_COUNTER(TCP_reassamble, "TCP::reasamble");
    70 PROFILE_COUNTER(TCP_input, "TCP::input");
     69PROFILE_COUNTER(TCP_reassamble, "TCP::reasamble")
     70PROFILE_COUNTER(TCP_input, "TCP::input")
    7171
    72 COUNTING_COUTER(DrvNAT_package_sent, "counting package sent via PDM queue");
    73 COUNTING_COUTER(DrvNAT_package_drop, "counting package drops by PDM queue");
     72COUNTING_COUTER(DrvNAT_package_sent, "counting package sent via PDM queue")
     73COUNTING_COUTER(DrvNAT_package_drop, "counting package drops by PDM queue")
     74
     75

  • trunk/src/VBox/Devices/Network/slirp/slirp.c

    r20454 r20457  
    729729
    730730# define PROFILE_COUNTER(name, dsc) \
    731     COUNTER(name, STAMTYPE_PROFILE, STAMUNIT_TICKS_PER_CALL, dsc) 
     731    COUNTER(name, STAMTYPE_PROFILE, STAMUNIT_TICKS_PER_CALL, dsc);
    732732# define COUNTING_COUTER(name, dsc) \
    733     COUNTER(name, STAMTYPE_COUNTER, STAMUNIT_COUNT, dsc)
     733    COUNTER(name, STAMTYPE_COUNTER, STAMUNIT_COUNT, dsc);
    734734
    735735#include "counters.h"
    … …  
    18891889}
    18901890
    1891 
     1891#ifdef VBOX_WITH_STATISTICS
     1892/*definitions */
     1893#define COUNTING_COUTER(name, dsc) \
     1894void slirp_counting_counter_##name##_reset(PNATState);      \
     1895void slirp_counting_counter_##name##_inc(PNATState);        \
     1896void slirp_counting_counter_##name##_add(PNATState,int );   \
     1897/* @todo think abaout it */
     1898#define PROFILE_COUNTER(name, dsc)
     1899#include "counters.h"
     1900#undef COUNTING_COUTER
     1901#undef PROFILE_COUNTER
     1902
     1903/*declarations*/
    18921904#define COUNTING_COUTER(name, dsc) \
    18931905void slirp_counting_counter_##name##_reset(PNATState pData) \
    … …  
    19081920#undef COUNTING_COUTER
    19091921#undef PROFILE_COUNTER
    1910 
     1922#endif

  • trunk/src/VBox/Devices/Network/slirp/slirp_state.h

    r20425 r20457  
    240240#endif
    241241
    242 # define PROFILE_COUNTER(name, dsc) STAMPROFILE Stat ## name
    243 # define COUNTING_COUTER(name, dsc) STAMCOUNTER Stat ## name
     242# define PROFILE_COUNTER(name, dsc) STAMPROFILE Stat ## name;
     243# define COUNTING_COUTER(name, dsc) STAMCOUNTER Stat ## name;
    244244
    245245#include "counters.h"
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette