Sat Jul 14 15:03:39 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

15 files changed, 140 insertions, 70 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 6165b22ac94..2a687ef4b3f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,24 @@
+Sat Jul 14 15:03:39 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * performance-tests/Misc/childbirth_time.cpp:
+        * performance-tests/Misc/preempt.cpp:
+        * performance-tests/Misc/test_guard.cpp:
+        * performance-tests/Misc/test_naming.cpp:
+        * performance-tests/RPC/client.cpp:
+        * performance-tests/SCTP/SOCK_SEQPACK_clt.cpp:
+        * performance-tests/SCTP/SOCK_STREAM_clt.cpp:
+        * performance-tests/SCTP/hist.cpp:
+        * performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp:
+        * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp:
+        * performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp:
+        * performance-tests/TCP/tcp_test.cpp:
+        * performance-tests/TTCP/C/new-ttcp.cpp:
+        * performance-tests/UDP/udp_test.cpp:
+
+          Fixed ACE_OS fuzz warnings. Use ACE_OS calls instead of raw OS function
+          where possible. If fuzz detected a false-positive, then disable
+          the ACE_OS fuzz check for that section of the code.
+
 Sat Jul 14 07:47:12 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * ace/config-macosx-tiger.h:
diff --git a/ACE/performance-tests/Misc/childbirth_time.cpp b/ACE/performance-tests/Misc/childbirth_time.cpp
index 739d676a5fb..913b4de0e25 100644
--- a/ACE/performance-tests/Misc/childbirth_time.cpp
+++ b/ACE/performance-tests/Misc/childbirth_time.cpp
@@ -156,7 +156,7 @@ prof_fork (size_t iteration)
               ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "process.spawn"), -1);
               /* NOTREACHED */
             case 0:
-              exit (0);
+              ACE_OS::exit (0);
               /* NOTREACHED */
               break;
             default:
@@ -199,6 +199,7 @@ prof_native_thread (size_t iteration)
                                   CREATE_SUSPENDED,
                                   0) == 0)
 #elif defined (ACE_HAS_STHREADS)
+                //FUZZ: disable check_for_lack_ACE_OS
                 if (::thr_create (0,
                                   0,
                                   &ace_empty,
@@ -207,6 +208,7 @@ prof_native_thread (size_t iteration)
                                   0) != 0)
 #endif
                   ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "CreateThread"), -1);
+                //FUZZ: enable check_for_lack_ACE_OS
             }
           ptimer.stop ();
           ptimer.elapsed_time (et);
diff --git a/ACE/performance-tests/Misc/preempt.cpp b/ACE/performance-tests/Misc/preempt.cpp
index 56a961031e8..0e6edcfbc30 100644
--- a/ACE/performance-tests/Misc/preempt.cpp
+++ b/ACE/performance-tests/Misc/preempt.cpp
@@ -88,7 +88,10 @@ public:
   High_Priority_Task (void);
   ~High_Priority_Task (void);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   int open (void *);
+  //FUZZ: enable check_for_lack_ACE_OS
+
   int svc (void);
   int done () const { return done_; }
   void print_times () const;
@@ -200,7 +203,10 @@ class Low_Priority_Task : public ACE_Task<ACE_SYNCH>
 public:
   Low_Priority_Task (const High_Priority_Task &);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   int open (void *);
+  //FUZZ: enable check_for_lack_ACE_OS
+
   int svc (void);
 
 private:
diff --git a/ACE/performance-tests/Misc/test_guard.cpp b/ACE/performance-tests/Misc/test_guard.cpp
index 507f22bfff7..f3ddde52b01 100644
--- a/ACE/performance-tests/Misc/test_guard.cpp
+++ b/ACE/performance-tests/Misc/test_guard.cpp
@@ -53,11 +53,17 @@ int
 main (int argc, char *argv[])
 {
   ACE_Profile_Timer timer;
+
+  //FUZZ: disable check_for_lack_ACE_OS
   ACE_Get_Opt getopt (argc, argv, "gtn:");
+  //FUZZ: enable check_for_lack_ACE_OS
+
   int iterations = DEFAULT_ITERATIONS;
   int c, i;
 
+  //FUZZ: disable check_for_lack_ACE_OS
   while ((c = getopt()) != -1)
+  //FUZZ: enable check_for_lack_ACE_OS
     switch (c)
       {
 #if defined (ACE_USES_OBSOLETE_GUARD_CLASSES)
diff --git a/ACE/performance-tests/Misc/test_naming.cpp b/ACE/performance-tests/Misc/test_naming.cpp
index f152053a16e..01938e7e563 100644
--- a/ACE/performance-tests/Misc/test_naming.cpp
+++ b/ACE/performance-tests/Misc/test_naming.cpp
@@ -34,9 +34,12 @@ static char name[BUFSIZ];
 static char value[BUFSIZ];
 static char type[BUFSIZ];
 
+//FUZZ: disable check_for_lack_ACE_OS
 void
 bind (ACE_Naming_Context *ns_context, int result)
 {
+//FUZZ: enable check_for_lack_ACE_OS
+
   // do the binds
   for (int i = 1; i <= ACE_NS_MAX_ENTRIES; i++)
     {
@@ -130,7 +133,7 @@ find (ACE_Naming_Context *ns_context, int sign, int result)
           ACE_ASSERT (w_value == val);
           if (type_out)
             {
-              ACE_ASSERT (::strcmp (type_out, temp_type) == 0);
+              ACE_ASSERT (ACE_OS::strcmp (type_out, temp_type) == 0);
               delete[] type_out;
             }
         }
@@ -165,7 +168,10 @@ void do_testing (int argc, ACE_TCHAR *argv[], int light)
   ACE_DEBUG ((LM_DEBUG, "Binding\n"));
 
   timer.start ();
+
+  //FUZZ: disable check_for_lack_ACE_OS
   bind (&ns_context, 0);
+  //FUZZ: enable check_for_lack_ACE_OS
 
   ACE_DEBUG ((LM_DEBUG, "Unbinding\n"));
   unbind (&ns_context, 0);
diff --git a/ACE/performance-tests/RPC/client.cpp b/ACE/performance-tests/RPC/client.cpp
index b0f4a476600..b3d3982920c 100644
--- a/ACE/performance-tests/RPC/client.cpp
+++ b/ACE/performance-tests/RPC/client.cpp
@@ -13,10 +13,12 @@ int main (int argc, char* argv[])
   int nsamples = 10000;
   int c;
 
+  //FUZZ: disable check_for_lack_ACE_OS
   ACE_Get_Opt getopt (argc, argv, "h:i:");
 
   while ((c = getopt ()) != -1)
     {
+  //FUZZ: enable check_for_lack_ACE_OS
       switch ((char) c)
         {
         case 'h':
diff --git a/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
index c6e0ae7342e..fc41f2c7d3a 100644
--- a/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
+++ b/ACE/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
@@ -119,8 +119,8 @@ ACE_SCTP::HIST createHistogram(ACE_CDR::ULong messageSize){
   // memory leak.
   char * histName = (char *) malloc(200);
 
-  sprintf(histName, "%s Unmarshalled Msg Synchronous Latency Test\n\t\t\t\t\t(Message Size %u, Message Type octet)",
-          "ACE", messageSize);
+  ACE_OS::sprintf(histName, "%s Unmarshalled Msg Synchronous Latency Test\n\t\t\t\t\t(Message Size %u, Message Type octet)",
+                  "ACE", messageSize);
 
   // actually create the histogram
   ACE_SCTP::HIST createdHist = ACE_SCTP::histogram(histName,
diff --git a/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp b/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp
index 365890265b1..9e560409c8f 100644
--- a/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp
+++ b/ACE/performance-tests/SCTP/SOCK_STREAM_clt.cpp
@@ -119,8 +119,8 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
   // memory leak.
   char * histName = (char *) malloc(200);
 
-  sprintf(histName, "%s Unmarshalled Msg Synchronous Latency Test\n\t\t\t\t\t(Message Size %u, Message Type octet)",
-          "ACE", messageSize);
+  ACE_OS::sprintf(histName, "%s Unmarshalled Msg Synchronous Latency Test\n\t\t\t\t\t(Message Size %u, Message Type octet)",
+                  "ACE", messageSize);
 
   // actually create the histogram
   ACE_SCTP::HIST createdHist = ACE_SCTP::histogram(histName,
diff --git a/ACE/performance-tests/SCTP/hist.cpp b/ACE/performance-tests/SCTP/hist.cpp
index 95bcbe2d25f..c67916a86cd 100644
--- a/ACE/performance-tests/SCTP/hist.cpp
+++ b/ACE/performance-tests/SCTP/hist.cpp
@@ -25,11 +25,11 @@
 //
 */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include "ace/OS_NS_stdio.h"
+#include "ace/OS_NS_stdlib.h"
 #include <float.h>
-#include <string.h>
-#include "ace/os_include/os_math.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_math.h"
 #include "hist.h"
 namespace ACE_SCTP
 {
@@ -39,15 +39,15 @@ hist_t *head_hist, *tail_hist;
 hist_t *histogram(char *name, unsigned int num_bins, double first,
                   double last) {
   ACE_SCTP::hist_t *hist;
-  if ((hist = (hist_t *)malloc(sizeof(hist_t))) == 0) {
-    fprintf(stderr, "unable to allocate memory for histogram : %s", name);
-    exit(-1);
+  if ((hist = (hist_t *)ACE_OS::malloc(sizeof(hist_t))) == 0) {
+    ACE_OS::fprintf(stderr, "unable to allocate memory for histogram : %s", name);
+    ACE_OS::exit(-1);
   }
-  if ((hist->hs = (unsigned int *)malloc(sizeof(unsigned int) * (num_bins+2))) == 0){
-    fprintf(stderr, "unable to allocate memory for histogram : %s", name);
-    exit(-1);
+  if ((hist->hs = (unsigned int *)ACE_OS::malloc(sizeof(unsigned int) * (num_bins+2))) == 0){
+    ACE_OS::fprintf(stderr, "unable to allocate memory for histogram : %s", name);
+    ACE_OS::exit(-1);
   }
-  memset(hist->hs, 0, sizeof(unsigned int) * (num_bins+2));
+  ACE_OS::memset(hist->hs, 0, sizeof(unsigned int) * (num_bins+2));
   hist->name = name;
   hist->num_bins = num_bins;
   hist->first = first;
@@ -75,7 +75,7 @@ hist_t *histogram(char *name, unsigned int num_bins, double first,
 
 
 void set_outer(unsigned int max_num_outer, hist_t *hist) {
-  hist->outer = (double *)realloc(hist->outer,sizeof(double) * max_num_outer);
+  hist->outer = (double *)ACE_OS::realloc(hist->outer,sizeof(double) * max_num_outer);
   hist->max_num_outer = max_num_outer;
 }
 
@@ -89,12 +89,12 @@ void add_field(char *key, char *value, hist_t *hist) {
   struct optheader *nextoptheader, *trace;
 
      /* create and prepare nextoptheader */
-  nextoptheader = (struct optheader *) malloc(sizeof(struct optheader));
-  nextoptheader->key = (char *) malloc(strlen(key)+1);
-  nextoptheader->value = (char *) malloc(strlen(value)+1);
+  nextoptheader = (struct optheader *) ACE_OS::malloc(sizeof(struct optheader));
+  nextoptheader->key = (char *) ACE_OS::malloc(ACE_OS::strlen(key)+1);
+  nextoptheader->value = (char *) ACE_OS::malloc(ACE_OS::strlen(value)+1);
   nextoptheader->next = 0;
-  strcpy(nextoptheader->key,key);
-  strcpy(nextoptheader->value,value);
+  ACE_OS::strcpy(nextoptheader->key,key);
+  ACE_OS::strcpy(nextoptheader->value,value);
 
      /* tack nextoptheader onto end of optheader list */
   if (hist->firstoptheader == 0) {
@@ -112,7 +112,7 @@ void add_field(char *key, char *value, hist_t *hist) {
 void add_field_n(char *key, int value, hist_t *hist) {
   char textvalue[40];
 
-  sprintf(textvalue,"%d",value);
+  ACE_OS::sprintf(textvalue,"%d",value);
   add_field(key,textvalue,hist);
 }
 
@@ -157,69 +157,75 @@ void report_to(FILE *strm, hist_t *hist) {
   struct optheader *trace;
 
   if (hist->num_points == 0) {
-    fprintf(strm, "\n\n\t\t\t\tHistogram %s is empty\n\n", hist->name);
+    ACE_OS::fprintf(strm, "\n\n\t\t\t\tHistogram %s is empty\n\n", hist->name);
     return;
   }
-  fprintf(strm, "\n\n\t\t\t\tHistogram %s\n", hist->name);
-  if (hist->skew) fprintf(strm, "version: %s\n", HIST_VERSION);
-  else fprintf(strm, "version: 1.1\n");
-  fprintf(strm, "minimum: %g\n", hist->min);
-  fprintf(strm, "maximum: %g\n", hist->max);
-  fprintf(strm, "mean: %g\n", mean = hist->sum/hist->num_points);
+  ACE_OS::fprintf(strm, "\n\n\t\t\t\tHistogram %s\n", hist->name);
+  if (hist->skew) ACE_OS::fprintf(strm, "version: %s\n", HIST_VERSION);
+  else ACE_OS::fprintf(strm, "version: 1.1\n");
+  ACE_OS::fprintf(strm, "minimum: %g\n", hist->min);
+  ACE_OS::fprintf(strm, "maximum: %g\n", hist->max);
+  ACE_OS::fprintf(strm, "mean: %g\n", mean = hist->sum/hist->num_points);
   variance = (hist->sum2 -
           2*hist->sum*mean +
           hist->num_points*mean*mean) / (hist->num_points-1);
-  fprintf(strm, "variance: %g\n", variance);
-  if (hist->skew) {
-    fprintf(strm, "skew: %g\n", ((hist->sum3 -
-          3*hist->sum2*mean +
-          3*hist->sum*mean*mean -
-          hist->num_points*mean*mean*mean) /
-          pow(sqrt(variance),3) / hist->num_points));
-    fprintf(strm, "kurtosis: %g\n", ((hist->sum4 -
-          4*hist->sum3*mean +
-          6*hist->sum2*mean*mean -
-          4*hist->sum*mean*mean*mean +
-          hist->num_points*mean*mean*mean*mean) /
-          pow(sqrt(variance),4)) / hist->num_points - 3);
+  ACE_OS::fprintf(strm, "variance: %g\n", variance);
+  if (hist->skew) 
+  {
+    ACE_OS::fprintf(strm, "skew: %g\n", ((hist->sum3 -
+                    3*hist->sum2*mean +
+                    3*hist->sum*mean*mean -
+                    hist->num_points*mean*mean*mean) /
+                    pow(sqrt(variance),3) / hist->num_points));
+
+    ACE_OS::fprintf(strm, "kurtosis: %g\n", ((hist->sum4 -
+                    4*hist->sum3*mean +
+                    6*hist->sum2*mean*mean -
+                    4*hist->sum*mean*mean*mean +
+                    hist->num_points*mean*mean*mean*mean) /
+                    pow(sqrt(variance),4)) / hist->num_points - 3);
   }
-  fprintf(strm, "num_points: %u\n", hist->num_points);
-  fprintf(strm, "num_bins: %d %g %g\n", hist->num_bins,hist->first,hist->last);
+  ACE_OS::fprintf(strm, "num_points: %u\n", hist->num_points);
+  ACE_OS::fprintf(strm, "num_bins: %d %g %g\n", hist->num_bins,hist->first,hist->last);
   if (hist->firstoptheader) {
      trace = hist->firstoptheader;
-     while(trace->next != 0) {
-        fprintf(strm, "%s: %s\n", trace->key, trace->value);
-        trace = trace->next;
+     while(trace->next != 0) 
+     {
+       ACE_OS::fprintf(strm, "%s: %s\n", trace->key, trace->value);
+       trace = trace->next;
      }
-     fprintf(strm, "%s: %s\n", trace->key, trace->value);
+     ACE_OS::fprintf(strm, "%s: %s\n", trace->key, trace->value);
   }
-  fprintf(strm, "\n");
+  ACE_OS::fprintf(strm, "\n");
   sofar = hist->hs[0];
-  fprintf(strm, "\t      Low     -          High     Count  Fraction  Cumulative\n");
-  fprintf(strm, "\t     below    -  %12.3f  :  %5u    %0.3f    %0.3f\n", hist->first,
-          hist->hs[0], (double)hist->hs[0]/hist->num_points,
-          (double)histfloor(1000.0*sofar/hist->num_points)/1000.0);
+  ACE_OS::fprintf(strm, "\t      Low     -          High     Count  Fraction  Cumulative\n");
+  ACE_OS::fprintf(strm, "\t     below    -  %12.3f  :  %5u    %0.3f    %0.3f\n", hist->first,
+                  hist->hs[0], (double)hist->hs[0]/hist->num_points,
+                  (double)histfloor(1000.0*sofar/hist->num_points)/1000.0);
   p2 = hist->first;
   d = (hist->last - hist->first)/hist->num_bins;
   for(i = 1; i <= hist->num_bins; i++) {
     p1 = p2;
     p2 = i*d+hist->first;
     sofar += hist->hs[i];
-    fprintf(strm, "\t%12.3f  -  %12.3f  :  %5u    %0.3f    %0.3f\n", p1, p2, hist->hs[i],
-            (double)hist->hs[i]/hist->num_points,
-            (double)histfloor(1000.0*sofar/hist->num_points)/1000.0);
+    ACE_OS::fprintf(strm, "\t%12.3f  -  %12.3f  :  %5u    %0.3f    %0.3f\n", p1, p2, hist->hs[i],
+                    (double)hist->hs[i]/hist->num_points,
+                    (double)histfloor(1000.0*sofar/hist->num_points)/1000.0);
   }
+
   sofar += hist->hs[hist->num_bins+1];
-  fprintf(strm, "\t%12.3f  -       above    :  %5u    %0.3f    %0.3f\n\n",
-          hist->last, hist->hs[hist->num_bins+1],
-          (double)hist->hs[hist->num_bins+1]/hist->num_points,
-          (double)histfloor(1000.0*sofar/hist->num_points)/1000.0);
-  if (hist->num_outer) {
-    fprintf(strm, "outliers:\n");
-    for(i = 0; i < hist->num_outer; i++) fprintf(strm, "\t%12.3f\n",
-                                            hist->outer[i]);
+  ACE_OS::fprintf(strm, "\t%12.3f  -       above    :  %5u    %0.3f    %0.3f\n\n",
+                  hist->last, hist->hs[hist->num_bins+1],
+                  (double)hist->hs[hist->num_bins+1]/hist->num_points,
+                  (double)histfloor(1000.0*sofar/hist->num_points)/1000.0);
+
+  if (hist->num_outer) 
+  {
+    ACE_OS::fprintf(strm, "outliers:\n");
+    for(i = 0; i < hist->num_outer; i++) ACE_OS::fprintf(strm, "\t%12.3f\n",
+                                                         hist->outer[i]);
   }
-  fprintf(strm, "\n\n");
+  ACE_OS::fprintf(strm, "\n\n");
 }
 
 void report() {
@@ -297,7 +303,7 @@ void add_histogram(HIST dest, HIST source) {
 double histfloor (double x) {
 
 #ifdef WIN32
-  return floor(x);
+  return ACE_OS::floor(x);
 #else
   return static_cast<double> (static_cast<long long> (x));
 #endif
diff --git a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
index 7f90fc62012..7a81c66279e 100644
--- a/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
+++ b/ACE/performance-tests/Server_Concurrency/Queue_Based_Workers/RT_CORBA_Workers.cpp
@@ -79,8 +79,10 @@ Synchronisers::start_synchronization (void)
 
   if (debug)
     {
+      //FUZZ: disable check_for_lack_ACE_OS
       ACE_DEBUG ((LM_DEBUG,
                   "(%P|%t) Ready to wait () on event.. \n"));
+      //FUZZ: enable check_for_lack_ACE_OS
     }
 
   // Wait blisfully till we are woken up
diff --git a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
index db1353b8daf..48d57269f18 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp
@@ -40,10 +40,12 @@ Baseline_Test_Base::init (int argc, ACE_TCHAR *argv[])
 int
 Baseline_Test_Base::parse_args (int argc, ACE_TCHAR *argv[])
 {
+  //FUZZ: disable check_for_lack_ACE_OS
   ACE_Get_Opt getopt (argc, argv, ACE_TEXT("i:ylrw"), 0);
   int c;
 
   while ((c = getopt ()) != -1)
+  //FUZZ: enable check_for_lack_ACE_OS
     switch (c)
       {
       case 'i':                 // Total iterations
@@ -102,10 +104,12 @@ Baseline_Test_Options::Baseline_Test_Options (void)
 int
 Baseline_Test_Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
+  //FUZZ: disable check_for_lack_ACE_OS
   ACE_Get_Opt getopt (argc, argv, ACE_TEXT("tv"), 0);
   int c;
 
   while ((c = getopt ()) != -1)
+  //FUZZ: enable check_for_lack_ACE_OS
     switch (c)
       {
       case 't':
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
index e1824f3d4ac..b5296452322 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
@@ -37,11 +37,13 @@ ACE_Thread_Mutex Guard_Test::mutex_;
 int
 Guard_Test::init (int argc, ACE_TCHAR *argv[])
 {
+  //FUZZ: disable check_for_lack_ACE_OS
   ACE_Get_Opt getopt (argc, argv, ACE_TEXT("gt"));
   int c;
 
   while ((c = getopt()) != -1)
     {
+  //FUZZ: enable check_for_lack_ACE_OS
       switch (c)
         {
 #if defined (ACE_USES_OBSOLETE_GUARD_CLASSES)
diff --git a/ACE/performance-tests/TCP/tcp_test.cpp b/ACE/performance-tests/TCP/tcp_test.cpp
index 47d2fd3ded5..168928f4406 100644
--- a/ACE/performance-tests/TCP/tcp_test.cpp
+++ b/ACE/performance-tests/TCP/tcp_test.cpp
@@ -111,8 +111,10 @@ public:
   virtual int handle_close (ACE_HANDLE handle,
                             ACE_Reactor_Mask close_mask);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   int send (const char *buf, size_t len);
   // Send the <buf> to the server.
+  //FUZZ: enable check_for_lack_ACE_OS
 
   int get_response (char *buf, size_t len);
   // Wait for the response.
@@ -120,8 +122,10 @@ public:
   int run (void);
   // Send messages to server and record statistics.
 
+  //FUZZ: disable check_for_lack_ACE_OS
   int shutdown (void);
   // Send shutdown message to server.
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   ACE_SOCK_Stream endpoint_;
@@ -528,11 +532,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                     "server (%P|%t): sched_params failed\n"));
     }
 
-
+  //FUZZ: disable check_for_lack_ACE_OS
   ACE_Get_Opt getopt (argc, argv, ACE_TEXT("hxwvb:I:p:sci:m:at:"));
 
   while ((c = getopt ()) != -1)
     {
+  //FUZZ: enable check_for_lack_ACE_OS
       switch ((char) c)
         {
         case 'v':
diff --git a/ACE/performance-tests/TTCP/C/new-ttcp.cpp b/ACE/performance-tests/TTCP/C/new-ttcp.cpp
index a897f5b39a3..3cf8e1045eb 100644
--- a/ACE/performance-tests/TTCP/C/new-ttcp.cpp
+++ b/ACE/performance-tests/TTCP/C/new-ttcp.cpp
@@ -48,6 +48,8 @@
 /* #define BSD41a */
 #define SYSV /* required on SGI IRIX releases before 3.3 */
 
+//FUZZ: disable check_for_lack_ACE_OS
+
 #include "ace/Log_Msg.h"
 #include "ace/SOCK_Connector.h"
 #include "ace/SOCK_Acceptor.h"
diff --git a/ACE/performance-tests/UDP/udp_test.cpp b/ACE/performance-tests/UDP/udp_test.cpp
index 4f2815fd39a..5c613fcef61 100644
--- a/ACE/performance-tests/UDP/udp_test.cpp
+++ b/ACE/performance-tests/UDP/udp_test.cpp
@@ -102,8 +102,10 @@ public:
   virtual int handle_close (ACE_HANDLE handle,
                             ACE_Reactor_Mask close_mask);
 
+  //FUZZ: disable check_for_lack_ACE_OS
   int send (const char *buf, size_t len);
   // Send the <buf> to the server.
+  //FUZZ: enable check_for_lack_ACE_OS
 
   int get_response (char *buf, size_t len);
   // Wait for the response.
@@ -111,8 +113,10 @@ public:
   int run (void);
   // Send messages to server and record statistics.
 
+  //FUZZ: disable check_for_lack_ACE_OS
   int shutdown (void);
   // Send shutdown message to server.
+  //FUZZ: enable check_for_lack_ACE_OS
 
 private:
   ACE_SOCK_Dgram endpoint_;
@@ -245,7 +249,7 @@ Client::run (void)
        (*seq)++, i++, j++, timer.reset ())
     {
       timer.start ();
-      if (send (sbuf, bufsz) <= 0)
+      if (this->send (sbuf, bufsz) <= 0)
         ACE_ERROR_RETURN ((LM_ERROR, "(%P) %p\n", "send"), -1);
 
       if ((n = get_response (rbuf, bufsz)) <= 0)
@@ -585,10 +589,12 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
   cmd = argv;
 
+  //FUZZ: disable check_for_lack_ACE_OS
   ACE_Get_Opt getopt (argc, argv, ACE_TEXT("x:w:f:vs:I:p:rtn:b:a"));
 
   while ((c = getopt ()) != -1)
     {
+  //FUZZ: enable check_for_lack_ACE_OS
       switch ((char) c)
         {
         case 'x':