ChangeLogTag: Thu May 16 17:52:36 UTC 2013 Adam Mitz <mitza@ociweb.com>

8 files changed, 35 insertions, 15 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index ff31c9519e0..2ee9f73549f 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,23 @@
+Thu May 16 17:52:36 UTC 2013  Adam Mitz  <mitza@ociweb.com>
+
+        * ace/Select_Reactor_T.cpp:
+
+          If a handler has to be removed by check_handles(),
+          also remove it from the three masks in the wait_set_.
+
+        * ace/Handle_Set.inl:
+        * ace/OS_NS_unistd.inl:
+        * ace/config-vxworks6.9.h:
+        * bin/PerlACE/ProcessVX.pm:
+        * tests/Log_Msg_Test.cpp:
+
+          Updated for port to 64-bit VxWorks 6.9 (x86 RTP static).
+
+        * bin/fuzz.pl:
+
+          Updated check for logging macros for the case
+          where the current directory is ACE_ROOT.
+
 Mon May 13 17:27:37 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
 
         Merging from branch OCI_Asynch_IMR:
@@ -13,7 +33,6 @@ Mon May 13 17:27:37 UTC 2013  Phil Mesnier  <mesnier_p@ociweb.com>
           would subtract its span and then the outer one would do the same
           resulting in the same span of time being subtracted twice.
 
-
 Mon May 13 17:34:28 UTC 2013  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tests/INET_Addr_Test.cpp:
@@ -361,7 +380,6 @@ Thu Apr 11 15:45:41 UTC 2013  Huang-Ming Huang  <huangh@ociweb.com>
         * ace/Module.cpp:
         * ace/Monitor_Admin.cpp:
         * ace/Monitor_Base.cpp:
-
         * ace/Monitor_Control/BSD_Network_Interface_Monitor.cpp:
         * ace/Monitor_Control/CPU_Load_Monitor.cpp:
         * ace/Monitor_Control/Constraint_Interpreter.cpp:
@@ -403,13 +421,11 @@ Thu Apr 11 15:45:41 UTC 2013  Huang-Ming Huang  <huangh@ociweb.com>
         * ace/Process_Mutex.cpp:
         * ace/Process_Semaphore.cpp:
         * ace/Profile_Timer.cpp:
-
         * ace/QoS/QoS_Manager.cpp:
         * ace/QoS/QoS_Session_Factory.cpp:
         * ace/QoS/QoS_Session_Impl.inl:
         * ace/QoS/QoS_Session_Impl.cpp:
         * ace/QoS/SOCK_Dgram_Mcast_QoS.cpp:
-
         * ace/RB_Tree.inl:
         * ace/RB_Tree.cpp:
         * ace/RW_Mutex.cpp:
@@ -434,13 +450,11 @@ Thu Apr 11 15:45:41 UTC 2013  Huang-Ming Huang  <huangh@ociweb.com>
         * ace/SOCK_SEQPACK_Connector.cpp:
         * ace/SPIPE_Acceptor.cpp:
         * ace/SPIPE_Connector.cpp:
-
         * ace/SSL/SSL_Asynch_Stream.cpp:
         * ace/SSL/SSL_Context.cpp:
         * ace/SSL/SSL_SOCK_Acceptor.cpp:
         * ace/SSL/SSL_SOCK_Connector.cpp:
         * ace/SSL/SSL_SOCK_Stream.cpp:
-
         * ace/SUN_Proactor.cpp:
         * ace/SV_Message_Queue.cpp:
         * ace/SV_Semaphore_Complex.cpp:
@@ -509,9 +523,7 @@ Thu Apr 11 15:45:41 UTC 2013  Huang-Ming Huang  <huangh@ociweb.com>
         * ace/WFMO_Reactor.cpp:
         * ace/WIN32_Asynch_IO.cpp:
         * ace/WIN32_Proactor.cpp:
-
         * ace/XML_Utils/XML_Error_Handler.cpp:
-
         * ace/XTI_ATM_Mcast.inl:
         Change the use of ACE_ERROR/ACE_DEBUG macros inside ace to ACELIB_ERROR/ACELIB_DEBUG.
 
diff --git a/ACE/ace/Handle_Set.inl b/ACE/ace/Handle_Set.inl
index 2d5f6dc222d..2ab6e34b9e2 100644
--- a/ACE/ace/Handle_Set.inl
+++ b/ACE/ace/Handle_Set.inl
@@ -76,7 +76,7 @@ ACE_Handle_Set::is_set (ACE_HANDLE handle) const
   return FD_ISSET (handle,
                    const_cast<fd_set*> (&this->mask_));
 #elif defined (ACE_VXWORKS) && ACE_VXWORKS >= 0x690
-  return static_cast<int> (FD_ISSET (handle, &this->mask_));
+  return FD_ISSET (handle, &this->mask_) != 0;
 #else
   return FD_ISSET (handle,
                    &this->mask_);
diff --git a/ACE/ace/OS_NS_unistd.inl b/ACE/ace/OS_NS_unistd.inl
index a44c01b1f3d..af393eb36be 100644
--- a/ACE/ace/OS_NS_unistd.inl
+++ b/ACE/ace/OS_NS_unistd.inl
@@ -498,7 +498,7 @@ ACE_OS::getpid (void)
 #elif defined (ACE_WIN32)
   return ::GetCurrentProcessId ();
 #else
-  ACE_OSCALL_RETURN (::getpid (), int, -1);
+  ACE_OSCALL_RETURN (::getpid (), pid_t, -1);
 #endif /* ACE_LACKS_GETPID */
 }
 
diff --git a/ACE/ace/Select_Reactor_T.cpp b/ACE/ace/Select_Reactor_T.cpp
index 325d9b7784c..8737b483122 100644
--- a/ACE/ace/Select_Reactor_T.cpp
+++ b/ACE/ace/Select_Reactor_T.cpp
@@ -1531,6 +1531,9 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::check_handles (void)
         {
           result = 1;
           this->remove_handler_i (h, ACE_Event_Handler::ALL_EVENTS_MASK);
+          this->wait_set_.rd_mask_.clr_bit (h);
+          this->wait_set_.wr_mask_.clr_bit (h);
+          this->wait_set_.ex_mask_.clr_bit (h);
         }
       rd_mask.clr_bit (h);
 #else /* !ACE_WIN32 && !MVS && !VXWORKS */
diff --git a/ACE/ace/config-vxworks6.9.h b/ACE/ace/config-vxworks6.9.h
index 2af2c65521c..f8497d54373 100644
--- a/ACE/ace/config-vxworks6.9.h
+++ b/ACE/ace/config-vxworks6.9.h
@@ -26,6 +26,9 @@
 #if defined(__RTP__)
 // bzero is in strings.h
 # define ACE_HAS_STRINGS 1
+# if defined ACE_HAS_PTHREADS
+#  define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
+# endif
 #endif
 
 #include /**/ "ace/post.h"
diff --git a/ACE/bin/PerlACE/ProcessVX.pm b/ACE/bin/PerlACE/ProcessVX.pm
index e5c9b70366d..35091e1e5c6 100644
--- a/ACE/bin/PerlACE/ProcessVX.pm
+++ b/ACE/bin/PerlACE/ProcessVX.pm
@@ -350,7 +350,6 @@ sub reboot
                                     Prompt => '/-> $/',
                                     Errmode => 'return');
                 $t->open($ENV{'ACE_RUN_VX_TGTHOST'});
-                $t->print("");
                 if (defined $target_login)  {
                     $t->waitfor('/VxWorks login: $/');
                     $t->print("$target_login");
@@ -359,9 +358,11 @@ sub reboot
                     $t->waitfor('/Password: $/');
                     $t->print("$target_password");
                 }
+                $t->print("");
                 $ok = $t->waitfor('/-> $/');
                 if ($ok) {
                     $t->print($PerlACE::ProcessVX::RebootCmd);
+                    sleep(5);
                 }
                 else {
                     print "ERROR: FAILED to execute 'reboot' command!\n";
diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl
index 916b020b0f0..3172ec00416 100755
--- a/ACE/bin/fuzz.pl
+++ b/ACE/bin/fuzz.pl
@@ -2310,11 +2310,12 @@ sub check_for_ace_log_categories ()
 
     for my $f (@files_h, @files_cpp, @files_inl) {
         my $cat = 'ACE';
-        if ($f =~ /\/ace\/(\w+)/) {
+        $f =~ s!\\!/!g;
+        if ($f =~ /ace\/(\w+)/) {
             next if $1 eq 'Log_Msg' || $` =~ /\/protocols$/;
             $cat = 'ACELIB';
         }
-        elsif ($f =~ /\/tao\//) {
+        elsif ($f =~ /tao\//) {
             $cat = 'TAOLIB';
         }
         elsif ($f =~ /\/orbsvcs\// && $f !~ /tests|examples/i) {
@@ -2323,7 +2324,7 @@ sub check_for_ace_log_categories ()
         elsif ($f =~ /CIAO\// || $f =~ /DAnCE\//) {
             next;
         }
-        elsif ($f =~ /\/tests\/Log_Msg_Test\.cpp/) {
+        elsif ($f =~ /tests\/Log_Msg_Test\.cpp/) {
             next;
         }
 
diff --git a/ACE/tests/Log_Msg_Test.cpp b/ACE/tests/Log_Msg_Test.cpp
index 6048d6bd1e8..5cef2f63d83 100644
--- a/ACE/tests/Log_Msg_Test.cpp
+++ b/ACE/tests/Log_Msg_Test.cpp
@@ -502,7 +502,7 @@ test_ostream (void)
                         1);
     }
 
-#if !defined (ACE_VXWORKS) && !defined (ACE_HAS_PHARLAP) || (defined(ACE_VXWORKS) && (ACE_VXWORKS > 0x680))
+#if !defined (ACE_VXWORKS) && !defined (ACE_HAS_PHARLAP) || (defined(ACE_VXWORKS) && (ACE_VXWORKS > 0x690))
 # define TEST_CAN_UNLINK_IN_ADVANCE
 #endif