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

Timestamp:

Jun 15, 2009 1:51:43 AM (16 years ago)

Author:

vboxsync

Message:

NAT: typo (missed 'N')

Location:

trunk/src/VBox/Devices/Network

Files:

• DrvNAT.cpp (modified) (2 diffs)
• slirp/counters.h (modified) (3 diffs)
• slirp/slirp.c (modified) (5 diffs)
• slirp/slirp_state.h (modified) (1 diff)

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

@@ -58 +58 @@
 #define VBOX_NAT_DELAY_HACK
 #ifdef VBOX_WITH_STATISTICS
-# define COUNTING_COUTER(name, dsc) \
+# define COUNTING_COUNTER(name, dsc) \
     extern "C" void slirp_counting_counter_##name##_reset(PNATState pData); \
     extern "C" void slirp_counting_counter_##name##_inc(PNATState pData); \
@@ -68 +68 @@
 # define PROFILE_COUNTER(name, dsc)
 # include "Network/slirp/counters.h"
-# undef COUNTING_COUTER
+# undef COUNTING_COUNTER
 # undef PROFILE_COUNTER
 # define DRVNAT_COUNTER_RESET(pData, name) \

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

@@ -20 +20 @@
  */
 #ifndef PROFILE_COUNTER
-# error PROFILE_COUNTER not defied
+# error PROFILE_COUNTER is not defied
 #endif
-#ifndef COUNTING_COUTER
-#error COUNTING_COUTER
+#ifndef COUNTING_COUNTER
+#error COUNTING_COUNTER is not defined
 #endif
 
@@ -33 +33 @@
 PROFILE_COUNTER(IOread, "Profiling IO soread")
 
-COUNTING_COUTER(TCP, "TCP sockets")
-COUNTING_COUTER(TCPHot, "TCP sockets active")
-COUNTING_COUTER(UDP, "UDP sockets")
-COUNTING_COUTER(UDPHot, "UDP sockets active")
+COUNTING_COUNTER(TCP, "TCP sockets")
+COUNTING_COUNTER(TCPHot, "TCP sockets active")
+COUNTING_COUNTER(UDP, "UDP sockets")
+COUNTING_COUNTER(UDPHot, "UDP sockets active")
 
-COUNTING_COUTER(IORead_in_1, "SB IORead_in_1")
-COUNTING_COUTER(IORead_in_1_bytes, "SB IORead_in_1_bytes")
-COUNTING_COUTER(IORead_in_2, "SB IORead_in_2")
-COUNTING_COUTER(IORead_in_2_1st_bytes, "SB IORead_in_2_1st_bytes")
-COUNTING_COUTER(IORead_in_2_2nd_bytes, "SB IORead_in_2_2nd_bytes")
-COUNTING_COUTER(IOWrite_in_1, "SB IOWrite_in_1")
-COUNTING_COUTER(IOWrite_in_1_bytes, "SB IOWrite_in_1_bytes")
-COUNTING_COUTER(IOWrite_in_2, "SB IOWrite_in_2")
-COUNTING_COUTER(IOWrite_in_2_1st_bytes, "SB IOWrite_in_2_1st_bytes")
-COUNTING_COUTER(IOWrite_in_2_2nd_bytes, "SB IOWrite_in_2_2nd_bytes")
-COUNTING_COUTER(IOWrite_no_w, "SB IOWrite_no_w")
-COUNTING_COUTER(IOWrite_rest, "SB IOWrite_rest")
-COUNTING_COUTER(IOWrite_rest_bytes, "SB IOWrite_rest_bytes")
+COUNTING_COUNTER(IORead_in_1, "SB IORead_in_1")
+COUNTING_COUNTER(IORead_in_1_bytes, "SB IORead_in_1_bytes")
+COUNTING_COUNTER(IORead_in_2, "SB IORead_in_2")
+COUNTING_COUNTER(IORead_in_2_1st_bytes, "SB IORead_in_2_1st_bytes")
+COUNTING_COUNTER(IORead_in_2_2nd_bytes, "SB IORead_in_2_2nd_bytes")
+COUNTING_COUNTER(IOWrite_in_1, "SB IOWrite_in_1")
+COUNTING_COUNTER(IOWrite_in_1_bytes, "SB IOWrite_in_1_bytes")
+COUNTING_COUNTER(IOWrite_in_2, "SB IOWrite_in_2")
+COUNTING_COUNTER(IOWrite_in_2_1st_bytes, "SB IOWrite_in_2_1st_bytes")
+COUNTING_COUNTER(IOWrite_in_2_2nd_bytes, "SB IOWrite_in_2_2nd_bytes")
+COUNTING_COUNTER(IOWrite_no_w, "SB IOWrite_no_w")
+COUNTING_COUNTER(IOWrite_rest, "SB IOWrite_rest")
+COUNTING_COUNTER(IOWrite_rest_bytes, "SB IOWrite_rest_bytes")
 
 PROFILE_COUNTER(IOSBAppend_pf, "Profiling sbuf::append common")
@@ -56 +56 @@
 PROFILE_COUNTER(IOSBAppend_pf_wf, "Profiling sbuf::append writen fault")
 PROFILE_COUNTER(IOSBAppend_pf_wp, "Profiling sbuf::append writen partly")
-COUNTING_COUTER(IOSBAppend, "SB: Append total")
-COUNTING_COUTER(IOSBAppend_wa, "SB: Append all is written to network ")
-COUNTING_COUTER(IOSBAppend_wf, "SB: Append nothing is written")
-COUNTING_COUTER(IOSBAppend_wp, "SB: Append is written partly")
-COUNTING_COUTER(IOSBAppend_zm, "SB: Append mbuf is zerro or less")
+COUNTING_COUNTER(IOSBAppend, "SB: Append total")
+COUNTING_COUNTER(IOSBAppend_wa, "SB: Append all is written to network ")
+COUNTING_COUNTER(IOSBAppend_wf, "SB: Append nothing is written")
+COUNTING_COUNTER(IOSBAppend_wp, "SB: Append is written partly")
+COUNTING_COUNTER(IOSBAppend_zm, "SB: Append mbuf is zerro or less")
 
-COUNTING_COUTER(IOSBAppendSB, "SB: AppendSB total")
-COUNTING_COUTER(IOSBAppendSB_w_l_r, "SB: AppendSB (sb_wptr < sb_rptr)")
-COUNTING_COUTER(IOSBAppendSB_w_ge_r, "SB: AppendSB (sb_wptr >= sb_rptr)")
-COUNTING_COUTER(IOSBAppendSB_w_alter, "SB: AppendSB (altering of sb_wptr)")
+COUNTING_COUNTER(IOSBAppendSB, "SB: AppendSB total")
+COUNTING_COUNTER(IOSBAppendSB_w_l_r, "SB: AppendSB (sb_wptr < sb_rptr)")
+COUNTING_COUNTER(IOSBAppendSB_w_ge_r, "SB: AppendSB (sb_wptr >= sb_rptr)")
+COUNTING_COUNTER(IOSBAppendSB_w_alter, "SB: AppendSB (altering of sb_wptr)")
 
 PROFILE_COUNTER(TCP_reassamble, "TCP::reasamble")
 PROFILE_COUNTER(TCP_input, "TCP::input")
 
-COUNTING_COUTER(DrvNAT_package_sent, "counting package sent via PDM queue")
-COUNTING_COUTER(DrvNAT_package_drop, "counting package drops by PDM queue")
+COUNTING_COUNTER(DrvNAT_package_sent, "counting package sent via PDM queue")
+COUNTING_COUNTER(DrvNAT_package_drop, "counting package drops by PDM queue")
 
 

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

@@ -730 +730 @@
 # define PROFILE_COUNTER(name, dsc) \
     COUNTER(name, STAMTYPE_PROFILE, STAMUNIT_TICKS_PER_CALL, dsc);
-# define COUNTING_COUTER(name, dsc) \
+# define COUNTING_COUNTER(name, dsc) \
     COUNTER(name, STAMTYPE_COUNTER, STAMUNIT_COUNT, dsc); 
 
@@ -737 +737 @@
 #undef COUNTER
 #undef PROFILE_COUNTER
-#undef COUNTING_COUTER
+#undef COUNTING_COUNTER
 
 #endif /* VBOX_WITH_STATISTICS */
@@ -1891 +1891 @@
 #ifdef VBOX_WITH_STATISTICS
 /*definitions */
-#define COUNTING_COUTER(name, dsc) \
+#define COUNTING_COUNTER(name, dsc) \
 void slirp_counting_counter_##name##_reset(PNATState);      \
 void slirp_counting_counter_##name##_inc(PNATState);        \
@@ -1898 +1898 @@
 #define PROFILE_COUNTER(name, dsc) 
 #include "counters.h"
-#undef COUNTING_COUTER
+#undef COUNTING_COUNTER
 #undef PROFILE_COUNTER
 
 /*declarations*/
-#define COUNTING_COUTER(name, dsc) \
+#define COUNTING_COUNTER(name, dsc) \
 void slirp_counting_counter_##name##_reset(PNATState pData) \
 {                                                           \
@@ -1918 +1918 @@
 #define PROFILE_COUNTER(name, dsc) 
 #include "counters.h"
-#undef COUNTING_COUTER
+#undef COUNTING_COUNTER
 #undef PROFILE_COUNTER
 #endif

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

@@ -241 +241 @@
 
 # define PROFILE_COUNTER(name, dsc) STAMPROFILE Stat ## name;
-# define COUNTING_COUTER(name, dsc) STAMCOUNTER Stat ## name;
+# define COUNTING_COUNTER(name, dsc) STAMCOUNTER Stat ## name;
 
 #include "counters.h"
 
 #undef PROFILE_COUNTER
-#undef COUNTING_COUTER
+#undef COUNTING_COUNTER
 
 } NATState;