diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-07 10:59:20 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-07 10:59:20 +0000 |
| commit | 765fb0f20770d9cc6e4a0c2d9fb6f388f5ea7d2f (patch) | |
| tree | 0c5ce964768d1621e7f31453c3893cc3f1f5c97d | |
| parent | 730f0547f9e33c3f10dbd2babb75ace20686c236 (diff) | |
| download | ATCD-765fb0f20770d9cc6e4a0c2d9fb6f388f5ea7d2f.tar.gz | |
Tue Sep 7 10:52:59 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp:
Use ACE_GUARD
* Kokyu/Dispatcher_Task.cpp:
Initialise pointer with 0
* PROBLEM-REPORT-FORM:
* VERSION:
Updated support email addresses
* ace/ACE.inl:
Layout changes
* ace/ACE.cpp:
Layout changes, simplified some ifdef checks
* ace/Auto_IncDec_T.h:
* ace/Env_Value_T.h:
Use ACE_Copy_Disabled
* ace/Bound_Ptr.inl:
Documentation updates
* ace/CORBA_macros.h:
Removed all deprecated macros
* ace/Dynamic_Service_Base.cpp:
Use ACE_GUARD_RETURN
* ace/Event_Handler_T.h:
* ace/Event_Handler_T.inl:
* ace/Event_Handler_T.cpp:
Removed checks for ACE_HAS_TEMPLATE_TYPEDEFS, I think all compilers
have this now, let us see if nothing breaks
* ace/FILE.h:
Doxygen updates
* ace/Future.h:
* ace/Future.cpp:
Use mutex defines
* ace/Future_Set.h:
Use ACE_Copy_Disabled
* ace/Future_Set.cpp:
Initialise pointer with 0
* ace/Global_Macros.h:
Removed checks for ACE_HAS_TEMPLATE_TYPEDEFS, doxygen changes, make it
possible for users to redefine ACE_GUARD macros
* ace/Guard_T.h:
* ace/Guard_T.inl:
* ace/Guard_T.cpp:
Doxygen changes, disable ACE_Guard checks for this file
* ace/Hash_Map_Manager_T.h:
* ace/Hash_Multi_Map_Manager_T.h:
* ace/Map_Manager.h:
Update to indicate the usage of ACE_GUARD
* ace/INET_Addr.h:
Doxygen changes
* ace/Local_Tokens.h:
Disable part of this file for ACE_Guard fuzz check
* ace/Log_Msg.cpp:
Use ACE_OS::thr_self
* ace/Malloc_T.h:
Disable part of this file for ACE_Guard fuzz check, doxygen changes
* ace/Message_Queue_T.h:
* ace/Message_Queue_T.cpp:
* ace/Message_Queue_Vx.h:
* ace/Message_Queue_Vx.cpp:
Removed ACE_Guard argument to some methods, not used and now cause
fuzz to fail
* ace/Mutex.h:
* ace/Mutex.inl:
Added non const lock(), this fixes bugzilla 3878. Thanks to
Susan Finster <sfinster at daetwyler-rd dot com> for reporting this
* ace/Null_Barrier.h:
* ace/Null_Condition.h:
* ace/Null_Mutex.h:
* ace/Null_Semaphore.h:
Removed old comments, disable part for ACE_Guard, removed
ACE_Null_Mutex_Guard
* ace/OS_NS_Thread.cpp:
Layout changes, use ACE_Guard
* ace/OS_NS_poll.cpp:
* ace/OS_NS_sys_select.cpp:
Layout changes
* ace/OS_NS_sys_socket.inl:
Comment change
* ace/Read_Buffer.h:
* ace/Remote_Tokens.h:
* ace/SOCK.h:
Doxygen changes
* ace/SOCK_Connector.h:
* ace/SOCK_Dgram_Mcast.h:
Doxygen changes
* ace/SOCK_Connector.cpp:
Layout and const changes
* ace/Select_Reactor.h:
Disable part of this file for ACE_Guard fuzz check
* ace/Service_Gestalt.h:
Use ACE_Copy_Disabled
* ace/Sig_Handler.cpp:
Use ACE_GUARD macros
* ace/Synch_Traits.h:
Removed ACE_HAS_TEMPLATE_TYPEDEFS checks
* ace/TSS_T.h:
* ace/TSS_T.cpp:
Use ACE_Copy_Disabled, reworked some code to fix ACE_Guard fuzz
checks
* ace/Task_Ex_T.h:
Use ACE_Copy_Disabled
* apps/Gateway/Peer/Peer.cpp:
* apps/JAWS/server/HTTP_Server.cpp:
* apps/JAWS/server/JAWS_IO.cpp:
Initialise pointers with 0
* apps/JAWS/server/HTTP_Helpers.cpp:
Use ACE_GUARD macros
* apps/JAWS2/JAWS/Cache_Hash_T.cpp:
* apps/JAWS2/JAWS/Cache_Manager_T.cpp:
* apps/JAWS2/JAWS/Cache_Object.cpp:
* apps/JAWS2/JAWS/Concurrency.cpp:
* apps/JAWS2/JAWS/FILE.cpp:
* apps/JAWS2/JAWS/Jaws_IO.cpp:
* apps/JAWS2/JAWS/Reaper.cpp:
* apps/JAWS3/jaws3/FILE.cpp:
Use ACE_GUARD macros
* apps/gperf/src/Options.cpp:
Rename of local variable so that we don't need to disable ACE_OS
fuzz check
* bin/fuzz.pl:
Improved ACE_Guard checks and enable this one by default
* bin/generate_doxygen.pl:
Let DANCE use the CIAO version file for the moment
* bin/make_release.py:
Don't create static and wince solutions as part of the release anymore,
if you use these, generate them by hand in the future. Added vc10
project files
* examples/APG/Proactor/HA_Proactive_Status.cpp:
* examples/APG/Reactor/Client.cpp:
* examples/APG/Reactor/HAStatus.cpp:
* examples/APG/Streams/Answerer.cpp:
* examples/APG/Streams/CommandStream.cpp:
* examples/APG/ThreadManagement/Pool.cpp:
* examples/APG/ThreadPools/LF_ThreadPool.cpp:
* examples/APG/ThreadPools/Task_ThreadPool.cpp:
* examples/APG/ThreadSafety/Semaphore.cpp:
* examples/APG/Threads/Message_Blocks.cpp:
* examples/APG/Threads/Message_Queue.cpp:
* examples/ASX/Message_Queue/bounded_buffer.cpp:
* examples/ASX/Message_Queue/priority_buffer.cpp:
* examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp:
* examples/C++NPv2/AIO_Client_Logging_Daemon.cpp:
* examples/C++NPv2/display_logfile.cpp:
* examples/IPC_SAP/UPIPE_SAP/ex1.cpp:
* examples/Reactor/Misc/test_demuxing.cpp:
* examples/Reactor/WFMO_Reactor/Talker.cpp:
* examples/Threads/barrier2.cpp:
* examples/Threads/thread_pool.cpp:
Initialise pointers with 0
* examples/APG/ThreadPools/ThreadPool.cpp:
Use ACE_Thread_ID to store a print a thread id using ACE_DEBUG, that
is the only way that is 100% portable
* examples/APG/Threads/Guards.cpp:
Disable ACE_Guard fuzz
* examples/Threads/reader_writer.cpp:
* examples/Threads/recursive_mutex.cpp:
Use ACE_GUARD macros
* examples/Threads/thread_specific.cpp:
* examples/Threads/tss1.cpp:
Removed code not used
* include/makeinclude/platform_g++_common.GNU:
Added CROSS_COMPILE support to this file
* include/makeinclude/platform_linux.GNU:
* include/makeinclude/platform_linux_common.GNU:
Moved some bits to platform_g++_common.GNU, works with G++ in
general
* include/makeinclude/platform_qnx_neutrino.GNU:
* include/makeinclude/platform_qnx_rtp_gcc.GNU:
Cleanup
* netsvcs/lib/Log_Message_Receiver.h:
* netsvcs/lib/Log_Message_Receiver.cpp:
Use ACE_GUARD macros
* performance-tests/Misc/Misc.mpc:
Enable test_guard
* performance-tests/Misc/test_guard.cpp:
Made this compiling again
* performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp:
* performance-tests/TCP/tcp_test.cpp:
Renamed variable to not need ACE_OS fuzz disable code
* protocols/ace/HTBP/HTBP_ID_Requestor.cpp:
* protocols/ace/HTBP/HTBP_Session.cpp:
Use ACE_GUARD macros
* protocols/ace/RMCast/Acknowledge.h:
* protocols/ace/RMCast/Acknowledge.cpp:
* protocols/ace/RMCast/Bits.h:
* protocols/ace/RMCast/Flow.h:
* protocols/ace/RMCast/Flow.cpp:
* protocols/ace/RMCast/Fragment.h:
* protocols/ace/RMCast/Fragment.cpp:
* protocols/ace/RMCast/Link.h:
* protocols/ace/RMCast/Link.cpp:
* protocols/ace/RMCast/Parameters.h:
* protocols/ace/RMCast/Protocol.h:
* protocols/ace/RMCast/Protocol.cpp:
* protocols/ace/RMCast/Reassemble.h:
* protocols/ace/RMCast/Reassemble.cpp:
* protocols/ace/RMCast/Retransmit.h:
* protocols/ace/RMCast/Retransmit.cpp:
* protocols/ace/RMCast/Simulator.h:
* protocols/ace/RMCast/Simulator.cpp:
* protocols/ace/RMCast/Socket.h:
* protocols/ace/RMCast/Socket.cpp:
* protocols/ace/RMCast/Stack.h:
* protocols/ace/RMCast/Stack.cpp:
* protocols/ace/TMCast/FaultDetector.hpp:
* protocols/ace/TMCast/Group.cpp:
* protocols/ace/TMCast/Group.hpp:
* protocols/ace/TMCast/GroupFwd.hpp:
* protocols/ace/TMCast/LinkListener.hpp:
* protocols/ace/TMCast/MTQueue.hpp:
* protocols/ace/TMCast/MTQueue.cpp:
* protocols/ace/TMCast/Messaging.hpp:
* protocols/ace/TMCast/Protocol.hpp:
* protocols/ace/TMCast/Protocol.cpp:
* protocols/ace/TMCast/TransactionController.hpp:
Removed commented out code, Id changes, disable ACE_Guard check
for this project
* rpmbuild/ace-tao.spec:
Fixed some problems in this spec file
* tests/Aio_Platform_Test.cpp:
* tests/Basic_Types_Test.cpp:
* tests/Bug_1576_Regression_Test.cpp:
* tests/Bug_3532_Regression_Test.cpp:
* tests/Bug_3673_Regression_Test.cpp:
* tests/Bug_3709_Regression_Test.cpp:
* tests/Bug_3744_Regression_Test.cpp:
* tests/Compiler_Features_03_Test.cpp:
* tests/Compiler_Features_09_Test.cpp:
* tests/Compiler_Features_13_Test.cpp:
* tests/Compiler_Features_14_Test.cpp:
* tests/Env_Value_Test.cpp:
* tests/Hash_Map_Bucket_Iterator_Test.cpp:
* tests/Logging_Strategy_Test.cpp:
* tests/MT_SOCK_Test.cpp:
* tests/Pipe_Test.cpp:
* tests/Priority_Task_Test.cpp:
* tests/Proactor_UDP_Test.cpp:
* tests/QtReactor_Test.cpp:
* tests/Reactor_Notification_Queue_Test.cpp:
* tests/Reactor_Registration_Test.cpp:
* tests/Reference_Counted_Event_Handler_Test.cpp:
* tests/Time_Service_Test.cpp:
Zapped ACE_RCSID
* tests/Message_Block_Test.cpp:
* tests/Multicast_Test_IPV6.cpp:
Initialise pointer with 0
* tests/Reader_Writer_Test.cpp:
Use ACE_GUARD
* tests/Recursive_Mutex_Test.cpp:
Disable ACE_Guard fuzz for part of this file
* tests/Bug_3878_Regression_Test.cpp:
New test for bugzilla 3878
* tests/SSL/Bug_2912_Regression_Test.cpp:
* tests/TP_Reactor_Test.cpp:
Use ACE_GUARD
* tests/Simple_Message_Block_Test.cpp:
* tests/Svc_Handler_Test.cpp:
* tests/Thread_Pool_Test.cpp:
* tests/UPIPE_SAP_Test.cpp:
Initialise pointers with 0
* tests/Thread_Mutex_Test.cpp:
Disable ACE_Guard fuzz
* tests/Upgradable_RW_Test.cpp:
Use ACE_GUARD
* tests/run_test.lst:
* tests/tests.mpc:
Added 3878
218 files changed, 1547 insertions, 2227 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 09b442f239c..d578c2b2535 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,338 @@ +Tue Sep 7 10:52:59 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp: + Use ACE_GUARD + + * Kokyu/Dispatcher_Task.cpp: + Initialise pointer with 0 + + * PROBLEM-REPORT-FORM: + * VERSION: + Updated support email addresses + + * ace/ACE.inl: + Layout changes + + * ace/ACE.cpp: + Layout changes, simplified some ifdef checks + + * ace/Auto_IncDec_T.h: + * ace/Env_Value_T.h: + Use ACE_Copy_Disabled + + * ace/Bound_Ptr.inl: + Documentation updates + + * ace/CORBA_macros.h: + Removed all deprecated macros + + * ace/Dynamic_Service_Base.cpp: + Use ACE_GUARD_RETURN + + * ace/Event_Handler_T.h: + * ace/Event_Handler_T.inl: + * ace/Event_Handler_T.cpp: + Removed checks for ACE_HAS_TEMPLATE_TYPEDEFS, I think all compilers + have this now, let us see if nothing breaks + + * ace/FILE.h: + Doxygen updates + + * ace/Future.h: + * ace/Future.cpp: + Use mutex defines + + * ace/Future_Set.h: + Use ACE_Copy_Disabled + + * ace/Future_Set.cpp: + Initialise pointer with 0 + + * ace/Global_Macros.h: + Removed checks for ACE_HAS_TEMPLATE_TYPEDEFS, doxygen changes, make it + possible for users to redefine ACE_GUARD macros + + * ace/Guard_T.h: + * ace/Guard_T.inl: + * ace/Guard_T.cpp: + Doxygen changes, disable ACE_Guard checks for this file + + * ace/Hash_Map_Manager_T.h: + * ace/Hash_Multi_Map_Manager_T.h: + * ace/Map_Manager.h: + Update to indicate the usage of ACE_GUARD + + * ace/INET_Addr.h: + Doxygen changes + + * ace/Local_Tokens.h: + Disable part of this file for ACE_Guard fuzz check + + * ace/Log_Msg.cpp: + Use ACE_OS::thr_self + + * ace/Malloc_T.h: + Disable part of this file for ACE_Guard fuzz check, doxygen changes + + * ace/Message_Queue_T.h: + * ace/Message_Queue_T.cpp: + * ace/Message_Queue_Vx.h: + * ace/Message_Queue_Vx.cpp: + Removed ACE_Guard argument to some methods, not used and now cause + fuzz to fail + + * ace/Mutex.h: + * ace/Mutex.inl: + Added non const lock(), this fixes bugzilla 3878. Thanks to + Susan Finster <sfinster at daetwyler-rd dot com> for reporting this + + * ace/Null_Barrier.h: + * ace/Null_Condition.h: + * ace/Null_Mutex.h: + * ace/Null_Semaphore.h: + Removed old comments, disable part for ACE_Guard, removed + ACE_Null_Mutex_Guard + + * ace/OS_NS_Thread.cpp: + Layout changes, use ACE_Guard + + * ace/OS_NS_poll.cpp: + * ace/OS_NS_sys_select.cpp: + Layout changes + + * ace/OS_NS_sys_socket.inl: + Comment change + + * ace/Read_Buffer.h: + * ace/Remote_Tokens.h: + * ace/SOCK.h: + Doxygen changes + + * ace/SOCK_Connector.h: + * ace/SOCK_Dgram_Mcast.h: + Doxygen changes + + * ace/SOCK_Connector.cpp: + Layout and const changes + + * ace/Select_Reactor.h: + Disable part of this file for ACE_Guard fuzz check + + * ace/Service_Gestalt.h: + Use ACE_Copy_Disabled + + * ace/Sig_Handler.cpp: + Use ACE_GUARD macros + + * ace/Synch_Traits.h: + Removed ACE_HAS_TEMPLATE_TYPEDEFS checks + + * ace/TSS_T.h: + * ace/TSS_T.cpp: + Use ACE_Copy_Disabled, reworked some code to fix ACE_Guard fuzz + checks + + * ace/Task_Ex_T.h: + Use ACE_Copy_Disabled + + * apps/Gateway/Peer/Peer.cpp: + * apps/JAWS/server/HTTP_Server.cpp: + * apps/JAWS/server/JAWS_IO.cpp: + Initialise pointers with 0 + + * apps/JAWS/server/HTTP_Helpers.cpp: + Use ACE_GUARD macros + + * apps/JAWS2/JAWS/Cache_Hash_T.cpp: + * apps/JAWS2/JAWS/Cache_Manager_T.cpp: + * apps/JAWS2/JAWS/Cache_Object.cpp: + * apps/JAWS2/JAWS/Concurrency.cpp: + * apps/JAWS2/JAWS/FILE.cpp: + * apps/JAWS2/JAWS/Jaws_IO.cpp: + * apps/JAWS2/JAWS/Reaper.cpp: + * apps/JAWS3/jaws3/FILE.cpp: + Use ACE_GUARD macros + + * apps/gperf/src/Options.cpp: + Rename of local variable so that we don't need to disable ACE_OS + fuzz check + + * bin/fuzz.pl: + Improved ACE_Guard checks and enable this one by default + + * bin/generate_doxygen.pl: + Let DANCE use the CIAO version file for the moment + + * bin/make_release.py: + Don't create static and wince solutions as part of the release anymore, + if you use these, generate them by hand in the future. Added vc10 + project files + + * examples/APG/Proactor/HA_Proactive_Status.cpp: + * examples/APG/Reactor/Client.cpp: + * examples/APG/Reactor/HAStatus.cpp: + * examples/APG/Streams/Answerer.cpp: + * examples/APG/Streams/CommandStream.cpp: + * examples/APG/ThreadManagement/Pool.cpp: + * examples/APG/ThreadPools/LF_ThreadPool.cpp: + * examples/APG/ThreadPools/Task_ThreadPool.cpp: + * examples/APG/ThreadSafety/Semaphore.cpp: + * examples/APG/Threads/Message_Blocks.cpp: + * examples/APG/Threads/Message_Queue.cpp: + * examples/ASX/Message_Queue/bounded_buffer.cpp: + * examples/ASX/Message_Queue/priority_buffer.cpp: + * examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp: + * examples/C++NPv2/AIO_Client_Logging_Daemon.cpp: + * examples/C++NPv2/display_logfile.cpp: + * examples/IPC_SAP/UPIPE_SAP/ex1.cpp: + * examples/Reactor/Misc/test_demuxing.cpp: + * examples/Reactor/WFMO_Reactor/Talker.cpp: + * examples/Threads/barrier2.cpp: + * examples/Threads/thread_pool.cpp: + Initialise pointers with 0 + + * examples/APG/ThreadPools/ThreadPool.cpp: + Use ACE_Thread_ID to store a print a thread id using ACE_DEBUG, that + is the only way that is 100% portable + + * examples/APG/Threads/Guards.cpp: + Disable ACE_Guard fuzz + + * examples/Threads/reader_writer.cpp: + * examples/Threads/recursive_mutex.cpp: + Use ACE_GUARD macros + + * examples/Threads/thread_specific.cpp: + * examples/Threads/tss1.cpp: + Removed code not used + + * include/makeinclude/platform_g++_common.GNU: + Added CROSS_COMPILE support to this file + + * include/makeinclude/platform_linux.GNU: + * include/makeinclude/platform_linux_common.GNU: + Moved some bits to platform_g++_common.GNU, works with G++ in + general + + * include/makeinclude/platform_qnx_neutrino.GNU: + * include/makeinclude/platform_qnx_rtp_gcc.GNU: + Cleanup + + * netsvcs/lib/Log_Message_Receiver.h: + * netsvcs/lib/Log_Message_Receiver.cpp: + Use ACE_GUARD macros + + * performance-tests/Misc/Misc.mpc: + Enable test_guard + + * performance-tests/Misc/test_guard.cpp: + Made this compiling again + + * performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp: + * performance-tests/TCP/tcp_test.cpp: + Renamed variable to not need ACE_OS fuzz disable code + + * protocols/ace/HTBP/HTBP_ID_Requestor.cpp: + * protocols/ace/HTBP/HTBP_Session.cpp: + Use ACE_GUARD macros + + * protocols/ace/RMCast/Acknowledge.h: + * protocols/ace/RMCast/Acknowledge.cpp: + * protocols/ace/RMCast/Bits.h: + * protocols/ace/RMCast/Flow.h: + * protocols/ace/RMCast/Flow.cpp: + * protocols/ace/RMCast/Fragment.h: + * protocols/ace/RMCast/Fragment.cpp: + * protocols/ace/RMCast/Link.h: + * protocols/ace/RMCast/Link.cpp: + * protocols/ace/RMCast/Parameters.h: + * protocols/ace/RMCast/Protocol.h: + * protocols/ace/RMCast/Protocol.cpp: + * protocols/ace/RMCast/Reassemble.h: + * protocols/ace/RMCast/Reassemble.cpp: + * protocols/ace/RMCast/Retransmit.h: + * protocols/ace/RMCast/Retransmit.cpp: + * protocols/ace/RMCast/Simulator.h: + * protocols/ace/RMCast/Simulator.cpp: + * protocols/ace/RMCast/Socket.h: + * protocols/ace/RMCast/Socket.cpp: + * protocols/ace/RMCast/Stack.h: + * protocols/ace/RMCast/Stack.cpp: + * protocols/ace/TMCast/FaultDetector.hpp: + * protocols/ace/TMCast/Group.cpp: + * protocols/ace/TMCast/Group.hpp: + * protocols/ace/TMCast/GroupFwd.hpp: + * protocols/ace/TMCast/LinkListener.hpp: + * protocols/ace/TMCast/MTQueue.hpp: + * protocols/ace/TMCast/MTQueue.cpp: + * protocols/ace/TMCast/Messaging.hpp: + * protocols/ace/TMCast/Protocol.hpp: + * protocols/ace/TMCast/Protocol.cpp: + * protocols/ace/TMCast/TransactionController.hpp: + Removed commented out code, Id changes, disable ACE_Guard check + for this project + + * rpmbuild/ace-tao.spec: + Fixed some problems in this spec file + + * tests/Aio_Platform_Test.cpp: + * tests/Basic_Types_Test.cpp: + * tests/Bug_1576_Regression_Test.cpp: + * tests/Bug_3532_Regression_Test.cpp: + * tests/Bug_3673_Regression_Test.cpp: + * tests/Bug_3709_Regression_Test.cpp: + * tests/Bug_3744_Regression_Test.cpp: + * tests/Compiler_Features_03_Test.cpp: + * tests/Compiler_Features_09_Test.cpp: + * tests/Compiler_Features_13_Test.cpp: + * tests/Compiler_Features_14_Test.cpp: + * tests/Env_Value_Test.cpp: + * tests/Hash_Map_Bucket_Iterator_Test.cpp: + * tests/Logging_Strategy_Test.cpp: + * tests/MT_SOCK_Test.cpp: + * tests/Pipe_Test.cpp: + * tests/Priority_Task_Test.cpp: + * tests/Proactor_UDP_Test.cpp: + * tests/QtReactor_Test.cpp: + * tests/Reactor_Notification_Queue_Test.cpp: + * tests/Reactor_Registration_Test.cpp: + * tests/Reference_Counted_Event_Handler_Test.cpp: + * tests/Time_Service_Test.cpp: + Zapped ACE_RCSID + + * tests/Message_Block_Test.cpp: + * tests/Multicast_Test_IPV6.cpp: + Initialise pointer with 0 + + * tests/Reader_Writer_Test.cpp: + Use ACE_GUARD + + * tests/Recursive_Mutex_Test.cpp: + Disable ACE_Guard fuzz for part of this file + + * tests/Bug_3878_Regression_Test.cpp: + New test for bugzilla 3878 + + * tests/SSL/Bug_2912_Regression_Test.cpp: + * tests/TP_Reactor_Test.cpp: + Use ACE_GUARD + + * tests/Simple_Message_Block_Test.cpp: + * tests/Svc_Handler_Test.cpp: + * tests/Thread_Pool_Test.cpp: + * tests/UPIPE_SAP_Test.cpp: + Initialise pointers with 0 + + * tests/Thread_Mutex_Test.cpp: + Disable ACE_Guard fuzz + + * tests/Upgradable_RW_Test.cpp: + Use ACE_GUARD + + * tests/run_test.lst: + * tests/tests.mpc: + Added 3878 + Mon Sep 6 09:30:00 UTC 2010 Simon Massey <buildczar at prismtech dot com> * ace/Acceptor.cpp: diff --git a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp index 5339fe8a3b8..8f368beae9b 100644 --- a/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp +++ b/ACE/Kokyu/DSRT_Direct_Dispatcher_Impl_T.cpp @@ -283,10 +283,6 @@ update_schedule_i (Guid_t guid, Block_Flag_t flag) DSRT_Dispatch_Item_var<DSRT_Scheduler_Traits> dispatch_item; ACE_hthread_t thr_handle; - //@@ Perhaps the lock could be got rid of. It looks like the state - //of this object is not getting modified here. It makes calls to - //other methods, which already are thread-safe. - //ACE_Guard<cond_lock_t> mon(sched_queue_modified_cond_lock_); int found = this->ready_queue_.find (guid, dispatch_item); if (found == 0 && flag == BLOCK) @@ -361,7 +357,7 @@ shutdown_i () { this->shutdown_flagged_ = 1; - ACE_Guard<cond_lock_t> mon(this->sched_queue_modified_cond_lock_); + ACE_GUARD_RETURN (cond_lock_t, mon, this->sched_queue_modified_cond_lock_, 0); this->sched_queue_modified_ = 1; this->sched_queue_modified_cond_.signal (); // We have to wait until the scheduler executive thread shuts diff --git a/ACE/Kokyu/Dispatch_Deferrer.h b/ACE/Kokyu/Dispatch_Deferrer.h index 6375ed1b865..bd7eb129d2c 100644 --- a/ACE/Kokyu/Dispatch_Deferrer.h +++ b/ACE/Kokyu/Dispatch_Deferrer.h @@ -20,7 +20,6 @@ #include "Kokyu_defs.h" #include "ace/Event_Handler.h" #include "ace/Thread_Mutex.h" -#include "ace/Synch_T.h" #include "ace/Message_Block.h" #include "ace/Message_Queue.h" #include "ace/Reactor.h" diff --git a/ACE/Kokyu/Dispatcher_Task.cpp b/ACE/Kokyu/Dispatcher_Task.cpp index c6e1ef9e3ba..12d7885ba90 100644 --- a/ACE/Kokyu/Dispatcher_Task.cpp +++ b/ACE/Kokyu/Dispatcher_Task.cpp @@ -97,7 +97,7 @@ Dispatcher_Task::svc (void) while (!done) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; if (this->getq (mb) == -1) { diff --git a/ACE/Kokyu/Kokyu_defs.h b/ACE/Kokyu/Kokyu_defs.h index 721b87e522f..b854d241144 100644 --- a/ACE/Kokyu/Kokyu_defs.h +++ b/ACE/Kokyu/Kokyu_defs.h @@ -11,7 +11,7 @@ #ifndef KOKYU_DEFS_H #define KOKYU_DEFS_H #include /**/ "ace/pre.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "ace/Time_Value.h" #include "ace/Auto_Ptr.h" #include "ace/Message_Block.h" diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM index 6aa5988c967..3557aed2885 100644 --- a/ACE/PROBLEM-REPORT-FORM +++ b/ACE/PROBLEM-REPORT-FORM @@ -1,6 +1,7 @@ [Please use the PRF form below to submit bug reports, problem reports, - etc., to the ACE developers and interested users. Send to - ace-bugs@cs.wustl.edu. If you are using OCI, PrismTech, or + etc., to the ACE developers and interested users. Send it to + ace-bugs@list.isis.vanderbilt.edu, you must be subscribed to the list + in order to be able to post to it. If you are using OCI, PrismTech, or Riverace's versions of ACE do not send bugs to this mailing list, but instead contact those companies for support. Please also send your PRF as plain ASCII text, _not_ uuencoded or as an attachment. @@ -15,12 +16,8 @@ browse bugzilla and the ChangeLog files to find out if your problem has been solved in a more recent version of ACE. - To ensure that you see responses, please do one of the following: - - 1) Subscribe to the ace-bugs mail list, by sending email with - contents "subscribe ace-bugs" to majordomo@cs.wustl.edu. - - 2) Or, monitor the comp.soft-sys.ace newsgroup for responses. + To subscribe to the list see + http://www.cs.wustl.edu/~schmidt/ACE-mail.html Replace/remove all the explanatory text in brackets before mailing. @@ -40,7 +37,7 @@ 8<----------8<----------8<----------8<----------8<----------8<----------8<---- -To: ace-bugs@cs.wustl.edu +To: ace-bugs@list.isis.vanderbilt.edu Subject: [area]: [synopsis] ACE VERSION: 5.8.2 diff --git a/ACE/THANKS b/ACE/THANKS index 90679c22585..9a62bbb5c56 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2333,6 +2333,7 @@ Rafi <rafi dot net at gmail dot com> Kannan Ramaswamy <kannan dot ramaswamy at cogcap dot com> Brian Johnson <johnsonb at ociweb dot com> Catherine L. Paquin <catherine dot paquin at ngc dot com> +Susan Finster <sfinster at daetwyler-rd dot com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ACE/VERSION b/ACE/VERSION index 2e26ed8f53b..87513bb2ff0 100644 --- a/ACE/VERSION +++ b/ACE/VERSION @@ -1,11 +1,8 @@ This is ACE version 5.8.2, released Sat Sep 04 11:30:18 CEST 2010 -If you have any problems with or questions about ACE, please send -email to the ACE mailing list (ace-users@cs.wustl.edu), using the form -found in the file PROBLEM-REPORT-FORM. To ensure that you see responses, -please do one of the following: +If you have any problems with or questions about CIAO, please send +e-mail to the CIAO mailing list (ace-bugs@list.isis.vanderbilt.edu), +using the form found in the file PROBLEM-REPORT-FORM. In order +to post to the list you must subscribe to it. - 1) Subscribe to the ace-users mail list, by sending email with - contents "subscribe ace-users" to majordomo@cs.wustl.edu. - - 2) Or, monitor the comp.soft-sys.ace newsgroup for responses. +See http://www.cs.wustl.edu/~schmidt/ACE-mail.html diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp index a3866079ab6..a265df29ae6 100644 --- a/ACE/ace/ACE.cpp +++ b/ACE/ace/ACE.cpp @@ -1762,7 +1762,7 @@ ACE::sendv_n_i (ACE_HANDLE handle, { // Try to transfer as much of the remaining data as possible. ssize_t n = ACE_OS::sendv (handle, iov + s, iovcnt - s); - + // Check EOF. if (n == 0) return 0; @@ -2184,18 +2184,14 @@ ACE::handle_ready (ACE_HANDLE handle, fds.revents = 0; - int result = ACE_OS::poll (&fds, 1, timeout); + int const result = ACE_OS::poll (&fds, 1, timeout); #else ACE_Handle_Set handle_set; handle_set.set_bit (handle); // Wait for data or for the timeout to elapse. - int select_width; -# if defined (ACE_WIN32) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - select_width = 0; -# else + int select_width = 0; +#if !defined (ACE_WIN32) select_width = int (handle) + 1; # endif /* ACE_WIN64 */ int result = ACE_OS::select (select_width, @@ -2205,7 +2201,6 @@ ACE::handle_ready (ACE_HANDLE handle, timeout); #endif /* ACE_HAS_POLL */ - switch (result) { case 0: // Timer expired. @@ -2226,14 +2221,12 @@ ACE::enter_recv_timedwait (ACE_HANDLE handle, const ACE_Time_Value *timeout, int &val) { - int result = ACE::handle_read_ready (handle, - timeout); + int const result = ACE::handle_read_ready (handle, timeout); if (result == -1) return -1; - ACE::record_and_set_non_blocking_mode (handle, - val); + ACE::record_and_set_non_blocking_mode (handle, val); return result; } @@ -2243,21 +2236,18 @@ ACE::enter_send_timedwait (ACE_HANDLE handle, const ACE_Time_Value *timeout, int &val) { - int result = ACE::handle_write_ready (handle, - timeout); + int const result = ACE::handle_write_ready (handle, timeout); if (result == -1) return -1; - ACE::record_and_set_non_blocking_mode (handle, - val); + ACE::record_and_set_non_blocking_mode (handle, val); return result; } void -ACE::record_and_set_non_blocking_mode (ACE_HANDLE handle, - int &val) +ACE::record_and_set_non_blocking_mode (ACE_HANDLE handle, int &val) { // We need to record whether we are already *in* nonblocking mode, // so that we can correctly reset the state when we're done. @@ -2270,11 +2260,9 @@ ACE::record_and_set_non_blocking_mode (ACE_HANDLE handle, } void -ACE::restore_non_blocking_mode (ACE_HANDLE handle, - int val) +ACE::restore_non_blocking_mode (ACE_HANDLE handle, int val) { - if (ACE_BIT_DISABLED (val, - ACE_NONBLOCK)) + if (ACE_BIT_DISABLED (val, ACE_NONBLOCK)) { // Save/restore errno. ACE_Errno_Guard error (errno); @@ -2435,7 +2423,7 @@ ACE::timestamp (const ACE_Time_Value& time_value, ACE_TEXT ("Fri"), ACE_TEXT ("Sat") }; - + static const ACE_TCHAR *month_name[] = { ACE_TEXT ("Jan"), @@ -2451,10 +2439,10 @@ ACE::timestamp (const ACE_Time_Value& time_value, ACE_TEXT ("Nov"), ACE_TEXT ("Dec") }; - + SYSTEMTIME local; ::GetLocalTime (&local); - + ACE_OS::sprintf (date_and_time, ACE_TEXT ("%3s %3s %2d %04d %02d:%02d:%02d.%06d"), day_of_week_name[local.wDayOfWeek], @@ -2469,8 +2457,8 @@ ACE::timestamp (const ACE_Time_Value& time_value, } #endif /* WIN32 */ ACE_TCHAR timebuf[26]; // This magic number is based on the ctime(3c) man page. - ACE_Time_Value cur_time = - (time_value == ACE_Time_Value::zero) ? + ACE_Time_Value cur_time = + (time_value == ACE_Time_Value::zero) ? ACE_Time_Value (ACE_OS::gettimeofday ()) : time_value; time_t secs = cur_time.sec (); @@ -2714,12 +2702,8 @@ ACE::handle_timed_accept (ACE_HANDLE listener, int n = ACE_OS::poll (&fds, 1, timeout); #else - int select_width; -# if defined (ACE_WIN32) - // This arg is ignored on Windows and causes pointer truncation - // warnings on 64-bit compiles. - select_width = 0; -# else + int select_width = 0; +# if !defined (ACE_WIN32) select_width = int (listener) + 1; # endif /* ACE_WIN32 */ int n = ACE_OS::select (select_width, diff --git a/ACE/ace/ACE.inl b/ACE/ace/ACE.inl index 67fd981bf38..033cef78f55 100644 --- a/ACE/ace/ACE.inl +++ b/ACE/ace/ACE.inl @@ -238,36 +238,21 @@ ACE::recv_i (ACE_HANDLE handle, void *buf, size_t len) } ACE_INLINE int -ACE::handle_read_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout) +ACE::handle_read_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout) { - return ACE::handle_ready (handle, - timeout, - 1, - 0, - 0); + return ACE::handle_ready (handle, timeout, 1, 0, 0); } ACE_INLINE int -ACE::handle_write_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout) +ACE::handle_write_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout) { - return ACE::handle_ready (handle, - timeout, - 0, - 1, - 0); + return ACE::handle_ready (handle, timeout, 0, 1, 0); } ACE_INLINE int -ACE::handle_exception_ready (ACE_HANDLE handle, - const ACE_Time_Value *timeout) +ACE::handle_exception_ready (ACE_HANDLE handle, const ACE_Time_Value *timeout) { - return ACE::handle_ready (handle, - timeout, - 0, - 0, - 1); + return ACE::handle_ready (handle, timeout, 0, 0, 1); } ACE_INLINE void diff --git a/ACE/ace/Array.h b/ACE/ace/Array.h deleted file mode 100644 index c3159cd7a89..00000000000 --- a/ACE/ace/Array.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- C++ -*- */ - -//============================================================================= -/** - * @file Array.h - * - * $Id$ - * - * @deprecated - * - * @note This file has been deprecated and will soon go away. You - * should directly include "Containers_T.h" instead. - * - * @author Douglas C. Schmidt <schmidt@cs.wustl.edu> - */ -//============================================================================= - -#ifndef ACE_ARRAY_H -#define ACE_ARRAY_H -#include /**/ "ace/pre.h" - -#include "ace/Containers_T.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include /**/ "ace/post.h" -#endif /* ACE_ARRAY_H */ diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h index 70619f28604..7a6bf7d0d19 100644 --- a/ACE/ace/Auto_IncDec_T.h +++ b/ACE/ace/Auto_IncDec_T.h @@ -38,10 +38,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * must provide at least operators ++ and --. */ template <class ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> -class ACE_Auto_IncDec +class ACE_Auto_IncDec : private ACE_Copy_Disabled { public: - /// Implicitly increment the counter. ACE_Auto_IncDec (ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter); @@ -55,13 +54,6 @@ protected: /// Reference to the <ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> counter /// we're incrementing/decrementing. ACE_SAFELY_INCREMENTABLE_DECREMENTABLE &counter_; - -private: - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const - ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Auto_IncDec (const - ACE_Auto_IncDec<ACE_SAFELY_INCREMENTABLE_DECREMENTABLE> &)) }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Bound_Ptr.inl b/ACE/ace/Bound_Ptr.inl index 5f5af57d4e5..570404e8520 100644 --- a/ACE/ace/Bound_Ptr.inl +++ b/ACE/ace/Bound_Ptr.inl @@ -67,7 +67,7 @@ ACE_Bound_Ptr_Counter<ACE_LOCK>::detach_strong (ACE_Bound_Ptr_Counter<ACE_LOCK>* counter->obj_ref_count_ = -1; if (--counter->self_ref_count_ == 0) - // Since counter contains the lock held by the ACE_Guard, the + // Since counter contains the lock held by the guard, the // guard needs to be released before freeing the memory holding // the lock. So save the pointer to free, then release, then // free. @@ -112,7 +112,7 @@ ACE_Bound_Ptr_Counter<ACE_LOCK>::detach_weak (ACE_Bound_Ptr_Counter<ACE_LOCK>* c ACE_GUARD (ACE_LOCK, guard, counter->lock_); if (--counter->self_ref_count_ == 0) - // Since counter contains the lock held by the ACE_Guard, the + // Since counter contains the lock held by the guard, the // guard needs to be released before freeing the memory holding // the lock. So save the pointer to free, then release, then // free. diff --git a/ACE/ace/CORBA_macros.h b/ACE/ace/CORBA_macros.h index af2f2ccb598..d30f4c6b354 100644 --- a/ACE/ace/CORBA_macros.h +++ b/ACE/ace/CORBA_macros.h @@ -43,369 +43,6 @@ # define ACE_del_bad_alloc #endif -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - -// If you wish to you use these macros for emulating exceptions on -// platforms which lack native exception support, you need to do the -// following: -// 1. Define a class Exception. You can name it as you please. This class -// should be at the root of the inheritance hierarchy of all the -// exceptions used in your application. It should define at a minimum -// the following pure virtual methods: -// a) _downcast () - Which allows narrowing of the base exception type to a -// derived type. -// b) _raise() - Which throws an exception of type Exception. -// -// Classes which derive from these should implement these operations. -// -// 2. Define a class Environment. You can name it as you please. This class -// is an exception holder. This class is always on the stack. It should -// support at a minimum the following methods: -// a) exception() - Which returns the Exception held in the current -// Environment. -// b) exception (Exception* foo) - Which replaces/sets the Exception -// held in the current Environment with foo. -// b) clear() - Which resets a particular instance of Environment. -// c) A copy constructor and an assignment operator. -// -// Note that the above description assumes that you use the following -// macros only within a particular domain. For example, if your -// application has to interoperate across domains, then you need to define -// an exception adapter to translate exceptions from one domain to -// exceptions in the other. Please refer to Stroustrup's book on how to do -// this. If your use case is this complex, you would be better off with -// going with native exceptions rather than emulated exceptions, though -// the macros should still work if you defined your adapter class as -// ACE_EXCEPTION_TYPE. - - -// The following macros assume that an environment variable is passed -// in/out of each function that can throw an exception. The type of the -// environment variable is defined by ACE_ENV_TYPE. - -#if !defined (ACE_ENV_TYPE) -# define ACE_ENV_TYPE CORBA::Environment -#endif /* ACE_ENV_TYPE */ - -// The name of the variable is defined by ACE_TRY_ENV. Below is the name -// that we use by default. If you wish to change it you can redefine -// ACE_TRY_ENV to change the default name. Also ACE_ADOPT_ENV allows the -// use of non-standard name within a scope. - -#if !defined (ACE_TRY_ENV) -# define ACE_TRY_ENV _ACE_CORBA_Environment_variable -#endif /* ACE_TRY_ENV */ - -// The base type of Exception from which all the other exception types are -// derived. You can set this to any type as you please. By default, it is -// set to CORBA::Exception. - -#if !defined (ACE_EXCEPTION_TYPE) -# define ACE_EXCEPTION_TYPE CORBA::Exception -#endif /* ACE_EXCEPTION_TYPE */ - -// This method is used to get the default value of the Environment -// variable. In the case of TAO, this variable is part of the TSS ORB -// resources and the method TAO_default_environment() returns the -// Environment variable. - -#if !defined (ACE_DEFAULT_GET_ENV_METHOD) -# define ACE_DEFAULT_GET_ENV_METHOD TAO_default_environment -#endif /* ACE_DEFAULT_GET_ENV_METHOD */ - -// This is the exception caught by ACE_CATCHANY. -#if !defined (ACE_ANY_EXCEPTION) -# define ACE_ANY_EXCEPTION ex -#endif /* ACE_ANY_EXCEPTION */ - -// Declare a new environment variable on the stack. The type of the -// environment variable is determined by ACE_ENV_TYPE. -#if defined (ACE_USES_NATIVE_EXCEPTIONS) -// Don't instantiate an emulated exception environment at all when -// using native C++ exception support. It won't be used. -# define ACE_DECLARE_NEW_ENV -#else -# define ACE_DECLARE_NEW_ENV \ - ACE_ENV_TYPE ACE_TRY_ENV -#endif /* ACE_USES_NATIVE_EXCEPTIONS */ - -// Provided for backward compatibility purposes. Don't use it in new code. -// Use the definition above along with defining ACE_ENV_TYPE. - -#if defined (ACE_ENV_POLLUTE_NAMES) -# define ACE_DECLARE_NEW_CORBA_ENV ACE_DECLARE_NEW_ENV -#endif /* ACE_ENV_POLLUTE_NAMES */ - -#if defined (ACE_USES_NATIVE_EXCEPTIONS) -// ----------------------------------------------------------------- - -// Provided for backward compatibility purposes. Don't use it in new code. -#if defined (ACE_ENV_POLLUTE_NAMES) -# define ACE_ADOPT_CORBA_ENV(ENV) -#endif /* ACE_ENV_POLLUTE_NAMES */ - -#define ACE_ADOPT_ENV (ENV) - -// No need to check. Native exceptions handle the control flow -// automatically when an exception occurs. -# define ACE_CHECK - -// Used when the function requires a return value. -# define ACE_CHECK_RETURN(RETV) - -// ACE_THROW_INT should not be used by the user. -# define ACE_THROW_INT(EXCEPTION) \ - throw EXCEPTION - -// Throwing an exception is easy. These two macros should _NOT_ be -// used within try blocks. -# define ACE_THROW(EXCEPTION) \ - throw EXCEPTION - -// Throwing an exception when the function requires a return value. -# define ACE_THROW_RETURN(EXCEPTION,RETV) \ - throw EXCEPTION - -// For compilers with native exceptions, we can simply use try to try. ;-) -// do {} while (0) is required to avoid compilation warnings. -# define ACE_TRY \ - do \ - { \ - try \ - { -# define ACE_TRY_NEW_ENV \ - do \ - { \ - try \ - { -# define ACE_TRY_EX(LABEL) \ - do \ - { \ - try \ - { - -// No need to check for exceptions within try block for compilers with -// native exceptions. -# define ACE_TRY_CHECK -# define ACE_TRY_CHECK_EX(LABEL) - -// Likewise, throwing exceptions within try blocks is easy. -# define ACE_TRY_THROW(EXCEPTION) throw EXCEPTION -# define ACE_TRY_THROW_EX(EXCEPTION,LABEL) throw EXCEPTION - -// Same thing for catch. -# define ACE_CATCH(EXCEPTION,VAR) \ - } \ - catch (EXCEPTION & VAR) \ - { \ - ACE_UNUSED_ARG (VAR); - -# define ACE_CATCHANY \ - ACE_CATCH(ACE_EXCEPTION_TYPE, ACE_ANY_EXCEPTION) - -# define ACE_CATCHALL \ - } \ - catch (...) \ - { - -# if defined (ACE_HAS_DEPRECATED_ACE_RETHROW) -# define ACE_RETHROW throw -# endif /* ACE_HAS_DEPRECATED_ACE_RETHROW */ - -// Rethrowing the exception from catch blocks. -# define ACE_RE_THROW throw -# define ACE_RE_THROW_EX(LABEL) throw - -// Close the catch block. -# define ACE_ENDTRY \ - } \ - } while (0) - -#else /* ! ACE_USES_NATIVE_EXCEPTIONS */ -// ----------------------------------------------------------------- - -// When handling compilers without native exceptions, things get a bit -// hairy. Exceptions are simulated using ACE_ENV_TYPE. The trick here is to -// make sure the flow-of-control can simulate the case when native -// exceptions occur... - -#if defined (ACE_ENV_POLLUTE_NAMES) -# define ACE_ADOPT_CORBA_ENV(ENV) ACE_ENV_TYPE &ACE_TRY_ENV = ENV -#endif /* ACE_ENV_POLLUTE_NAMES */ - -# define ACE_ADOPT_ENV(ENV) ACE_ENV_TYPE &ACE_TRY_ENV = ENV - -// Follow every statement that could throw exceptions with ACE_CHECK or -// ACE_CHECK_RETURN. These two macros should _NOT_ be used within try -// blocks. Use ACE_TRY_CHECK or ACE_TRY_CHECK_EX instead. -# define ACE_CHECK \ - if (ACE_TRY_ENV . exception () != 0) \ - return -// When function requires a return value -# define ACE_CHECK_RETURN(RETV) \ - if (ACE_TRY_ENV . exception () != 0) \ - return RETV - -// ACE_THROW_INT should not be used by the user. -# define ACE_THROW_INT(EXCEPTION) ACE_TRY_ENV.exception (new EXCEPTION) - -// Throwing exceptions will inevitably cause a return from the current -// function. These two macros should _NOT_ be used within try blocks. Use -// ACE_TRY_THROW or ACE_TRY_THROW_EX instead. -# define ACE_THROW(EXCEPTION) \ - do \ - { \ - ACE_TRY_ENV.exception (new EXCEPTION); \ - return; \ - } while (0) - -# define ACE_THROW_RETURN(EXCEPTION,RETV) \ - do \ - { \ - ACE_TRY_ENV.exception (new EXCEPTION); \ - return RETV; \ - } while (0) - -// ACE_TRY sets up flags to control program flow. ACE_TRY_FLAG acts like a -// one-shot flip-flop. When an exception occurs (detected using -// ACE_TRY_CHECK,) ACE_TRY_FLAG will be reset and the control goes back -// into ACE_TRY_LABEL. Since ACE_TRY_FLAG is reset, the try block won't get -// executed again and the control proceeds to the following catch blocks. -// ACE_EXCEPTION_NOT_CAUGHT flag is used to prevent catching an exception -// twice. This macro assumes there's already an ACE_ENV_TYPE variable -// ACE_TRY_ENV defined (which should be the case normally) -# define ACE_TRY \ - do { \ - int ACE_TRY_FLAG = 1; \ - int ACE_EXCEPTION_NOT_CAUGHT = 1; \ - ACE_TRY_LABEL: \ - if (ACE_TRY_FLAG) \ - do { - -// ACE_TRY_NEW_ENV functions like the macro ACE_TRY but defines a new -// ACE_ENV_TYPE variable ACE_TRY_ENV. It is most often used in the outer -// most function where no ACE_TRY_ENV is available. -# define ACE_TRY_NEW_ENV \ - do { \ - ACE_DECLARE_NEW_ENV;\ - int ACE_TRY_FLAG = 1; \ - int ACE_EXCEPTION_NOT_CAUGHT = 1; \ - ACE_TRY_LABEL: \ - if (ACE_TRY_FLAG) \ - do { - -// ACE_TRY_EX works exactly like ACE_TRY macro except the label used in the -// try block is customizable to avoid name clashing. It should be used when -// nested try blocks or multiple try blocks are required, in the same -// function. -# define ACE_TRY_EX(LABEL) \ - do { \ - int ACE_TRY_FLAG = 1; \ - int ACE_EXCEPTION_NOT_CAUGHT = 1; \ - ACE_TRY_LABEL ## LABEL: \ - if (ACE_TRY_FLAG) \ - do { - -// Check for exceptions within try blocks. -# define ACE_TRY_CHECK \ - { \ - if (ACE_TRY_ENV.exception () != 0) \ - { \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL; \ - } \ - } - -// Checking exception within EX try blocks. -# define ACE_TRY_CHECK_EX(LABEL) \ - { \ - if (ACE_TRY_ENV.exception () != 0) \ - { \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL ## LABEL; \ - } \ - } - -// Throwing exception within TRY blocks. -# define ACE_TRY_THROW(EXCEPTION) \ - { \ - ACE_TRY_ENV.exception (new EXCEPTION); \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL; \ - } - -# define ACE_TRY_THROW_EX(EXCEPTION,LABEL) \ - { \ - ACE_TRY_ENV.exception (new EXCEPTION); \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL ## LABEL; \ - } - -// When exceptions occur or try block finishes execution without exception, -// control will continue in the catch block. This macro first checks if -// there's any uncaught exception left. If all the conditions are met, we -// have caught an exception. It then resets ACE_EXCEPTION_NOT_CAUGHT to -// prevent subsequent catch blocks from catching the same exception again, -// and extracts out the underlying exception in ACE_TRY_ENV. We also make a -// copy of ACE_TRY_ENV in ACE_CAUGHT_ENV, in case we want to rethrow the -// exception. ACE_TRY_ENV is cleared out after the exception is caught so -// you should not use ACE_TRY_ENV within the catch block(You should use the -// exception directly). -# define ACE_CATCH(TYPE,VAR) \ - } while (0); \ - do \ - if (ACE_TRY_ENV.exception () != 0 && ACE_EXCEPTION_NOT_CAUGHT && \ - TYPE::_downcast(ACE_TRY_ENV.exception ()) != 0) \ - { \ - ACE_ENV_TYPE ACE_CAUGHT_ENV = ACE_TRY_ENV;\ - ACE_EXCEPTION_NOT_CAUGHT = 0; \ - TYPE &VAR = *TYPE::_downcast (ACE_CAUGHT_ENV.exception ()); \ - ACE_UNUSED_ARG (VAR); \ - ACE_TRY_ENV.clear (); - -// ACE_CATCHANY uses ACE_CATCH to catch all exceptions derived from -// ACE_EXCEPTION_TYPE -# define ACE_CATCHANY ACE_CATCH (ACE_EXCEPTION_TYPE, ACE_ANY_EXCEPTION) - -// Since there's no other exception for compilers without exception -// support, we simply catch all ACE_EXCEPTION_TYPE exceptions for -// ACE_CATCHALL. -# define ACE_CATCHALL ACE_CATCHANY - -# if defined (ACE_HAS_DEPRECATED_ACE_RETHROW) -# define ACE_RETHROW \ - do \ - ACE_TRY_ENV = ACE_CAUGHT_ENV; \ - while (0) -# endif /* ACE_HAS_DEPRECATED_ACE_RETHROW */ - -// Rethrowing exception within catch blocks. Notice that we depend on the -// ACE_CHECK/ACE_CHECK_RETURN following the ACE_ENDTRY, or ACE_TRY_CHECK/ -// ACE_TRY_CHECK_EX following the ACE_ENDTRY when the catch block is within -// another try block, to do the "Right Thing[TM]." -# define ACE_RE_THROW \ - do {\ - ACE_TRY_ENV = ACE_CAUGHT_ENV; \ - goto ACE_TRY_LABEL; \ - } while (0) -# define ACE_RE_THROW_EX(LABEL) \ - do {\ - ACE_TRY_ENV = ACE_CAUGHT_ENV; \ - goto ACE_TRY_LABEL ## LABEL; \ - } while (0) - -// Close the try block. Since exceptions may not get caught, and exceptions -// can also be rethrown from the catch block, it's always a good idea to -// follow ACE_ENDTRY with ACE_CHECK or ACE_TRY_CHECK (depending on the -// context.) -# define ACE_ENDTRY \ - } while (0); \ - } while (0) - -#endif /* ! ACE_USES_NATIVE_EXCEPTIONS */ - -#endif /* !ACE_LACKS_DEPRECATED_MACROS */ - // ACE_HAS_EXCEPTIONS is not the same as ACE_NEW_THROWS_EXCEPTIONS. #if defined(ACE_NEW_THROWS_EXCEPTIONS) @@ -434,6 +71,7 @@ #endif /* ACE_NEW_THROWS_EXCEPTIONS */ +// FUZZ: disable check_for_ACE_Guard # define ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ ACE_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) throw EXCEPTION; @@ -445,6 +83,7 @@ # define ACE_WRITE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ ACE_Write_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) throw EXCEPTION; +// FUZZ: enable check_for_ACE_Guard #include /**/ "ace/post.h" diff --git a/ACE/ace/Dump_T.h b/ACE/ace/Dump_T.h index 07dc2eadd63..ed84abec881 100644 --- a/ACE/ace/Dump_T.h +++ b/ACE/ace/Dump_T.h @@ -44,7 +44,7 @@ public: ACE_Dumpable_Adapter (const Concrete *t); ~ACE_Dumpable_Adapter (void); - /// Concrete dump method (simply delegates to the <dump> method of + /// Concrete dump method (simply delegates to the dump() method of /// <class Concrete>). virtual void dump (void) const; diff --git a/ACE/ace/Dynamic_Service_Base.cpp b/ACE/ace/Dynamic_Service_Base.cpp index 16b97eccc95..4d3ba9996c2 100644 --- a/ACE/ace/Dynamic_Service_Base.cpp +++ b/ACE/ace/Dynamic_Service_Base.cpp @@ -78,7 +78,7 @@ ACE_Dynamic_Service_Base::instance (const ACE_Service_Gestalt* repo, if (ACE::debug ()) { - ACE_Guard <ACE_Log_Msg> log_guard (*ACE_Log_Msg::instance ()); + ACE_GUARD_RETURN (ACE_Log_Msg, log_guard, *ACE_Log_Msg::instance (), 0); if (repo->repo_ != repo_found->repo_) { diff --git a/ACE/ace/Env_Value_T.h b/ACE/ace/Env_Value_T.h index 01f4fcc5e8d..940a930e3f1 100644 --- a/ACE/ace/Env_Value_T.h +++ b/ACE/ace/Env_Value_T.h @@ -22,6 +22,7 @@ #include /**/ "ace/config-all.h" #include "ace/Global_Macros.h" #include "ace/OS_NS_stdlib.h" +#include "ace/Copy_Disabled.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -38,7 +39,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * value. */ template <class T> -class ACE_Env_Value +class ACE_Env_Value : private ACE_Copy_Disabled { public: /** @@ -48,9 +49,8 @@ public: */ ACE_Env_Value (void); - /// Constructor that calls <open>. - ACE_Env_Value (const ACE_TCHAR *varname, - const T &vardefault); + /// Constructor that calls open(). + ACE_Env_Value (const ACE_TCHAR *varname, const T &vardefault); /// Destroy the value. ~ACE_Env_Value (void); @@ -66,10 +66,6 @@ public: const ACE_TCHAR *varname (void) const; private: - /// Disallow copying and assignment. - ACE_UNIMPLEMENTED_FUNC (ACE_Env_Value(const ACE_Env_Value<T> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Env_Value<T> operator=(const ACE_Env_Value<T> &)) - void fetch_value (void); const ACE_TCHAR *varname_; diff --git a/ACE/ace/Event_Handler_T.cpp b/ACE/ace/Event_Handler_T.cpp index 51a03f62310..3911da07853 100644 --- a/ACE/ace/Event_Handler_T.cpp +++ b/ACE/ace/Event_Handler_T.cpp @@ -11,8 +11,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - #if !defined (__ACE_INLINE__) #include "ace/Event_Handler_T.inl" #endif /* __ACE_INLINE__ */ @@ -120,6 +118,4 @@ ACE_Event_Handler_T<T>::handle_signal (int signum, siginfo_t *s, ucontext_t *u) ACE_END_VERSIONED_NAMESPACE_DECL -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - #endif /* ACE_EVENT_HANDLER_T_CPP */ diff --git a/ACE/ace/Event_Handler_T.h b/ACE/ace/Event_Handler_T.h index ff91cd4480d..d6726d703be 100644 --- a/ACE/ace/Event_Handler_T.h +++ b/ACE/ace/Event_Handler_T.h @@ -20,8 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -186,6 +184,5 @@ ACE_END_VERSIONED_NAMESPACE_DECL #pragma implementation ("Event_Handler_T.cpp") #endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ #include /**/ "ace/post.h" #endif /* ACE_EVENT_HANDLER_H */ diff --git a/ACE/ace/Event_Handler_T.inl b/ACE/ace/Event_Handler_T.inl index c3facd7e25f..fc99e5d1c48 100644 --- a/ACE/ace/Event_Handler_T.inl +++ b/ACE/ace/Event_Handler_T.inl @@ -1,5 +1,4 @@ // -*- C++ -*- -// // $Id$ #include "ace/Global_Macros.h" diff --git a/ACE/ace/FILE.h b/ACE/ace/FILE.h index bf8f4561d4f..ba8c519990b 100644 --- a/ACE/ace/FILE.h +++ b/ACE/ace/FILE.h @@ -85,13 +85,13 @@ public: /** * Sets the file pointer as follows: - * o If <whence> is <SEEK_SET>, the pointer is set to @a offset + * o If @ whence is @c SEEK_SET, the pointer is set to @a offset * bytes. * - * o If <whence> is <SEEK_CUR>, the pointer is set to its - * current location plus @a offset. + * o If @a whence> is @c SEEK_CUR, the pointer is set to its + * current location plus @a offset. * - * o If <whence> is <SEEK_END>, the pointer is set to the size + * o If @a whence is @c SEEK_END, the pointer is set to the size * of the file plus offset. */ ACE_OFF_T seek (ACE_OFF_T offset, diff --git a/ACE/ace/FoxReactor/FoxReactor.cpp b/ACE/ace/FoxReactor/FoxReactor.cpp index 23db7a9dbe1..33af891edce 100644 --- a/ACE/ace/FoxReactor/FoxReactor.cpp +++ b/ACE/ace/FoxReactor/FoxReactor.cpp @@ -2,8 +2,6 @@ #include "ace/FoxReactor/FoxReactor.h" -#include "ace/Synch_T.h" - FXDEFMAP(ACE_FoxReactor) ACE_FoxReactorMap[]={ FXMAPFUNCS(SEL_IO_READ,0,MAXKEY,ACE_FoxReactor::onFileEvents), FXMAPFUNCS(SEL_IO_WRITE,0,MAXKEY,ACE_FoxReactor::onFileEvents), diff --git a/ACE/ace/Future.cpp b/ACE/ace/Future.cpp index 3eb201afe67..88ad62502e1 100644 --- a/ACE/ace/Future.cpp +++ b/ACE/ace/Future.cpp @@ -98,7 +98,7 @@ ACE_Future_Rep<T>::attach (ACE_Future_Rep<T>*& rep) { ACE_ASSERT (rep != 0); // Use value_ready_mutex_ for both condition and ref count management - ACE_MT (ACE_Guard<ACE_Recursive_Thread_Mutex> r_mon (rep->value_ready_mutex_)); +// ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, r_mon, rep->value_ready_mutex_, 0); ++rep->ref_count_; return rep; } @@ -108,7 +108,7 @@ ACE_Future_Rep<T>::detach (ACE_Future_Rep<T>*& rep) { ACE_ASSERT (rep != 0); // Use value_ready_mutex_ for both condition and ref count management - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, r_mon, rep->value_ready_mutex_)); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, r_mon, rep->value_ready_mutex_); if (rep->ref_count_-- == 0) { @@ -126,7 +126,7 @@ ACE_Future_Rep<T>::assign (ACE_Future_Rep<T>*& rep, ACE_Future_Rep<T>* new_rep) ACE_ASSERT (rep != 0); ACE_ASSERT (new_rep != 0); // Use value_ready_mutex_ for both condition and ref count management - ACE_MT (ACE_GUARD (ACE_Recursive_Thread_Mutex, r_mon, rep->value_ready_mutex_)); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, r_mon, rep->value_ready_mutex_); ACE_Future_Rep<T>* old = rep; rep = new_rep; @@ -169,10 +169,10 @@ ACE_Future_Rep<T>::set (const T &r, // If the value is already produced, ignore it... if (this->value_ == 0) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, - ace_mon, - this->value_ready_mutex_, - -1)); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, + ace_mon, + this->value_ready_mutex_, + -1); // Otherwise, create a new result value. Note the use of the // Double-checked locking pattern to avoid multiple allocations. @@ -210,9 +210,9 @@ ACE_Future_Rep<T>::get (T &value, // If the value is already produced, return it. if (this->value_ == 0) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, - this->value_ready_mutex_, - -1)); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, + this->value_ready_mutex_, + -1); // If the value is not yet defined we must block until the // producer writes to it. @@ -232,7 +232,7 @@ template <class T> int ACE_Future_Rep<T>::attach (ACE_Future_Observer<T> *observer, ACE_Future<T> &caller) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->value_ready_mutex_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->value_ready_mutex_, -1); // Otherwise, create a new result value. Note the use of the // Double-checked locking pattern to avoid corrupting the list. @@ -251,7 +251,7 @@ ACE_Future_Rep<T>::attach (ACE_Future_Observer<T> *observer, template <class T> int ACE_Future_Rep<T>::detach (ACE_Future_Observer<T> *observer) { - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->value_ready_mutex_, -1)); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->value_ready_mutex_, -1); // Remove all occurrences of the specified observer from this // objects hash map. @@ -265,7 +265,7 @@ ACE_Future_Rep<T>::operator T () if (this->value_ == 0) { // Constructor of ace_mon acquires the mutex. - ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, this->value_ready_mutex_, 0)); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, ace_mon, this->value_ready_mutex_, 0); // If the value is not yet defined we must block until the // producer writes to it. diff --git a/ACE/ace/Future.h b/ACE/ace/Future.h index c172b0fd9ac..558bcb134fa 100644 --- a/ACE/ace/Future.h +++ b/ACE/ace/Future.h @@ -27,6 +27,7 @@ #if defined (ACE_HAS_THREADS) +#include "ace/Synch_Traits.h" #include "ace/Recursive_Thread_Mutex.h" #include "ace/Condition_Recursive_Thread_Mutex.h" @@ -107,7 +108,7 @@ private: friend class ACE_Future<T>; /** - * Set the result value. The specified <caller> represents the + * Set the result value. The specified @a caller represents the * future that invoked this <set> method, which is used to notify * the list of future observers. Returns 0 for success, -1 on error. * This function only has an effect the first time it is called for @@ -214,8 +215,8 @@ private: OBSERVER_COLLECTION observer_collection_; // = Condition variable and mutex that protect the <value_>. - mutable ACE_Recursive_Thread_Mutex value_ready_mutex_; - mutable ACE_Condition_Recursive_Thread_Mutex value_ready_; + mutable ACE_SYNCH_RECURSIVE_MUTEX value_ready_mutex_; + mutable ACE_SYNCH_RECURSIVE_CONDITION value_ready_; private: @@ -303,8 +304,7 @@ public: * @retval 0 Success; @a value contains the value of the ACE_Future. * @retval -1 Error; check ACE_OS::last_error() for an error code. */ - int get (T &value, - ACE_Time_Value *tv = 0) const; + int get (T &value, ACE_Time_Value *tv = 0) const; /** * @deprecated Note that this method is going away in a subsequent @@ -364,7 +364,7 @@ public: private: - // the ACE_Future_Rep + /// The ACE_Future_Rep /// Protect operations on the <Future>. typedef ACE_Future_Rep<T> FUTURE_REP; FUTURE_REP *future_rep_; diff --git a/ACE/ace/Future_Set.cpp b/ACE/ace/Future_Set.cpp index 3bd4abe8156..5469aa13e80 100644 --- a/ACE/ace/Future_Set.cpp +++ b/ACE/ace/Future_Set.cpp @@ -83,7 +83,7 @@ ACE_Future_Set<T>::insert (ACE_Future<T> &future) template <class T> void ACE_Future_Set<T>::update (const ACE_Future<T> &future) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; FUTURE &local_future = const_cast<ACE_Future<T> &> (future); ACE_NEW (mb, diff --git a/ACE/ace/Future_Set.h b/ACE/ace/Future_Set.h index 1e0c0b8e6ec..aec779f7ead 100644 --- a/ACE/ace/Future_Set.h +++ b/ACE/ace/Future_Set.h @@ -41,7 +41,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * using the ACE_Future_Set::next_readable() method. */ template <class T> -class ACE_Future_Set : public ACE_Future_Observer<T> +class ACE_Future_Set : public ACE_Future_Observer<T>, + private ACE_Copy_Disabled { public: // = Initialization and termination methods. @@ -99,10 +100,6 @@ public: ACE_ALLOC_HOOK_DECLARE; private: - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Future_Set<T> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Future_Set (const ACE_Future_Set<T> &)) - typedef ACE_Future<T> FUTURE; typedef ACE_Future_Rep<T> FUTURE_REP; diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index cce114df09e..814be2ee1f9 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -106,9 +106,11 @@ ACE_END_VERSIONED_NAMESPACE_DECL // ---------------------------------------------------------------- +// FUZZ: disable check_for_ACE_Guard + // Convenient macro for testing for deadlock, as well as for detecting // when mutexes fail. -/* WARNING: +/* @warning * Use of ACE_GUARD() is rarely correct. ACE_GUARD() causes the current * function to return if the lock is not acquired. Since merely returning * (no value) almost certainly fails to handle the acquisition failure @@ -118,28 +120,45 @@ ACE_END_VERSIONED_NAMESPACE_DECL * ACE_GUARD_REACTION() is better because it lets you specify error * handling code. */ +#if !defined (ACE_GUARD_ACTION) #define ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ACTION, REACTION) \ ACE_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () != 0) { ACTION; } \ else { REACTION; } +#endif /* !ACE_GUARD_ACTION */ +#if !defined (ACE_GUARD_REACTION) #define ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, REACTION) \ ACE_GUARD_ACTION(MUTEX, OBJ, LOCK, ;, REACTION) +#endif /* !ACE_GUARD_REACTION */ +#if !defined (ACE_GUARD) #define ACE_GUARD(MUTEX, OBJ, LOCK) \ ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, return) +#endif /* !ACE_GUARD */ +#if !defined (ACE_GUARD_RETURN) #define ACE_GUARD_RETURN(MUTEX, OBJ, LOCK, RETURN) \ ACE_GUARD_REACTION(MUTEX, OBJ, LOCK, return RETURN) +#endif /* !ACE_GUARD_RETURN */ +#if !defined (ACE_WRITE_GUARD) # define ACE_WRITE_GUARD(MUTEX,OBJ,LOCK) \ ACE_Write_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) return; +#endif /* !ACE_WRITE_GUARD */ +#if !defined (ACE_WRITE_GUARD_RETURN) # define ACE_WRITE_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \ ACE_Write_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) return RETURN; +#endif /* ACE_WRITE_GUARD_RETURN */ +#if !defined (ACE_READ_GUARD) # define ACE_READ_GUARD(MUTEX,OBJ,LOCK) \ ACE_Read_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) return; +#endif /* !ACE_READ_GUARD */ +#if !defined (ACE_READ_GUARD_RETURN) # define ACE_READ_GUARD_RETURN(MUTEX,OBJ,LOCK,RETURN) \ ACE_Read_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) return RETURN; +#endif /* !ACE_READ_GUARD_RETURN */ +// FUZZ: enable check_for_ACE_Guard // ---------------------------------------------------------------- @@ -908,15 +927,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # define ACE_SEH_FINALLY if (1) #endif /* ACE_WIN32 */ -// These should probably be put into a seperate header. - -// The following is necessary since many C++ compilers don't support -// typedef'd types inside of classes used as formal template -// arguments... ;-(. Luckily, using the C++ preprocessor I can hide -// most of this nastiness! - -# if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - // Handle ACE_Message_Queue. # define ACE_SYNCH_DECL class _ACE_SYNCH # define ACE_SYNCH_USE _ACE_SYNCH @@ -999,96 +1009,6 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool # define ACE_PAGEFILE_MEMORY_POOL ACE_Pagefile_Memory_Pool -# else /* TEMPLATES are broken in some form or another (i.e., most C++ compilers) */ - -// Handle ACE_Message_Queue. -# if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE) -# define ACE_SYNCH_DECL class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T, class _ACE_SYNCH_SEMAPHORE_T -# define ACE_SYNCH_USE _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_CONDITION_T, _ACE_SYNCH_SEMAPHORE_T -# else -# define ACE_SYNCH_DECL class _ACE_SYNCH_MUTEX_T, class _ACE_SYNCH_CONDITION_T -# define ACE_SYNCH_USE _ACE_SYNCH_MUTEX_T, _ACE_SYNCH_CONDITION_T -# endif /* ACE_HAS_OPTIMIZED_MESSAGE_QUEUE */ -# define ACE_SYNCH_MUTEX_T _ACE_SYNCH_MUTEX_T -# define ACE_SYNCH_CONDITION_T _ACE_SYNCH_CONDITION_T -# define ACE_SYNCH_SEMAPHORE_T _ACE_SYNCH_SEMAPHORE_T - -// Handle ACE_Malloc* -# define ACE_MEM_POOL_1 class _ACE_MEM_POOL, class _ACE_MEM_POOL_OPTIONS -# define ACE_MEM_POOL_2 _ACE_MEM_POOL, _ACE_MEM_POOL_OPTIONS -# define ACE_MEM_POOL _ACE_MEM_POOL -# define ACE_MEM_POOL_OPTIONS _ACE_MEM_POOL_OPTIONS - -// Handle ACE_Svc_Handler -# define ACE_PEER_STREAM_1 class _ACE_PEER_STREAM, class _ACE_PEER_ADDR -# define ACE_PEER_STREAM_2 _ACE_PEER_STREAM, _ACE_PEER_ADDR -# define ACE_PEER_STREAM _ACE_PEER_STREAM -# define ACE_PEER_STREAM_ADDR _ACE_PEER_ADDR - -// Handle ACE_Acceptor -# define ACE_PEER_ACCEPTOR_1 class _ACE_PEER_ACCEPTOR, class _ACE_PEER_ADDR -# define ACE_PEER_ACCEPTOR_2 _ACE_PEER_ACCEPTOR, _ACE_PEER_ADDR -# define ACE_PEER_ACCEPTOR _ACE_PEER_ACCEPTOR -# define ACE_PEER_ACCEPTOR_ADDR _ACE_PEER_ADDR - -// Handle ACE_Connector -# define ACE_PEER_CONNECTOR_1 class _ACE_PEER_CONNECTOR, class _ACE_PEER_ADDR -# define ACE_PEER_CONNECTOR_2 _ACE_PEER_CONNECTOR, _ACE_PEER_ADDR -# define ACE_PEER_CONNECTOR _ACE_PEER_CONNECTOR -# define ACE_PEER_CONNECTOR_ADDR _ACE_PEER_ADDR -# define ACE_PEER_CONNECTOR_ADDR_ANY ACE_PEER_CONNECTOR_ADDR::sap_any - -// Handle ACE_SOCK_* -# define ACE_SOCK_ACCEPTOR ACE_SOCK_Acceptor, ACE_INET_Addr -# define ACE_SOCK_CONNECTOR ACE_SOCK_Connector, ACE_INET_Addr -# define ACE_SOCK_STREAM ACE_SOCK_Stream, ACE_INET_Addr -# define ACE_SOCK_DGRAM ACE_SOCK_Dgram, ACE_INET_Addr -# define ACE_SOCK_DGRAM_BCAST ACE_SOCK_Dgram_Bcast, ACE_INET_Addr -# define ACE_SOCK_DGRAM_MCAST ACE_SOCK_Dgram_Mcast, ACE_INET_Addr - -// Handle ACE_SOCK_SEQPACK_* -# define ACE_SOCK_SEQPACK_ACCEPTOR ACE_SOCK_SEQPACK_Acceptor, ACE_Multihomed_INET_Addr -# define ACE_SOCK_SEQPACK_CONNECTOR ACE_SOCK_SEQPACK_Connector, ACE_Multihomed_INET_Addr -# define ACE_SOCK_SEQPACK_ASSOCIATION ACE_SOCK_SEQPACK_Association, ACE_Multihomed_INET_Addr - -// Handle ACE_MEM_* -# define ACE_MEM_ACCEPTOR ACE_MEM_Acceptor, ACE_MEM_Addr -# define ACE_MEM_CONNECTOR ACE_MEM_Connector, ACE_INET_Addr -# define ACE_MEM_STREAM ACE_MEM_Stream, ACE_INET_Addr - -// Handle ACE_LSOCK_* -# define ACE_LSOCK_ACCEPTOR ACE_LSOCK_Acceptor, ACE_UNIX_Addr -# define ACE_LSOCK_CONNECTOR ACE_LSOCK_Connector, ACE_UNIX_Addr -# define ACE_LSOCK_STREAM ACE_LSOCK_Stream, ACE_UNIX_Addr - -// Handle ACE_TLI_* -# define ACE_TLI_ACCEPTOR ACE_TLI_Acceptor, ACE_INET_Addr -# define ACE_TLI_CONNECTOR ACE_TLI_Connector, ACE_INET_Addr -# define ACE_TLI_STREAM ACE_TLI_Stream, ACE_INET_Addr - -// Handle ACE_SPIPE_* -# define ACE_SPIPE_ACCEPTOR ACE_SPIPE_Acceptor, ACE_SPIPE_Addr -# define ACE_SPIPE_CONNECTOR ACE_SPIPE_Connector, ACE_SPIPE_Addr -# define ACE_SPIPE_STREAM ACE_SPIPE_Stream, ACE_SPIPE_Addr - -// Handle ACE_UPIPE_* -# define ACE_UPIPE_ACCEPTOR ACE_UPIPE_Acceptor, ACE_SPIPE_Addr -# define ACE_UPIPE_CONNECTOR ACE_UPIPE_Connector, ACE_SPIPE_Addr -# define ACE_UPIPE_STREAM ACE_UPIPE_Stream, ACE_SPIPE_Addr - -// Handle ACE_FILE_* -# define ACE_FILE_CONNECTOR ACE_FILE_Connector, ACE_FILE_Addr -# define ACE_FILE_STREAM ACE_FILE_IO, ACE_FILE_Addr - -// Handle ACE_*_Memory_Pool. -# define ACE_MMAP_MEMORY_POOL ACE_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options -# define ACE_LITE_MMAP_MEMORY_POOL ACE_Lite_MMAP_Memory_Pool, ACE_MMAP_Memory_Pool_Options -# define ACE_SBRK_MEMORY_POOL ACE_Sbrk_Memory_Pool, ACE_Sbrk_Memory_Pool_Options -# define ACE_SHARED_MEMORY_POOL ACE_Shared_Memory_Pool, ACE_Shared_Memory_Pool_Options -# define ACE_LOCAL_MEMORY_POOL ACE_Local_Memory_Pool, ACE_Local_Memory_Pool_Options -# define ACE_PAGEFILE_MEMORY_POOL ACE_Pagefile_Memory_Pool, ACE_Pagefile_Memory_Pool_Options -# endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - // Work around compilers that don't like in-class static integral // constants. Constants in this case are meant to be compile-time // constants so that they may be used as template arguments, for diff --git a/ACE/ace/Guard_T.cpp b/ACE/ace/Guard_T.cpp index 895c0d9ffdc..be279928533 100644 --- a/ACE/ace/Guard_T.cpp +++ b/ACE/ace/Guard_T.cpp @@ -3,6 +3,8 @@ #ifndef ACE_GUARD_T_CPP #define ACE_GUARD_T_CPP +// FUZZ: disable check_for_ACE_Guard + #include "ace/Guard_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h index 26a7e9441ef..5a95f43999b 100644 --- a/ACE/ace/Guard_T.h +++ b/ACE/ace/Guard_T.h @@ -25,6 +25,8 @@ #include "ace/Global_Macros.h" #include "ace/OS_NS_Thread.h" +// FUZZ: disable check_for_ACE_Guard + ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -38,7 +40,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * the very least the <acquire>, <tryacquire>, <release>, and * <remove> methods. * - * WARNING: A successfully constructed ACE_Guard does NOT mean that the + * @warning A successfully constructed ACE_Guard does NOT mean that the * lock was acquired! It is the caller's responsibility, after * constructing an ACE_Guard, to check whether the lock was successfully * acquired. Code like this is dangerous: @@ -138,7 +140,7 @@ private: * <ACE_LOCK> it is instantiated with must support the appropriate * API). * - * WARNING: See important "WARNING" in comments at top of ACE_Guard. + * @warning See important "WARNING" in comments at top of ACE_Guard. */ template <class ACE_LOCK> class ACE_Write_Guard : public ACE_Guard<ACE_LOCK> @@ -184,7 +186,7 @@ public: * <ACE_LOCK> it is instantiated with must support the appropriate * API). * - * WARNING: See important "WARNING" in comments at top of ACE_Guard. + * @warning See important "WARNING" in comments at top of ACE_Guard. */ template <class ACE_LOCK> class ACE_Read_Guard : public ACE_Guard<ACE_LOCK> @@ -241,7 +243,7 @@ public: * is released even if a thread exits via <thr_exit>! */ template <class ACE_LOCK> -class ACE_TSS_Guard +class ACE_TSS_Guard : private ACE_Copy_Disabled { public: // = Initialization and termination methods. @@ -288,9 +290,9 @@ protected: ACE_thread_key_t key_; private: - // = Prevent assignment and initialization. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS_Guard<ACE_LOCK> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_TSS_Guard (const ACE_TSS_Guard<ACE_LOCK> &)) + // FUZZ: disable check_for_ACE_Guard + typedef ACE_Guard<ACE_LOCK> Guard_Type; + // FUZZ: enable check_for_ACE_Guard }; /** @@ -331,6 +333,11 @@ public: // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. +private: + // FUZZ: disable check_for_ACE_Guard + typedef ACE_Guard<ACE_LOCK> Guard_Type; + typedef ACE_Write_Guard<ACE_LOCK> Write_Guard_Type; + // FUZZ: enable check_for_ACE_Guard }; /** @@ -370,6 +377,11 @@ public: // ACE_ALLOC_HOOK_DECLARE; // Declare the dynamic allocation hooks. +private: + // FUZZ: disable check_for_ACE_Guard + typedef ACE_Guard<ACE_LOCK> Guard_Type; + typedef ACE_Read_Guard<ACE_LOCK> Read_Guard_Type; + // FUZZ: enable check_for_ACE_Guard }; #endif /* !(defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION))) */ diff --git a/ACE/ace/Guard_T.inl b/ACE/ace/Guard_T.inl index e37ac76bb6c..56c69af9041 100644 --- a/ACE/ace/Guard_T.inl +++ b/ACE/ace/Guard_T.inl @@ -2,6 +2,8 @@ // // $Id$ +// FUZZ: disable check_for_ACE_Guard + #include "ace/RW_Thread_Mutex.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Hash_Map_Manager_T.h b/ACE/ace/Hash_Map_Manager_T.h index aaf0bcdf7c7..5e33720753c 100644 --- a/ACE/ace/Hash_Map_Manager_T.h +++ b/ACE/ace/Hash_Map_Manager_T.h @@ -1,4 +1,4 @@ -// -*- C++ -*- +// // -*- C++ -*- //============================================================================= /** @@ -765,8 +765,8 @@ protected: * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's - * internal lock, which is accessible via its <mutex> method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's + * internal lock, which is accessible via its mutex() method. */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> class ACE_Hash_Map_Iterator_Ex : public ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> @@ -835,8 +835,8 @@ public: * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's - * internal lock, which is accessible via its <mutex> method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's + * internal lock, which is accessible via its mutex() method. */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> class ACE_Hash_Map_Const_Iterator_Ex : public ACE_Hash_Map_Const_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> @@ -894,8 +894,8 @@ public: * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's - * internal lock, which is accessible via its <mutex> method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's + * internal lock, which is accessible via its mutex() method. * * Note that a creation method for this new iterator cannot be added * to the hash map, since this would require adding explicit template @@ -979,8 +979,8 @@ protected: * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's - * internal lock, which is accessible via its <mutex> method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's + * internal lock, which is accessible via its mutex() method. */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> class ACE_Hash_Map_Reverse_Iterator_Ex : public ACE_Hash_Map_Iterator_Base_Ex<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> @@ -1036,7 +1036,7 @@ public: * ACE_Hash_Map_Manager_Ex it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Hash_Map_Manager_Ex's + * ACE_GUARD or ACE_READ_GUARD on the ACE_Hash_Map_Manager_Ex's * internal lock, which is accessible via its <mutex> method. */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> diff --git a/ACE/ace/Hash_Multi_Map_Manager_T.h b/ACE/ace/Hash_Multi_Map_Manager_T.h index 11e54292477..211c9f05ef9 100644 --- a/ACE/ace/Hash_Multi_Map_Manager_T.h +++ b/ACE/ace/Hash_Multi_Map_Manager_T.h @@ -744,7 +744,7 @@ protected: * @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * @c ACE_Guard or @c ACE_Read_Guard on the @c ACE_Hash_Multi_Map_Manager's + * @c ACE_GUARD or @c ACE_READ_GUARD on the @c ACE_Hash_Multi_Map_Manager's * internal lock, which is accessible via its @c mutex method. */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> @@ -790,8 +790,8 @@ public: * @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * @c ACE_Guard or @c ACE_Read_Guard on the @c ACE_Hash_Multi_Map_Manager's - * internal lock, which is accessible via its @c mutex method. + * @c ACE_GUARD or @c ACE_READ_GUARD on the @c ACE_Hash_Multi_Map_Manager's + * internal lock, which is accessible via its @c mutex() method. */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> class ACE_Hash_Multi_Map_Const_Iterator : public ACE_Hash_Multi_Map_Const_Iterator_Base<EXT_ID, INT_ID, HASH_KEY, COMPARE_KEYS, ACE_LOCK> @@ -838,7 +838,7 @@ public: * @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * @c ACE_Guard or @c ACE_Read_Guard on the @c ACE_Hash_Multi_Map_Manager's + * @c ACE_GUARD or @c ACE_READ_GUARD on the @c ACE_Hash_Multi_Map_Manager's * internal lock, which is accessible via its @c mutex method. * * Note that a creation method for this new iterator cannot be added @@ -912,7 +912,7 @@ protected: * @c ACE_Hash_Multi_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * @c ACE_Guard or @c ACE_Read_Guard on the @c ACE_Hash_Multi_Map_Manager's + * @c ACE_GUARD or @c ACE_READ_GUARD on the @c ACE_Hash_Multi_Map_Manager's * internal lock, which is accessible via its @c mutex method. */ template <class EXT_ID, class INT_ID, class HASH_KEY, class COMPARE_KEYS, class ACE_LOCK> diff --git a/ACE/ace/INET_Addr.h b/ACE/ace/INET_Addr.h index b4184f38461..b8ce15be27f 100644 --- a/ACE/ace/INET_Addr.h +++ b/ACE/ace/INET_Addr.h @@ -133,7 +133,7 @@ public: * are converted into network byte order, otherwise they are assumed to be * in network byte order already and are passed straight through. * - * If <map> is non-zero and IPv6 support has been compiled in, + * If @a map is non-zero and IPv6 support has been compiled in, * then this address will be set to the IPv4-mapped IPv6 address of it. */ int set (u_short port_number, @@ -141,15 +141,15 @@ public: int encode = 1, int map = 0); - /// Uses <getservbyname> to initialize an ACE_INET_Addr from a - /// <port_name>, the remote @a host_name, and the @a protocol. + /// Uses getservbyname() to initialize an ACE_INET_Addr from a + /// @a port_name, the remote @a host_name, and the @a protocol. int set (const char port_name[], const char host_name[], const char protocol[] = "tcp"); /** - * Uses <getservbyname> to initialize an ACE_INET_Addr from a - * <port_name>, an @a ip_addr, and the @a protocol. This assumes that + * Uses getservbyname() to initialize an ACE_INET_Addr from a + * @a port_name, an @a ip_addr, and the @a protocol. This assumes that * @a ip_addr is already in network byte order. */ int set (const char port_name[], diff --git a/ACE/ace/Local_Tokens.h b/ACE/ace/Local_Tokens.h index 4f46f43fdab..fa23dcc3efd 100644 --- a/ACE/ace/Local_Tokens.h +++ b/ACE/ace/Local_Tokens.h @@ -34,7 +34,7 @@ * mechanisms, such as mutexes or semaphores. Instead, you should * use the ACE_Recursive_Thread_Mutex, ACE_Thread_Mutex, * ACE_Thread_Semaphore, etc., that are defined in - * $ACE_ROOT/ace/Synch.h and $ACE_ROOT/ace/Synch_T.h or the + * $ACE_ROOT/ace/Synch.h or the * ACE_Token that's defined in $ACE_ROOT/ace/Token.h. * * @@ -79,6 +79,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * this class is necessary to fight the compiler with order of * declaration errors. */ +// FUZZ: disable check_for_ACE_Guard namespace ACE_TOKEN_CONST { #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) @@ -92,6 +93,7 @@ namespace ACE_TOKEN_CONST typedef ACE_Guard<ACE_Null_Mutex> GUARD; #endif /* ACE_HAS_THREADS */ } +// FUZZ: enable check_for_ACE_Guard // Forward decl. class ACE_Token_Proxy; diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index 8276c5c7df4..2a01d02fdd4 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -1745,7 +1745,7 @@ ACE_Log_Msg::log (const ACE_TCHAR *format_str, } #else ACE_hthread_t t_id; - ACE_Thread::self (t_id); + ACE_OS::thr_self (t_id); # if defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS) // MVS's pthread_t is a struct... yuck. So use the ACE 5.0 diff --git a/ACE/ace/Makefile.am b/ACE/ace/Makefile.am index f5c2b1a09c0..623e5463aba 100644 --- a/ACE/ace/Makefile.am +++ b/ACE/ace/Makefile.am @@ -382,7 +382,6 @@ nobase_include_HEADERS += \ Arg_Shifter.h \ Argv_Type_Converter.h \ Argv_Type_Converter.inl \ - Array.h \ Array_Base.cpp \ Array_Base.h \ Array_Base.inl \ @@ -1014,8 +1013,6 @@ nobase_include_HEADERS += \ Svc_Handler.h \ Synch.h \ Synch_Options.h \ - Synch_T.cpp \ - Synch_T.h \ Synch_Traits.h \ System_Time.h \ TLI.h \ diff --git a/ACE/ace/Malloc_T.h b/ACE/ace/Malloc_T.h index eef3739f3f2..9cea14888c2 100644 --- a/ACE/ace/Malloc_T.h +++ b/ACE/ace/Malloc_T.h @@ -213,14 +213,7 @@ class ACE_Allocator_Adapter : public ACE_Allocator public: // Trait. typedef MALLOC ALLOCATOR; - -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - // The following code will break C++ compilers that don't support - // template typedefs correctly. typedef const typename MALLOC::MEMORY_POOL_OPTIONS *MEMORY_POOL_OPTIONS; -#else - typedef const void *MEMORY_POOL_OPTIONS; -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ // = Initialization. /** @@ -747,8 +740,7 @@ public: * the set that hasn't yet been visited. Returns 0 when all items * have been seen, else 1. */ - int next (void *&next_entry, - const char *&name); + int next (void *&next_entry, const char *&name); /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. @@ -767,8 +759,10 @@ private: /// Keeps track of how far we've advanced... NAME_NODE *curr_; +// FUZZ: disable check_for_ACE_Guard /// Lock Malloc for the lifetime of the iterator. ACE_Read_Guard<ACE_LOCK> guard_; +// FUZZ: enable check_for_ACE_Guard /// Name that we are searching for. const char *name_; @@ -792,7 +786,6 @@ public: typedef typename ACE_CB::ACE_Name_Node NAME_NODE; typedef typename ACE_CB::ACE_Malloc_Header MALLOC_HEADER; - // = Initialization method. /// If @a name = 0 it will iterate through everything else only /// through those entries whose @a name match. ACE_Malloc_FIFO_Iterator_T (ACE_Malloc_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_CB> &malloc, @@ -815,8 +808,7 @@ public: * the set that hasn't yet been visited. Returns 0 when all items * have been seen, else 1. */ - int next (void *&next_entry, - const char *&name); + int next (void *&next_entry, const char *&name); /// Move forward by one element in the set. Returns 0 when all the /// items in the set have been seen, else 1. @@ -839,8 +831,10 @@ private: /// Keeps track of how far we've advanced... NAME_NODE *curr_; +// FUZZ: disable check_for_ACE_Guard /// Lock Malloc for the lifetime of the iterator. ACE_Read_Guard<ACE_LOCK> guard_; +// FUZZ: enable check_for_ACE_Guard /// Name that we are searching for. const char *name_; @@ -888,7 +882,6 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> class ACE_Malloc_LIFO_Iterator : public ACE_Malloc_LIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_Control_Block> { public: - // = Initialization method. /// If @a name = 0 it will iterate through everything else only /// through those entries whose @a name match. ACE_Malloc_LIFO_Iterator (ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK> &malloc, @@ -899,7 +892,6 @@ template <ACE_MEM_POOL_1, class ACE_LOCK> class ACE_Malloc_FIFO_Iterator : public ACE_Malloc_FIFO_Iterator_T<ACE_MEM_POOL_2, ACE_LOCK, ACE_Control_Block> { public: - // = Initialization method. /// If @a name = 0 it will iterate through everything else only /// through those entries whose @a name match. ACE_Malloc_FIFO_Iterator (ACE_Malloc<ACE_MEM_POOL_2, ACE_LOCK> &malloc, diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h index f18c984a5d7..d12636ce4d5 100644 --- a/ACE/ace/Map_Manager.h +++ b/ACE/ace/Map_Manager.h @@ -569,8 +569,8 @@ protected: * ACE_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Map_Manager's - * internal lock, which is accessible via its <mutex> method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Map_Manager's + * internal lock, which is accessible via its mutex() method. */ template <class EXT_ID, class INT_ID, class ACE_LOCK> class ACE_Map_Iterator : public ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK> @@ -616,8 +616,8 @@ public: * ACE_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Map_Manager's - * internal lock, which is accessible via its <mutex> method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Map_Manager's + * internal lock, which is accessible via its mutex() method. */ template <class EXT_ID, class INT_ID, class ACE_LOCK> class ACE_Map_Const_Iterator : public ACE_Map_Const_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK> @@ -663,8 +663,8 @@ public: * ACE_Map_Manager it is iterating upon since locking is * inherently inefficient and/or error-prone within an STL-style * iterator. If you require locking, you can explicitly use an - * ACE_Guard or ACE_Read_Guard on the ACE_Map_Manager's - * internal lock, which is accessible via its <mutex> method. + * ACE_GUARD or ACE_READ_GUARD on the ACE_Map_Manager's + * internal lock, which is accessible via its mutex() method. */ template <class EXT_ID, class INT_ID, class ACE_LOCK> class ACE_Map_Reverse_Iterator : public ACE_Map_Iterator_Base<EXT_ID, INT_ID, ACE_LOCK> diff --git a/ACE/ace/Message_Queue_T.cpp b/ACE/ace/Message_Queue_T.cpp index b4ac7421545..36c3cd139af 100644 --- a/ACE/ace/Message_Queue_T.cpp +++ b/ACE/ace/Message_Queue_T.cpp @@ -1699,7 +1699,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::peek_dequeue_head (ACE_Message_Block *&first_i // Wait for at least one item to become available. - if (this->wait_not_empty_cond (ace_mon, timeout) == -1) + if (this->wait_not_empty_cond (timeout) == -1) return -1; first_item = this->head_; @@ -1707,8 +1707,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::peek_dequeue_head (ACE_Message_Block *&first_i } template <ACE_SYNCH_DECL> int -ACE_Message_Queue<ACE_SYNCH_USE>::wait_not_full_cond (ACE_Guard<ACE_SYNCH_MUTEX_T> &, - ACE_Time_Value *timeout) +ACE_Message_Queue<ACE_SYNCH_USE>::wait_not_full_cond (ACE_Time_Value *timeout) { int result = 0; @@ -1734,8 +1733,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::wait_not_full_cond (ACE_Guard<ACE_SYNCH_MUTEX_ } template <ACE_SYNCH_DECL> int -ACE_Message_Queue<ACE_SYNCH_USE>::wait_not_empty_cond - (ACE_Guard<ACE_SYNCH_MUTEX_T> &, ACE_Time_Value *timeout) +ACE_Message_Queue<ACE_SYNCH_USE>::wait_not_empty_cond (ACE_Time_Value *timeout) { int result = 0; @@ -1779,7 +1777,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_head (ACE_Message_Block *new_item, return -1; } - if (this->wait_not_full_cond (ace_mon, timeout) == -1) + if (this->wait_not_full_cond (timeout) == -1) return -1; queue_count = this->enqueue_head_i (new_item); @@ -1817,7 +1815,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_prio (ACE_Message_Block *new_item, return -1; } - if (this->wait_not_full_cond (ace_mon, timeout) == -1) + if (this->wait_not_full_cond (timeout) == -1) return -1; queue_count = this->enqueue_i (new_item); @@ -1855,7 +1853,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_deadline (ACE_Message_Block *new_item, return -1; } - if (this->wait_not_full_cond (ace_mon, timeout) == -1) + if (this->wait_not_full_cond (timeout) == -1) return -1; queue_count = this->enqueue_deadline_i (new_item); @@ -1900,7 +1898,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::enqueue_tail (ACE_Message_Block *new_item, return -1; } - if (this->wait_not_full_cond (ace_mon, timeout) == -1) + if (this->wait_not_full_cond (timeout) == -1) return -1; queue_count = this->enqueue_tail_i (new_item); @@ -1935,7 +1933,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_head (ACE_Message_Block *&first_item, return -1; } - if (this->wait_not_empty_cond (ace_mon, timeout) == -1) + if (this->wait_not_empty_cond (timeout) == -1) return -1; return this->dequeue_head_i (first_item); @@ -1958,7 +1956,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_prio (ACE_Message_Block *&dequeued, return -1; } - if (this->wait_not_empty_cond (ace_mon, timeout) == -1) + if (this->wait_not_empty_cond (timeout) == -1) return -1; return this->dequeue_prio_i (dequeued); @@ -1981,7 +1979,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_tail (ACE_Message_Block *&dequeued, return -1; } - if (this->wait_not_empty_cond (ace_mon, timeout) == -1) + if (this->wait_not_empty_cond (timeout) == -1) return -1; return this->dequeue_tail_i (dequeued); @@ -2004,7 +2002,7 @@ ACE_Message_Queue<ACE_SYNCH_USE>::dequeue_deadline (ACE_Message_Block *&dequeued return -1; } - if (this->wait_not_empty_cond (ace_mon, timeout) == -1) + if (this->wait_not_empty_cond (timeout) == -1) return -1; return this->dequeue_deadline_i (dequeued); diff --git a/ACE/ace/Message_Queue_T.h b/ACE/ace/Message_Queue_T.h index b1765d457cb..928af80aca7 100644 --- a/ACE/ace/Message_Queue_T.h +++ b/ACE/ace/Message_Queue_T.h @@ -557,12 +557,10 @@ protected: // = Helper methods to factor out common #ifdef code. /// Wait for the queue to become non-full. - virtual int wait_not_full_cond (ACE_Guard<ACE_SYNCH_MUTEX_T> &mon, - ACE_Time_Value *timeout); + virtual int wait_not_full_cond (ACE_Time_Value *timeout); /// Wait for the queue to become non-empty. - virtual int wait_not_empty_cond (ACE_Guard<ACE_SYNCH_MUTEX_T> &mon, - ACE_Time_Value *timeout); + virtual int wait_not_empty_cond (ACE_Time_Value *timeout); /// Inform any threads waiting to enqueue that they can procede. virtual int signal_enqueue_waiters (void); diff --git a/ACE/ace/Message_Queue_Vx.cpp b/ACE/ace/Message_Queue_Vx.cpp index 80f41bca736..9bda2e17374 100644 --- a/ACE/ace/Message_Queue_Vx.cpp +++ b/ACE/ace/Message_Queue_Vx.cpp @@ -328,24 +328,16 @@ ACE_Message_Queue_Vx::dequeue_deadline_i (ACE_Message_Block *& /*dequeued*/) // Take a look at the first item without removing it. int -ACE_Message_Queue_Vx::wait_not_full_cond (ACE_Guard<ACE_Null_Mutex> &mon, - ACE_Time_Value *tv) +ACE_Message_Queue_Vx::wait_not_full_cond (ACE_Time_Value *) { // Always return here, and let the VxWorks message queue handle blocking. - ACE_UNUSED_ARG (mon); - ACE_UNUSED_ARG (tv); - return 0; } int -ACE_Message_Queue_Vx::wait_not_empty_cond (ACE_Guard<ACE_Null_Mutex> &mon, - ACE_Time_Value *tv) +ACE_Message_Queue_Vx::wait_not_empty_cond (ACE_Time_Value *) { // Always return here, and let the VxWorks message queue handle blocking. - ACE_UNUSED_ARG (mon); - ACE_UNUSED_ARG (tv); - return 0; } diff --git a/ACE/ace/Message_Queue_Vx.h b/ACE/ace/Message_Queue_Vx.h index 535e1e25557..f689cc2d1c3 100644 --- a/ACE/ace/Message_Queue_Vx.h +++ b/ACE/ace/Message_Queue_Vx.h @@ -107,6 +107,7 @@ public: * the message block sizes. */ virtual void message_bytes (size_t new_size); + /** * New value of the number of total length on the queue, i.e., sum * of the message block lengths. @@ -136,10 +137,10 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Enqueue an <ACE_Message_Block *> in accordance with its priority. + /// Enqueue an ACE_Message_Block * in accordance with its priority. virtual int enqueue_i (ACE_Message_Block *new_item); - /// Enqueue an <ACE_Message_Block *> in accordance with its deadline time. + /// Enqueue an ACE_Message_Block * in accordance with its deadline time. virtual int enqueue_deadline_i (ACE_Message_Block *new_item); /// Enqueue an <ACE_Message_Block *> at the end of the queue. @@ -177,12 +178,10 @@ protected: // = Helper methods to factor out common #ifdef code. /// Wait for the queue to become non-full. - virtual int wait_not_full_cond (ACE_Guard<ACE_Null_Mutex> &mon, - ACE_Time_Value *tv); + virtual int wait_not_full_cond (ACE_Time_Value *tv); /// Wait for the queue to become non-empty. - virtual int wait_not_empty_cond (ACE_Guard<ACE_Null_Mutex> &mon, - ACE_Time_Value *tv); + virtual int wait_not_empty_cond (ACE_Time_Value *tv); /// Inform any threads waiting to enqueue that they can procede. virtual int signal_enqueue_waiters (void); diff --git a/ACE/ace/Module.h b/ACE/ace/Module.h index 2c90ad64160..3e3ff89b86e 100644 --- a/ACE/ace/Module.h +++ b/ACE/ace/Module.h @@ -43,22 +43,22 @@ public: /// Indicates that the flags have not been set M_FLAGS_NOT_SET = 0, - /// Indicates that <close> should delete the writer Task. + /// Indicates that close() should delete the writer Task. M_DELETE_READER = 1, - /// Indicates that <close> should delete the reader Task. + /// Indicates that close() should delete the reader Task. M_DELETE_WRITER = 2, - /// Indicates that <close> deletes the Tasks. + /// Indicates that close() deletes the Tasks. /** * Don't change this value without updating the same enum in class * ACE_Stream... - * The <M_DELETE_READER> and <M_DELETE_WRITER> flags may be or'ed + * The M_DELETE_READER and M_DELETE_WRITER flags may be or'ed * together. */ M_DELETE = 3, - /// Indicates that <close> should not delete any Tasks. + /// Indicates that close() should not delete any Tasks. M_DELETE_NONE = 4 }; }; diff --git a/ACE/ace/Multihomed_INET_Addr.h b/ACE/ace/Multihomed_INET_Addr.h index 2a46e1b6aaf..d0598bdf6e6 100644 --- a/ACE/ace/Multihomed_INET_Addr.h +++ b/ACE/ace/Multihomed_INET_Addr.h @@ -51,7 +51,7 @@ public: /** * Constructs an ACE_Multihomed_INET_Addr from a @a port_number, a - * @a primary_host_name, and an array of <secondary_host_names>. + * @a primary_host_name, and an array of @a secondary_host_names. * @a size is taken to be the length of the array. If @a encode is * non-zero, then @a port_number is converted into network byte * order; otherwise it is assumed to be in network byte order @@ -105,7 +105,7 @@ public: /// Use compiler-generated assignment operator. - /// Default dtor. + /// Default destructor. ~ACE_Multihomed_INET_Addr (void); // = Direct initialization methods. @@ -114,7 +114,7 @@ public: /** * Initializes an ACE_Multihomed_INET_Addr from a @a port_number, a - * @a primary_host_name, and an array of <secondary_host_names>. + * @a primary_host_name, and an array of @a secondary_host_names. * @a size is taken to be the length of the array. If @a encode is * non-zero, then @a port_number is converted into network byte * order; otherwise it is assumed to be in network byte order @@ -174,14 +174,12 @@ public: * primary and secondary addresses. @a size is taken as the size of * this array. */ - void get_addresses(sockaddr_in *addrs, - size_t size) const; + void get_addresses(sockaddr_in *addrs, size_t size) const; #if defined (ACE_HAS_IPV6) /// IPV6 version of the above. - void get_addresses(sockaddr_in6 *addrs, - size_t size) const; + void get_addresses(sockaddr_in6 *addrs, size_t size) const; #endif /* ACE_HAS_IPV6 */ private: diff --git a/ACE/ace/Mutex.h b/ACE/ace/Mutex.h index e876a09d3f8..157360210dd 100644 --- a/ACE/ace/Mutex.h +++ b/ACE/ace/Mutex.h @@ -144,6 +144,7 @@ public: /// Return the underlying mutex. const ACE_mutex_t &lock (void) const; + ACE_mutex_t &lock (void); /// Dump the state of an object. void dump (void) const; diff --git a/ACE/ace/Mutex.inl b/ACE/ace/Mutex.inl index eb09217501d..97ebf851da5 100644 --- a/ACE/ace/Mutex.inl +++ b/ACE/ace/Mutex.inl @@ -51,6 +51,17 @@ ACE_Mutex::lock (void) const return this->lock_; } +ACE_INLINE ACE_mutex_t & +ACE_Mutex::lock (void) +{ +// ACE_TRACE ("ACE_Mutex::lock"); +#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS) + if (this->process_lock_) + return *this->process_lock_; +#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */ + return this->lock_; +} + ACE_INLINE int ACE_Mutex::tryacquire_write (void) { diff --git a/ACE/ace/Null_Barrier.h b/ACE/ace/Null_Barrier.h index 9b3bc16912a..513aa96d7a4 100644 --- a/ACE/ace/Null_Barrier.h +++ b/ACE/ace/Null_Barrier.h @@ -18,9 +18,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// All methods in this class are inline, so there is no -// need to import or export on Windows. -- CAE 12/18/2003 - /** * @class ACE_Null_Barrier * diff --git a/ACE/ace/Null_Condition.h b/ACE/ace/Null_Condition.h index e67f2a0bb41..31a2cbc9d16 100644 --- a/ACE/ace/Null_Condition.h +++ b/ACE/ace/Null_Condition.h @@ -16,8 +16,6 @@ #define ACE_NULL_CONDITION_H #include /**/ "ace/pre.h" -// All methods in this class are inline, so there is no -// need to import or export on Windows. -- CAE 12/18/2003 #include "ace/Null_Mutex.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/ACE/ace/Null_Mutex.h b/ACE/ace/Null_Mutex.h index 3fcb08629d0..4c0fb3eb713 100644 --- a/ACE/ace/Null_Mutex.h +++ b/ACE/ace/Null_Mutex.h @@ -16,12 +16,6 @@ #define ACE_NULL_MUTEX_H #include /**/ "ace/pre.h" -// All methods in this class are inline, so there is no -// need to import or export on Windows. -- CAE 12/18/2003 -// Update... leaving off the ACE_Export causes compile warnings in some -// cases with Microsoft Visual Studio .NET 2005, so I added the ACE_Export -// to these class declarations. Steve Huston, 12/8/2006. - #include "ace/os_include/os_errno.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) @@ -90,35 +84,7 @@ public: int lock_; // A dummy lock. }; -#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES) -/** - * @class ACE_Null_Mutex_Guard - * - * @brief This data structure is meant to be used within a method or - * function... It performs automatic aquisition and release of - * an ACE_Null_Mutex. - * - * This class is obsolete and should be replaced by - * ACE_Guard<ACE_Null_Mutex>. - */ -class ACE_Export ACE_Null_Mutex_Guard -{ -public: - ACE_Null_Mutex_Guard (ACE_Null_Mutex &) {} - ~ACE_Null_Mutex_Guard (void) {} - int remove (void) {return 0;} - int locked (void) {return 1;} - int acquire (void) {return 0;} - int tryacquire (void) {return 0;} - int release (void) {return 0:} - void dump (void) const {} - -private: - // = Prevent assignment and initialization. - void operator= (const ACE_Null_Mutex_Guard &); - ACE_Null_Mutex_Guard (const ACE_Null_Mutex_Guard &); -}; -#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */ +// FUZZ: disable check_for_ACE_Guard template <class ACE_LOCK> class ACE_Guard; @@ -206,6 +172,8 @@ public: void dump (void) const {} }; +// FUZZ: enable check_for_ACE_Guard + template <class T> class ACE_Malloc_Lock_Adapter_T; /** diff --git a/ACE/ace/Null_Semaphore.h b/ACE/ace/Null_Semaphore.h index 23650db7518..dbfcfb80df1 100644 --- a/ACE/ace/Null_Semaphore.h +++ b/ACE/ace/Null_Semaphore.h @@ -16,8 +16,6 @@ #define ACE_NULL_SEMAPHORE_H #include /**/ "ace/pre.h" -// All methods in this class are inline, so there is no -// need to import or export on Windows. -- CAE 12/18/2003 #include "ace/os_include/os_errno.h" #include "ace/os_include/sys/os_types.h" diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index f4ebb6ce500..ec257ba59b4 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -59,24 +59,17 @@ ACE_Thread_ID::to_string (char *thr_string) const ACE_OS::strcpy (fp, "u"); ACE_OS::sprintf (thr_string, format, - static_cast <unsigned> (thread_id_)); + static_cast <unsigned> (this->thread_id_)); #elif defined (DIGITAL_UNIX) ACE_OS::strcpy (fp, "u"); - ACE_OS::sprintf (thr_string, format, -# if defined (ACE_HAS_THREADS) - thread_id_ -# else - thread_id_ -# endif /* ACE_HAS_THREADS */ - ); + ACE_OS::sprintf (thr_string, format, this->thread_id_); #else - -# if defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS) +# if defined (ACE_MVS) || defined (ACE_TANDEM_T1248_PTHREADS) // MVS's pthread_t is a struct... yuck. So use the ACE 5.0 // code for it. ACE_OS::strcpy (fp, "u"); ACE_OS::sprintf (thr_string, format, thread_handle_); -# else +# else // Yes, this is an ugly C-style cast, but the // correct C++ cast is different depending on // whether the t_id is an integral type or a pointer @@ -87,8 +80,7 @@ ACE_Thread_ID::to_string (char *thr_string) const ACE_OS::sprintf (thr_string, format, (unsigned long) thread_handle_); -# endif /* ACE_MVS || ACE_TANDEM_T1248_PTHREADS */ - +# endif /* ACE_MVS || ACE_TANDEM_T1248_PTHREADS */ #endif /* ACE_WIN32 */ } @@ -664,7 +656,7 @@ TSS_Cleanup_Instance::TSS_Cleanup_Instance (Purpose purpose) ACE_NEW (condition_, ACE_Thread_Condition<ACE_Thread_Mutex> (*mutex_)); } - ACE_Guard<ACE_Thread_Mutex> guard(*mutex_); + ACE_GUARD (ACE_Thread_Mutex, m, *mutex_); if (purpose == CREATE) { @@ -1151,7 +1143,7 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) { return -1; } - + bool have_waiters = false; if (cv->waiters_ > 0) @@ -1163,13 +1155,13 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv) cv->was_broadcast_ = 1; have_waiters = true; } - + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) { // This is really bad, we have the lock but can't release it anymore return -1; } - + int result = 0; if (have_waiters) { @@ -1208,7 +1200,7 @@ ACE_OS::cond_destroy (ACE_cond_t *cv) int result = 0; if (ACE_OS::thread_mutex_destroy (&cv->waiters_lock_) != 0) result = -1; - + if (ACE_OS::sema_destroy (&cv->sema_) != 0) result = -1; @@ -1335,9 +1327,9 @@ ACE_OS::cond_wait (ACE_cond_t *cv, // Prevent race conditions on the <waiters_> count. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) return -1; - + ++cv->waiters_; - + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) return -1; @@ -1446,9 +1438,9 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // Prevent race conditions on the <waiters_> count. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) return -1; - + ++cv->waiters_; - + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) return -1; @@ -1509,7 +1501,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // Reacquire lock to avoid race conditions. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) return -1; - + --cv->waiters_; bool const last_waiter = cv->was_broadcast_ && cv->waiters_ == 0; @@ -1648,9 +1640,9 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, // Prevent race conditions on the <waiters_> count. if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) return -1; - + ++cv->waiters_; - + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) return -1; @@ -1721,7 +1713,7 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv, if (ACE_OS::event_signal (&cv->waiters_done_) != 0) return -1; } - + // We must always regain the <external_mutex>, even when errors // occur because that's the guarantee that we give to our callers. if (ACE_OS::thread_mutex_lock (external_mutex) != 0) @@ -1755,7 +1747,7 @@ ACE_OS::cond_wait (ACE_cond_t *cv, if (ACE_OS::thread_mutex_lock (&cv->waiters_lock_) != 0) return -1; ++cv->waiters_; - + if (ACE_OS::thread_mutex_unlock (&cv->waiters_lock_) != 0) return -1; diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl index 5ce9198d8d9..da68f286402 100644 --- a/ACE/ace/OS_NS_Thread.inl +++ b/ACE/ace/OS_NS_Thread.inl @@ -3600,7 +3600,7 @@ ACE_Thread_ID::ACE_Thread_ID (const ACE_Thread_ID &id) } ACE_INLINE -ACE_Thread_ID& +ACE_Thread_ID& ACE_Thread_ID::operator= (const ACE_Thread_ID &id) { if (this != &id) diff --git a/ACE/ace/OS_NS_poll.cpp b/ACE/ace/OS_NS_poll.cpp index e54f0944d61..9abf800da36 100644 --- a/ACE/ace/OS_NS_poll.cpp +++ b/ACE/ace/OS_NS_poll.cpp @@ -2,8 +2,6 @@ #include "ace/OS_NS_poll.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_poll.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/ACE/ace/OS_NS_sys_select.cpp b/ACE/ace/OS_NS_sys_select.cpp index 76209d3e571..fa0edb9ff62 100644 --- a/ACE/ace/OS_NS_sys_select.cpp +++ b/ACE/ace/OS_NS_sys_select.cpp @@ -2,8 +2,6 @@ #include "ace/OS_NS_sys_select.h" - - #if !defined (ACE_HAS_INLINED_OSCALLS) # include "ace/OS_NS_sys_select.inl" #endif /* ACE_HAS_INLINED_OSCALLS */ diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index 6fa4c34e15b..e88c714a97d 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -104,7 +104,7 @@ ACE_OS::bind (ACE_HANDLE handle, struct sockaddr *addr, int addrlen) ACE_UNUSED_ARG (addrlen); ACE_NOTSUP_RETURN (-1); #elif defined (ACE_VXWORKS) && (ACE_VXWORKS <= 0x640) - // VxWorks clears the sin_port member after a succesfull bind when + // VxWorks clears the sin_port member after a successful bind when // sin_addr != INADDR_ANY, so after the bind we do retrieve the // original address so that user code can safely check the addr // after the bind. See bugzilla 3107 for more details diff --git a/ACE/ace/Read_Buffer.h b/ACE/ace/Read_Buffer.h index cfa0dd0f791..fbf13ca9094 100644 --- a/ACE/ace/Read_Buffer.h +++ b/ACE/ace/Read_Buffer.h @@ -66,13 +66,13 @@ public: /** * Returns a pointer dynamically allocated with - * ACE_Allocator::malloc to data from the input stream up to (and + * ACE_Allocator::malloc() to data from the input stream up to (and * including) the @a terminator. If @a search is >= 0 then all * occurrences of the @a search value are substituted with the * @a replace value. The last of the byte of data is a 0, so that * @c strlen can be used on it. The caller is responsible for * freeing the pointer returned from this method using the - * ACE_Allocator::free. + * ACE_Allocator::free(). */ char *read (int terminator = EOF, int search = '\n', diff --git a/ACE/ace/Remote_Tokens.h b/ACE/ace/Remote_Tokens.h index 288d0ca454f..1d3ee52849c 100644 --- a/ACE/ace/Remote_Tokens.h +++ b/ACE/ace/Remote_Tokens.h @@ -41,7 +41,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * The Remote_Token_Proxy class implements the mechanisms for * distributed token operations. It is similar to the * ACE_Token_Proxy. - * = BUGS + * @todo * Distributed sleep_hooks have not been implemented. <owner_id> * is not implemented. */ @@ -56,8 +56,8 @@ public: /** * Same as Token_Proxy. @a name is the string uniquely identifying - * the token. <ignore_deadlock> can be 1 to disable deadlock - * notifications. <debug> prints debug messages. + * the token. @a ignore_deadlock can be 1 to disable deadlock + * notifications. @a debug prints debug messages. */ int open (const ACE_TCHAR *name, int ignore_deadlock = 0, @@ -120,10 +120,9 @@ public: virtual int release (ACE_Synch_Options &options = ACE_Synch_Options::synch); - /// Become interface compliant for ACE_Guard<>. This has no + /// Become interface compliant for our guards. This has no /// functionality. - virtual int remove (ACE_Synch_Options &options = - ACE_Synch_Options::synch); + virtual int remove (ACE_Synch_Options &options = ACE_Synch_Options::synch); /// Override the default to do nothing. virtual void token_acquired (ACE_TPQ_Entry *); diff --git a/ACE/ace/SOCK.h b/ACE/ace/SOCK.h index f78f693e3c1..f0841270e50 100644 --- a/ACE/ace/SOCK.h +++ b/ACE/ace/SOCK.h @@ -63,7 +63,7 @@ public: */ int close (void); - /// Return the local endpoint address in the referenced <ACE_Addr>. + /// Return the local endpoint address in the referenced ACE_Addr. /// Returns 0 if successful, else -1. int get_local_addr (ACE_Addr &) const; @@ -120,7 +120,7 @@ protected: /// Protected destructor. /** - * Not a virtual destructor. Protected destructor to prevent + * Not a virtual destructor. Protected destructor to prevent * operator delete() from being called through a base class ACE_SOCK * pointer/reference. */ diff --git a/ACE/ace/SOCK_Connector.cpp b/ACE/ace/SOCK_Connector.cpp index d9040f9b4e2..f45361473f7 100644 --- a/ACE/ace/SOCK_Connector.cpp +++ b/ACE/ace/SOCK_Connector.cpp @@ -81,11 +81,9 @@ ACE_SOCK_Connector::shared_connect_start (ACE_SOCK_Stream &new_stream, if (local_sap != ACE_Addr::sap_any) { sockaddr *laddr = reinterpret_cast<sockaddr *> (local_sap.get_addr ()); - int size = local_sap.get_size (); + int const size = local_sap.get_size (); - if (ACE_OS::bind (new_stream.get_handle (), - laddr, - size) == -1) + if (ACE_OS::bind (new_stream.get_handle (), laddr, size) == -1) { // Save/restore errno. ACE_Errno_Guard error (errno); @@ -148,9 +146,7 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream, #endif /* ACE_WIN32 */ } // Wait synchronously using timeout. - else if (this->complete (new_stream, - 0, - timeout) == -1) + else if (this->complete (new_stream, 0, timeout) == -1) error = errno; else return 0; @@ -177,7 +173,6 @@ ACE_SOCK_Connector::shared_connect_finish (ACE_SOCK_Stream &new_stream, } // Actively connect and produce a new ACE_SOCK_Stream if things go well... - int ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, const ACE_Addr &remote_sap, @@ -204,9 +199,7 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, reinterpret_cast<sockaddr *> (remote_sap.get_addr ()), remote_sap.get_size ()); - return this->shared_connect_finish (new_stream, - timeout, - result); + return this->shared_connect_finish (new_stream, timeout, result); } #if !defined (ACE_HAS_WINCE) @@ -242,9 +235,7 @@ ACE_SOCK_Connector::connect (ACE_SOCK_Stream &new_stream, remote_sap.get_size (), qos_params); - return this->shared_connect_finish (new_stream, - timeout, - result); + return this->shared_connect_finish (new_stream, timeout, result); } #endif // ACE_HAS_WINCE @@ -256,8 +247,7 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, const ACE_Time_Value *tv) { ACE_TRACE ("ACE_SOCK_Connector::complete"); - ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (), - tv); + ACE_HANDLE h = ACE::handle_timed_complete (new_stream.get_handle (), tv); // We failed to get connected. if (h == ACE_INVALID_HANDLE) { @@ -268,8 +258,7 @@ ACE_SOCK_Connector::complete (ACE_SOCK_Stream &new_stream, // then retry to see if it's a real failure. ACE_Time_Value time (0, ACE_NON_BLOCKING_BUG_DELAY); ACE_OS::sleep (time); - h = ACE::handle_timed_complete (new_stream.get_handle (), - tv); + h = ACE::handle_timed_complete (new_stream.get_handle (), tv); if (h == ACE_INVALID_HANDLE) { #endif /* ACE_WIN32 */ diff --git a/ACE/ace/SOCK_Connector.h b/ACE/ace/SOCK_Connector.h index 842a69c65bc..2cb7cbd3d1a 100644 --- a/ACE/ace/SOCK_Connector.h +++ b/ACE/ace/SOCK_Connector.h @@ -43,7 +43,6 @@ class ACE_Time_Value; class ACE_Export ACE_SOCK_Connector { public: - // = Initialization and termination methods. /// Default constructor. ACE_SOCK_Connector (void); @@ -249,7 +248,7 @@ public: int perms = 0); #endif // ACE_HAS_WINCE - /// Default dtor. + /// Default destructor. ~ACE_SOCK_Connector (void); // = Completion routine. diff --git a/ACE/ace/SOCK_Dgram_Mcast.h b/ACE/ace/SOCK_Dgram_Mcast.h index 48f1610ad20..a3c72714ff4 100644 --- a/ACE/ace/SOCK_Dgram_Mcast.h +++ b/ACE/ace/SOCK_Dgram_Mcast.h @@ -89,7 +89,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * Some platforms, such as pSoS, support only cardinal numbers as network * interface specifications; for these platforms, just give these numbers in * alphanumeric form and <subscribe> will convert them into numbers via - * <ACE_OS::atoi>. + * ACE_OS::atoi(). */ class ACE_Export ACE_SOCK_Dgram_Mcast : public ACE_SOCK_Dgram { @@ -202,13 +202,13 @@ public: * This method is optional; if not explicitly invoked, it is invoked by * the first <subscribe>, using the subscribed address/port# and network * interface parameters. - * The <mcast_addr> parameter defines the default send address/port# and + * The @a mcast_addr parameter defines the default send address/port# and * also the port# and, if the OPT_BINDADDR_YES option is used, * the multicast address that is bound to this socket. * If the <send_net_if> parameter != 0, it defines the network interface * used for all sends by this instance, otherwise the system "default" * interface is used. (The <send_net_if> parameter is ignored if this - * feature is not supported by the envriornment.) + * feature is not supported by the environment.) * The port# in <mcast_addr> may be 0, in which case a system-assigned * (ephemeral) port# is used for sending and receiving. * If @a reuse_addr != 0, the SO_REUSEADDR option and, if it is supported, @@ -327,7 +327,7 @@ private: int reuse_addr); /// Do subscription processing w/out updating the subscription list. - // (Layered method for <subscribe> processing). + /// (Layered method for <subscribe> processing). int subscribe_i (const ACE_INET_Addr &mcast_addr, int reuse_addr = 1, const ACE_TCHAR *net_if = 0); @@ -337,7 +337,7 @@ private: const ACE_TCHAR *net_if = 0); /// Do unsubscription processing w/out udpating subscription list. - // (Layered method for <unsubscribe> processing). + /// (Layered method for <unsubscribe> processing). int unsubscribe_i (const ACE_INET_Addr &mcast_addr, const ACE_TCHAR *net_if = 0); @@ -353,7 +353,6 @@ protected: int clear_subs_list (void); private: - /// Per-instance options.. int opts_; diff --git a/ACE/ace/Select_Reactor.h b/ACE/ace/Select_Reactor.h index 0a9b94a0746..2e8b67977d3 100644 --- a/ACE/ace/Select_Reactor.h +++ b/ACE/ace/Select_Reactor.h @@ -34,6 +34,7 @@ typedef ACE_Select_Reactor_T<ACE_Select_Reactor_Token> ACE_Select_Reactor; //@@ TAO_REACTOR_SPL_COMMENT_HOOK_END #if defined (ACE_MT_SAFE) && (ACE_MT_SAFE == 0) +// FUZZ: disable check_for_ACE_Guard /** * @class ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > * @@ -65,6 +66,7 @@ private: void operator= (const ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > &); }; +// FUZZ: enable check_for_ACE_Guard #endif /* ACE_MT_SAFE && ACE_MT_SAFE == 0 */ ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Service_Gestalt.h b/ACE/ace/Service_Gestalt.h index ce8f51bcc36..a73b3e6761b 100644 --- a/ACE/ace/Service_Gestalt.h +++ b/ACE/ace/Service_Gestalt.h @@ -67,15 +67,8 @@ class ACE_Svc_Conf_Param; * Service Config in particular. * */ -class ACE_Export ACE_Service_Gestalt +class ACE_Export ACE_Service_Gestalt : private ACE_Copy_Disabled { -private: - /// - /// Not implemented to enforce no copying - // - ACE_UNIMPLEMENTED_FUNC (ACE_Service_Gestalt(const ACE_Service_Gestalt&)) - ACE_UNIMPLEMENTED_FUNC (ACE_Service_Gestalt& operator=(const ACE_Service_Gestalt&)) - public: enum { @@ -512,8 +505,10 @@ private: size_t repo_begin_; ACE_TCHAR const * const name_; -# if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) +#if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0) +// FUZZ: disable check_for_ACE_Guard ACE_Guard< ACE_Recursive_Thread_Mutex > repo_monitor_; +// FUZZ: enable check_for_ACE_Guard #endif }; diff --git a/ACE/ace/Sig_Handler.cpp b/ACE/ace/Sig_Handler.cpp index 56832562107..d408b8ba839 100644 --- a/ACE/ace/Sig_Handler.cpp +++ b/ACE/ace/Sig_Handler.cpp @@ -71,7 +71,7 @@ ACE_Sig_Handler::sig_pending (void) ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, 0)); return ACE_Sig_Handler::sig_pending_ != 0; } @@ -83,7 +83,7 @@ ACE_Sig_Handler::sig_pending (int pending) ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock)); + ACE_GUARD (ACE_Recursive_Thread_Mutex, m, *lock)); ACE_Sig_Handler::sig_pending_ = pending; } @@ -94,7 +94,7 @@ ACE_Sig_Handler::handler (int signum) ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, 0)); if (ACE_Sig_Handler::in_range (signum)) return ACE_Sig_Handler::signal_handlers_[signum]; @@ -127,7 +127,7 @@ ACE_Sig_Handler::handler (int signum, ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, 0)); return ACE_Sig_Handler::handler_i (signum, new_sh); } @@ -185,7 +185,7 @@ ACE_Sig_Handler::register_handler (int signum, ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1)); return ACE_Sig_Handler::register_handler_i (signum, new_sh, @@ -206,7 +206,7 @@ ACE_Sig_Handler::remove_handler (int signum, ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1)); if (ACE_Sig_Handler::in_range (signum)) { @@ -221,7 +221,7 @@ ACE_Sig_Handler::remove_handler (int signum, return new_disp->register_action (signum, old_disp); } - return -1; + return -1; } // Master dispatcher function that gets called by a signal handler and @@ -270,8 +270,7 @@ ACE_Sig_Handler::dispatch (int signum, // dispatched. Therefore, to workaround this "feature" we // must re-register the <ACE_Event_Handler> with <signum> // explicitly. - ACE_Sig_Handler::register_handler_i (signum, - eh); + ACE_Sig_Handler::register_handler_i (signum, eh); #endif /* ACE_WIN32*/ } } @@ -345,7 +344,7 @@ ACE_Sig_Handlers::register_handler (int signum, ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1)); if (ACE_Sig_Handler::in_range (signum)) { @@ -474,7 +473,7 @@ ACE_Sig_Handlers::remove_handler (int signum, ACE_MT (ACE_Recursive_Thread_Mutex *lock = ACE_Managed_Object<ACE_Recursive_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_SIG_HANDLER_LOCK); - ACE_Guard<ACE_Recursive_Thread_Mutex> m (*lock)); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1)); if (ACE_Sig_Handler::in_range (signum)) { diff --git a/ACE/ace/Synch.h b/ACE/ace/Synch.h index 8a8b98dd342..30bb1fc9788 100644 --- a/ACE/ace/Synch.h +++ b/ACE/ace/Synch.h @@ -47,10 +47,6 @@ #include "ace/Thread_Semaphore.h" #include "ace/TSS_Adapter.h" -// Include the templates here. -// FUZZ: disable check_for_synch_include -#include "ace/Synch_T.h" - #if defined (ACE_LEGACY_MODE) # include "ace/File_Lock.h" # include "ace/Process_Semaphore.h" diff --git a/ACE/ace/Synch_T.cpp b/ACE/ace/Synch_T.cpp deleted file mode 100644 index 22ee08d4e0b..00000000000 --- a/ACE/ace/Synch_T.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// $Id$ - -#ifndef ACE_SYNCH_T_CPP -#define ACE_SYNCH_T_CPP - -#include "ace/Thread.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// FUZZ: disable check_for_synch_include -#include "ace/Synch_T.h" -#include "ace/Log_Msg.h" - -#include "ace/Lock_Adapter_T.cpp" -#include "ace/Reverse_Lock_T.cpp" -#include "ace/Guard_T.cpp" -#include "ace/TSS_T.cpp" -#include "ace/Condition_T.cpp" - -#endif /* ACE_SYNCH_T_CPP */ diff --git a/ACE/ace/Synch_T.h b/ACE/ace/Synch_T.h deleted file mode 100644 index edd7c6ba77e..00000000000 --- a/ACE/ace/Synch_T.h +++ /dev/null @@ -1,42 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file Synch_T.h - * - * $Id$ - * - * @author Douglas C. Schmidt <schmidt@uci.edu> - */ -//============================================================================= - -#ifndef ACE_SYNCH_T_H -#define ACE_SYNCH_T_H -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -// FUZZ: disable check_for_synch_include -#include "ace/Synch.h" - -#include "ace/Lock_Adapter_T.h" -#include "ace/Reverse_Lock_T.h" -#include "ace/Guard_T.h" -#include "ace/TSS_T.h" -#include "ace/Condition_T.h" -#include "ace/Synch_Traits.h" - -#if defined (ACE_TEMPLATES_REQUIRE_SOURCE) -#include "ace/Synch_T.cpp" -#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ - -#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) -#pragma implementation ("Synch_T.cpp") -#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ - -#include /**/ "ace/post.h" -#endif /* ACE_SYNCH_T_H */ diff --git a/ACE/ace/Synch_Traits.h b/ACE/ace/Synch_Traits.h index 086e29b1e63..1fe6d483692 100644 --- a/ACE/ace/Synch_Traits.h +++ b/ACE/ace/Synch_Traits.h @@ -38,8 +38,6 @@ class ACE_Condition_Thread_Mutex; class ACE_Condition_Recursive_Thread_Mutex; class ACE_Thread_Semaphore; -#if defined (ACE_HAS_TEMPLATE_TYPEDEFS) - /** * @class ACE_NULL_SYNCH * @@ -101,41 +99,6 @@ public: #define ACE_SYNCH_NULL_SEMAPHORE ACE_SYNCH::NULL_SEMAPHORE #define ACE_SYNCH_SEMAPHORE ACE_SYNCH::SEMAPHORE -#else /* !ACE_HAS_TEMPLATE_TYPEDEFS */ - -#if defined (ACE_HAS_OPTIMIZED_MESSAGE_QUEUE) -#define ACE_NULL_SYNCH ACE_Null_Mutex, ACE_Null_Condition, ACE_Null_Mutex -#define ACE_MT_SYNCH ACE_Thread_Mutex, ACE_Condition_Thread_Mutex, ACE_Thread_Semaphore -#else -#define ACE_NULL_SYNCH ACE_Null_Mutex, ACE_Null_Condition -#define ACE_MT_SYNCH ACE_Thread_Mutex, ACE_Condition_Thread_Mutex -#endif /* ACE_HAS_OPTIMIZED_MESSAGE_QUEUE */ - -#if defined (ACE_HAS_THREADS) - -#define ACE_SYNCH_MUTEX ACE_Thread_Mutex -#define ACE_SYNCH_NULL_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_RECURSIVE_MUTEX ACE_Recursive_Thread_Mutex -#define ACE_SYNCH_RW_MUTEX ACE_RW_Thread_Mutex -#define ACE_SYNCH_CONDITION ACE_Condition_Thread_Mutex -#define ACE_SYNCH_RECURSIVE_CONDITION ACE_Condition_Recursive_Thread_Mutex -#define ACE_SYNCH_SEMAPHORE ACE_Thread_Semaphore -#define ACE_SYNCH_NULL_SEMAPHORE ACE_Null_Semaphore - -#else /* ACE_HAS_THREADS */ - -#define ACE_SYNCH_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_NULL_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_RECURSIVE_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_RW_MUTEX ACE_Null_Mutex -#define ACE_SYNCH_CONDITION ACE_Null_Condition -#define ACE_SYNCH_RECURSIVE_CONDITION ACE_Null_Condition -#define ACE_SYNCH_SEMAPHORE ACE_Null_Semaphore -#define ACE_SYNCH_NULL_SEMAPHORE ACE_Null_Mutex - -#endif /* ACE_HAS_THREADS */ -#endif /* ACE_HAS_TEMPLATE_TYPEDEFS */ - // These are available on *all* platforms #define ACE_SYNCH_PROCESS_SEMAPHORE ACE_Process_Semaphore #define ACE_SYNCH_PROCESS_MUTEX ACE_Process_Mutex diff --git a/ACE/ace/TSS_T.cpp b/ACE/ace/TSS_T.cpp index 900c47d1415..5d081e2a17a 100644 --- a/ACE/ace/TSS_T.cpp +++ b/ACE/ace/TSS_T.cpp @@ -83,7 +83,6 @@ template <class TYPE> void ACE_TSS<TYPE>::dump (void) const { #if defined (ACE_HAS_DUMP) -// ACE_TRACE ("ACE_TSS<TYPE>::dump"); #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->keylock_.dump (); @@ -339,8 +338,6 @@ template <class ACE_LOCK> void ACE_TSS_Guard<ACE_LOCK>::dump (void) const { #if defined (ACE_HAS_DUMP) -// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::dump"); - ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("key_ = %d\n"), this->key_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); @@ -350,8 +347,6 @@ ACE_TSS_Guard<ACE_LOCK>::dump (void) const template <class ACE_LOCK> void ACE_TSS_Guard<ACE_LOCK>::init_key (void) { -// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::init_key"); - this->key_ = ACE_OS::NULL_key; ACE_Thread::keycreate (&this->key_, #if defined (ACE_HAS_THR_C_DEST) @@ -365,27 +360,24 @@ ACE_TSS_Guard<ACE_LOCK>::init_key (void) template <class ACE_LOCK> ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard (void) { -// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard"); this->init_key (); } template <class ACE_LOCK> int ACE_TSS_Guard<ACE_LOCK>::release (void) { -// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::release"); - - ACE_Guard<ACE_LOCK> *guard = 0; + Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast <ACE_TSS_Adapter *> (temp); - guard = static_cast <ACE_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_); + guard = static_cast <Guard_Type *> (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast <ACE_Guard<ACE_LOCK> *> (temp); + guard = static_cast <Guard_Type *> (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->release (); @@ -394,20 +386,18 @@ ACE_TSS_Guard<ACE_LOCK>::release (void) template <class ACE_LOCK> int ACE_TSS_Guard<ACE_LOCK>::remove (void) { -// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::remove"); - - ACE_Guard<ACE_LOCK> *guard = 0; + Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast <ACE_TSS_Adapter *> (temp); - guard = static_cast <ACE_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_); + guard = static_cast <Guard_Type *> (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast <ACE_Guard<ACE_LOCK> *> (temp); + guard = static_cast <Guard_Type *> (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->remove (); @@ -416,20 +406,18 @@ ACE_TSS_Guard<ACE_LOCK>::remove (void) template <class ACE_LOCK> ACE_TSS_Guard<ACE_LOCK>::~ACE_TSS_Guard (void) { -// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::~ACE_TSS_Guard"); - - ACE_Guard<ACE_LOCK> *guard = 0; + Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast <ACE_TSS_Adapter *> (temp); - guard = static_cast <ACE_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_); + guard = static_cast <Guard_Type *> (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast <ACE_Guard<ACE_LOCK> *> (temp); + guard = static_cast <Guard_Type *> (temp); #endif /* ACE_HAS_THR_C_DEST */ // Make sure that this pointer is NULL when we shut down... @@ -442,22 +430,17 @@ ACE_TSS_Guard<ACE_LOCK>::~ACE_TSS_Guard (void) template <class ACE_LOCK> void ACE_TSS_Guard<ACE_LOCK>::cleanup (void *ptr) { -// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::cleanup"); - // Destructor releases lock. - delete (ACE_Guard<ACE_LOCK> *) ptr; + delete (Guard_Type *) ptr; } template <class ACE_LOCK> ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard (ACE_LOCK &lock, bool block) { -// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard"); - this->init_key (); - ACE_Guard<ACE_LOCK> *guard = 0; + Guard_Type *guard = 0; ACE_NEW (guard, - ACE_Guard<ACE_LOCK> (lock, - block)); + Guard_Type (lock, block)); #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; @@ -475,20 +458,18 @@ ACE_TSS_Guard<ACE_LOCK>::ACE_TSS_Guard (ACE_LOCK &lock, bool block) template <class ACE_LOCK> int ACE_TSS_Guard<ACE_LOCK>::acquire (void) { -// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::acquire"); - - ACE_Guard<ACE_LOCK> *guard = 0; + Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast <ACE_TSS_Adapter *> (temp); - guard = static_cast <ACE_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_); + guard = static_cast <Guard_Type *> (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast <ACE_Guard<ACE_LOCK> *> (temp); + guard = static_cast <Guard_Type *> (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->acquire (); @@ -497,20 +478,18 @@ ACE_TSS_Guard<ACE_LOCK>::acquire (void) template <class ACE_LOCK> int ACE_TSS_Guard<ACE_LOCK>::tryacquire (void) { -// ACE_TRACE ("ACE_TSS_Guard<ACE_LOCK>::tryacquire"); - - ACE_Guard<ACE_LOCK> *guard = 0; + Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast <ACE_TSS_Adapter *> (temp); - guard = static_cast <ACE_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_); + guard = static_cast <Guard_Type *> (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast <ACE_Guard<ACE_LOCK> *> (temp); + guard = static_cast <Guard_Type *> (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->tryacquire (); @@ -520,44 +499,37 @@ template <class ACE_LOCK> ACE_TSS_Write_Guard<ACE_LOCK>::ACE_TSS_Write_Guard (ACE_LOCK &lock, bool block) { -// ACE_TRACE ("ACE_TSS_Write_Guard<ACE_LOCK>::ACE_TSS_Write_Guard"); - this->init_key (); - ACE_Guard<ACE_LOCK> *guard = 0; + Guard_Type *guard = 0; ACE_NEW (guard, - ACE_Write_Guard<ACE_LOCK> (lock, - block)); + Write_Guard_Type (lock, block)); #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; ACE_NEW (tss_adapter, ACE_TSS_Adapter ((void *) guard, ACE_TSS_Guard<ACE_LOCK>::cleanup)); - ACE_Thread::setspecific (this->key_, - (void *) tss_adapter); + ACE_Thread::setspecific (this->key_, (void *) tss_adapter); #else - ACE_Thread::setspecific (this->key_, - (void *) guard); + ACE_Thread::setspecific (this->key_, (void *) guard); #endif /* ACE_HAS_THR_C_DEST */ } template <class ACE_LOCK> int ACE_TSS_Write_Guard<ACE_LOCK>::acquire (void) { -// ACE_TRACE ("ACE_TSS_Write_Guard<ACE_LOCK>::acquire"); - - ACE_Write_Guard<ACE_LOCK> *guard = 0; + Write_Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast <ACE_TSS_Adapter *> (temp); - guard = static_cast <ACE_Write_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_); + guard = static_cast <Write_Guard_Type *> (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast <ACE_Write_Guard<ACE_LOCK> *> (temp); + guard = static_cast <Write_Guard_Type *> (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->acquire_write (); @@ -566,20 +538,18 @@ ACE_TSS_Write_Guard<ACE_LOCK>::acquire (void) template <class ACE_LOCK> int ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire (void) { -// ACE_TRACE ("ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire"); - - ACE_Write_Guard<ACE_LOCK> *guard = 0; + Write_Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast <ACE_TSS_Adapter *> (temp); - guard = static_cast <ACE_Write_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_); + guard = static_cast <Write_Guard_Type *> (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast <ACE_Write_Guard<ACE_LOCK> *> (temp); + guard = static_cast <Write_Guard_Type *> (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->tryacquire_write (); @@ -588,16 +558,12 @@ ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire (void) template <class ACE_LOCK> int ACE_TSS_Write_Guard<ACE_LOCK>::acquire_write (void) { -// ACE_TRACE ("ACE_TSS_Write_Guard<ACE_LOCK>::acquire_write"); - return this->acquire (); } template <class ACE_LOCK> int ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire_write (void) { -// ACE_TRACE ("ACE_TSS_Write_Guard<ACE_LOCK>::tryacquire_write"); - return this->tryacquire (); } @@ -605,7 +571,6 @@ template <class ACE_LOCK> void ACE_TSS_Write_Guard<ACE_LOCK>::dump (void) const { #if defined (ACE_HAS_DUMP) -// ACE_TRACE ("ACE_TSS_Write_Guard<ACE_LOCK>::dump"); ACE_TSS_Guard<ACE_LOCK>::dump (); #endif /* ACE_HAS_DUMP */ } @@ -613,13 +578,10 @@ ACE_TSS_Write_Guard<ACE_LOCK>::dump (void) const template <class ACE_LOCK> ACE_TSS_Read_Guard<ACE_LOCK>::ACE_TSS_Read_Guard (ACE_LOCK &lock, bool block) { -// ACE_TRACE ("ACE_TSS_Read_Guard<ACE_LOCK>::ACE_TSS_Read_Guard"); - this->init_key (); - ACE_Guard<ACE_LOCK> *guard = 0; + Guard_Type *guard = 0; ACE_NEW (guard, - ACE_Read_Guard<ACE_LOCK> (lock, - block)); + Read_Guard_Type (lock, block)); #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter; ACE_NEW (tss_adapter, @@ -636,20 +598,18 @@ ACE_TSS_Read_Guard<ACE_LOCK>::ACE_TSS_Read_Guard (ACE_LOCK &lock, bool block) template <class ACE_LOCK> int ACE_TSS_Read_Guard<ACE_LOCK>::acquire (void) { -// ACE_TRACE ("ACE_TSS_Read_Guard<ACE_LOCK>::acquire"); - - ACE_Read_Guard<ACE_LOCK> *guard = 0; + Read_Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast <ACE_TSS_Adapter *> (temp); - guard = static_cast <ACE_Read_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_); + guard = static_cast <Read_Guard_Type *> (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast <ACE_Read_Guard<ACE_LOCK> *> (temp); + guard = static_cast <Read_Guard_Type *> (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->acquire_read (); @@ -658,20 +618,18 @@ ACE_TSS_Read_Guard<ACE_LOCK>::acquire (void) template <class ACE_LOCK> int ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire (void) { -// ACE_TRACE ("ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire"); - - ACE_Read_Guard<ACE_LOCK> *guard = 0; + Read_Guard_Type *guard = 0; #if defined (ACE_HAS_THR_C_DEST) ACE_TSS_Adapter *tss_adapter = 0; void *temp = tss_adapter; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); tss_adapter = static_cast <ACE_TSS_Adapter *> (temp); - guard = static_cast <ACE_Read_Guard<ACE_LOCK> *> (tss_adapter->ts_obj_); + guard = static_cast <Read_Guard_Type *> (tss_adapter->ts_obj_); #else void *temp = guard; // Need this temp to keep G++ from complaining. ACE_Thread::getspecific (this->key_, &temp); - guard = static_cast <ACE_Read_Guard<ACE_LOCK> *> (temp); + guard = static_cast <Read_Guard_Type *> (temp); #endif /* ACE_HAS_THR_C_DEST */ return guard->tryacquire_read (); @@ -680,16 +638,12 @@ ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire (void) template <class ACE_LOCK> int ACE_TSS_Read_Guard<ACE_LOCK>::acquire_read (void) { -// ACE_TRACE ("ACE_TSS_Read_Guard<ACE_LOCK>::acquire_read"); - return this->acquire (); } template <class ACE_LOCK> int ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire_read (void) { -// ACE_TRACE ("ACE_TSS_Read_Guard<ACE_LOCK>::tryacquire_read"); - return this->tryacquire (); } @@ -697,7 +651,6 @@ template <class ACE_LOCK> void ACE_TSS_Read_Guard<ACE_LOCK>::dump (void) const { #if defined (ACE_HAS_DUMP) -// ACE_TRACE ("ACE_TSS_Read_Guard<ACE_LOCK>::dump"); ACE_TSS_Guard<ACE_LOCK>::dump (); #endif /* ACE_HAS_DUMP */ } diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h index edd85202e31..38f4c806749 100644 --- a/ACE/ace/TSS_T.h +++ b/ACE/ace/TSS_T.h @@ -76,7 +76,7 @@ class ACE_TSS_Adapter; * */ template <class TYPE> -class ACE_TSS +class ACE_TSS : private ACE_Copy_Disabled { public: /** @@ -212,9 +212,6 @@ protected: int ts_value (TYPE *new_ts_obj) const; # endif /* ACE_HAS_THR_C_DEST */ #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ - // = Disallow copying... - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_TSS<TYPE> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_TSS (const ACE_TSS<TYPE> &)) }; /** diff --git a/ACE/ace/Task_Ex_T.h b/ACE/ace/Task_Ex_T.h index 090ac7a18a0..66f7cd89893 100644 --- a/ACE/ace/Task_Ex_T.h +++ b/ACE/ace/Task_Ex_T.h @@ -58,7 +58,8 @@ template <ACE_SYNCH_DECL> class ACE_Module; * code is in action. */ template <ACE_SYNCH_DECL, class ACE_MESSAGE_TYPE> -class ACE_Task_Ex : public ACE_Task_Base +class ACE_Task_Ex : public ACE_Task_Base, + private ACE_Copy_Disabled { public: friend class ACE_Module<ACE_SYNCH_USE>; @@ -179,12 +180,6 @@ public: // Should be protected: /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; - -private: - - // = Disallow these operations. - ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE> &)) - ACE_UNIMPLEMENTED_FUNC (ACE_Task_Ex (const ACE_Task_Ex<ACE_SYNCH_USE, ACE_MESSAGE_TYPE> &)) }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/ace.mpc b/ACE/ace/ace.mpc index 046e7523f53..8f39934e9e4 100644 --- a/ACE/ace/ace.mpc +++ b/ACE/ace/ace.mpc @@ -348,7 +348,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, Stream_Modules.cpp String_Base.cpp Svc_Handler.cpp - Synch_T.cpp Refcountable_T.cpp TSS_T.cpp Task_Ex_T.cpp @@ -390,7 +389,6 @@ project(ACE) : ace_output, acedefaults, install, other, codecs, token, svcconf, recurse = 1 ACE_export.h - Array.h Bound_Ptr.h CE_Screen_Output.h Codeset_Symbols.h diff --git a/ACE/ace/ace_for_tao.mpc b/ACE/ace/ace_for_tao.mpc index 2aa33dbf9b1..6b14a7a1813 100644 --- a/ACE/ace/ace_for_tao.mpc +++ b/ACE/ace/ace_for_tao.mpc @@ -262,7 +262,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Stream_Modules.cpp String_Base.cpp Svc_Handler.cpp - Synch_T.cpp TSS_T.cpp Task_Ex_T.cpp Task_T.cpp @@ -300,7 +299,6 @@ project(ACE_FOR_TAO) : acedefaults, install, svcconf, uuid, versioned_namespace, Header_Files { ACE_export.h - Array.h Based_Pointer_Repository.h Bound_Ptr.h CORBA_macros.h diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h index 26f9d540f52..c66b180c155 100644 --- a/ACE/ace/config-openvms.h +++ b/ACE/ace/config-openvms.h @@ -141,7 +141,7 @@ #define ACE_LACKS_STRRECVFD 1 #define ACE_LACKS_T_ERRNO 1 -/* POSIX threads ompatibilities */ +/* POSIX threads compatibilities */ #define ACE_LACKS_RWLOCK_T 1 #define ACE_LACKS_PTHREAD_KILL 1 #define ACE_LACKS_THREAD_PROCESS_SCOPING 1 diff --git a/ACE/apps/Gateway/Peer/Peer.cpp b/ACE/apps/Gateway/Peer/Peer.cpp index d8da4010489..7d5a212f990 100644 --- a/ACE/apps/Gateway/Peer/Peer.cpp +++ b/ACE/apps/Gateway/Peer/Peer.cpp @@ -116,7 +116,7 @@ Peer_Handler::transmit_stdin (void) int result = 0; if (this->connection_id_ != -1) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (sizeof (Event)), @@ -551,7 +551,7 @@ Peer_Handler::await_connection_id (void) int Peer_Handler::subscribe (void) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (sizeof (Event)), diff --git a/ACE/apps/JAWS/server/HTTP_Helpers.cpp b/ACE/apps/JAWS/server/HTTP_Helpers.cpp index 083199e49b1..651171a8bcf 100644 --- a/ACE/apps/JAWS/server/HTTP_Helpers.cpp +++ b/ACE/apps/JAWS/server/HTTP_Helpers.cpp @@ -103,7 +103,7 @@ HTTP_Helper::HTTP_mktime (const char *httpdate) { #if !defined (ACE_HAS_REENTRANT_LIBC) - ACE_MT (ACE_Guard<ACE_SYNCH_MUTEX> g (HTTP_Helper::mutex_)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g, HTTP_Helper::mutex_, -1)); #endif /* NOT ACE_HAS_REENTRANT_LIBC */ return ACE_OS::mktime (&tms); @@ -115,7 +115,7 @@ HTTP_Helper::HTTP_date (void) { if (HTTP_Helper::date_string_ == 0) { - ACE_MT (ACE_Guard<ACE_SYNCH_MUTEX> m (HTTP_Helper::mutex_)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, m, HTTP_Helper::mutex_, 0)); if (HTTP_Helper::date_string_ == 0) { @@ -387,7 +387,7 @@ HTTP_Status_Code::instance (void) { if (HTTP_Status_Code::instance_ == 0) { - ACE_MT (ACE_Guard<ACE_SYNCH_MUTEX> g (lock_)); + ACE_MT (ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g, lock_, 0)); if (HTTP_Status_Code::instance_ == 0) { diff --git a/ACE/apps/JAWS/server/HTTP_Server.cpp b/ACE/apps/JAWS/server/HTTP_Server.cpp index 3ef96eda033..4e92ad3defc 100644 --- a/ACE/apps/JAWS/server/HTTP_Server.cpp +++ b/ACE/apps/JAWS/server/HTTP_Server.cpp @@ -228,7 +228,7 @@ Synch_Thread_Pool_Task::svc (void) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT("%p\n"), ACE_TEXT ("HTTP_Acceptor::accept")), -1); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (HTTP_Handler::MAX_REQUEST_SIZE + 1), -1); @@ -334,7 +334,7 @@ Thread_Per_Request_Task::open (void *) int Thread_Per_Request_Task::svc (void) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (HTTP_Handler::MAX_REQUEST_SIZE + 1), -1); //Synch_HTTP_Handler_Factory factory; diff --git a/ACE/apps/JAWS/server/JAWS_IO.cpp b/ACE/apps/JAWS/server/JAWS_IO.cpp index 4043193d2ee..01e331e8320 100644 --- a/ACE/apps/JAWS/server/JAWS_IO.cpp +++ b/ACE/apps/JAWS/server/JAWS_IO.cpp @@ -388,7 +388,7 @@ JAWS_Asynch_IO::send_message (const char *buffer, int length, int act) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW (mb, ACE_Message_Block (buffer, length)); if (mb == 0) diff --git a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp index a908c4147f1..e86e3667597 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Hash_T.cpp @@ -139,7 +139,7 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::bind (const EXT_ID &ext_id, if (this->hashtable_[hash_idx] == 0) { - ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g, this->lock_, -1); if (this->new_cachebucket (hash_idx) == -1) return -1; @@ -161,7 +161,7 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::trybind (const EXT_ID &ext_id, if (this->hashtable_[hash_idx] == 0) { - ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g, this->lock_, -1); if (this->new_cachebucket (hash_idx) == -1) return -1; @@ -185,7 +185,7 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::rebind (const EXT_ID &ext_id, if (this->hashtable_[hash_idx] == 0) { - ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g, this->lock_, -1); if (this->new_cachebucket (hash_idx) == -1) return -1; diff --git a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp index a4e54f693d5..96c0b4df63b 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Manager_T.cpp @@ -206,7 +206,7 @@ template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> ::GET_i (const KEY &key, JAWS_Cache_Object *&object) { - int result = this->hash_->find (key, object); + int const result = this->hash_->find (key, object); if (result == 0) this->TAKE (object); @@ -355,7 +355,7 @@ template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> ::GET (const KEY &key, JAWS_Cache_Object *&object) { - ACE_Read_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_); + ACE_READ_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, g,this->lock_, -1); return this->GET_i (key, object); } @@ -364,7 +364,7 @@ template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> ::PUT (const KEY &key, const void *data, size_t size, JAWS_Cache_Object *&obj) { - ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_); + ACE_WRITE_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, g,this->lock_, -1); return this->PUT_i (key, data, size, obj); } @@ -452,68 +452,34 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> if (obj == 0) return -1; -#if 0 - if (obj->size ()/1024 > this->maxobjsize_) - { - ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_); + ACE_WRITE_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, g, this->lock_, -1); - int result = obj->release (); - if (result == 0) + int result = obj->release (); + + if (result == 0) + { + if (obj->count () == 0) { - if (obj->count () == 0) - { - KEY *key = (KEY *) obj->internal (); -#ifdef ENTERA_VERBOSE_TRACE - cerr << "*** drop large unbinding: " << key << endl; -#endif - result = this->hash_->unbind (*key); - if (result == 0) - { - if (this->heap_->remove (obj->heap_item ()) == -1) - cerr << "*** drop large heap remove failed: " << endl; - this->factory_->destroy (obj); - delete key; - obj = 0; - result = 1; - } - else - cerr << "*** drop large hash unbind failed: " << key << endl; - } + KEY *key = (KEY *) obj->internal (); + this->factory_->destroy (obj); + delete key; + obj = 0; + result = 1; + } + else + { + result = this->DROP_i (obj); } - return result; } -#endif /* 0 */ - { - ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_); - - int result = obj->release (); - - if (result == 0) - { - if (obj->count () == 0) - { - KEY *key = (KEY *) obj->internal (); - this->factory_->destroy (obj); - delete key; - obj = 0; - result = 1; - } - else - { - result = this->DROP_i (obj); - } - } - - return result; - } + return result; } template <class KEY, class FACTORY, class HASH_FUNC, class EQ_FUNC> int JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC> ::FLUSH (void) { - ACE_Write_Guard<ACE_SYNCH_RW_MUTEX> g (this->lock_); + ACE_WRITE_GUARD_RETURN (ACE_SYNCH_RW_MUTEX, g, this->lock_, -1); return this->FLUSH_i (); } @@ -528,7 +494,7 @@ JAWS_Cache_Proxy<KEY, DATA, CACHE_MANAGER> if (this->manager_ == 0) this->manager_ = Cache_Manager_Singleton::instance (); - int result = this->manager_->GET (key, this->object_); + int const result = this->manager_->GET (key, this->object_); if (result == -1) this->object_ = 0; } diff --git a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp index 011f94182cd..34a91341e64 100644 --- a/ACE/apps/JAWS2/JAWS/Cache_Object.cpp +++ b/ACE/apps/JAWS2/JAWS/Cache_Object.cpp @@ -173,7 +173,7 @@ JAWS_Counted_Cache_Object::lock (void) unsigned int JAWS_Counted_Cache_Object::count_i (void) const { - ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g ,this->lock_, 0); return this->count_; } @@ -181,18 +181,18 @@ JAWS_Counted_Cache_Object::count_i (void) const int JAWS_Counted_Cache_Object::acquire_i (void) { - ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g ,this->lock_, 0); - this->new_count_++; + ++this->new_count_; return 0; } int JAWS_Counted_Cache_Object::release_i (void) { - ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g ,this->lock_, 0); - this->new_count_--; + --this->new_count_; this->count_ = this->new_count_; return 0; } diff --git a/ACE/apps/JAWS2/JAWS/Concurrency.cpp b/ACE/apps/JAWS2/JAWS/Concurrency.cpp index bc557137ac7..a4e3a57c36a 100644 --- a/ACE/apps/JAWS2/JAWS/Concurrency.cpp +++ b/ACE/apps/JAWS2/JAWS/Concurrency.cpp @@ -30,7 +30,7 @@ JAWS_Concurrency_Base::singleton_mb (void) { if (this->mb_acquired_ == 0) { - ACE_Guard<ACE_SYNCH_MUTEX> g(this->lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g, this->lock_, 0); if (this->mb_acquired_ == 0) { diff --git a/ACE/apps/JAWS2/JAWS/FILE.cpp b/ACE/apps/JAWS2/JAWS/FILE.cpp index 5467f50e606..4d89af85d4f 100644 --- a/ACE/apps/JAWS2/JAWS/FILE.cpp +++ b/ACE/apps/JAWS2/JAWS/FILE.cpp @@ -38,7 +38,7 @@ JAWS_FILE::mem_map (int length, { if (this->map_ == 0) { - ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g ,this->lock_, 0); if (this->map_ == 0) { diff --git a/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp b/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp index 4f0525a6f6d..adfd1feb63c 100644 --- a/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp +++ b/ACE/apps/JAWS2/JAWS/Jaws_IO.cpp @@ -562,7 +562,7 @@ JAWS_Asynch_IO::send_message (JAWS_IO_Handler *ioh, JAWS_Asynch_IO_Handler *aioh = dynamic_cast<JAWS_Asynch_IO_Handler *> (ioh); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW (mb, ACE_Message_Block (buffer, length)); if (mb == 0) diff --git a/ACE/apps/JAWS2/JAWS/Reaper.cpp b/ACE/apps/JAWS2/JAWS/Reaper.cpp index 6d1d5845cba..14883e33012 100644 --- a/ACE/apps/JAWS2/JAWS/Reaper.cpp +++ b/ACE/apps/JAWS2/JAWS/Reaper.cpp @@ -21,7 +21,7 @@ JAWS_Reaper::open (void *) { if (this->waiting_ == 0) { - ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g ,this->lock_, -1); if (this->waiting_ == 0) { if (this->activate () == -1) diff --git a/ACE/apps/JAWS3/jaws3/FILE.cpp b/ACE/apps/JAWS3/jaws3/FILE.cpp index ed4723962ea..4dbc6199b56 100644 --- a/ACE/apps/JAWS3/jaws3/FILE.cpp +++ b/ACE/apps/JAWS3/jaws3/FILE.cpp @@ -52,7 +52,7 @@ JAWS_FILE::mem_map (int length, if (this->map_ == 0) { - ACE_Guard<ACE_SYNCH_MUTEX> g (this->lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g, this->lock_, 0); if (this->map_ == 0) { diff --git a/ACE/apps/gperf/src/Options.cpp b/ACE/apps/gperf/src/Options.cpp index f6d7a9a7cfc..4521b82c8b5 100644 --- a/ACE/apps/gperf/src/Options.cpp +++ b/ACE/apps/gperf/src/Options.cpp @@ -261,15 +261,13 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) if (ACE_LOG_MSG->open (argv[0]) == -1) return -1; - //FUZZ: disable check_for_lack_ACE_OS - ACE_Get_Opt getopt (argc, argv, ACE_TEXT("abBcCdDe:Ef:F:gGhH:i:IJj:k:K:lL:mMnN:oOprs:S:tTvVZ:")); - //FUZZ: enable check_for_lack_ACE_OS + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("abBcCdDe:Ef:F:gGhH:i:IJj:k:K:lL:mMnN:oOprs:S:tTvVZ:")); argc_ = argc; argv_ = argv; int option_char; - while ((option_char = getopt ()) != -1) + while ((option_char = get_opt ()) != -1) { switch (option_char) { @@ -321,7 +319,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) // Allows user to provide keyword/attribute separator case 'e': { - delimiters_ = ACE_TEXT_ALWAYS_CHAR(getopt.opt_arg ()); + delimiters_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); break; } case 'E': @@ -333,7 +331,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) case 'f': { ACE_SET_BITS (option_word_, FAST); - iterations_ = ACE_OS::atoi (getopt.opt_arg ()); + iterations_ = ACE_OS::atoi (get_opt.opt_arg ()); if (iterations_ < 0) { ACE_ERROR ((LM_ERROR, "iterations value must not be negative, assuming 0\n")); @@ -453,13 +451,13 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) // Sets the name for the hash function. case 'H': { - hash_name_ = ACE_TEXT_ALWAYS_CHAR(getopt.opt_arg ()); + hash_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); break; } // Sets the initial value for the associated values array. case 'i': { - initial_asso_value_ = ACE_OS::atoi (getopt.opt_arg ()); + initial_asso_value_ = ACE_OS::atoi (get_opt.opt_arg ()); if (initial_asso_value_ < 0) ACE_ERROR ((LM_ERROR, "Initial value %d should be non-zero, ignoring and continuing.\n", @@ -477,7 +475,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) // Sets the jump value, must be odd for later algorithms. case 'j': { - jump_ = ACE_OS::atoi (getopt.opt_arg ()); + jump_ = ACE_OS::atoi (get_opt.opt_arg ()); if (jump_ < 0) ACE_ERROR_RETURN ((LM_ERROR, "Jump value %d must be a positive number.\n%r", @@ -501,7 +499,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) { const int BAD_VALUE = -1; int value; - Iterator expand (ACE_TEXT_ALWAYS_CHAR(getopt.opt_arg ()), + Iterator expand (ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()), 1, MAX_KEY_POS - 1, WORD_END, @@ -509,7 +507,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) EOS); // Use all the characters for hashing!!!! - if (*getopt.opt_arg () == '*') + if (*get_opt.opt_arg () == '*') option_word_ = (option_word_ & ~DEFAULTCHARS) | ALLCHARS; else { @@ -550,7 +548,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) // Make this the keyname for the keyword component field. case 'K': { - key_name_ = ACE_TEXT_ALWAYS_CHAR(getopt.opt_arg ()); + key_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); break; } // Create length table to avoid extra string compares. @@ -563,15 +561,15 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) case 'L': { option_word_ &= ~C; - if (!ACE_OS::strcmp (getopt.opt_arg (), ACE_TEXT("C++"))) + if (!ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT("C++"))) ACE_SET_BITS (option_word_, (CPLUSPLUS | ANSI)); - else if (!ACE_OS::strcmp (getopt.opt_arg (), ACE_TEXT("C"))) + else if (!ACE_OS::strcmp (get_opt.opt_arg (), ACE_TEXT("C"))) ACE_SET_BITS (option_word_, C); else { ACE_ERROR ((LM_ERROR, "unsupported language option %s, defaulting to C\n", - getopt.opt_arg ())); + get_opt.opt_arg ())); ACE_SET_BITS (option_word_, C); } break; @@ -597,13 +595,13 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) // Make generated lookup function name be.opt_arg () case 'N': { - function_name_ = ACE_TEXT_ALWAYS_CHAR(getopt.opt_arg ()); + function_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); break; } // Make fill_default be.opt_arg () case 'F': { - fill_default_ = ACE_TEXT_ALWAYS_CHAR(getopt.opt_arg ()); + fill_default_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); break; } // Order input by frequency of key set occurrence. @@ -636,7 +634,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) // Range of associated values, determines size of final table. case 's': { - size_ = ACE_OS::atoi (getopt.opt_arg ()); + size_ = ACE_OS::atoi (get_opt.opt_arg ()); if (abs (size_) > 50) ACE_ERROR ((LM_ERROR, "%d is excessive, did you really mean this?! (type %n -h for help)\n", @@ -647,11 +645,11 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) case 'S': { ACE_SET_BITS (option_word_, SWITCH); - total_switches_ = ACE_OS::atoi (getopt.opt_arg ()); + total_switches_ = ACE_OS::atoi (get_opt.opt_arg ()); if (total_switches_ <= 0) ACE_ERROR_RETURN ((LM_ERROR, "number of switches %s must be a positive number\n%r", - getopt.opt_arg (), + get_opt.opt_arg (), &Options::usage), -1); break; @@ -685,7 +683,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) // Set the class name. case 'Z': { - class_name_ = ACE_TEXT_ALWAYS_CHAR(getopt.opt_arg ()); + class_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ()); break; } default: @@ -697,16 +695,16 @@ Options::parse_args (int argc, ACE_TCHAR *argv[]) } - if (argv[getopt.opt_ind ()] && - ACE_OS::freopen (argv[getopt.opt_ind ()], + if (argv[get_opt.opt_ind ()] && + ACE_OS::freopen (argv[get_opt.opt_ind ()], ACE_TEXT("r"), stdin) == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open keyword file %p\n%r", - argv[getopt.opt_ind ()], + argv[get_opt.opt_ind ()], &Options::usage), -1); - if (getopt.opt_ind () + 1 < argc) + if (get_opt.opt_ind () + 1 < argc) ACE_ERROR_RETURN ((LM_ERROR, "Extra trailing arguments to %n.\n%r", usage), diff --git a/ACE/bin/fuzz.pl b/ACE/bin/fuzz.pl index 57077ad6f7c..47183ba8391 100755 --- a/ACE/bin/fuzz.pl +++ b/ACE/bin/fuzz.pl @@ -347,7 +347,6 @@ sub check_for_ACE_SYNCH_MUTEX () } if (/FUZZ\: enable check_for_ACE_SYNCH_MUTEX/) { $disable = 0; - next ITERATION; } if ($disable == 0 and /ACE_SYNCH_MUTEX/) { # It is okay to use ACE_SYNCH_MUTEX in ACE @@ -403,7 +402,6 @@ sub check_for_ACE_Thread_Mutex () } if (/FUZZ\: enable check_for_ACE_Thread_Mutex/) { $disable = 0; - next ITERATION; } if ($disable == 0 and /ACE_Thread_Mutex/) { # It is okay to use ACE_Thread_Mutex in ACE @@ -438,13 +436,19 @@ sub check_for_ACE_Guard () if (/FUZZ\: disable check_for_ACE_Guard/) { $disable = 1; } - if (/FUZZ\: enable check_for_ACE_Thread_Mutex/) { + if (/FUZZ\: enable check_for_ACE_Guard/) { $disable = 0; - next ITERATION; + next; } if ($disable == 0 and /ACE_Guard/) { print_error ("$file:$.: found ACE_Guard, use ACE_GUARD"); } + if ($disable == 0 and /ACE_Read_Guard/) { + print_error ("$file:$.: found ACE_Read_Guard, use ACE_READ_GUARD"); + } + if ($disable == 0 and /ACE_Write_Guard/) { + print_error ("$file:$.: found ACE_Write_Guard, use ACE_WRITE_GUARD"); + } } close (FILE); } @@ -1984,7 +1988,6 @@ sub check_for_TAO_Local_RefCounted_Object () } if (/FUZZ\: enable check_for_TAO_Local_RefCounted_Object/) { $disable = 0; - next ITERATION; } if ($disable == 0 and /TAO_Local_RefCounted_Object/) { @@ -2167,6 +2170,8 @@ if ($opt_t) { print "--------------------Configuration: Fuzz - Level ",$opt_l, "--------------------\n"; +check_for_lack_ACE_OS () if ($opt_l >= 6); +check_for_ACE_Guard () if ($opt_l >= 1); check_for_generated_headers () if ($opt_l >= 6); check_for_bad_run_test () if ($opt_l >= 5); check_for_deprecated_macros () if ($opt_l >= 1); @@ -2183,7 +2188,6 @@ check_for_newline () if ($opt_l >= 1); check_for_ACE_Thread_Mutex () if ($opt_l >= 1); check_for_ACE_SYNCH_MUTEX () if ($opt_l >= 1); check_for_tab () if ($opt_l >= 1); -check_for_lack_ACE_OS () if ($opt_l >= 6); check_for_exception_spec () if ($opt_l >= 1); check_for_NULL () if ($opt_l >= 1); check_for_inline () if ($opt_l >= 2); @@ -2209,7 +2213,6 @@ check_for_TAO_Local_RefCounted_Object () if ($opt_l >= 1); check_for_ORB_init () if ($opt_l >= 1); check_for_export_file () if ($opt_l >= 6); check_for_trailing_whitespace () if ($opt_l >= 6); -check_for_ACE_Guard () if ($opt_l >= 8); print "\nfuzz.pl - $errors error(s), $warnings warning(s)\n"; diff --git a/ACE/bin/generate_doxygen.pl b/ACE/bin/generate_doxygen.pl index 5728ebba8ae..e436f383308 100755 --- a/ACE/bin/generate_doxygen.pl +++ b/ACE/bin/generate_doxygen.pl @@ -98,11 +98,11 @@ if (!-r "$ACE_ROOT/ace/config.h") { $wrote_configh = 1; } -&generate_doxy_files ('ACE', " $ACE_ROOT", @ACE_DOCS) if (!$exclude_ace); -&generate_doxy_files ('TAO', " $TAO_ROOT", @TAO_DOCS) if (!$exclude_tao); -&generate_doxy_files ('CIAO', " $CIAO_ROOT", @CIAO_DOCS) if (!$exclude_ciao); -&generate_doxy_files ('DANCE'," $DANCE_ROOT", @DANCE_DOCS) if (!$exclude_dance); -&generate_doxy_files ('DDS', "$DDS_ROOT", @DDS_DOCS) if $dds; +&generate_doxy_files ('ACE', " $ACE_ROOT", " $ACE_ROOT/VERSION", @ACE_DOCS) if (!$exclude_ace); +&generate_doxy_files ('TAO', " $TAO_ROOT", " $TAO_ROOT/VERSION" @TAO_DOCS) if (!$exclude_tao); +&generate_doxy_files ('CIAO', " $CIAO_ROOT", " $CIAO_ROOT/VERSION" @CIAO_DOCS) if (!$exclude_ciao); +&generate_doxy_files ('DANCE'," $DANCE_ROOT", " $CIAO_ROOT/VERSION" @DANCE_DOCS) if (!$exclude_dance); +&generate_doxy_files ('DDS', "$DDS_ROOT", " $DDS_ROOT/VERSION" @DDS_DOCS) if $dds; unlink "$ACE_ROOT/ace/config.h" if $wrote_configh; @@ -154,8 +154,8 @@ sub generate_doxy_files { my $KIT = shift; my $ROOT_DIR = shift; + my $VERSION_FILE= shift; my @DOCS = @_; - my $VERSION_FILE = "$ROOT_DIR/VERSION"; my $VERSION = 'Snapshot ('. POSIX::strftime("%Y/%m/%d-%H:%M", localtime) @@ -301,7 +301,7 @@ sub get_versions () { my ($major_version, $minor_version, $beta_version); open (VERSION, '<'.$VERSION_FILE) || - die "$0: unable to open VERSION\n"; + die "$0: unable to open $VERSION_FILE\n"; while (<VERSION>) { chomp; if (/$KIT version (\d+)\.(\d+)\.(\d+)/) { diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py index b45f2cdff24..571ff650f44 100755 --- a/ACE/bin/make_release.py +++ b/ACE/bin/make_release.py @@ -866,23 +866,10 @@ def generate_workspaces (stage_dir): mpc_option += ' -relative CIAO_ROOT=' + stage_dir + '/ACE_wrappers/TAO/CIAO ' mpc_option += ' -relative DANCE_ROOT=' + stage_dir + '/ACE_wrappers/TAO/CIAO/DAnCE ' - static_vc8_option = ' -static -name_modifier *_vc8_Static -apply_project -exclude TAO/CIAO ' - static_vc8_option += mpc_option - - static_vc9_option = ' -static -name_modifier *_vc9_Static -apply_project -exclude TAO/CIAO ' - static_vc9_option += mpc_option - + vc10_option = ' -name_modifier *_vc10 ' vc9_option = ' -name_modifier *_vc9 ' vc8_option = ' -name_modifier *_vc8 ' - # Build option string for VC8 platforms - ce_option = ' -name_modifier *_vc8_WinCE -features "uses_wchar=1,wince=1" ' - ce_option += ' -value_template platforms+=\'"Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"\' ' - ce_option += ' -value_template platforms+=\'"Windows Mobile 5.0 Smartphone SDK (ARMV4I)"\' ' - ce_option += ' -value_template platforms+=\'"Windows Mobile 6 Standard SDK (ARMV4I)"\' ' - ce_option += ' -value_template platforms+=\'"Windows Mobile 6 Professional SDK (ARMV4I)"\' ' - ce_option += ' -exclude TAO/CIAO ' - redirect_option = str () if not opts.verbose: redirect_option = " >> ../mpc.log 2>&1" @@ -894,23 +881,17 @@ def generate_workspaces (stage_dir): print "\tGenerating GNUmakefiles...." ex (mpc_command + " -type gnuace " + exclude_option + mpc_option + redirect_option) + print "\tGenerating VC10 solutions..." + ex (mpc_command + " -type vc10 " + mpc_option + vc10_option + redirect_option) + print "\tGenerating VC9 solutions..." ex (mpc_command + " -type vc9 " + mpc_option + vc9_option + redirect_option) print "\tGenerating VC8 solutions..." ex (mpc_command + " -type vc8 " + mpc_option + vc8_option + redirect_option) - print "\tGenerating VC8 Windows CE solutions..." - ex (mpc_command + " -type vc8 " + mpc_option + ce_option + redirect_option) - - print "\tGenerating VC8 Static solutions" - ex (mpc_command + " -type vc8 " + static_vc8_option + redirect_option) - - print "\tGenerating VC9 Static solutions" - ex (mpc_command + " -type vc9 " + static_vc9_option + redirect_option) - print "\tCorrecting permissions for all generated files..." - ex ("find ./ -name '*.vc[p,w]' -or -name '*.bmak' -or -name '*.vcproj' -or -name '*.sln' -or -name 'GNUmake*' | xargs chmod 0644") + ex ("find ./ -name '*.vc[p,w]' -or -name '*.bmak' -or -name '*.vcproj' -or -name '*.sln' -or -name '*.vcxproj' -or -name '*.filters' -or -name 'GNUmake*' | xargs chmod 0644") def create_kit (): """ Creates kits """ diff --git a/ACE/debian/changelog b/ACE/debian/changelog index 3c557761b45..cb759272ea6 100644 --- a/ACE/debian/changelog +++ b/ACE/debian/changelog @@ -1,3 +1,10 @@ +ace (5.8.2-1) unstable; urgency=low + + [ Johnny Wilemsen ] + * New upstream release + + -- Johnny Willemsen <jwillemsen@remedy.nl> Mon, 4 Sep 2010 20:00:00 +0100 + ace (5.7.7-1) unstable; urgency=low [ Marek Brudka ] @@ -8,7 +15,7 @@ ace (5.7.7-1) unstable; urgency=low * Added PerlACE to mpc-ace. This should resolve #522557 * Replaced find [C,S,A].[h,inl] by 2-pass mpc generation * Remove obsolete patches - + -- Marek Brudka <mbrudka@aster.pl> Sat, 27 Mar 2010 20:00:00 +0100 ace (5.7.5-2) unstable; urgency=low @@ -58,9 +65,9 @@ ace (5.7.5-1) unstable; urgency=low * fixed fidone once again * created gperf-ace-5.7.5 and gperf-ace-dev package for gperf runtime libraries * included number of runtime and static libraries with headers (Monitor, ZIOP, ETCL, Catior) to libtao-orbsvcs-* packages - * renamed split-cpp to split-cpp.pl in libace-dev to follow the upstream + * renamed split-cpp to split-cpp.pl in libace-dev to follow the upstream conventions - * renamed utilities (ns{add,del,list> to tao_ns{add,del,list}) in tao-utils + * renamed utilities (ns{add,del,list> to tao_ns{add,del,list}) in tao-utils to follow the upstream changes * removed permission fixes for example in debian/rules as there is nothing to fix * created libace_gperf runtime and devel libraries @@ -91,7 +98,7 @@ ace (5.6.3-6) unstable; urgency=low [ Pau Garcia i Quiles ] * Add new patches: - Remove duplicate files from .mpc files so that Makefile.am files do - not have duplicates + not have duplicates - Run autoupdate and autoreconf in the ACE and TAO directories in order to update from libtool 1.5 (what upstream uses) to libtool 2.2 @@ -332,9 +339,9 @@ ace (5.4.7-6) unstable; urgency=low * debian/patches/16-g++4-visibility-tweaks.dpatch: Backport upstream tweaks for g++ 4 visibility feature and disable visibility hiding for now. (Closes: #324271). - * debian/rules: g++ 4.0.2 was ICE'ing on #pragma once. This is no + * debian/rules: g++ 4.0.2 was ICE'ing on #pragma once. This is no longer true as of g++-4.0_4.0.2-4, so we can use g++4 again. For the - record, another possible fix was to #define ACE_LACKS_PRAGMA_ONCE in + record, another possible fix was to #define ACE_LACKS_PRAGMA_ONCE in `$ACE_ROOT/ace/config.h`. * Add `c2a` suffix to all libs for libstdc++ allocator change. (Closes: #339142). @@ -385,7 +392,7 @@ ace (5.4.7-1) unstable; urgency=low -- Konstantinos Margaritis <markos@debian.org> Fri, 12 Aug 2005 12:45:13 +0300 ace (5.4.2.1.0-4) unstable; urgency=high - + * Thomas Girard <thomas.g.girard@free.fr> - debian/control: o libacexml-dev depends on libace-dev. @@ -396,7 +403,7 @@ ace (5.4.2.1.0-4) unstable; urgency=high reported by lintian. - debian/libciao-dev.install: add missing .idl and .pidl files. (Closes: #307258) - + -- Thomas Girard <thomas.g.girard@free.fr> Mon, 2 May 2005 19:30:01 +0200 ace (5.4.2.1.0-3) unstable; urgency=high @@ -490,9 +497,9 @@ ace (5.4.2.1-1) unstable; urgency=low * Konstantinos Margaritis - Fixed missed path for libACE.so.5.4.2 in dh_shlibdeps - Fixed incorrect timestamp of original archive (1970 etc). - + -- Konstantinos Margaritis <markos@debian.org> Thu, 2 Sep 2004 23:04:56 +0200 - + ace (5.4.0.1-1.1) unstable; urgency=low * Fixed ACE_NDEBUG configuration of ACE. (Closes: #242881) @@ -558,7 +565,7 @@ ace (5.3.1-7) unstable; urgency=low ace (5.3.1-6) unstable; urgency=low - * Added the ORB services .idl files that were left out from the + * Added the ORB services .idl files that were left out from the libtao-orbsvcs-dev package. (Closes: #213568) -- Konstantinos Margaritis <markos@debian.org> Sun, 5 Oct 2003 12:31:21 +0300 @@ -584,7 +591,7 @@ ace (5.3.1-3) unstable; urgency=low * Updated to new standards version 3.6.1 * Fixed the section of a couple of packages. - * Now the getrlimit, etc functions are always defined + * Now the getrlimit, etc functions are always defined as ints. g++ 3.x does not complain anymore (Closes: #104681). -- Konstantinos Margaritis <markos@debian.org> Tue, 16 Sep 2003 10:31:03 +0300 @@ -599,7 +606,7 @@ ace (5.3.1-2) unstable; urgency=low * Full doxygen documentation not included due to size concerns. (Closes: #108749). * tao-config included in libtao-dev. (Closes: #159234). - * All -dev packages carry their respective examples in full and + * All -dev packages carry their respective examples in full and uncompressed. (Closes: #52145, #76967). * libACE.a is compiled with thread support enabled. (Closes: #126717). dbbalancer now builds successfully with -static. @@ -640,7 +647,7 @@ ace (5.2.4-1.2) unstable; urgency=low ace (5.2.4-1.1) unstable; urgency=low - * gcc-3.2 transition, NMU patch by Andreas Metzler <ametzler@debian.org> + * gcc-3.2 transition, NMU patch by Andreas Metzler <ametzler@debian.org> * (Closes: #188328) -- Konstantinos Margaritis <markos@debian.org> Fri, 11 Apr 2003 23:25:38 +0200 @@ -710,7 +717,7 @@ ace (5.1.8-5) unstable; urgency=low 5.0 debian packages, since both sets of packages have files with the same name. libace5.1-dev also conflicts with libace4.6-dev. (#74031) * Added xlib6g-dev to the list of build dependencies. The X11 libraries - aren't strictly necessary to build ACE, but the Debian packages enable + aren't strictly necessary to build ACE, but the Debian packages enable ACE's XtReactor support. * Updated `README.Debian'. The Debian ACE packages are no longer built using experimental ACE Configuration Project distributions. They are diff --git a/ACE/debian/control b/ACE/debian/control index 9d93cb61c46..d0afd50b6e7 100644 --- a/ACE/debian/control +++ b/ACE/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org> Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Pau Garcia i Quiles <pgquiles@elpauer.org> -Build-Depends: debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), libfox-1.6-dev, zlib1g-dev, libzzip-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz +Build-Depends: debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz Standards-Version: 3.8.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-ace/trunk Vcs-Browser: http://svn.debian.org/wsvn/pkg-ace/trunk @@ -54,7 +54,7 @@ Architecture: any Section: libdevel Depends: libace-5.8.2 (= ${binary:Version}), ${misc:Depends} Suggests: libace-doc, libtao-dev, pkg-config -Replaces: mpc-ace (<< 5.6.3-4) +#Replaces: mpc-ace (<< 5.6.3-4) Description: C++ network programming framework development files This package contains the header files and static library for the ACE framework. @@ -107,9 +107,9 @@ Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: ACE transactional multicast library - The TMCast library is a transaction multicast protocol implementation. + The TMCast library is a transaction multicast protocol implementation. . - Each message is delivered to multicast group members as a transaction: + Each message is delivered to multicast group members as a transaction: an atomic, consistent and isolated action. Package: libace-tmcast-dev @@ -308,7 +308,7 @@ Architecture: any Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: ACE based CORBA ORB core libraries - The ACE ORB (TAO) is an open-source Common Object Request Broker + The ACE ORB (TAO) is an open-source Common Object Request Broker Architecture (CORBA) 2.x-compliant Object Request Broker (ORB). It supports real-time extensions. . diff --git a/ACE/debian/copyright b/ACE/debian/copyright index 891512b3683..82e997d96c1 100644 --- a/ACE/debian/copyright +++ b/ACE/debian/copyright @@ -5,6 +5,7 @@ It is now maintained by: Brian Nelson <pyro@debian.org> Konstantinos Margaritis <markos@debian.org> Thomas Girard <thomas.g.girard@free.fr> + Johnny Willemsen <jwillemsen@remedy.nl> It was downloaded from: <http://download.dre.vanderbilt.edu/> @@ -15,7 +16,7 @@ Copyright: © 1993-2008 Douglas C. Schmidt and his research group at License: other-BSD Copyright and Licensing Information for ACE(TM), TAO(TM), CIAO(TM), and CoSMIC(TM) - + [1]ACE(TM), [2]TAO(TM), [3]CIAO(TM), and [4]CoSMIC(TM) (henceforth referred to as "DOC software") are copyrighted by [5]Douglas C. Schmidt and his [6]research group at [7]Washington University, @@ -28,7 +29,7 @@ License: other-BSD include this copyright statement along with any code built using DOC software that you release. No copyright statement needs to be provided if you just ship binary executables of your software products. - + You can use DOC software in commercial and/or binary software releases and are under no obligation to redistribute any of your source code that is built using DOC software. Note, however, that you may not do @@ -39,7 +40,7 @@ License: other-BSD software in your software, though we encourage you to let [10]us know so we can promote your project in the [11]DOC software success stories. - + The [12]ACE, [13]TAO, [14]CIAO, and [15]CoSMIC web sites are maintained by the [16]DOC Group at the [17]Institute for Software Integrated Systems (ISIS) and the [18]Center for Distributed Object @@ -57,7 +58,7 @@ License: other-BSD modification of such Submissions is entirely at the discretion of the moderators of the open-source DOC software projects or their designees. - + Submissions are provided by the submitter ``as is'' with no warranties whatsoever, including any warranty of merchantability, noninfringement of third party intellectual property, or fitness for any particular @@ -75,13 +76,13 @@ License: other-BSD University, UC Irvine, or Vanderbilt University, their employees, or students be liable for any lost revenue or profits or other special, indirect and consequential damages. - + DOC software is provided with no support and without any obligation on the part of Washington University, UC Irvine, Vanderbilt University, their employees, or students to assist in its use, correction, modification, or enhancement. A [19]number of companies around the world provide commercial support for DOC software, however. - + DOC software is Y2K-compliant, as long as the underlying OS platform is Y2K-compliant. Likewise, DOC software is compliant with the new US daylight savings rule passed by Congress as "The Energy Policy Act of @@ -90,7 +91,7 @@ License: other-BSD obtains time/date and calendaring information from operating systems users will not be affected by the new DST rules as long as they upgrade their operating systems accordingly. - + The names ACE(TM), TAO(TM), CIAO(TM), CoSMIC(TM), Washington University, UC Irvine, and Vanderbilt University, may not be used to endorse or promote products or services derived from this source @@ -101,15 +102,15 @@ License: other-BSD Vanderbilt University appear in their names, without express written permission from Washington University, UC Irvine, and Vanderbilt University. - + If you have any suggestions, additions, comments, or questions, please let [20]me know. - + [21]Douglas C. Schmidt _________________________________________________________________ Back to the [22]ACE home page. - + References 1. http://www.cs.wustl.edu/~schmidt/ACE.html 2. http://www.cs.wustl.edu/~schmidt/TAO.html @@ -145,7 +146,7 @@ Copyright: © 2003-2006 OCI. St. Louis MO USA License: other-BSD MPC (Licensed Product) is protected by copyright, and is distributed under the following terms. - + MPC (Make, Project and workspace Creator) is an open source tool, developed by OCI and written in Perl. It is designed to generate a variety of tool specific project files from a common baseline. Through the powerful @@ -157,44 +158,44 @@ License: other-BSD usually experienced by developer groups, by replacing it with a singular robust build environment, and an active community of users committed to its evolution. - + Since MPC is open source and free of licensing fees, you are free to use, modify, and distribute the source code, as long as you include this copyright statement. - + In particular, you can use MPC to build proprietary software and are under no obligation to redistribute any of your source code that is built using MPC. Note, however, that you may not do anything to the MPC code, such as copyrighting it yourself or claiming authorship of the MPC code, that will prevent MPC from being distributed freely using an open source development model. - + Warranty - + LICENSED PRODUCT IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - + Support - + LICENSED PRODUCT IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY OBLIGATION ON THE PART OF OCI OR ANY OF ITS SUBSIDIARIES OR AFFILIATES TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT. - + Support may be available from OCI to users who have agreed to a support contract. - + Liability - + OCI OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY LICENSED PRODUCT OR ANY PART THEREOF. - + IN NO EVENT WILL OCI OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF OCI HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - + MPC copyright OCI. St. Louis MO USA, 2003-2006 Files: ACE_wrappers/contrib/minizip/*.[ch] @@ -203,11 +204,11 @@ License: ZLIB This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. - + Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be @@ -223,27 +224,27 @@ License: other-BSD express or implied warranty. In no event will the author or contributors be held liable for any damages arising from the use of this software or documentation. - + Permission is granted to anyone to use this software or documentation for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: - + 1. The origin of this software or documentation must not be misrepresented; you must not claim that you wrote the original software or documentation. If you use this software or documentation in a product, an acknowledgment in the product documentation would be appreciated but is not required. - + 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software or documentation. Altered source versions may be contributed back to the author to be - integrated into the original software or documentation at the + integrated into the original software or documentation at the author's discretion. - + 3. Neither this notice or reference to it nor any copyright, author or - contributor clause may be removed from or altered in any software + contributor clause may be removed from or altered in any software source distribution or documentation covered by this license. - + 4. Neither the name of the author, nor the names of contributors may be used to endorse or promote products derived from this software or documentation without specific prior written permission. @@ -255,13 +256,13 @@ Files: ACE_wrappers/TAO/TAO_IDL/* Copyright: © 1992-1995 Sun Micosystems, Inc License: other COPYRIGHT - + Copyright 1992, 1993, 1994 Sun Microsystems, Inc. Printed in the United States of America. All Rights Reserved. - + This product is protected by copyright and distributed under the following license restricting its use. - + The Interface Definition Language Compiler Front End (CFE) is made available for your use provided that you include this license and copyright notice on all media and documentation and the software @@ -271,49 +272,49 @@ License: other not authorized to license or distribute it to anyone else except as part of a product or program developed by you or with the express written consent of Sun Microsystems, Inc. ("Sun"). - + The names of Sun Microsystems, Inc. and any of its subsidiaries or affiliates may not be used in advertising or publicity pertaining to distribution of Interface Definition Language CFE as permitted herein. - + This license is effective until terminated by Sun for failure to comply with this license. Upon termination, you shall destroy or return all code and documentation for the Interface Definition Language CFE. - + INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - + INTERFACE DEFINITION LANGUAGE CFE IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY OBLIGATION ON THE PART OF Sun OR ANY OF ITS SUBSIDIARIES OR AFFILIATES TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT. - + SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY INTERFACE DEFINITION LANGUAGE CFE OR ANY PART THEREOF. - + IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - + Use, duplication, or disclosure by the government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR 52.227-19. - + Sun, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. - - SunSoft, Inc. - 2550 Garcia Avenue + + SunSoft, Inc. + 2550 Garcia Avenue Mountain View, California 94043 - + NOTE: - + SunOS, SunSoft, Sun, Solaris, Sun Microsystems or the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. @@ -341,68 +342,68 @@ License: other This notice applies to all files in this software distribution that were originally derived from SunSoft IIOP code (these files contain Sun Microsystems copyright notices). - + COPYRIGHT AND LICENSING ----------------------- - + Copyright 1995 Sun Microsystems, Inc. Printed in the United States of America. All Rights Reserved. - + This software product (LICENSED PRODUCT), implementing the Object Management Group's "Internet Inter-ORB Protocol", is protected by copyright and is distributed under the following license restricting its use. Portions of LICENSED PRODUCT may be protected by one or more U.S. or foreign patents, or pending applications. - + LICENSED PRODUCT is made available for your use provided that you include this license and copyright notice on all media and documentation and the software program in which this product is incorporated in whole or part. - + You may copy, modify, distribute, or sublicense the LICENSED PRODUCT without charge as part of a product or software program developed by you, so long as you preserve the functionality of interoperating with the Object Management Group's "Internet Inter-ORB Protocol" version one. However, any uses other than the foregoing uses shall require the express written consent of Sun Microsystems, Inc. - + The names of Sun Microsystems, Inc. and any of its subsidiaries or affiliates may not be used in advertising or publicity pertaining to distribution of the LICENSED PRODUCT as permitted herein. - + This license is effective until terminated by Sun for failure to comply with this license. Upon termination, you shall destroy or return all code and documentation for the LICENSED PRODUCT. - + LICENSED PRODUCT IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - + LICENSED PRODUCT IS PROVIDED WITH NO SUPPORT AND WITHOUT ANY OBLIGATION ON THE PART OF SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES TO ASSIST IN ITS USE, CORRECTION, MODIFICATION OR ENHANCEMENT. - + SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES SHALL HAVE NO LIABILITY WITH RESPECT TO THE INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY LICENSED PRODUCT OR ANY PART THEREOF. - + IN NO EVENT WILL SUN OR ANY OF ITS SUBSIDIARIES OR AFFILIATES BE LIABLE FOR ANY LOST REVENUE OR PROFITS OR OTHER SPECIAL, INDIRECT AND CONSEQUENTIAL DAMAGES, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - + Use, duplication, or disclosure by the government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 and FAR 52.227-19. - + SunOS, SunSoft, Sun, Solaris, Sun Microsystems and the Sun logo are trademarks or registered trademarks of Sun Microsystems, Inc. - - SunSoft, Inc. - 2550 Garcia Avenue + + SunSoft, Inc. + 2550 Garcia Avenue Mountain View, California 94043 Files: ACE_wrappers/ace/OS_NS_unistd.inl (swab function) @@ -415,7 +416,7 @@ Files: ACE_wrappers/ace/UTF32_Encoding_Converter.cpp Copyright: © 2001-2004 Unicode, Inc. License: other Limitations on Rights to Redistribute This Code - + Unicode, Inc. hereby grants the right to freely use the information supplied in this file in the creation of products supporting the Unicode Standard, and to make copies of this file in any form @@ -427,14 +428,14 @@ Copyright: © 2000 James Hu and Entera, Inc. License: other Copyright and Licensing Information for JAWS Adaptive Web Server, version 3 (JAWS3). - + JAWS3 is copyrighted by James Hu and Entera, Inc., Copyright (c) 2000, all rights reserved. Since JAWS3 is open source, free software, you are free to use, modify, and distribute the JAWS3 source code and object code produced or otherwise derived from JAWS3, provided you include this copyright statement in all versions of such code. - + In particular, you can use JAWS3 in proprietary software and are under no obligation to redistribute any of your source code that is derived from JAWS3. Note, however, that you may not modify the @@ -442,20 +443,20 @@ License: other it yourself or claiming authorship of the JAWS3 code, that will prevent JAWS3 from being distributed freely using an open source development model. - + JAWS3 is provided as is with no warranties of any kind, including the warranties of design, merchantibility and fitness for a particular purpose, noninfringement, or arising from a course of dealing, usage or trade practice. Moreover, JAWS3 is provided with no support and without any obligation on the part of Entera, Inc., or its employees. - + Entera, Inc., and its employees shall have no liability with respect to the infringement of copyrights, trade secrets or any patents by JAWS3 or any part thereof. Moreover, in no event will Entera, Inc., or its employees, be liable for any lost revenue or profits or other special, indirect and consequential damages. - + By submitting comments, suggestions, code, code snippets, techniques (including that of usage), and algorithms, submitters acknowledge that they have the right to do so, that any such submissions are @@ -467,17 +468,17 @@ License: other submitters acknowledge that the incorporation or modification of such submissions is entirely at the discretion of the moderators of the open source JAWS3 project or their designees. - + The names JAWS3 and Entera, Inc., may not be used to endorse or promote products or services derived from this source without express written permission from Entera, Inc. Further, products or services derived from this source may not be called JAWS3 nor may the name Entera, Inc., appear in their names, without express written permission from Entera, Inc. - + If you have any suggestions, additions, comments, or questions, please let me know. - + James C. Hu Entera, Inc. jxh@entera.com @@ -485,20 +486,20 @@ License: other Files: ACE_wrappers/apps/JAWS/clients/WebSTONE/* Copyright: © 1995 Silicon Graphics, Inc. License: other - This file and all files contained in this directory are + This file and all files contained in this directory are copyright 1995, Silicon Graphics, Inc. - - This software is provided without support and without any obligation on the - part of Silicon Graphics, Inc. to assist in its use, correction, modification - or enhancement. There is no guarantee that this software will be included in + + This software is provided without support and without any obligation on the + part of Silicon Graphics, Inc. to assist in its use, correction, modification + or enhancement. There is no guarantee that this software will be included in future software releases, and it probably will not be included. - - THIS SOFTWARE IS PROVIDED "AS IS" WITH NO WARRANTIES OF ANY KIND INCLUDING THE - WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, - OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. - - In no event will Silicon Graphics, Inc. be liable for any lost revenue or - profits or other special, indirect and consequential damages, even if + + THIS SOFTWARE IS PROVIDED "AS IS" WITH NO WARRANTIES OF ANY KIND INCLUDING THE + WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE, + OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. + + In no event will Silicon Graphics, Inc. be liable for any lost revenue or + profits or other special, indirect and consequential damages, even if Silicon Graphics, Inc. has been advised of the possibility of such damages. Files: ACE_wrappers/ASNMP/* @@ -507,37 +508,37 @@ Copyright: © 1996 Hewlett-Packard Company © 1997 Cisco Systems, Inc. License: other-BSD These copyrights apply to the SNMP++ module shipped with the ACE library: - + /*=================================================================== Copyright (c) 1996 Hewlett-Packard Company - + ATTENTION: USE OF THIS SOFTWARE IS SUBJECT TO THE FOLLOWING TERMS. - Permission to use, copy, modify, distribute and/or sell this software - and/or its documentation is hereby granted without fee. User agrees - to display the above copyright notice and this license notice in all - copies of the software and any documentation of the software. User - agrees to assume all liability for the use of the software; Hewlett-Packard - makes no representations about the suitability of this software for any - purpose. It is provided "AS-IS without warranty of any kind,either express - or implied. User hereby grants a royalty-free license to any and all - derivatives based upon this software code base. - + Permission to use, copy, modify, distribute and/or sell this software + and/or its documentation is hereby granted without fee. User agrees + to display the above copyright notice and this license notice in all + copies of the software and any documentation of the software. User + agrees to assume all liability for the use of the software; Hewlett-Packard + makes no representations about the suitability of this software for any + purpose. It is provided "AS-IS without warranty of any kind,either express + or implied. User hereby grants a royalty-free license to any and all + derivatives based upon this software code base. + =====================================================================*/ - + /********************************************************************** Copyright 1988, 1989, 1991, 1992 by Carnegie Mellon University - + All Rights Reserved - - Permission to use, copy, modify, and distribute this software and its - documentation for any purpose and without fee is hereby granted, + + Permission to use, copy, modify, and distribute this software and its + documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that - both that copyright notice and this permission notice appear in + both that copyright notice and this permission notice appear in supporting documentation, and that the name of CMU not be used in advertising or publicity pertaining to distribution of the - software without specific, written prior permission. - + software without specific, written prior permission. + CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL CMU BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR @@ -546,12 +547,12 @@ License: other-BSD ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ - + Certain portions of this version of HP's SNMP++ are: - + /*-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Copyright 1997 Cisco Systems, Inc. - + Permission to use, copy, modify, and distribute this software for any purpose and without fee is hereby granted, provided that this copyright and permission notice appear on all copies of the software and @@ -560,7 +561,7 @@ License: other-BSD program without specific prior permission, and notice be given in supporting documentation that modification, copying and distribution is by permission of Cisco Systems, Inc. - + Cisco Systems, Inc. makes no representations about the suitability of this software for any purpose. THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT @@ -576,10 +577,10 @@ Copyright: © 1991, 1993 The Regents of the University of California License: BSD-4 Copyright (c) 1991, 1993 The Regents of the University of California. All rights reserved. - + This code is derived from software contributed to Berkeley by James W. Williams of NASA Goddard Space Flight Center. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -595,7 +596,7 @@ License: BSD-4 4. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -614,7 +615,7 @@ Copyright: © 1987, 1993, 1994 The Regents of the University of California License: BSD-4 Copyright (c) 1987, 1993, 1994 The Regents of the University of California. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -630,7 +631,7 @@ License: BSD-4 4. Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -642,15 +643,15 @@ License: BSD-4 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - + ****************************************************************** - + Copyright (c) 2000 The NetBSD Foundation, Inc. All rights reserved. - + This code is derived from software contributed to The NetBSD Foundation by Dieter Baron and Thomas Klausner. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -666,7 +667,7 @@ License: BSD-4 4. Neither the name of The NetBSD Foundation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR diff --git a/ACE/debian/dsc b/ACE/debian/dsc index e51e85fe1bc..24d98c2386d 100644 --- a/ACE/debian/dsc +++ b/ACE/debian/dsc @@ -1,10 +1,9 @@ -# Format: 1.0 -# Source: ace -# Version: 1.8.2 -# Binary: ace -# Maintainer: Johnny Willemsen <jwillemsen@remedy.nl> -# Architecture: any -# Build-Depends: g++ -# Files: -# <hash> <size> ACE+TAO+CIAO-src-5.8.2.tar.bz2 -# +Format: 1.0 +Source: ACE+TAO+CIAO-src-5.8.2 +Version: 1.8.2 +Binary: ace +Maintainer: Johnny Willemsen <jwillemsen@remedy.nl> +Architecture: any +Build-Depends: gcc, make, g++, debhelper (>= 5), libssl-dev (>= 0.9.7d), dpatch (>= 2.0.10), libxt-dev (>= 4.3.0), libfltk1.1-dev (>= 1.1.4), libqt4-dev (>= 4.4~rc1-4), tk-dev (>= 8.4.7), zlib1g-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz +Files: + 65b34001c9605f056713a7e146b052d1 46346654 ACE+TAO+CIAO-src-5.8.2.tar.gz diff --git a/ACE/debian/libace-dev.install b/ACE/debian/libace-dev.install index a0eb6eaa8ab..66eccc042ed 100644 --- a/ACE/debian/libace-dev.install +++ b/ACE/debian/libace-dev.install @@ -14,5 +14,4 @@ usr/include/ace/Monitor_Control/*.{h,inl,cpp} usr/lib/libACE_ETCL_Parser.so usr/lib/libACE_Monitor_Control.so usr/lib/libACE_ETCL.so -usr/lib/libACE_gperf_lib.so usr/include/apps/gperf/src diff --git a/ACE/debian/rules b/ACE/debian/rules index cfaa1f713f0..51822b44cc2 100644 --- a/ACE/debian/rules +++ b/ACE/debian/rules @@ -9,7 +9,7 @@ INSTALL := install -o root -g root INSTALL_755 := $(INSTALL) -m 755 ACE_SUBDIR := ACE_wrappers -ACE_ARCHIVE := $(shell ls -1 ACE+TAO+CIAO-src-*.tar.bz2 2>/dev/null || echo ace-archive-missing) +ACE_ARCHIVE := $(shell ls -1 ACE+TAO+CIAO-src-*.tar.gz 2>/dev/null || echo ace-archive-missing) MPC_SUBDIR := MPC MPC_ARCHIVE := $(shell ls -1 MPC*.tar.gz 2>/dev/null || echo mpc-archive-missing) MWCFLAGS := -type gnuace -features "ssl=1,zlib=1,zzip=1,xt=1,tk=1,fl=1,fox=1,qt4=1,exceptions=1,ace_qt4reactor=1" -noreldefs -genins @@ -87,7 +87,7 @@ pl-stamp: extract-stamp for fn in `find "$(ACE_ROOT)" -name "*.pl"`; do (echo '#!/usr/bin/perl'; cat "$$fn") > "$${fn}T"; mv "$${fn}T" "$$fn"; chmod a+x "$$fn"; done touch $@ -patch-stamp: prepatch pl-stamp +patch-stamp: prepatch pl-stamp dpatch apply-all touch $@ @@ -104,8 +104,8 @@ manpages-stamp: $(MAN1) $(MAN5) doxygen-stamp: extract-stamp cd $(ACE_ROOT) && bin/generate_doxygen.pl -is_release - find $(ACE_ROOT)/html/ace $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f - find $(ACE_ROOT)/html/tao $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f + find $(ACE_ROOT)/html/libace-doc $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f + find $(ACE_ROOT)/html/libtao-doc $(DOXYGEN_FILES_TO_REMOVE) | xargs -r rm -f touch $@ doxygen: doxygen-stamp @@ -118,6 +118,7 @@ build-stamp: patch-stamp clean: dh_testdir + dh_testroot rm -rf $(ACE_SUBDIR) $(MPC_SUBDIR) debian/patched $(MAN1) $(MAN5) *-stamp debian/mpc-ace.sgml dh_clean @@ -132,14 +133,14 @@ install: build cd $(TAO_ROOT) && ../bin/mwc.pl $(MWCFLAGS) TAO-DPKG.mwc # Install ACE files in $(CURDIR)/$(DT) echo Installing.. - cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ace - cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) apps - cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ACEXML + cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ace + cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) apps + cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ACEXML cd $(ACE_ROOT) && MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) Kokyu cd $(ACE_ROOT)/protocols && ../MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) ace # Install TAO files in $(CURDIR)/$(DT) - cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) tao + cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) tao cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) orbsvcs cd $(TAO_ROOT) && ../MPC/prj_install.pl -k -s man_files,exe_output,lib_output -b exe_output=usr/bin -b man_files=usr/share/man -b lib_output=usr/lib $(CURDIR)/$(DT) TAO_IDL cd $(TAO_ROOT) && ../MPC/prj_install.pl $(PRJ_INSTALL_FLAGS) $(CURDIR)/$(DT) utils @@ -156,7 +157,7 @@ install: build cd $(CURDIR)/$(DT)/usr/share/man && find . -iname *.1 -exec mv {} man1 ';' && rm -rf apps # Move orbsvcs files from include/tao/orbsvcs into include/orbsvcs - cd $(CURDIR)/$(DT)/usr/include/orbsvcs && mv -f orbsvcs/* . && rm -rf orbsvcs + cd $(CURDIR)/$(DT)/usr/include/orbsvcs && mv -f orbsvcs/* . && rm -rf orbsvcs # We provide scripts replacement for tao_idl and tao_ifr ; they # automatically define ACE_ROOT and TAO_ROOT @@ -169,8 +170,6 @@ install: build $(INSTALL_755) -D $(ACE_ROOT)/bin/mpc.pl $(DT)/usr/bin/mpc-ace $(INSTALL_755) -D $(ACE_ROOT)/bin/mwc.pl $(DT)/usr/bin/mwc-ace - rm -f $(ACE_SUBDIR)/MPC/config/.cvsignore - # Be lintian clean, fix permissions on examples # But find returns nothing.. # -chmod -x `find $(TAO_ROOT)/examples/ -perm 755 ! -type d -a ! \( -name "*.pl" -o -name "*.sh" \)` diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html index 4950c2eb1a2..eff33eee035 100644 --- a/ACE/docs/bczar/bczar.html +++ b/ACE/docs/bczar/bczar.html @@ -12,64 +12,64 @@ Scoreboard </a> as one of the primary source of information. <li> - Notify developers who broke compilation to fix the errors as soon as possible, - ideally by the next day. A red color in the "Compile" column is not at all - acceptable - the Build Czar needs to ensure that these problems are identified - and fixed in a timely manner. If possible, the Build Czar should let developers - know what the source of problems might be. It is quite possible that developers - who checked in the code or users who provided the patch may not have resources - to investigate the issues, so the Builds Czar's help is essential to keep + Notify developers who broke compilation to fix the errors as soon as possible, + ideally by the next day. A red color in the "Compile" column is not at all + acceptable - the Build Czar needs to ensure that these problems are identified + and fixed in a timely manner. If possible, the Build Czar should let developers + know what the source of problems might be. It is quite possible that developers + who checked in the code or users who provided the patch may not have resources + to investigate the issues, so the Builds Czar's help is essential to keep things moving ahead. <li> - Keep an eye on the tests that are run in every build. Anything abnormal needs - to be notified to the right developer. The Build Czar should try helping the - developer by providing stack traces (in case of crashes) or other details like + Keep an eye on the tests that are run in every build. Anything abnormal needs + to be notified to the right developer. The Build Czar should try helping the + developer by providing stack traces (in case of crashes) or other details like printouts with debugging level turned on. <li> - Some tests fail in the daily builds for many reasons like known bugs, transient + Some tests fail in the daily builds for many reasons like known bugs, transient timeouts etc. Make sure that no new test failures show up. This <a href="mailto:jwillemsen@remedy.nl"> guy</a> knows most of the information. Ask him to help you out with known problems. <li> - Keep an eye on the <a href="http://www.dre.vanderbilt.edu/Stats">footprint and - performance</a> stats. Any abnormal changes should be brought to the + Keep an eye on the <a href="http://www.dre.vanderbilt.edu/Stats">footprint and + performance</a> stats. Any abnormal changes should be brought to the attention of the developer resposible for it or to the <a href="mailto:devo-group@list.isis.vanderbilt.edu"> devo group</a>. <li> - Keep the builds ticking. Any red on the "Last Finished" column in the - Scoreboard should be fixed. The link to the "Build Name" indicates the machine + Keep the builds ticking. Any red on the "Last Finished" column in the + Scoreboard should be fixed. The link to the "Build Name" indicates the machine where the build is being run. <li> - The builds don't cover all the possible configurations. If you get a bug report - about a compile error in a particular configuration, try setting up a build to + The builds don't cover all the possible configurations. If you get a bug report + about a compile error in a particular configuration, try setting up a build to make sure that it doesn't show up again if it has been fixed. <li> Keep an eye on the <a href="http://bugzilla.dre.vanderbilt.edu/">bugzilla </a> - entries that are registered by users and developers. Decide on the bugs that + entries that are registered by users and developers. Decide on the bugs that need to be fixed for the beta and pain developers for an ETA. </p> <P> - The document <a href="./privileges.html">here </a>talks about the powers of a + The document <a href="./privileges.html">here </a>talks about the powers of a build Czar. </P> <P> - The Build Czar is empowered to set up more builds on his own for his + The Build Czar is empowered to set up more builds on his own for his convenience. This <a href="https://svn.dre.vanderbilt.edu/viewvc/autobuild/trunk/README?revision=HEAD"> page </a>has a step by step instructions on how to do that. </P> <P> - The build czar can get the build configuration by looking at the config portion + The build czar can get the build configuration by looking at the config portion of the scoreboard. </P> - <p>Pro-active involvement by the build czar is necessary. Being a pro-active - build czar requires monitoring the subversion archive carefully and responding + <p>Pro-active involvement by the build czar is necessary. Being a pro-active + build czar requires monitoring the subversion archive carefully and responding quickly to suspected changes to keep the repo stays stable.</p> <hr> <h2>Recipe for Cutting a Beta/Minor Kit</h2> <P> - The build czar is also in charge for the release of the beta. Cutting a beta is - as simple as cutting butter if things go well. Here is the procedure followed + The build czar is also in charge for the release of the beta. Cutting a beta is + as simple as cutting butter if things go well. Here is the procedure followed while cutting a beta: <ol> <li> @@ -82,7 +82,7 @@ <li> type <code>screen</code> to start screen.</li> <li> - execute commands as normal. Note that Ctrl-A is special in screen, so you need + execute commands as normal. Note that Ctrl-A is special in screen, so you need to type Ctrl-A-A to send a Ctrl-A to the shell</li> <li> should your session be interrupted, reconnect and type <code>screen -x</code></li> @@ -95,7 +95,7 @@ <code>ssh bczar@download.dre.vanderbilt.edu</code><br> to ensure that this succeeds. If not fix the problem, if ok exit again back to <li> - Prior to starting this, gather aggregate release notes from all developers. + Prior to starting this, gather aggregate release notes from all developers. This is usually in the form of an email plea asking to update all NEWS files in the archive. These NEWS files are used as part of the release notes for the release.</li> <li> @@ -108,8 +108,8 @@ </li> <li> Checkout a new workspace on a Fedora system with the last public release and with - all patches installed. - + all patches installed. + </li> <ul> <li> @@ -120,23 +120,23 @@ Checkout like this: <ul> <li> - <code>svn co --username <your user id> + <code>svn co --username <your user id> https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk DOC_ROOT</code></li> <li> - <code>svn co --username <your user id> + <code>svn co --username <your user id> https://svn.dre.vanderbilt.edu/DOC/MPC/trunk DOC_ROOT/ACE/MPC</code></li> </ul> </ul> <li> Set $DOC_ROOT to point to the new workspace you checked out.</li> <li> - Set an environment variable SIGNATURE indicating your full name. This is used + Set an environment variable SIGNATURE indicating your full name. This is used to fill the ChangeLog entry.</li> <ul> <li> For example,<tt>export SIGNATURE="Johnny Willemsen"</tt></li></ul> <li> - Set an environment variable MAILID indicating your mail id. This is used to + Set an environment variable MAILID indicating your mail id. This is used to fill the mail id portion of the ChangeLog entry.</li> <ul> <li> @@ -147,16 +147,16 @@ <li> Tag the release by executing<br> <code>ACE/bin/make_release.py --beta --update --tag</code><br> - This will only take a couple minutes to complete and once done successfully, - you can carry on with BOTH creating the kits and generating the doxygen - documentation in parallel. NOTE that <code>--beta</code> should be replaced + This will only take a couple minutes to complete and once done successfully, + you can carry on with BOTH creating the kits and generating the doxygen + documentation in parallel. NOTE that <code>--beta</code> should be replaced with <code>--minor</code> or <code>--major</code> as appropriate.</li> <br> After the repository has been tagged check each file listed below to make sure version numbers are updated as expected.<br> <br> In the <em>EXTREMELY</em> unlikely event that something goes wrong during the <em> - tagging</em> of the repo, the following files must be returned to the state + tagging</em> of the repo, the following files must be returned to the state they were in before the release process started and then checked back into SVN:<br> <ul> <code> @@ -187,16 +187,16 @@ In most cases, a<br> <code>svn revert -R *</code><br> from DOC_ROOT will suffice.<br /> - The tag will also need to be removed (both in Middleware and MPC): - ACE+TAO+CIAO-X_Y_Z (where X is the ACE Major version number, and Y & Z are the + The tag will also need to be removed (both in Middleware and MPC): + ACE+TAO+CIAO-X_Y_Z (where X is the ACE Major version number, and Y & Z are the Minor and Beta release numbers of the release that is to be restarted).<p> E.g.:<br> - <code>svn rm + <code>svn rm https://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z<br /> svn rm https://svn.dre.vanderbilt.edu/DOC/MPC/tags/ACE+TAO+CIAO-X_Y_Z<br /> </code> <br> - Note that this <em>only</em> needs to be done if the <em>tagging</em> fails. If + Note that this <em>only</em> needs to be done if the <em>tagging</em> fails. If kit creation fails, simply restart that process. <li> Create the kits by executing<br> @@ -204,14 +204,14 @@ This will take somewhere arround 2-4 hours to complete. <ul> <li> - These commands only tags and creates the kits for the software itself, not + These commands only tags and creates the kits for the software itself, not documentation, this can be started in parrellel with this activity. </li> <li> The kits end up in <tt>$DOC_ROOT/packages</tt></li> </ul> <p> - To summarize, the following is a transcript of the steps up to this point + To summarize, the following is a transcript of the steps up to this point executing successfully: <p><code>$ ssh ..<br> No default printer<br> @@ -231,17 +231,17 @@ <p> Feel free to cut and paste with suitable edits. <li> - The packages end up by default under $DOC_ROOT/package-<PID>, you can - copy them to the webserver using the following commands. (Note that <PID> + The packages end up by default under $DOC_ROOT/package-<PID>, you can + copy them to the webserver using the following commands. (Note that <PID> needs to be the numerical pid of the process that created the kit, use<br> <code>ls -ald</code> - to determine the correct filename.) At the moment you execute these commands + to determine the correct filename.) At the moment you execute these commands all users can download these packages.</li> - <code>scp $DOC_ROOT/package-<PID>/ACE* + <code>scp $DOC_ROOT/package-<PID>/ACE* bczar@download.dre.vanderbilt.edu:/export/www/download.dre/ACE+TAO-distribution<br> </code> <li> - After the repository is tagged you can also start generating the doxygen + After the repository is tagged you can also start generating the doxygen documentation in parrellel with the kit generation above.<br> <ul> <li> @@ -251,7 +251,7 @@ After login check that you can, <br> <code>ssh bczar@download.dre.vanderbilt.edu</code><br> - to ensure that this succeeds. If not fix the problem, if ok exit again back to + to ensure that this succeeds. If not fix the problem, if ok exit again back to your release system. </li> <li> <code>cd /tmp</code><br> @@ -263,15 +263,15 @@ than make sure you use <code>/web/users/isisbuilds/tmp/ACE_wrappers</code> as working directory <li> - Update the workspace with the right version tag (replace the X_Y_Z with the ACE + Update the workspace with the right version tag (replace the X_Y_Z with the ACE version number being released e.g. 5_6_7) <br> - <code>svn co - svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/ACE + <code>svn co + svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/ACE ACE_wrappers<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/TAO + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/TAO ACE_wrappers/TAO<br> - svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/CIAO + svn co svn://svn.dre.vanderbilt.edu/DOC/Middleware/tags/ACE+TAO+CIAO-X_Y_Z/CIAO ACE_wrappers/TAO/CIAO </code> </li> <li>Change to the ACE_wrappers directory using <br> @@ -313,51 +313,51 @@ </code> <br> <li> - While doxygen churns, format a release announcement, including the release + While doxygen churns, format a release announcement, including the release notes gathered from developers. <ul> - <li>Get from bugzilla the bugs fixed. Use the following + <li>Get from bugzilla the bugs fixed. Use the following <a href="http://bugzilla.dre.vanderbilt.edu/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&product=ACE&product=CIAO&product=CoSMIC&product=MPC&product=OpenDDS&product=TAO&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&emailassigned_to1=1&emailtype1=substring&email1=&emailreporter2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=2010-07-04&chfieldto=Now&chfield=resolution&chfieldvalue=FIXED&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0=">query</a> as start query and update the start date.</li> <li> - Let <a href="mailto:schmidt@cs.wustl.edu">Doug Schmidt</a> review these before + Let <a href="mailto:schmidt@cs.wustl.edu">Doug Schmidt</a> review these before you do anything with them.</li></ul> - + <li> Make sure the new version is available in Bugzilla.</li> <ul> <li> - We now have a bczar Bugzilla user (bczar@dre.vanderbilt.edu) with full - privileges which points to the bczar user at ISIS. To gain access to this - account as a new build czar, you could update the ~/.forward file on one of the - ISIS hosts (for example bczar@naboo.dre.vanderbilt.edu) with your own email - address (but be aware that if you leave this ~/.forward file in effect, you - will get innundated with cron mail messages from all of the ISIS lab build - machines, so it is probably best to remove it after obtaining the Bugzilla - password). From the "Bugzilla - Main Page" - (http://bugzilla.dre.vanderbilt.edu/index.cgi) click on one of the various - "LogIn" links, and from this login page you should be able to "Submit Request" - to change a forgotten password. If you enter bczar@dre.vanderbilt.edu and click - "Submit Request" this will email you the password change link to - bczar@dre.vanderbilt.edu, which will then in turn be forwarded to your own - email account. Simply copy this link into your browser to set your own bczar + We now have a bczar Bugzilla user (bczar@dre.vanderbilt.edu) with full + privileges which points to the bczar user at ISIS. To gain access to this + account as a new build czar, you could update the ~/.forward file on one of the + ISIS hosts (for example bczar@naboo.dre.vanderbilt.edu) with your own email + address (but be aware that if you leave this ~/.forward file in effect, you + will get innundated with cron mail messages from all of the ISIS lab build + machines, so it is probably best to remove it after obtaining the Bugzilla + password). From the "Bugzilla - Main Page" + (http://bugzilla.dre.vanderbilt.edu/index.cgi) click on one of the various + "LogIn" links, and from this login page you should be able to "Submit Request" + to change a forgotten password. If you enter bczar@dre.vanderbilt.edu and click + "Submit Request" this will email you the password change link to + bczar@dre.vanderbilt.edu, which will then in turn be forwarded to your own + email account. Simply copy this link into your browser to set your own bczar password for the next steps.</li> <li> here is the description of how to add a new version through Bugzilla.</li> <li> - go to any Bugzilla "Query" page, you should see a grey box at the bottom. click + go to any Bugzilla "Query" page, you should see a grey box at the bottom. click "Log in" link to log in as bczar@dre.vanderbilt.edu.</li> <li> - look at the grey box at bottom again. You will see several links following + look at the grey box at bottom again. You will see several links following "Edit". Click on the "Product" link.</li> <li> - you are then at "Select product" page. You should see a list components, i.e., + you are then at "Select product" page. You should see a list components, i.e., ACE CIAO TAO. Click on the product you want to edit.</li> <li> - you are then at "Edit product" page. Scroll down a bit, you should see a list - of all versions coming with this product. At the very beginning of the list, + you are then at "Edit product" page. Scroll down a bit, you should see a list + of all versions coming with this product. At the very beginning of the list, you should see "Edit versions" link. Click this link.</li> <li> - you should see a "Add a new version" text box and a "Add" link just above the + you should see a "Add a new version" text box and a "Add" link just above the grey box at the bottom. Click on this link</li> <li> you are then at "Add version of [Name of the product]" page.</li> @@ -372,7 +372,7 @@ <li> Create a temporary directory. eg. tmp and change Directory to this- <br><code>mkdir tmp</code><br><code>cd tmp</code></li> <li> - scp file from the download server -<br><code>scp + scp file from the download server -<br><code>scp bczar@download.dre.vanderbilt.edu:/export/www/download.dre/ACE+TAO-distribution/ACE-html.tar.bz2 .</code> </li> <li> @@ -411,12 +411,12 @@ one build where you run the TAO Hello world test and check if the libraries are having the correct version number.</li> <li> - Update in the autobuild archive the file configs/scoreboard/releases.xml with + Update in the autobuild archive the file configs/scoreboard/releases.xml with the made release (version number and release date). This is used by the integrated scoreboard on http://scoreboard.theaceorb.nl Remember to do a changelog entry.</li> <li> Update the ACE_wrappers repo (remember to create a changelog entry, and possiably archive the old changelog to the changelog directory if this has become too long):<ul> - <li>docs/Download.html to show the new release. Make sure you refer to the - previous_versions directory, that way we can exactly track how many people + <li>docs/Download.html to show the new release. Make sure you refer to the + previous_versions directory, that way we can exactly track how many people download a specific version.</li> <li> etc/index.hml to show the new doxygen package you installed</li> @@ -424,12 +424,25 @@ <li> Update the NEWS, TAO/NEWS, and TAO/CIAO/NEWS files to have a new section for the next release.</li> <li> + Update OpenSuSE Build service using + <code> + osc checkout devel:libraries:ACE + osc add <new release> + cp rpmbuild/ace-tao.spec . + cp debian/control debian.control + cp debian/dsc ace.dsc + cp debian/changelog debian.changelog + cp debian/rules debian.rules + osc commit + </code> + </li> + <li> Mail the approved release announcement out to, at minimum the following: <tt>ciao-users@list.isis.vanderbilt.edu</tt>, <tt>tao-users@list.isis.vanderbilt.edu</tt>, <tt>tao-announce@list.isis.vanderbilt.edu</tt>, - <tt>ace-users@list.isis.vanderbilt.edu</tt>, <tt>ace-announce@list.isis.vanderbilt.edu</tt>. + <tt>ace-users@list.isis.vanderbilt.edu</tt>, <tt>ace-announce@list.isis.vanderbilt.edu</tt>. Do this as yourself (not as bugzilla). <b>N.B.</b> - You will not be able to post to the users' lists unless you are subscribed to - them. Odds are you will not be able to post to the announce lists at all. Ask + You will not be able to post to the users' lists unless you are subscribed to + them. Odds are you will not be able to post to the announce lists at all. Ask someone else (like Doug or Johnny) to do this step.<br> </ol> </p> @@ -438,37 +451,37 @@ Tips to being a Build Czar</h2> <p><ol> <li>Trust no one.</li> - <li>Be careful with <a href="http://www.cs.wustl.edu/~schmidt">this guy</a>, he - is notorious in breaking builds (and fixing them as well...Rumour has it that - it's actually a super-scalar, super-pipelined processor capable of out-of-order + <li>Be careful with <a href="http://www.cs.wustl.edu/~schmidt">this guy</a>, he + is notorious in breaking builds (and fixing them as well...Rumour has it that + it's actually a super-scalar, super-pipelined processor capable of out-of-order execution, in human incarnation).</li> <li>Don't forgive people who break ACE :-)</li> - <li>If a build hasn't run in a long time (symptoms are a "red" in the Last Run - column of the build scoreboard), delete the .disable file in + <li>If a build hasn't run in a long time (symptoms are a "red" in the Last Run + column of the build scoreboard), delete the .disable file in /path/to/build/directory/BUILD_NAME/ by hand.</li> - <li>Think of the group who wrote the scoreboard update script, every time you + <li>Think of the group who wrote the scoreboard update script, every time you catch an otherwise not so obvious error with the help of the scoreboard. Tell <a href="mailto:devo-group@list.isis.vanderbilt.edu"> DEVO group</a> about it.</li> <li>Send a note to <a href="mailto:sysadmin@isis.vanderbilt.edu">sysadmin@isis.vanderbilt.edu</a> asking for the repo to be frozen. Provide them a list of names, including yourself and bczar to be granted write permission. </li> <li>Compile once on Win32, Linux and Solaris before cutting a beta.</li> - <li>Trust the release script when making a release. Don't make tar balls by - hand. Make sure that the public ftp directories - (/project/beguine/ftp/pub/ACE+TAO-distribution and - /project/beguine/ftp/pub/ACE+TAO-distribution/diffs) have the right + <li>Trust the release script when making a release. Don't make tar balls by + hand. Make sure that the public ftp directories + (/project/beguine/ftp/pub/ACE+TAO-distribution and + /project/beguine/ftp/pub/ACE+TAO-distribution/diffs) have the right permissions, so that the release script can copy the tar balls.</li> - <li>When all hell breaks loose, don't wait for the nightly builds to monitor + <li>When all hell breaks loose, don't wait for the nightly builds to monitor improvement. Instead manually start the builds.</li> - <li>Maintain private up-to-date workspaces for problem platforms (read as + <li>Maintain private up-to-date workspaces for problem platforms (read as Solaris).</li> <li>Don't hesitate to ask for help.</li> - <li>When you get an account to access the svn repo, make sure you are added to - the correct groups, for example, - gid=100(users),5000(doc),5002(acetaodev),5003(cvs). Otherwise you will have + <li>When you get an account to access the svn repo, make sure you are added to + the correct groups, for example, + gid=100(users),5000(doc),5002(acetaodev),5003(cvs). Otherwise you will have problem to checkout various modules.</li> - <li>Install your public key to the different machines you have frequent access + <li>Install your public key to the different machines you have frequent access to avoid typing password.</li> - <li>Update this page if you have any more tips for future build czars :-). This + <li>Update this page if you have any more tips for future build czars :-). This page is in svn under <code>ACE_wrappres/docs/bczar/bczar.html</code></li> </p></ol> <hr> @@ -477,8 +490,8 @@ </Center> <hr> <h2>Build Czar Arthur</h2> - <p>Many years have passes since the days of the legendary Build Czar Arthur. His - duties were given to him by the mystical Lady of the Lake, who outlined the + <p>Many years have passes since the days of the legendary Build Czar Arthur. His + duties were given to him by the mystical Lady of the Lake, who outlined the first responsibilities of the Build Czar.</p> <tt> <br> diff --git a/ACE/etc/README b/ACE/etc/README deleted file mode 100644 index e55a06ad89c..00000000000 --- a/ACE/etc/README +++ /dev/null @@ -1,32 +0,0 @@ -$Id$ - -Svc_Conf_[ly].cpp.diff are used to patch their respective files in -ACE_wrappers/ace. They are used by the Makefile in that directory, -so users don't ordinarily need to be concerned with them. - -To update Svc_Conf_l.cpp.diff: - -1) % cd ACE_wrappers/ace. - -2) Create the unpatched version of the file, in Svc_Conf_l.cpp.orig: - % /bin/rm Svc_Conf_l.cpp - % make Svc_Conf_l.cpp RM=echo - % cp -p Svc_Conf_l.cpp.orig Svc_Conf_l.cpp.save - -3) Create the new version of Svc_Conf_l.cpp. If the old patch succeeds, - you can use it: - % /bin/rm Svc_Conf_l.cpp - % make - % mv Svc_Conf_l.cpp.save Svc_Conf_l.cpp.orig - - Otherwise, the new version has to be created manually. - -4) % diff -u Svc_Conf_l.cpp.orig Svc_Conf_l.cpp > ../etc/Svc_Conf_l.cpp.diff - -5) % rm Svc_Conf_l.cpp.orig - -6) % cd ../etc - % cvs commit -ko -m'updated diff file' Svc_Conf_l.cpp.diff - -To update Svc_Conf_y.cpp.diff, follow the same procedure, above, as -for updating Svc_Conf_l.cpp.diff, but replace "_l" with "_y". diff --git a/ACE/etc/enforce_ace_try.diff b/ACE/etc/enforce_ace_try.diff deleted file mode 100644 index c17a1f855fa..00000000000 --- a/ACE/etc/enforce_ace_try.diff +++ /dev/null @@ -1,271 +0,0 @@ -Index: ace/CORBA_macros.h -=================================================================== -RCS file: /project/ace/cvs-repository/ACE_wrappers-repository/ace/CORBA_macros.h,v -retrieving revision 1.19 -diff -u -r1.19 CORBA_macros.h ---- CORBA_macros.h 1999/06/28 00:53:07 1.19 -+++ CORBA_macros.h 1999/07/31 22:52:52 -@@ -174,15 +174,15 @@ - // or ACE_CHECK_ENV. These two macros should _NOT_ be used within - // try blocks. Use ACE_TRY_CHECK or ACE_TRY_CHECK_EX instead. - # define ACE_CHECK \ -- if (ACE_TRY_ENV . exception () != 0) \ -+ if (ACE_TRY_ENV . _exception () != 0) \ - return - // When function requires a return value - # define ACE_CHECK_RETURN(RETV) \ -- if (ACE_TRY_ENV . exception () != 0) \ -+ if (ACE_TRY_ENV . _exception () != 0) \ - return RETV - - // ACE_THROW_INT should not be used by the user. --# define ACE_THROW_INT(EXCEPTION) ACE_TRY_ENV.exception (new EXCEPTION) -+# define ACE_THROW_INT(EXCEPTION) ACE_TRY_ENV._exception (new EXCEPTION) - - // Throwing exceptions will inevitably cause an return from the current - // function. These two macros should _NOT_ be used within try blocks. -@@ -190,14 +190,14 @@ - # define ACE_THROW(EXCEPTION) \ - do \ - { \ -- ACE_TRY_ENV.exception (new EXCEPTION); \ -+ ACE_TRY_ENV._exception (new EXCEPTION); \ - return; \ - } while (0) - - # define ACE_THROW_RETURN(EXCEPTION,RETV) \ - do \ - { \ -- ACE_TRY_ENV.exception (new EXCEPTION); \ -+ ACE_TRY_ENV._exception (new EXCEPTION); \ - return RETV; \ - } while (0) - -@@ -245,7 +245,7 @@ - // Check for exceptions within try blocks. - # define ACE_TRY_CHECK \ - { \ -- if (ACE_TRY_ENV.exception () != 0) \ -+ if (ACE_TRY_ENV._exception () != 0) \ - { \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL; \ -@@ -255,7 +255,7 @@ - // Checking exception within EX try blocks. - # define ACE_TRY_CHECK_EX(LABEL) \ - { \ -- if (ACE_TRY_ENV.exception () != 0) \ -+ if (ACE_TRY_ENV._exception () != 0) \ - { \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL ## LABEL; \ -@@ -265,14 +265,14 @@ - // Throwing exception within TRY blocks. - # define ACE_TRY_THROW(EXCEPTION) \ - { \ -- ACE_TRY_ENV.exception (new EXCEPTION); \ -+ ACE_TRY_ENV._exception (new EXCEPTION); \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL; \ - } - - # define ACE_TRY_THROW_EX(EXCEPTION,LABEL) \ - { \ -- ACE_TRY_ENV.exception (new EXCEPTION); \ -+ ACE_TRY_ENV._exception (new EXCEPTION); \ - ACE_TRY_FLAG = 0; \ - goto ACE_TRY_LABEL ## LABEL; \ - } -@@ -291,14 +291,14 @@ - # define ACE_CATCH(TYPE,VAR) \ - } while (0); \ - do \ -- if (ACE_TRY_ENV.exception () != 0 && ACE_EXCEPTION_NOT_CAUGHT && \ -- TYPE::_narrow(ACE_TRY_ENV.exception ()) != 0) \ -+ if (ACE_TRY_ENV._exception () != 0 && ACE_EXCEPTION_NOT_CAUGHT && \ -+ TYPE::_narrow(ACE_TRY_ENV._exception ()) != 0) \ - { \ - CORBA::Environment ACE_CAUGHT_ENV = ACE_TRY_ENV;\ - ACE_EXCEPTION_NOT_CAUGHT = 0; \ -- TYPE &VAR = *TYPE::_narrow (ACE_CAUGHT_ENV.exception ()); \ -+ TYPE &VAR = *TYPE::_narrow (ACE_CAUGHT_ENV._exception ()); \ - ACE_UNUSED_ARG (VAR); \ -- ACE_TRY_ENV.clear (); -+ ACE_TRY_ENV._clear (); - - // ACE_CATCHANY uses ACE_CATCH to catch all CORBA exceptions. - # define ACE_CATCHANY ACE_CATCH (CORBA::Exception, ACE_ANY_EXCEPTION) -Index: TAO/tao/Environment.cpp -=================================================================== -RCS file: /project/ace/cvs-repository/ACE_wrappers-repository/TAO/tao/Environment.cpp,v -retrieving revision 1.29 -diff -u -r1.29 Environment.cpp ---- Environment.cpp 1999/06/24 01:49:38 1.29 -+++ Environment.cpp 1999/07/31 22:52:52 -@@ -88,15 +88,15 @@ - { - if (this != &rhs) - { -- this->clear (); -- this->exception (rhs.exception_); -+ this->_clear (); -+ this->_exception (rhs.exception_); - } - return *this; - } - - CORBA_Environment::~CORBA_Environment (void) - { -- this->clear (); -+ this->_clear (); - - // If previous is 0 then this is the first Environment, allocated - // with the ORB, it shouldn't try to pop because the ORB is beign -@@ -106,11 +106,11 @@ - } - - void --CORBA_Environment::exception (CORBA_Exception *ex) -+CORBA_Environment::_exception (CORBA_Exception *ex) - { - if (ex != this->exception_) - { -- this->clear (); -+ this->_clear (); - this->exception_ = ex; - } - if (this->exception_ != 0) -@@ -123,7 +123,7 @@ - } - - void --CORBA_Environment::clear (void) -+CORBA_Environment::_clear (void) - { - if (this->exception_) - this->exception_->_decr_refcnt (); -@@ -149,7 +149,7 @@ - // the Environment argument) because then the user is supposed to - // clear the environment before calling into the ORB. - // -- TAO_ORB_Core_instance ()->default_environment ()->clear (); -+ TAO_ORB_Core_instance ()->default_environment ()->_clear (); - #endif /* TAO_HAS_EXCEPTIONS */ - - return CORBA::default_environment (); -@@ -210,8 +210,8 @@ - // standard I/O stream passed as a parameter. - - void --CORBA::Environment::print_exception (const char *info, -- FILE *) const -+CORBA::Environment::_print_exception (const char *info, -+ FILE *) const - { - if (this->exception_) - { -Index: TAO/tao/Environment.h -=================================================================== -RCS file: /project/ace/cvs-repository/ACE_wrappers-repository/TAO/tao/Environment.h,v -retrieving revision 1.17 -diff -u -r1.17 Environment.h ---- Environment.h 1999/06/25 19:51:05 1.17 -+++ Environment.h 1999/07/31 22:52:52 -@@ -76,11 +76,11 @@ - static CORBA_Environment * _nil (void); - // Some static methods that need to be defined in every pseudo object - -- CORBA_Exception* exception (void) const; -+ CORBA_Exception* _exception (void) const; - // Return the exception. Caller must call <_incr_refcnf> in order - // to keep the ptr. - -- void exception (CORBA_Exception *ex); -+ void _exception (CORBA_Exception *ex); - // Set the exception to <ex>, taking a reference on it. - - int exception_type (void) const; -@@ -90,10 +90,10 @@ - const char *exception_id (void) const; - // return the repository ID for the exception. - -- void clear (void); -+ void _clear (void); - // Clear the exception. - -- void print_exception (const char *info, -+ void _print_exception (const char *info, - FILE *f=stdout) const; - // Print the exception to output determined by f. This function is - // not CORBA compliant. -Index: TAO/tao/Environment.i -=================================================================== -RCS file: /project/ace/cvs-repository/ACE_wrappers-repository/TAO/tao/Environment.i,v -retrieving revision 1.7 -diff -u -r1.7 Environment.i ---- Environment.i 1999/06/25 19:50:57 1.7 -+++ Environment.i 1999/07/31 22:52:52 -@@ -15,7 +15,7 @@ - } - - ACE_INLINE CORBA_Exception* --CORBA_Environment::exception (void) const -+CORBA_Environment::_exception (void) const - { - return this->exception_; - } -Index: TAO/tao/Invocation.cpp -=================================================================== -RCS file: /project/ace/cvs-repository/ACE_wrappers-repository/TAO/tao/Invocation.cpp,v -retrieving revision 1.102 -diff -u -r1.102 Invocation.cpp ---- Invocation.cpp 1999/07/22 20:06:46 1.102 -+++ Invocation.cpp 1999/07/31 22:52:52 -@@ -47,6 +47,12 @@ - - #endif /* ACE_ENABLE_TIMEPROBES */ - -+#if defined (ACE_CORBA_HAS_EXCEPTIONS) -+#define ACE_THROW_EX(EXCEPTION) EXCEPTION->_raise (); -+#else -+#define ACE_THROW_EX(EXCEPTION) ACE_TRY_ENV._exception (EXCEPTION) -+#endif /* ACE_CORBA_HAS_EXCEPTIONS */ -+ - // Normal invocations don't involve any heap al; messages are - // constructed into stack-based buffers and are read into those - // buffers too. Larger buffers are heap-allocated as needed. -@@ -472,9 +478,7 @@ - CORBA::COMPLETED_YES)); - ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION); - -- // @@ Think about a better way to raise the exception here, -- // maybe we need some more macros? -- ACE_TRY_ENV.exception (exception); // We can not use ACE_THROW here. -+ ACE_THROW_EX (exception); - return TAO_INVOKE_EXCEPTION; - } - -@@ -560,9 +564,7 @@ - "TAO: (%P|%t) Raising exception %s\n", - buf.in ())); - -- // @@ Think about a better way to raise the exception here, -- // maybe we need some more macros? -- ACE_TRY_ENV.exception (exception); // We can not use ACE_THROW here. -+ ACE_THROW_EX (exception); - return TAO_INVOKE_EXCEPTION; - } - -@@ -746,11 +748,7 @@ - ex->minor (minor); - ex->completed (CORBA::CompletionStatus (completion)); - -- -- // @@ There should be a better way to raise this exception! -- // This code works for both native and emulated exceptions, -- // but it is ugly. -- ACE_TRY_ENV.exception (ex); // We can not use ACE_THROW here. -+ ACE_THROW_EX (ex); - return TAO_INVOKE_OK; - } - // NOTREACHED. diff --git a/ACE/examples/APG/Proactor/HA_Proactive_Status.cpp b/ACE/examples/APG/Proactor/HA_Proactive_Status.cpp index a1fc1bc2774..b6656c6b20f 100644 --- a/ACE/examples/APG/Proactor/HA_Proactive_Status.cpp +++ b/ACE/examples/APG/Proactor/HA_Proactive_Status.cpp @@ -27,7 +27,7 @@ HA_Proactive_Service::open (ACE_HANDLE h, ACE_Message_Block&) return; } - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_NORETURN (mb, ACE_Message_Block (1024)); if (this->reader_.read (*mb, mb->space ()) != 0) { diff --git a/ACE/examples/APG/Reactor/Client.cpp b/ACE/examples/APG/Reactor/Client.cpp index b2773bbf7f3..2010fdc8721 100644 --- a/ACE/examples/APG/Reactor/Client.cpp +++ b/ACE/examples/APG/Reactor/Client.cpp @@ -55,7 +55,7 @@ int Client::handle_timeout(const ACE_Time_Value &, const void *) return 0; } - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (128), -1); int nbytes = ACE_OS::sprintf (mb->wr_ptr (), "Iteration %d\n", this->iterations_); @@ -69,7 +69,7 @@ int Client::handle_timeout(const ACE_Time_Value &, const void *) // Listing 5 code/ch07 int Client::handle_output (ACE_HANDLE) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_Time_Value nowait (ACE_OS::gettimeofday ()); while (-1 != this->getq (mb, &nowait)) { diff --git a/ACE/examples/APG/Reactor/HAStatus.cpp b/ACE/examples/APG/Reactor/HAStatus.cpp index e2808fb8369..71ff3f756d2 100644 --- a/ACE/examples/APG/Reactor/HAStatus.cpp +++ b/ACE/examples/APG/Reactor/HAStatus.cpp @@ -170,7 +170,7 @@ ClientService::handle_input (ACE_HANDLE) 0); if (send_cnt == -1) send_cnt = 0; - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; size_t remaining = static_cast<size_t> ((recv_cnt - send_cnt)); ACE_NEW_RETURN (mb, ACE_Message_Block (remaining), -1); @@ -196,7 +196,7 @@ ClientService::handle_input (ACE_HANDLE) int ClientService::handle_output (ACE_HANDLE) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_Time_Value nowait (ACE_OS::gettimeofday ()); while (0 <= this->output_queue_.dequeue_head (mb, &nowait)) diff --git a/ACE/examples/APG/Streams/Answerer.cpp b/ACE/examples/APG/Streams/Answerer.cpp index f760490efad..d736a425098 100644 --- a/ACE/examples/APG/Streams/Answerer.cpp +++ b/ACE/examples/APG/Streams/Answerer.cpp @@ -348,7 +348,7 @@ public: // Listing 13 code/ch18 int record (RecordingDevice *recorder) { - ACE_Message_Block * mb; + ACE_Message_Block * mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (sizeof(Message)), -1); Message *message = (Message *)mb->wr_ptr (); diff --git a/ACE/examples/APG/Streams/CommandStream.cpp b/ACE/examples/APG/Streams/CommandStream.cpp index def3f123d77..63575001f92 100644 --- a/ACE/examples/APG/Streams/CommandStream.cpp +++ b/ACE/examples/APG/Streams/CommandStream.cpp @@ -76,7 +76,7 @@ int CommandStream::open (void *arg, // Listing 04 code/ch18 Command *CommandStream::execute (Command *command) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (command), 0); if (this->put (mb) == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/examples/APG/ThreadManagement/Pool.cpp b/ACE/examples/APG/ThreadManagement/Pool.cpp index bc3644480a6..bb6db1e8fdc 100644 --- a/ACE/examples/APG/ThreadManagement/Pool.cpp +++ b/ACE/examples/APG/ThreadManagement/Pool.cpp @@ -13,7 +13,7 @@ public: virtual int svc (void) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) starting up\n"))); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; if (this->getq (mb) == -1) return -1; // ... do something with the message. diff --git a/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp b/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp index 39548a249d3..81d7c9eec80 100644 --- a/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp +++ b/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp @@ -223,7 +223,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) ACE_OS::sleep (2); ACE_Time_Value tv (1L); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; for (int i = 0; i < 30; i++) { ACE_NEW_RETURN (mb, ACE_Message_Block (sizeof(int)), -1); diff --git a/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp b/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp index 53ebe76b0bc..97c2539d3c5 100644 --- a/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp +++ b/ACE/examples/APG/ThreadPools/Task_ThreadPool.cpp @@ -118,7 +118,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) ACE_Time_Value tv; tv.msec (100); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; for (int i = 0; i < 30; i++) { ACE_NEW_RETURN diff --git a/ACE/examples/APG/ThreadPools/ThreadPool.cpp b/ACE/examples/APG/ThreadPools/ThreadPool.cpp index 684762efcbf..2e30c28f4c2 100644 --- a/ACE/examples/APG/ThreadPools/ThreadPool.cpp +++ b/ACE/examples/APG/ThreadPools/ThreadPool.cpp @@ -31,7 +31,8 @@ public: virtual int svc (void) { - thread_id_ = ACE_Thread::self (); + ACE_Thread_ID id; + thread_id_ = id; while (1) { ACE_Message_Block *mb = 0; @@ -55,9 +56,9 @@ public: } // Listing 2 - ACE_thread_t thread_id (void) + const ACE_Thread_ID& thread_id (void) { - return thread_id_; + return this->thread_id_; } private: @@ -78,7 +79,7 @@ private: } IManager *manager_; - ACE_thread_t thread_id_; + ACE_Thread_ID thread_id_; }; // Listing 1 code/ch16 @@ -136,15 +137,14 @@ public: int shut_down (void); - ACE_thread_t thread_id (Worker *worker); + const ACE_Thread_ID& thread_id (Worker *worker); virtual int return_to_work (Worker *worker) { ACE_GUARD_RETURN (ACE_Thread_Mutex, worker_mon, this->workers_lock_, -1); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Worker %d returning to work.\n"), - worker->thr_mgr ()->thr_self ())); + ACE_TEXT ("(%t) Worker %t returning to work.\n"))); this->workers_.enqueue_tail (worker); this->workers_cond_.signal (); @@ -160,7 +160,7 @@ private: -1); for (int i = 0; i < POOL_SIZE; i++) { - Worker *worker; + Worker *worker = 0; ACE_NEW_RETURN (worker, Worker (this), -1); this->workers_.enqueue_tail (worker); worker->activate (); @@ -195,12 +195,15 @@ Manager::shut_down (void) { iter.next (worker_ptr); Worker *worker = (*worker_ptr); + ACE_Thread_ID id = thread_id (worker); + char buf [65]; + id.to_string (buf); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Attempting shutdown of %d\n"), - thread_id (worker))); + ACE_TEXT ("(%t) Attempting shutdown of %C\n"), + buf)); // Send the hangup message. - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block(0, @@ -213,8 +216,8 @@ Manager::shut_down (void) ACE_ASSERT (worker->msg_queue ()->is_empty ()); ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%t) Worker %d shut down.\n)"), - thread_id (worker))); + ACE_TEXT ("(%t) Worker %C shut down.\n"), + buf)); delete worker; } while (iter.advance ()); @@ -224,13 +227,12 @@ Manager::shut_down (void) return 0; } -ACE_thread_t +const ACE_Thread_ID& Manager::thread_id (Worker *worker) { return worker->thread_id (); } - int ACE_TMAIN (int, ACE_TCHAR *[]) { Manager tp; @@ -240,7 +242,7 @@ int ACE_TMAIN (int, ACE_TCHAR *[]) ACE_Time_Value tv; tv.msec (100); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; for (int i = 0; i < 30; i++) { ACE_NEW_RETURN diff --git a/ACE/examples/APG/ThreadSafety/Semaphore.cpp b/ACE/examples/APG/ThreadSafety/Semaphore.cpp index 6b3440b38c9..d06029d9bd4 100644 --- a/ACE/examples/APG/ThreadSafety/Semaphore.cpp +++ b/ACE/examples/APG/ThreadSafety/Semaphore.cpp @@ -29,7 +29,7 @@ public: csema_.acquire (); if (!is_closed ()) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; this->getq (mb); if (mb->msg_type () == ACE_Message_Block::MB_HANGUP) { diff --git a/ACE/examples/APG/Threads/Guards.cpp b/ACE/examples/APG/Threads/Guards.cpp index 7ef23e1e4da..1813dd68843 100644 --- a/ACE/examples/APG/Threads/Guards.cpp +++ b/ACE/examples/APG/Threads/Guards.cpp @@ -50,7 +50,9 @@ HA_Device_Repository::update_device (int device_id) // Construct a guard specifying the type of the mutex as // a template parameter and passing in the mutex to hold // as a parameter. + // FUZZ: disable check_for_ACE_Guard ACE_Guard<ACE_Thread_Mutex> guard (this->mutex_); + // FUZZ: enable check_for_ACE_Guard // This can throw an exception that is not caught here. ACE_NEW_RETURN (object, Object, -1); diff --git a/ACE/examples/APG/Threads/Message_Blocks.cpp b/ACE/examples/APG/Threads/Message_Blocks.cpp index 96cbf3e8cfe..8e4e66d2178 100644 --- a/ACE/examples/APG/Threads/Message_Blocks.cpp +++ b/ACE/examples/APG/Threads/Message_Blocks.cpp @@ -13,7 +13,7 @@ int ACE_TMAIN (int, ACE_TCHAR **) // Just for the book... // Listing 1 code/ch12 - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (128), -1); const char *deviceAddr= "Dev#12"; @@ -21,7 +21,7 @@ int ACE_TMAIN (int, ACE_TCHAR **) // Listing 1 #endif /* 0 */ // Listing 2 code/ch12 - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (128), -1); const char *commandSeq= "CommandSeq#14"; diff --git a/ACE/examples/APG/Threads/Message_Queue.cpp b/ACE/examples/APG/Threads/Message_Queue.cpp index 8c3ffcb60f4..eafdb0c155c 100644 --- a/ACE/examples/APG/Threads/Message_Queue.cpp +++ b/ACE/examples/APG/Threads/Message_Queue.cpp @@ -13,7 +13,7 @@ HA_CommandHandler::svc (void) { while(1) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; if (this->getq (mb) == -1) break; if (mb->msg_type () == ACE_Message_Block::MB_HANGUP) @@ -47,7 +47,7 @@ HA_CommandHandler::svc (void) ACE_Message_Block * Message_Receiver::shut_down_message (void) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (0, ACE_Message_Block::MB_HANGUP), 0); return mb; @@ -98,7 +98,7 @@ Message_Receiver::handle_input (ACE_HANDLE) return -1; } - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (dch.length_ + sizeof dch), -1); // Copy the header. diff --git a/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp b/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp index a3b7abbf13a..69927a7a59b 100644 --- a/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp +++ b/ACE/examples/ASX/Message_Queue/bounded_buffer.cpp @@ -28,7 +28,7 @@ producer (ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue) for (int n; ; ) { // Allocate a new message. - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (BUFSIZ), 0); @@ -73,7 +73,7 @@ static void *consumer (ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue) for (;;) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_Time_Value timeout (ACE_OS::time (0) + 4, 0); // Wait for upto 4 seconds diff --git a/ACE/examples/ASX/Message_Queue/priority_buffer.cpp b/ACE/examples/ASX/Message_Queue/priority_buffer.cpp index a71e8653ab9..5305e20f132 100644 --- a/ACE/examples/ASX/Message_Queue/priority_buffer.cpp +++ b/ACE/examples/ASX/Message_Queue/priority_buffer.cpp @@ -36,7 +36,7 @@ consumer (ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue) for (;;) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; if (msg_queue->dequeue_head (mb) == -1) break; @@ -75,7 +75,7 @@ producer (ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue) // Allocate a new buffer. char *buffer = rb.read ('\n'); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; if (buffer == 0) { diff --git a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp index f8ca093528b..aefff24925c 100644 --- a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp +++ b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp @@ -84,7 +84,7 @@ Text_Input_Device_Wrapper::create_input_message (void) { // Construct a new message block to send. - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (read_length_), 0); diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp index 3d7e36cb239..40efc8159b9 100644 --- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp +++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp @@ -94,7 +94,7 @@ void AIO_Output_Handler::open reader_.open (*this, new_handle, 0, proactor ()); writer_.open (*this, new_handle, 0, proactor ()); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW (mb, ACE_Message_Block (1)); reader_.read (*mb, 1); ACE_Sig_Action no_sigpipe ((ACE_SignalHandler) SIG_IGN); diff --git a/ACE/examples/C++NPv2/display_logfile.cpp b/ACE/examples/C++NPv2/display_logfile.cpp index 9382a2cf894..7eec2a55f57 100644 --- a/ACE/examples/C++NPv2/display_logfile.cpp +++ b/ACE/examples/C++NPv2/display_logfile.cpp @@ -223,7 +223,7 @@ public: virtual int svc () { int stop = 0; - for (ACE_Message_Block *mb; !stop && getq (mb) != -1; ) { + for (ACE_Message_Block *mb = 0; !stop && getq (mb) != -1; ) { if (mb->msg_type () == ACE_Message_Block::MB_STOP) stop = 1; else diff --git a/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp b/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp index 39ad86d5819..867cd7709ae 100644 --- a/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp +++ b/ACE/examples/IPC_SAP/UPIPE_SAP/ex1.cpp @@ -45,7 +45,7 @@ peer1 (void *) ACE_ERROR ((LM_ERROR, "(%t) peer1 ACE_UPIPE_Connector failed\n")); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (20), 0); diff --git a/ACE/examples/Reactor/Misc/test_demuxing.cpp b/ACE/examples/Reactor/Misc/test_demuxing.cpp index 99e3715f345..71ead8cb68b 100644 --- a/ACE/examples/Reactor/Misc/test_demuxing.cpp +++ b/ACE/examples/Reactor/Misc/test_demuxing.cpp @@ -299,7 +299,7 @@ Message_Handler::svc (void) { for (int i = 0;; i++) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (1), @@ -334,7 +334,7 @@ Message_Handler::handle_input (ACE_HANDLE) ACE_DEBUG ((LM_DEBUG, "(%t) Message_Handler::handle_input\n")); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; if (this->getq (mb, (ACE_Time_Value *) &ACE_Time_Value::zero) == -1) ACE_ERROR ((LM_ERROR, diff --git a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp index 12bf5e32eaa..8f05fcbe3aa 100644 --- a/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp +++ b/ACE/examples/Reactor/WFMO_Reactor/Talker.cpp @@ -412,7 +412,7 @@ Peer_Handler::handle_close (ACE_HANDLE, ACE_Reactor_Mask) int Peer_Handler::handle_output (ACE_HANDLE) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_Time_Value tv (ACE_Time_Value::zero); diff --git a/ACE/examples/Threads/barrier2.cpp b/ACE/examples/Threads/barrier2.cpp index 3264df56c11..db3a4f551e0 100644 --- a/ACE/examples/Threads/barrier2.cpp +++ b/ACE/examples/Threads/barrier2.cpp @@ -197,7 +197,7 @@ Worker_Task<BARRIER>::producer (void) for (;;) { // Allocate a new message. - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (BUFSIZ), diff --git a/ACE/examples/Threads/reader_writer.cpp b/ACE/examples/Threads/reader_writer.cpp index 5344ba4d5b4..460ce32249a 100644 --- a/ACE/examples/Threads/reader_writer.cpp +++ b/ACE/examples/Threads/reader_writer.cpp @@ -89,7 +89,7 @@ reader (void *) for (int iterations = 1; iterations <= n_iterations; iterations++) { - ACE_Read_Guard<ACE_RW_Mutex> g(rw_mutex); + ACE_READ_GUARD_RETURN (ACE_RW_Mutex, g, rw_mutex, 0); ++current_readers; @@ -127,7 +127,7 @@ writer (void *) iterations <= n_iterations; iterations++) { - ACE_Write_Guard<ACE_RW_Mutex> g(rw_mutex); + ACE_WRITE_GUARD_RETURN (ACE_RW_Mutex, g, rw_mutex, 0); ++current_writers; diff --git a/ACE/examples/Threads/recursive_mutex.cpp b/ACE/examples/Threads/recursive_mutex.cpp index 6ffc7670776..9c30e6e975d 100644 --- a/ACE/examples/Threads/recursive_mutex.cpp +++ b/ACE/examples/Threads/recursive_mutex.cpp @@ -62,7 +62,7 @@ recursive_worker (size_t nesting_level, "(%P|%t) = trying to acquire, nesting = %d, thread id = %u\n", rm->get_nesting_level (), rm->get_thread_id ())); { - // This illustrates the use of the ACE_Guard<LOCK> with an + // This illustrates the use of the ACE_GUARD with an // ACE_Recursive_Thread_Mutex. ACE_GUARD (ACE_Recursive_Thread_Mutex, ace_mon, *rm); ACE_DEBUG ((LM_DEBUG, diff --git a/ACE/examples/Threads/thread_pool.cpp b/ACE/examples/Threads/thread_pool.cpp index 6fe30ae25fd..62d13ebc279 100644 --- a/ACE/examples/Threads/thread_pool.cpp +++ b/ACE/examples/Threads/thread_pool.cpp @@ -104,7 +104,7 @@ Thread_Pool::svc (void) for (;; count++) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_DEBUG ((LM_DEBUG, "(%t) in iteration %d before getq ()\n", diff --git a/ACE/examples/Threads/thread_specific.cpp b/ACE/examples/Threads/thread_specific.cpp index e32b6aba329..4d4b25d9583 100644 --- a/ACE/examples/Threads/thread_specific.cpp +++ b/ACE/examples/Threads/thread_specific.cpp @@ -25,12 +25,6 @@ static ACE_TSS<Errno> tss_error; // Serializes output via cout. static ACE_SYNCH_MUTEX printf_lock; -#if defined (ACE_HAS_THREADS) -typedef ACE_TSS_Guard<ACE_Thread_Mutex> GUARD; -#else -typedef ACE_Guard<ACE_Null_Mutex> GUARD; -#endif /* ACE_HAS_THREADS */ - extern "C" void cleanup (void *ptr) { diff --git a/ACE/examples/Threads/tss1.cpp b/ACE/examples/Threads/tss1.cpp index edf1ee37164..23011071722 100644 --- a/ACE/examples/Threads/tss1.cpp +++ b/ACE/examples/Threads/tss1.cpp @@ -42,12 +42,6 @@ int Errno::flags_; // (Sun C++ 4.2 with -O3 won't link if the following is static.) ACE_TSS<Errno> TSS_Error; -#if defined (ACE_HAS_THREADS) - typedef ACE_TSS_Guard<ACE_Thread_Mutex> GUARD; -#else - typedef ACE_Guard<ACE_Null_Mutex> GUARD; -#endif /* ACE_HAS_THREADS */ - // Keeps track of whether Tester::close () has started. // (Sun C++ 4.2 with -O3 won't link if the following is static.) int close_started = 0; diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU index ec540074f2b..c339c7dd531 100644 --- a/ACE/include/makeinclude/platform_g++_common.GNU +++ b/ACE/include/makeinclude/platform_g++_common.GNU @@ -1,7 +1,44 @@ # -*- Makefile -*- # $Id$ -# -# Common file help turn on/off explicit template instantiation + +ifeq ($(insure),1) + CC = insure + CXX = insure +else + ifneq ($(CROSS_COMPILE),) + # Build using the cross-tools + CC = ${CROSS_COMPILE}gcc + CXX = ${CROSS_COMPILE}g++ + AR = ${CROSS_COMPILE}ar + # Cross-linker requires this for linked in shared libs that depend + # themselves on other shared libs (not directly linked in) + LDFLAGS += -Wl,-rpath-link,$(ACE_ROOT)/lib + ifneq (,$(HOST_ROOT)) + TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf + TAO_IDL = $(HOST_ROOT)/bin/tao_idl + TAO_IDL_DEP = $(TAO_IDL) + TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_idl2 + TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2) + # make sure to use the target compiler, not the cross-compiler + # as preprocessor for the cross-compiled idl tools + TAO_IDL_PREPROCESSOR = gcc + endif + endif +endif + +ifneq ($(TCPU),) + ifeq ($(tunemodelflag),1) + FLAGS_C_CC += -mtune=$(TCPU) + endif + + ifeq ($(cpumodelflag),1) + FLAGS_C_CC += -mcpu=$(TCPU) + endif + + ifeq ($(archmodelflag),1) + FLAGS_C_CC += -march=$(TCPU) + endif +endif ifeq ($(CXX),insure) # insure does not pass through the -dumpversion option. diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU index baea711f66d..0cb0b03a5c6 100644 --- a/ACE/include/makeinclude/platform_linux.GNU +++ b/ACE/include/makeinclude/platform_linux.GNU @@ -86,20 +86,6 @@ PRELIB = @true # include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU -ifneq ($(TCPU),) - ifeq ($(tunemodelflag),1) - FLAGS_C_CC += -mtune=$(TCPU) - endif - - ifeq ($(cpumodelflag),1) - FLAGS_C_CC += -mcpu=$(TCPU) - endif - - ifeq ($(archmodelflag),1) - FLAGS_C_CC += -march=$(TCPU) - endif -endif - # TAO with GCC 4.0.2 and -O3 seems to result in runtime issues, for example # the ForwardRequest PI test will fail. For GCC 4.0.2 we default to -O2 ifeq ($(CXX_VERSION),4.0.2) diff --git a/ACE/include/makeinclude/platform_linux_common.GNU b/ACE/include/makeinclude/platform_linux_common.GNU index 1695532fd3a..a4c693ad1b6 100644 --- a/ACE/include/makeinclude/platform_linux_common.GNU +++ b/ACE/include/makeinclude/platform_linux_common.GNU @@ -114,31 +114,6 @@ endif # ssl SYSARCH := $(shell uname -m) -ifeq ($(insure),1) - CC = insure - CXX = insure -else - ifneq ($(CROSS_COMPILE),) - # Build using the cross-tools - CC = ${CROSS_COMPILE}gcc - CXX = ${CROSS_COMPILE}g++ - AR = ${CROSS_COMPILE}ar - # Cross-linker requires this for linked in shared libs that depend - # themselves on other shared libs (not directly linked in) - LDFLAGS += -Wl,-rpath-link,$(ACE_ROOT)/lib - ifneq (,$(HOST_ROOT)) - TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/ace_gperf - TAO_IDL = $(HOST_ROOT)/bin/tao_idl - TAO_IDL_DEP = $(TAO_IDL) - TAO_IDL3_TO_IDL2 = $(HOST_ROOT)/TAO/CIAO/bin/tao_idl3_to_idl2 - TAO_IDL3_TO_IDL2_DEP = $(TAO_IDL3_TO_IDL2) - # make sure to use the target compiler, not the cross-compiler - # as preprocessor for the cross-compiled idl tools - TAO_IDL_PREPROCESSOR = gcc - endif - endif -endif - PIC = -fPIC AR ?= ar ARFLAGS ?= rsuv diff --git a/ACE/include/makeinclude/platform_qnx_neutrino.GNU b/ACE/include/makeinclude/platform_qnx_neutrino.GNU index 2bd92551f7b..272671d589e 100644 --- a/ACE/include/makeinclude/platform_qnx_neutrino.GNU +++ b/ACE/include/makeinclude/platform_qnx_neutrino.GNU @@ -8,7 +8,6 @@ static_libs_only = 1 debug ?= 1 optimize ?= 1 pipes ?= 1 - CC ?= i386-nto-gcc CXX ?= i386-nto-g++ diff --git a/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU b/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU index 08618ddc28a..be3c802fcc4 100644 --- a/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU +++ b/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU @@ -1,6 +1,6 @@ # $Id$ # -# QNX/RTP hosted, using gcc-2.95.2 +# QNX/RTP hosted, using GCC inline ?= 1 debug ?= 1 @@ -43,3 +43,6 @@ PRELIB = @true # include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU CCFLAGS += $(CFLAGS) $(TEMPLATES_FLAG) + +CFLAGS += $(FLAGS_C_CC) +CCFLAGS += $(FLAGS_C_CC) diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.cpp b/ACE/netsvcs/lib/Log_Message_Receiver.cpp index b6496232bd3..01492c145d8 100644 --- a/ACE/netsvcs/lib/Log_Message_Receiver.cpp +++ b/ACE/netsvcs/lib/Log_Message_Receiver.cpp @@ -14,8 +14,8 @@ Static_Log_Message_Receiver<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostnam ACE_Log_Record &record) { #if defined (ACE_HAS_THREADS) - static ACE_SYNCH_MUTEX_T lock_; - ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, lock_); + static ACE_SYNCH_MUTEX_T lock_; + ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, lock_); #endif /* ACE_HAS_THREADS */ record.print (hostname, @@ -68,15 +68,10 @@ Log_Message_Receiver_Impl<ACE_SYNCH_USE>::attach (Log_Message_Receiver_Impl<ACE_ #if defined (ACE_HAS_THREADS) # if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - Guard guard (copy_lock_); - if (guard.locked () == 0) - return 0; + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX_T, guard, copy_lock_, 0); # else // Use the "body"s print lock as copy lock. - ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, - guard, - global_copy_lock_, - 0); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, global_copy_lock_, 0); # endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ #endif /* ACE_HAS_THREADS */ ++body->count_; @@ -90,14 +85,10 @@ Log_Message_Receiver_Impl<ACE_SYNCH_USE>::detach (Log_Message_Receiver_Impl<ACE_ #if defined (ACE_HAS_THREADS) # if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) - Guard guard (copy_lock_); - if (guard.locked () == 0) - return; + ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, copy_lock_); # else // Use the "body"s print lock as copy lock. - ACE_GUARD (ACE_SYNCH_MUTEX, - guard, - global_copy_lock_); + ACE_GUARD (ACE_SYNCH_MUTEX, guard, global_copy_lock_); # endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ #endif /* ACE_HAS_THREADS */ if (body->count_-- == 0) @@ -109,7 +100,7 @@ template<ACE_SYNCH_DECL> void Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_record (const ACE_TCHAR *hostname, ACE_Log_Record &record) { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, print_lock_)); + ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, print_lock_); record.print (hostname, ACE_Log_Msg::instance ()->flags (), stderr); @@ -122,7 +113,7 @@ Log_Message_Receiver_Impl<ACE_SYNCH_USE>::log_output (const ACE_TCHAR *hostname, { if (outputfile != 0) { - ACE_MT (ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, print_lock_)); + ACE_GUARD (ACE_SYNCH_MUTEX_T, guard, print_lock_); record.print (hostname, ACE_Log_Msg::instance ()->flags (), *outputfile); diff --git a/ACE/netsvcs/lib/Log_Message_Receiver.h b/ACE/netsvcs/lib/Log_Message_Receiver.h index a067ca537c7..8c3570a6ed2 100644 --- a/ACE/netsvcs/lib/Log_Message_Receiver.h +++ b/ACE/netsvcs/lib/Log_Message_Receiver.h @@ -175,7 +175,7 @@ private: * @brief Implementation with reference count. */ template<ACE_SYNCH_DECL> -class Log_Message_Receiver_Impl +class Log_Message_Receiver_Impl : private ACE_Copy_Disabled { public: // Methods for handling reference count and instance lifetime @@ -183,8 +183,7 @@ public: static Log_Message_Receiver_Impl *attach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body); static void detach (Log_Message_Receiver_Impl<ACE_SYNCH_USE> *body); - void log_record (const ACE_TCHAR *hostname, - ACE_Log_Record &record); + void log_record (const ACE_TCHAR *hostname, ACE_Log_Record &record); void log_output(const ACE_TCHAR *hostname, ACE_Log_Record &record, @@ -195,7 +194,6 @@ protected: ~Log_Message_Receiver_Impl (void); /// Attributes - typedef ACE_Guard<ACE_SYNCH_MUTEX_T> Guard; int count_; ACE_SYNCH_MUTEX_T print_lock_; @@ -203,10 +201,6 @@ private: #if !defined (ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES) static ACE_SYNCH_MUTEX_T copy_lock_; #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */ - - // = Not implemeted - ACE_UNIMPLEMENTED_FUNC (Log_Message_Receiver_Impl (const Log_Message_Receiver_Impl<ACE_SYNCH_USE> &rhs)) - ACE_UNIMPLEMENTED_FUNC (void operator=(const Log_Message_Receiver_Impl<ACE_SYNCH_USE> &rhs)) }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/ACE/performance-tests/Misc/Misc.mpc b/ACE/performance-tests/Misc/Misc.mpc index 3be2b7e3078..789966ba50c 100644 --- a/ACE/performance-tests/Misc/Misc.mpc +++ b/ACE/performance-tests/Misc/Misc.mpc @@ -58,10 +58,9 @@ project(*preempt) : aceexe { } } -// May need to add an ace_obsolete_guard_class feature -//project(*test_guard) : aceexe { -// exename = test_guard -// Source_Files { -// test_guard.cpp -// } -//} +project(*test_guard) : aceexe { + exename = test_guard + Source_Files { + test_guard.cpp + } +} diff --git a/ACE/performance-tests/Misc/test_guard.cpp b/ACE/performance-tests/Misc/test_guard.cpp index e559508af41..9117a747a0f 100644 --- a/ACE/performance-tests/Misc/test_guard.cpp +++ b/ACE/performance-tests/Misc/test_guard.cpp @@ -1,24 +1,15 @@ // $Id$ -// This test program illustrates the performance of ACE_Guard and -// ACE_Thread_Mutex_Guard. +// This test program illustrates the performance of ACE_GUARD #include "ace/Log_Msg.h" #include "ace/Get_Opt.h" #include "ace/Profile_Timer.h" -#if !defined (ACE_USES_OBSOLETE_GUARD_CLASSES) -#error You must compile ACE and this program with ACE_USES_OBSOLETE_GUARD_CLASSES defined! -#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */ - ACE_RCSID(Misc, test_guard, "$Id$") #if defined (ACE_HAS_THREADS) -# define ACE_THREAD_GUARD(OBJ,LOCK) \ - ACE_Thread_Mutex_Guard OBJ (LOCK); \ - if (OBJ.locked () == 0) return; - static const int DEFAULT_ITERATIONS = 100000000; enum @@ -39,13 +30,9 @@ void guard (void) dummy++; } -void thr_guard (void) -{ - ACE_THREAD_GUARD (_ace_mon, lock_); - dummy++; -} - -char *test_name[TEST_END] = { "ACE_Guard", "ACE_Thread_Mutex_Guard" }; +// FUZZ: disable check_for_ACE_Guard +char *test_name[TEST_END] = { "ACE_Guard" }; +// FUZZ: enable check_for_ACE_Guard guard_func test_function=guard; @@ -54,30 +41,20 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { ACE_Profile_Timer timer; - //FUZZ: disable check_for_lack_ACE_OS - ACE_Get_Opt getopt (argc, argv, ACE_TEXT("gtn:")); - //FUZZ: enable check_for_lack_ACE_OS + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("gn:")); 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 + while ((c = get_opt()) != -1) switch (c) { -#if defined (ACE_USES_OBSOLETE_GUARD_CLASSES) - case 't': - test_type = TEST_THR_GUARD; - test_function = thr_guard; - break; -#endif /* ACE_USES_OBSOLETE_GUARD_CLASSES */ case 'g': test_type = TEST_GUARD; test_function = guard; break; case 'n': - iterations = ACE_OS::atoi (getopt.opt_arg ()); + iterations = ACE_OS::atoi (get_opt.opt_arg ()); break; default: ACE_ERROR_RETURN ((LM_ERROR, 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 48d57269f18..86e166c47f5 100644 --- a/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp +++ b/ACE/performance-tests/Synch-Benchmarks/Base_Test/Baseline_Test.cpp @@ -40,17 +40,15 @@ 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); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:ylrw"), 0); int c; - while ((c = getopt ()) != -1) - //FUZZ: enable check_for_lack_ACE_OS + while ((c = get_opt ()) != -1) switch (c) { case 'i': // Total iterations { - int tmp = ACE_OS::atoi (getopt.opt_arg ()); + int tmp = ACE_OS::atoi (get_opt.opt_arg ()); if (tmp <= 0) ACE_ERROR_RETURN ((LM_ERROR, "%d is not a valid value for iteration\n", diff --git a/ACE/performance-tests/TCP/tcp_test.cpp b/ACE/performance-tests/TCP/tcp_test.cpp index e2b202326d7..987846227dc 100644 --- a/ACE/performance-tests/TCP/tcp_test.cpp +++ b/ACE/performance-tests/TCP/tcp_test.cpp @@ -541,12 +541,10 @@ 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:")); + ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hxwvb:I:p:sci:m:at:")); - while ((c = getopt ()) != -1) + while ((c = get_opt ()) != -1) { - //FUZZ: enable check_for_lack_ACE_OS switch ((char) c) { case 'v': @@ -558,7 +556,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) break; case 'm': - bufsz = ACE_OS::atoi (getopt.opt_arg ()); + bufsz = ACE_OS::atoi (get_opt.opt_arg ()); if (bufsz <= 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -571,7 +569,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) 1); case 'i': - nsamples = ACE_OS::atoi (getopt.opt_arg ()); + nsamples = ACE_OS::atoi (get_opt.opt_arg ()); if (nsamples <= 0) ACE_ERROR_RETURN ((LM_ERROR, "\nIterations must be greater than 0!\n\n"), @@ -595,7 +593,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) #endif /* ACE_WIN32 */ case 'b': - so_bufsz = ACE_OS::atoi (getopt.opt_arg ()); + so_bufsz = ACE_OS::atoi (get_opt.opt_arg ()); if (so_bufsz <= 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -604,7 +602,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) break; case 'I': - usdelay = ACE_OS::atoi (getopt.opt_arg ()); + usdelay = ACE_OS::atoi (get_opt.opt_arg ()); if (usdelay < 0) { @@ -612,20 +610,20 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_ERROR_RETURN ((LM_ERROR, "%s: bad usdelay: %s\n", argv[0], - getopt.opt_arg ()), + get_opt.opt_arg ()), 1); } break; case 'p': - dstport = ACE_OS::atoi (getopt.opt_arg ()); + dstport = ACE_OS::atoi (get_opt.opt_arg ()); if (dstport <= 0) ACE_ERROR_RETURN ((LM_ERROR, "\nInvalid port number!\n\n"), 1); break; case 't': - svr_thrno = ACE_OS::atoi (getopt.opt_arg ()); + svr_thrno = ACE_OS::atoi (get_opt.opt_arg ()); if (svr_thrno <= 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -647,7 +645,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } } - if ((getopt.opt_ind () >= argc && client != 0) || argc == 1) + if ((get_opt.opt_ind () >= argc && client != 0) || argc == 1) { usage (); return 1; @@ -670,25 +668,25 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACE_INET_Addr remote_addr; - if (ACE_OS::ace_isdigit(argv[getopt.opt_ind ()][0])) + if (ACE_OS::ace_isdigit(argv[get_opt.opt_ind ()][0])) { if (remote_addr.set (dstport, (ACE_UINT32) ACE_OS::inet_addr - (ACE_TEXT_ALWAYS_CHAR(argv[getopt.opt_ind ()]))) == -1) + (ACE_TEXT_ALWAYS_CHAR(argv[get_opt.opt_ind ()]))) == -1) ACE_ERROR_RETURN ((LM_ERROR, "invalid IP address: %s\n", - argv[getopt.opt_ind ()]), + argv[get_opt.opt_ind ()]), 1); } else { - if (remote_addr.set (dstport, argv[getopt.opt_ind ()]) == -1) + if (remote_addr.set (dstport, argv[get_opt.opt_ind ()]) == -1) ACE_ERROR_RETURN ((LM_ERROR, "invalid IP address: %s\n", - argv[getopt.opt_ind ()]), + argv[get_opt.opt_ind ()]), 1); } - getopt.opt_ind ()++; + get_opt.opt_ind ()++; ACE_DEBUG ((LM_DEBUG, "Connecting to %s:%d\n", remote_addr.get_host_name (), diff --git a/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.cpp b/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.cpp index ee29ed17ca2..509c2607512 100644 --- a/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_ID_Requestor.cpp @@ -101,7 +101,7 @@ ACE::HTBP::ID_Requestor::get_HTID () if (ACE::HTBP::ID_Requestor::htid_.length() != 0) return ACE::HTBP::ID_Requestor::htid_.rep(); - ACE_Guard<ACE_SYNCH_MUTEX> guard (ACE::HTBP::ID_Requestor::htid_lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, ACE::HTBP::ID_Requestor::htid_lock_, 0); if (ACE::HTBP::ID_Requestor::htid_.length() != 0) return ACE::HTBP::ID_Requestor::htid_.rep(); diff --git a/ACE/protocols/ace/HTBP/HTBP_Session.cpp b/ACE/protocols/ace/HTBP/HTBP_Session.cpp index ee5ce58d501..f02ba5c9ce3 100644 --- a/ACE/protocols/ace/HTBP/HTBP_Session.cpp +++ b/ACE/protocols/ace/HTBP/HTBP_Session.cpp @@ -25,7 +25,7 @@ ACE_SYNCH_MUTEX ACE::HTBP::Session::session_id_lock_; ACE_UINT32 ACE::HTBP::Session::next_session_id () { - ACE_Guard<ACE_SYNCH_MUTEX> g(ACE::HTBP::Session::session_id_lock_); + ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, g, ACE::HTBP::Session::session_id_lock_, 0); return ++last_session_id_; } diff --git a/ACE/protocols/ace/INet/FTP_Request.h b/ACE/protocols/ace/INet/FTP_Request.h index c73e955e4b5..d57bb4898de 100644 --- a/ACE/protocols/ace/INet/FTP_Request.h +++ b/ACE/protocols/ace/INet/FTP_Request.h @@ -11,7 +11,7 @@ #include /**/ "ace/pre.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "ace/INet/INet_Export.h" #include "ace/INet/Request.h" #include "ace/SString.h" diff --git a/ACE/protocols/ace/INet/FTP_Response.h b/ACE/protocols/ace/INet/FTP_Response.h index 06d632b0e16..022cd77e9d2 100644 --- a/ACE/protocols/ace/INet/FTP_Response.h +++ b/ACE/protocols/ace/INet/FTP_Response.h @@ -14,7 +14,7 @@ #include "ace/INet/INet_Export.h" #include "ace/INet/Response.h" #include "ace/SString.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #include <iostream> ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/protocols/ace/INet/HTTP_Request.h b/ACE/protocols/ace/INet/HTTP_Request.h index b549e403c59..b10a870f389 100644 --- a/ACE/protocols/ace/INet/HTTP_Request.h +++ b/ACE/protocols/ace/INet/HTTP_Request.h @@ -17,7 +17,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "ace/INet/INet_Export.h" #include "ace/INet/Request.h" #include "ace/INet/HTTP_Header.h" diff --git a/ACE/protocols/ace/INet/HTTP_Response.h b/ACE/protocols/ace/INet/HTTP_Response.h index 46c0fa4fa8e..fe6e3fbc813 100644 --- a/ACE/protocols/ace/INet/HTTP_Response.h +++ b/ACE/protocols/ace/INet/HTTP_Response.h @@ -17,7 +17,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "ace/INet/INet_Export.h" #include "ace/INet/Response.h" #include "ace/INet/HTTP_Header.h" diff --git a/ACE/protocols/ace/INet/HeaderBase.h b/ACE/protocols/ace/INet/HeaderBase.h index 67b10282192..5231ee24294 100644 --- a/ACE/protocols/ace/INet/HeaderBase.h +++ b/ACE/protocols/ace/INet/HeaderBase.h @@ -19,7 +19,7 @@ #include "ace/SString.h" #include "ace/Containers_T.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "ace/OS_NS_ctype.h" #include "ace/INet/INet_Export.h" #include <iostream> diff --git a/ACE/protocols/ace/RMCast/Acknowledge.cpp b/ACE/protocols/ace/RMCast/Acknowledge.cpp index 2423357e92a..09af788bd9a 100644 --- a/ACE/protocols/ace/RMCast/Acknowledge.cpp +++ b/ACE/protocols/ace/RMCast/Acknowledge.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Acknowledge.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "ace/Time_Value.h" // ACE_Time_Value #include "ace/OS_NS_unistd.h" @@ -9,12 +8,6 @@ #include "Acknowledge.h" -/* -#include <iostream> -using std::cerr; -using std::endl; -*/ - namespace ACE_RMCast { Acknowledge:: diff --git a/ACE/protocols/ace/RMCast/Acknowledge.h b/ACE/protocols/ace/RMCast/Acknowledge.h index 3d7654b1fec..799ff7e353b 100644 --- a/ACE/protocols/ace/RMCast/Acknowledge.h +++ b/ACE/protocols/ace/RMCast/Acknowledge.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Acknowledge.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_ACKNOWLEDGE_H #define ACE_RMCAST_ACKNOWLEDGE_H diff --git a/ACE/protocols/ace/RMCast/Bits.h b/ACE/protocols/ace/RMCast/Bits.h index 1b45580647b..79a0bde104e 100644 --- a/ACE/protocols/ace/RMCast/Bits.h +++ b/ACE/protocols/ace/RMCast/Bits.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Bits.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_BITS_H #define ACE_RMCAST_BITS_H @@ -13,13 +12,10 @@ namespace ACE_RMCast { typedef ACE_SYNCH_MUTEX Mutex; +// FUZZ: disable check_for_ACE_Guard typedef ACE_Guard<Mutex> Lock; typedef ACE_Condition<Mutex> Condition; - - // tmp - // - //using std::cerr; - //using std::endl; +// FUZZ: enable check_for_ACE_Guard } diff --git a/ACE/protocols/ace/RMCast/Flow.cpp b/ACE/protocols/ace/RMCast/Flow.cpp index c5d9f63a754..a0d75081075 100644 --- a/ACE/protocols/ace/RMCast/Flow.cpp +++ b/ACE/protocols/ace/RMCast/Flow.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Flow.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "Flow.h" @@ -9,12 +8,6 @@ #include "ace/os_include/os_math.h" // exp -/* -#include <iostream> -using std::cerr; -using std::endl; -*/ - namespace ACE_RMCast { Flow:: diff --git a/ACE/protocols/ace/RMCast/Flow.h b/ACE/protocols/ace/RMCast/Flow.h index e64d0d438a2..7c8848b8d3d 100644 --- a/ACE/protocols/ace/RMCast/Flow.h +++ b/ACE/protocols/ace/RMCast/Flow.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Flow.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_FLOW_H #define ACE_RMCAST_FLOW_H diff --git a/ACE/protocols/ace/RMCast/Fragment.cpp b/ACE/protocols/ace/RMCast/Fragment.cpp index 9a483e7cfbe..3bf08f24350 100644 --- a/ACE/protocols/ace/RMCast/Fragment.cpp +++ b/ACE/protocols/ace/RMCast/Fragment.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Fragment.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "Fragment.h" diff --git a/ACE/protocols/ace/RMCast/Fragment.h b/ACE/protocols/ace/RMCast/Fragment.h index bfaa3044c83..6362c51bfbb 100644 --- a/ACE/protocols/ace/RMCast/Fragment.h +++ b/ACE/protocols/ace/RMCast/Fragment.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Fragment.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_FRAGMENT_H #define ACE_RMCAST_FRAGMENT_H diff --git a/ACE/protocols/ace/RMCast/Link.cpp b/ACE/protocols/ace/RMCast/Link.cpp index 12e6003d456..a863addfec2 100644 --- a/ACE/protocols/ace/RMCast/Link.cpp +++ b/ACE/protocols/ace/RMCast/Link.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Link.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "ace/Time_Value.h" // ACE_Time_Value #include "ace/OS_NS_stdio.h" diff --git a/ACE/protocols/ace/RMCast/Link.h b/ACE/protocols/ace/RMCast/Link.h index 6397322556f..35ca7fb2f15 100644 --- a/ACE/protocols/ace/RMCast/Link.h +++ b/ACE/protocols/ace/RMCast/Link.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Link.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_LINK_H #define ACE_RMCAST_LINK_H diff --git a/ACE/protocols/ace/RMCast/Parameters.h b/ACE/protocols/ace/RMCast/Parameters.h index d254bd00fad..0137979fcf7 100644 --- a/ACE/protocols/ace/RMCast/Parameters.h +++ b/ACE/protocols/ace/RMCast/Parameters.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Parameters.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_PARAMETERS_H #define ACE_RMCAST_PARAMETERS_H diff --git a/ACE/protocols/ace/RMCast/Protocol.cpp b/ACE/protocols/ace/RMCast/Protocol.cpp index 755872371cb..9ae7804d010 100644 --- a/ACE/protocols/ace/RMCast/Protocol.cpp +++ b/ACE/protocols/ace/RMCast/Protocol.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Protocol.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "Protocol.h" diff --git a/ACE/protocols/ace/RMCast/Protocol.h b/ACE/protocols/ace/RMCast/Protocol.h index 50090523ad0..f86a1fa3afc 100644 --- a/ACE/protocols/ace/RMCast/Protocol.h +++ b/ACE/protocols/ace/RMCast/Protocol.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Protocol.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_PROTOCOL_H #define ACE_RMCAST_PROTOCOL_H @@ -22,10 +21,6 @@ #include "Bits.h" -/* -#include <iostream> -*/ - namespace ACE_RMCast { // Basic types. diff --git a/ACE/protocols/ace/RMCast/Reassemble.cpp b/ACE/protocols/ace/RMCast/Reassemble.cpp index e5aeab92519..2ffa5c2a7d0 100644 --- a/ACE/protocols/ace/RMCast/Reassemble.cpp +++ b/ACE/protocols/ace/RMCast/Reassemble.cpp @@ -1,16 +1,9 @@ -// file : ace/RMCast/Reassemble.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "Reassemble.h" #include "ace/OS_NS_stdlib.h" -/* -#include <iostream> -using std::cerr; -using std::endl; -*/ - namespace ACE_RMCast { Reassemble:: diff --git a/ACE/protocols/ace/RMCast/Reassemble.h b/ACE/protocols/ace/RMCast/Reassemble.h index cffa4fdc359..37a12cf8922 100644 --- a/ACE/protocols/ace/RMCast/Reassemble.h +++ b/ACE/protocols/ace/RMCast/Reassemble.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Reassemble.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_REASSEMBLE_H #define ACE_RMCAST_REASSEMBLE_H diff --git a/ACE/protocols/ace/RMCast/Retransmit.cpp b/ACE/protocols/ace/RMCast/Retransmit.cpp index 6611bb14b52..1a570f337fa 100644 --- a/ACE/protocols/ace/RMCast/Retransmit.cpp +++ b/ACE/protocols/ace/RMCast/Retransmit.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Retransmit.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "ace/Time_Value.h" // ACE_Time_Value #include "ace/OS_NS_stdlib.h" // abort @@ -8,12 +7,6 @@ #include "Retransmit.h" -/* -#include <iostream> -using std::cerr; -using std::endl; -*/ - namespace ACE_RMCast { Retransmit:: diff --git a/ACE/protocols/ace/RMCast/Retransmit.h b/ACE/protocols/ace/RMCast/Retransmit.h index 0a3a8f72bd7..977f61b4c42 100644 --- a/ACE/protocols/ace/RMCast/Retransmit.h +++ b/ACE/protocols/ace/RMCast/Retransmit.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Retransmit.h // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #ifndef ACE_RMCAST_RETRANSMIT_H #define ACE_RMCAST_RETRANSMIT_H diff --git a/ACE/protocols/ace/RMCast/Simulator.cpp b/ACE/protocols/ace/RMCast/Simulator.cpp index ec879c865ba..c449821aa95 100644 --- a/ACE/protocols/ace/RMCast/Simulator.cpp +++ b/ACE/protocols/ace/RMCast/Simulator.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Simulator.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "ace/OS_NS_time.h" #include "Simulator.h" diff --git a/ACE/protocols/ace/RMCast/Simulator.h b/ACE/protocols/ace/RMCast/Simulator.h index 27b227f488b..0548ae2fa93 100644 --- a/ACE/protocols/ace/RMCast/Simulator.h +++ b/ACE/protocols/ace/RMCast/Simulator.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Simulator.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_SIMULATOR_H #define ACE_RMCAST_SIMULATOR_H diff --git a/ACE/protocols/ace/RMCast/Socket.cpp b/ACE/protocols/ace/RMCast/Socket.cpp index 51e6d450173..b3bd0b2a01c 100644 --- a/ACE/protocols/ace/RMCast/Socket.cpp +++ b/ACE/protocols/ace/RMCast/Socket.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Socket.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "ace/OS_Memory.h" #include "ace/OS_NS_stdio.h" diff --git a/ACE/protocols/ace/RMCast/Socket.h b/ACE/protocols/ace/RMCast/Socket.h index 3468df15d4d..261808afe8c 100644 --- a/ACE/protocols/ace/RMCast/Socket.h +++ b/ACE/protocols/ace/RMCast/Socket.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Socket.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_SOCKET_H #define ACE_RMCAST_SOCKET_H diff --git a/ACE/protocols/ace/RMCast/Stack.cpp b/ACE/protocols/ace/RMCast/Stack.cpp index 19d592f5c21..68b0d31bcfe 100644 --- a/ACE/protocols/ace/RMCast/Stack.cpp +++ b/ACE/protocols/ace/RMCast/Stack.cpp @@ -1,6 +1,5 @@ -// file : ace/RMCast/Stack.cpp // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ +// $Id$ #include "Stack.h" diff --git a/ACE/protocols/ace/RMCast/Stack.h b/ACE/protocols/ace/RMCast/Stack.h index 322fe0dc501..1637d87a1d4 100644 --- a/ACE/protocols/ace/RMCast/Stack.h +++ b/ACE/protocols/ace/RMCast/Stack.h @@ -1,6 +1,5 @@ -// file : ace/RMCast/Stack.h +// $Id$ // author : Boris Kolpackov <boris@kolpackov.net> -// cvs-id : $Id$ #ifndef ACE_RMCAST_STACK_H #define ACE_RMCAST_STACK_H diff --git a/ACE/protocols/ace/TMCast/FaultDetector.hpp b/ACE/protocols/ace/TMCast/FaultDetector.hpp index d91540ba6f6..b629cf27078 100644 --- a/ACE/protocols/ace/TMCast/FaultDetector.hpp +++ b/ACE/protocols/ace/TMCast/FaultDetector.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/FaultDetector.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #include "Protocol.hpp" diff --git a/ACE/protocols/ace/TMCast/Group.cpp b/ACE/protocols/ace/TMCast/Group.cpp index 1165aa34e98..edc73145dd1 100644 --- a/ACE/protocols/ace/TMCast/Group.cpp +++ b/ACE/protocols/ace/TMCast/Group.cpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/Group.cpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #include "Group.hpp" @@ -298,7 +297,9 @@ namespace ACE_TMCast ACE_Thread_Mutex mutex_; ACE_Condition<ACE_Thread_Mutex> cond_; +// FUZZ: disable check_for_ACE_Guard typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; +// FUZZ: enable check_for_ACE_Guard char id_[Protocol::MEMBER_ID_LENGTH]; @@ -463,7 +464,9 @@ namespace ACE_TMCast ACE_Condition<ACE_Thread_Mutex> send_cond_; ACE_Condition<ACE_Thread_Mutex> recv_cond_; + // FUZZ: disable check_for_ACE_Guard typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; + // FUZZ: enable check_for_ACE_Guard bool failed_; diff --git a/ACE/protocols/ace/TMCast/Group.hpp b/ACE/protocols/ace/TMCast/Group.hpp index 1ec39ca4f22..55adb735a87 100644 --- a/ACE/protocols/ace/TMCast/Group.hpp +++ b/ACE/protocols/ace/TMCast/Group.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/Group.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #ifndef TMCAST_GROUP_HPP #define TMCAST_GROUP_HPP diff --git a/ACE/protocols/ace/TMCast/GroupFwd.hpp b/ACE/protocols/ace/TMCast/GroupFwd.hpp index d224586545e..43da9eef0a6 100644 --- a/ACE/protocols/ace/TMCast/GroupFwd.hpp +++ b/ACE/protocols/ace/TMCast/GroupFwd.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/GroupFwd.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #ifndef TMCAST_GROUP_FWD_HPP #define TMCAST_GROUP_FWD_HPP diff --git a/ACE/protocols/ace/TMCast/LinkListener.hpp b/ACE/protocols/ace/TMCast/LinkListener.hpp index 983f7828f3e..c432e2f54f2 100644 --- a/ACE/protocols/ace/TMCast/LinkListener.hpp +++ b/ACE/protocols/ace/TMCast/LinkListener.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/LinkListener.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ // OS primitives #include <ace/OS_NS_string.h> @@ -15,15 +14,8 @@ namespace ACE_TMCast { - // - // - // class LinkFailure : public virtual Message {}; - - // - // - // class LinkData : public virtual Message { public: @@ -64,9 +56,6 @@ namespace ACE_TMCast ACE_Refcounted_Auto_Ptr<LinkData, ACE_Null_Mutex> LinkDataPtr; - // - // - // class LinkListener { private: @@ -161,7 +150,9 @@ namespace ACE_TMCast } private: + // FUZZ: disable check_for_ACE_Guard typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; + // FUZZ: enable check_for_ACE_Guard ACE_hthread_t thread_; ACE_SOCK_Dgram_Mcast& sock_; diff --git a/ACE/protocols/ace/TMCast/MTQueue.cpp b/ACE/protocols/ace/TMCast/MTQueue.cpp index 9f08db5843d..74eef90ae38 100644 --- a/ACE/protocols/ace/TMCast/MTQueue.cpp +++ b/ACE/protocols/ace/TMCast/MTQueue.cpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/MTQueue.cpp +// $Id$ // author : Steve Huston <shuston@riverace.com> -// cvs-id : $Id$ #include "LinkListener.hpp" #include "MTQueue.hpp" diff --git a/ACE/protocols/ace/TMCast/MTQueue.hpp b/ACE/protocols/ace/TMCast/MTQueue.hpp index 2eb128823fe..ac0c83b4c1f 100644 --- a/ACE/protocols/ace/TMCast/MTQueue.hpp +++ b/ACE/protocols/ace/TMCast/MTQueue.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/MTQueue.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #ifndef TMCAST_MT_QUEUE_HPP #define TMCAST_MT_QUEUE_HPP diff --git a/ACE/protocols/ace/TMCast/Messaging.hpp b/ACE/protocols/ace/TMCast/Messaging.hpp index f17dd40b03c..a75191f23f0 100644 --- a/ACE/protocols/ace/TMCast/Messaging.hpp +++ b/ACE/protocols/ace/TMCast/Messaging.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/Messaging.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #ifndef TMCAST_MESSAGING_HPP #define TMCAST_MESSAGING_HPP diff --git a/ACE/protocols/ace/TMCast/Protocol.cpp b/ACE/protocols/ace/TMCast/Protocol.cpp index ea4c6b39020..14991207edd 100644 --- a/ACE/protocols/ace/TMCast/Protocol.cpp +++ b/ACE/protocols/ace/TMCast/Protocol.cpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/Protocol.cpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #include "Protocol.hpp" diff --git a/ACE/protocols/ace/TMCast/Protocol.hpp b/ACE/protocols/ace/TMCast/Protocol.hpp index 6cdf374f4f9..91ef5ab4dab 100644 --- a/ACE/protocols/ace/TMCast/Protocol.hpp +++ b/ACE/protocols/ace/TMCast/Protocol.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/Protocol.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #ifndef TMCAST_PROTOCOL_HPP #define TMCAST_PROTOCOL_HPP @@ -9,9 +8,6 @@ namespace ACE_TMCast { namespace Protocol { - // - // - // unsigned long const MEMBER_ID_LENGTH = 38; struct MemberId @@ -23,13 +19,8 @@ namespace ACE_TMCast */ }; - // - // - // typedef unsigned short TransactionId; - - typedef unsigned char TransactionStatus; TransactionStatus const TS_BEGIN = 1; @@ -51,9 +42,6 @@ namespace ACE_TMCast // typedef Transaction TransactionList[TL_LENGTH]; - // - // - // struct MessageHeader { unsigned long length; @@ -67,11 +55,6 @@ namespace ACE_TMCast //TransactionList transaction_list; }; - - // - // - // - unsigned long const MAX_MESSAGE_SIZE = 768; unsigned long const diff --git a/ACE/protocols/ace/TMCast/TransactionController.hpp b/ACE/protocols/ace/TMCast/TransactionController.hpp index 0ed5002bdf1..2ac6f3bcf66 100644 --- a/ACE/protocols/ace/TMCast/TransactionController.hpp +++ b/ACE/protocols/ace/TMCast/TransactionController.hpp @@ -1,6 +1,5 @@ -// file : ACE_TMCast/TransactionController.hpp +// $Id$ // author : Boris Kolpackov <boris@dre.vanderbilt.edu> -// cvs-id : $Id$ #include "ace/OS_NS_string.h" #include "ace/OS_NS_stdlib.h" @@ -367,7 +366,9 @@ namespace ACE_TMCast } private: + // FUZZ: disable check_for_ACE_Guard typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; + // FUZZ: enable check_for_ACE_Guard bool trace_; diff --git a/ACE/protocols/tests/INet/MT_Get/Main.cpp b/ACE/protocols/tests/INet/MT_Get/Main.cpp index a106c5e6fab..5b6732aee13 100644 --- a/ACE/protocols/tests/INet/MT_Get/Main.cpp +++ b/ACE/protocols/tests/INet/MT_Get/Main.cpp @@ -2,7 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #include "ace/Reactor.h" #include "ace/INet/HTTP_URL.h" #include "ace/INet/HTTP_ClientRequestHandler.h" diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index 55e761af364..f0de2b7b517 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -1393,7 +1393,7 @@ ln -sfn %{_datadir}/ace/bin/mwc.pl %{buildroot}%{_bindir}/mwc.pl install -d %{buildroot}%{_mandir} install -d %{buildroot}%{_mandir}/man1 install ${TAO_ROOT}/TAO_IDL/tao_idl.1 %{buildroot}%{_mandir}/man1 -install ${ACE_ROOT}/apps/gperf/ACE_gperf.1 %{buildroot}%{_mandir}/man1 +install ${ACE_ROOT}/apps/gperf/ace_gperf.1 %{buildroot}%{_mandir}/man1 install -d %{buildroot}%{_infodir} install ${ACE_ROOT}/apps/gperf/ace_gperf.info %{buildroot}%{_infodir} @@ -1962,6 +1962,7 @@ fi %{_libdir}/libACE_TMCast.so.%{ACEVERSO} %{_libdir}/libACE_SSL.so.%{ACEVERSO} %{_libdir}/libACE_INet.so.%{ACEVERSO} +%{_libdir}/libACE_INet_SSL.so.%{ACEVERSO} %doc ACE-INSTALL.html %doc AUTHORS @@ -1985,6 +1986,7 @@ fi %{_libdir}/libACE_TMCast.so %{_libdir}/libACE_SSL.so %{_libdir}/libACE_INet.so +%{_libdir}/libACE_INet_SSL.so %dir %{_datadir}/ace %{_datadir}/ace/include %{_datadir}/ace/include/makeinclude diff --git a/ACE/tests/Aio_Platform_Test.cpp b/ACE/tests/Aio_Platform_Test.cpp index 22c13223e06..0713fe1d7ac 100644 --- a/ACE/tests/Aio_Platform_Test.cpp +++ b/ACE/tests/Aio_Platform_Test.cpp @@ -21,8 +21,6 @@ #include "test_config.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(tests, Aio_Platform_Test, "$Id$") - #if defined (_POSIX_ASYNCHRONOUS_IO) static int do_sysconf (void) { diff --git a/ACE/tests/Basic_Types_Test.cpp b/ACE/tests/Basic_Types_Test.cpp index 2372defb539..51eace2b93e 100644 --- a/ACE/tests/Basic_Types_Test.cpp +++ b/ACE/tests/Basic_Types_Test.cpp @@ -38,8 +38,6 @@ #include "ace/Basic_Types.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(tests, Basic_Types_Test, "$Id$") - typedef void* (*a_function_pointer) (void*); static diff --git a/ACE/tests/Bug_1576_Regression_Test.cpp b/ACE/tests/Bug_1576_Regression_Test.cpp index e0986fe9fa9..daa633e977f 100644 --- a/ACE/tests/Bug_1576_Regression_Test.cpp +++ b/ACE/tests/Bug_1576_Regression_Test.cpp @@ -12,10 +12,6 @@ #include "test_config.h" #include "ace/DLL.h" -ACE_RCSID (tests, - Bug_1576_Regression_Test, - "$Id$") - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Bug_3532_Regression_Test.cpp b/ACE/tests/Bug_3532_Regression_Test.cpp index 0de011c6406..bc119794c6d 100644 --- a/ACE/tests/Bug_3532_Regression_Test.cpp +++ b/ACE/tests/Bug_3532_Regression_Test.cpp @@ -12,10 +12,6 @@ #include "test_config.h" #include "ace/ACE.h" -ACE_RCSID (tests, - Bug_3532_Regression_Test, - "$Id$") - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Bug_3673_Regression_Test.cpp b/ACE/tests/Bug_3673_Regression_Test.cpp index cae18afda88..251978627be 100644 --- a/ACE/tests/Bug_3673_Regression_Test.cpp +++ b/ACE/tests/Bug_3673_Regression_Test.cpp @@ -11,10 +11,6 @@ #include "ace/ACE.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (tests, - Bug_3673_Regression_Test, - "$Id$") - static bool construct_alpha = false; static bool destruct_alpha = false; static bool construct_beta = false; diff --git a/ACE/tests/Bug_3709_Regression_Test.cpp b/ACE/tests/Bug_3709_Regression_Test.cpp index 5fc6f8646c8..7efaba85d29 100644 --- a/ACE/tests/Bug_3709_Regression_Test.cpp +++ b/ACE/tests/Bug_3709_Regression_Test.cpp @@ -14,10 +14,6 @@ using namespace std; -ACE_RCSID (tests, - Bug_3709_Regression_Test, - "$Id$") - #if defined(_MSC_VER) && _MSC_VER < 1400 #define MSVC_71_OR_OLDER #endif diff --git a/ACE/tests/Bug_3744_Regression_Test.cpp b/ACE/tests/Bug_3744_Regression_Test.cpp index 7dd790f5226..c7adc481517 100644 --- a/ACE/tests/Bug_3744_Regression_Test.cpp +++ b/ACE/tests/Bug_3744_Regression_Test.cpp @@ -4,8 +4,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_netdb.h" -ACE_RCSID(tests, OS_Test, "$Id$") - #undef THIS_IS_NOT_AN_ASSERT_IT_IS_A_NON_DEBUG_TEST_AS_WELL #define THIS_IS_NOT_AN_ASSERT_IT_IS_A_NON_DEBUG_TEST_AS_WELL(X) \ ((X) \ diff --git a/ACE/tests/Bug_3878_Regression_Test.cpp b/ACE/tests/Bug_3878_Regression_Test.cpp new file mode 100644 index 00000000000..b0c5510440b --- /dev/null +++ b/ACE/tests/Bug_3878_Regression_Test.cpp @@ -0,0 +1,269 @@ +// $Id$ + +#include "ace/config-lite.h" + +#include "ace/OS_NS_string.h" +#include "ace/OS_NS_time.h" +#include "ace/Task.h" +#include "ace/Containers.h" +#include "ace/Synch.h" +#include "ace/SString.h" +#include "ace/Method_Request.h" +#include "ace/Future.h" +#include "ace/Activation_Queue.h" +#include "test_config.h" + +class Worker; + +class IManager +{ +public: + virtual ~IManager (void) { } + + virtual int return_to_work (Worker *worker) = 0; +}; + +// Listing 2 code/ch16 +class Worker : public ACE_Task<ACE_MT_SYNCH> +{ +public: + Worker (IManager *manager) : manager_(manager) { } + + virtual int svc (void) + { + ACE_Thread_ID id; + thread_id_ = id; + while (1) + { + ACE_Message_Block *mb = 0; + if (this->getq (mb) == -1) + ACE_ERROR_BREAK + ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("getq"))); + if (mb->msg_type () == ACE_Message_Block::MB_HANGUP) + { + ACE_DEBUG ((LM_INFO, + ACE_TEXT ("(%t) Shutting down\n"))); + mb->release (); + break; + } + // Process the message. + process_message (mb); + // Return to work. + this->manager_->return_to_work (this); + } + + return 0; + } + + const ACE_Thread_ID& thread_id (void) + { + return thread_id_; + } + +private: + void process_message (ACE_Message_Block *mb) + { + ACE_TRACE (ACE_TEXT ("Worker::process_message")); + int msgId; + ACE_OS::memcpy (&msgId, mb->rd_ptr (), sizeof(int)); + mb->release (); + + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%t) Started processing message %d\n"), + msgId)); + ACE_OS::sleep (3); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%t) Finished processing message %d\n"), + msgId)); + } + + IManager *manager_; + ACE_Thread_ID thread_id_; +}; + +// Listing 1 code/ch16 +class Manager: public ACE_Task<ACE_MT_SYNCH>, private IManager +{ +public: + enum {POOL_SIZE = 5, MAX_TIMEOUT = 5}; + + Manager () + : shutdown_(0), workers_lock_(), workers_cond_(workers_lock_) + { + ACE_TRACE (ACE_TEXT ("Manager::Manager")); + } + + int svc (void) + { + ACE_TRACE (ACE_TEXT ("Manager::svc")); + + ACE_DEBUG ((LM_INFO, ACE_TEXT ("(%t) Manager started\n"))); + + // Create pool. + create_worker_pool (); + + while (!done ()) + { + ACE_Message_Block *mb = 0; + ACE_Time_Value tv ((long)MAX_TIMEOUT); + tv += ACE_OS::time (0); + + // Get a message request. + if (this->getq (mb, &tv) < 0) + { + shut_down (); + break; + } + + // Choose a worker. + Worker *worker = 0; + { + ACE_GUARD_RETURN (ACE_Mutex, + worker_mon, this->workers_lock_, -1); + + while (this->workers_.is_empty ()) + workers_cond_.wait (); + + this->workers_.dequeue_head (worker); + } + + // Ask the worker to do the job. + worker->putq (mb); + } + + return 0; + } + + int shut_down (void); + + const ACE_Thread_ID& thread_id (Worker *worker); + + virtual int return_to_work (Worker *worker) + { + ACE_GUARD_RETURN (ACE_Mutex, + worker_mon, this->workers_lock_, -1); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%t) Worker %t returning to work.\n"))); + this->workers_.enqueue_tail (worker); + this->workers_cond_.signal (); + + return 0; + } + +private: + int create_worker_pool (void) + { + ACE_GUARD_RETURN (ACE_Mutex, + worker_mon, + this->workers_lock_, + -1); + for (int i = 0; i < POOL_SIZE; i++) + { + Worker *worker; + ACE_NEW_RETURN (worker, Worker (this), -1); + this->workers_.enqueue_tail (worker); + worker->activate (); + } + + return 0; + } + + int done (void); + +private: + int shutdown_; + ACE_Mutex workers_lock_; + ACE_Condition<ACE_Mutex> workers_cond_; + ACE_Unbounded_Queue<Worker* > workers_; +}; +// Listing 1 + +int Manager::done (void) +{ + return (shutdown_ == 1); +} + +int +Manager::shut_down (void) +{ + ACE_TRACE (ACE_TEXT ("Manager::shut_down")); + ACE_Unbounded_Queue<Worker* >::ITERATOR iter = + this->workers_.begin (); + Worker **worker_ptr = 0; + do + { + iter.next (worker_ptr); + Worker *worker = (*worker_ptr); + ACE_Thread_ID id = thread_id (worker); + char buf [65]; + id.to_string (buf); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%t) Attempting shutdown of %C\n"), + buf)); + + // Send the hangup message. + ACE_Message_Block *mb = 0; + ACE_NEW_RETURN + (mb, + ACE_Message_Block(0, + ACE_Message_Block::MB_HANGUP), + -1); + worker->putq (mb); + + // Wait for the exit. + worker->wait (); + + ACE_ASSERT (worker->msg_queue ()->is_empty ()); + ACE_DEBUG ((LM_DEBUG, + ACE_TEXT ("(%t) Worker %C shut down.\n"), + buf)); + delete worker; + } + while (iter.advance ()); + + shutdown_ = 1; + + return 0; +} + +const ACE_Thread_ID& +Manager::thread_id (Worker *worker) +{ + return worker->thread_id (); +} + +int +run_main (int, ACE_TCHAR *[]) +{ + ACE_START_TEST (ACE_TEXT ("Bug_3878_Regression_Test")); + +#if defined (ACE_HAS_THREADS) + Manager tp; + tp.activate (); + + // Wait for a moment every time you send a message. + ACE_Time_Value tv; + tv.msec (100); + + ACE_Message_Block *mb = 0; + for (int i = 0; i < 3; i++) + { + ACE_NEW_RETURN + (mb, ACE_Message_Block(sizeof(int)), -1); + + ACE_OS::memcpy (mb->wr_ptr (), &i, sizeof(int)); + + ACE_OS::sleep (tv); + + // Add a new work item. + tp.putq (mb); + } + + ACE_Thread_Manager::instance ()->wait (); +#endif + + ACE_END_TEST; + + return 0; +} + diff --git a/ACE/tests/Compiler_Features_03_Test.cpp b/ACE/tests/Compiler_Features_03_Test.cpp index 59cba0840bb..b37d068700b 100644 --- a/ACE/tests/Compiler_Features_03_Test.cpp +++ b/ACE/tests/Compiler_Features_03_Test.cpp @@ -18,8 +18,6 @@ // does not compile the platform is just too broken. #include <vector> -ACE_RCSID(tests, Compiler_Features_03_Test, "$Id$") - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Compiler_Features_09_Test.cpp b/ACE/tests/Compiler_Features_09_Test.cpp index 98b7a79938a..a7a92270b19 100644 --- a/ACE/tests/Compiler_Features_09_Test.cpp +++ b/ACE/tests/Compiler_Features_09_Test.cpp @@ -56,8 +56,6 @@ public: }; } -ACE_RCSID(tests, Compiler_Features_09_Test, "$Id$") - int run_main (int, ACE_TCHAR *[]) { diff --git a/ACE/tests/Compiler_Features_13_Test.cpp b/ACE/tests/Compiler_Features_13_Test.cpp index 58f271d6872..32934dda76d 100644 --- a/ACE/tests/Compiler_Features_13_Test.cpp +++ b/ACE/tests/Compiler_Features_13_Test.cpp @@ -16,8 +16,6 @@ #include <stdexcept> -ACE_RCSID(tests, Compiler_Features_13_Test, "$Id$") - namespace { /** diff --git a/ACE/tests/Compiler_Features_14_Test.cpp b/ACE/tests/Compiler_Features_14_Test.cpp index ab9355422a9..f8b1f07c61c 100644 --- a/ACE/tests/Compiler_Features_14_Test.cpp +++ b/ACE/tests/Compiler_Features_14_Test.cpp @@ -14,8 +14,6 @@ #include "test_config.h" -ACE_RCSID(tests, Compiler_Features_14_Test, "$Id$") - // We are going to test if partial template specializations work by // demonstrating a standard technique in generic programming, i.e., // using the specialization to detect if a type is a pointer. diff --git a/ACE/tests/Env_Value_Test.cpp b/ACE/tests/Env_Value_Test.cpp index 5cb8464b55b..0411b8387cf 100644 --- a/ACE/tests/Env_Value_Test.cpp +++ b/ACE/tests/Env_Value_Test.cpp @@ -20,8 +20,6 @@ #include "ace/Process.h" #include "ace/Env_Value_T.h" -ACE_RCSID(tests, Env_Value_Test, "$Id$") - #define TEST_THIS(type, varname, defval, expval) \ do { \ ACE_Env_Value<type> val (varname, (defval)); \ diff --git a/ACE/tests/Hash_Map_Bucket_Iterator_Test.cpp b/ACE/tests/Hash_Map_Bucket_Iterator_Test.cpp index ab1cae561df..5d2ed20e9b4 100644 --- a/ACE/tests/Hash_Map_Bucket_Iterator_Test.cpp +++ b/ACE/tests/Hash_Map_Bucket_Iterator_Test.cpp @@ -24,8 +24,6 @@ #include "ace/Get_Opt.h" #include "ace/Functor.h" -ACE_RCSID(tests, Hash_Map_Bucket_Iterator_Test, "$Id$") - static ACE_UINT32 iterations = ACE_MAX_ITERATIONS * 10; static ACE_UINT32 table_size = ACE_MAX_ITERATIONS; diff --git a/ACE/tests/Logging_Strategy_Test.cpp b/ACE/tests/Logging_Strategy_Test.cpp index 31b8b610399..92efa0fefce 100644 --- a/ACE/tests/Logging_Strategy_Test.cpp +++ b/ACE/tests/Logging_Strategy_Test.cpp @@ -52,8 +52,6 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_time.h" -ACE_RCSID(tests, Logging_Strategy_Test, "$Id$") - // Considering UNIX OS to be default. On Win32 platforms, the symbols // are got form the .exe as one cant have .exe and .dll for the same // .cpp. Also, on Win32 platforms one cant use the .obj to obtain diff --git a/ACE/tests/MT_SOCK_Test.cpp b/ACE/tests/MT_SOCK_Test.cpp index 638d5e81613..90e01fe6952 100644 --- a/ACE/tests/MT_SOCK_Test.cpp +++ b/ACE/tests/MT_SOCK_Test.cpp @@ -33,8 +33,6 @@ #include "ace/Handle_Set.h" #include "ace/Time_Value.h" -ACE_RCSID(tests, MT_SOCK_Test, "$Id$") - static const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz"; // Normally the test will have BACKLOG < NUM_CLIENTS to force some diff --git a/ACE/tests/Message_Block_Test.cpp b/ACE/tests/Message_Block_Test.cpp index 54a0d782b5f..d1cd5b03e6a 100644 --- a/ACE/tests/Message_Block_Test.cpp +++ b/ACE/tests/Message_Block_Test.cpp @@ -248,7 +248,7 @@ static int produce (Worker_Task &worker_task, ACE_Allocator *alloc_strategy) { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; int status; // Send <n_iteration> messages through the pipeline. diff --git a/ACE/tests/Multicast_Test_IPV6.cpp b/ACE/tests/Multicast_Test_IPV6.cpp index 06d059e0028..f5b862ccfbb 100644 --- a/ACE/tests/Multicast_Test_IPV6.cpp +++ b/ACE/tests/Multicast_Test_IPV6.cpp @@ -560,7 +560,7 @@ MCT_Event_Handler::join (const ACE_INET_Addr &mcast_addr, -1); ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Joined %C\n"), buf)); - ACE_CString *str; + ACE_CString *str = 0; ACE_NEW_RETURN (str, ACE_CString (buf), -1); this->address_vec_.push_back (str); return 0; diff --git a/ACE/tests/Pipe_Test.cpp b/ACE/tests/Pipe_Test.cpp index a3d2175a009..cbbc7c35acb 100644 --- a/ACE/tests/Pipe_Test.cpp +++ b/ACE/tests/Pipe_Test.cpp @@ -25,8 +25,6 @@ #include "ace/OS_NS_stdlib.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(tests, Pipe_Test, "$Id$") - // Indicates whether we should close the pipe or not. static int close_pipe = 1; diff --git a/ACE/tests/Priority_Task_Test.cpp b/ACE/tests/Priority_Task_Test.cpp index 74f2fa9858d..dcc4c604378 100644 --- a/ACE/tests/Priority_Task_Test.cpp +++ b/ACE/tests/Priority_Task_Test.cpp @@ -24,8 +24,6 @@ #include "ace/OS_NS_errno.h" #include "ace/OS_NS_string.h" -ACE_RCSID(tests, Priority_Task_Test, "$Id$") - static const ACE_TCHAR *usage = ACE_TEXT ("usage: %s [-d]\n"); #if defined (ACE_HAS_THREADS) diff --git a/ACE/tests/Proactor_UDP_Test.cpp b/ACE/tests/Proactor_UDP_Test.cpp index 42db2649865..49bc63cedfe 100644 --- a/ACE/tests/Proactor_UDP_Test.cpp +++ b/ACE/tests/Proactor_UDP_Test.cpp @@ -15,10 +15,6 @@ #include "test_config.h" -ACE_RCSID (tests, - Proactor_UDP_Test, - "$Id$") - #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)) // This only works on Win32 platforms and on Unix platforms // supporting POSIX aio calls. diff --git a/ACE/tests/QtReactor_Test.cpp b/ACE/tests/QtReactor_Test.cpp index 95b116dc598..c871969f37c 100644 --- a/ACE/tests/QtReactor_Test.cpp +++ b/ACE/tests/QtReactor_Test.cpp @@ -41,10 +41,6 @@ #include "test_config.h" -ACE_RCSID (tests, - QtReactor_Test, - "$Id$") - #include <assert.h> #include <qapplication.h> #include <qtimer.h> diff --git a/ACE/tests/Reactor_Notification_Queue_Test.cpp b/ACE/tests/Reactor_Notification_Queue_Test.cpp index 7e22474d3b3..c080701194f 100644 --- a/ACE/tests/Reactor_Notification_Queue_Test.cpp +++ b/ACE/tests/Reactor_Notification_Queue_Test.cpp @@ -23,9 +23,6 @@ #include "ace/Select_Reactor.h" #include "ace/WFMO_Reactor.h" -ACE_RCSID(tests, - Reactor_Notification_Queue_Test, "$Id$") - class Event_Handler : public ACE_Event_Handler { public: diff --git a/ACE/tests/Reactor_Registration_Test.cpp b/ACE/tests/Reactor_Registration_Test.cpp index 10e92c812a4..f623a8fc3f6 100644 --- a/ACE/tests/Reactor_Registration_Test.cpp +++ b/ACE/tests/Reactor_Registration_Test.cpp @@ -24,8 +24,6 @@ #include "ace/WFMO_Reactor.h" #include "ace/ACE.h" -ACE_RCSID(tests, Reactor_Registration_Test, "$Id$") - static const char message[] = "abcdefghijklmnopqrstuvwxyz"; static const size_t message_size = 26; static int iteration = 1; diff --git a/ACE/tests/Reader_Writer_Test.cpp b/ACE/tests/Reader_Writer_Test.cpp index d268bed118f..a7d52008428 100644 --- a/ACE/tests/Reader_Writer_Test.cpp +++ b/ACE/tests/Reader_Writer_Test.cpp @@ -113,7 +113,7 @@ reader (void *) for (size_t iterations = 1; iterations <= n_iterations; iterations++) { ACE_OS::sleep (pause); - ACE_Read_Guard<ACE_RW_Thread_Mutex> g (rw_mutex); + ACE_READ_GUARD_RETURN (ACE_RW_Thread_Mutex, g, rw_mutex, 0); // int n = ++current_readers; // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) I'm reader number %d\n"), n)); @@ -213,7 +213,7 @@ writer (void *) { ACE_OS::sleep (pause); - ACE_Write_Guard<ACE_RW_Thread_Mutex> g (rw_mutex); + ACE_WRITE_GUARD_RETURN (ACE_RW_Thread_Mutex, g, rw_mutex, 0); ++current_writers; diff --git a/ACE/tests/Recursive_Mutex_Test.cpp b/ACE/tests/Recursive_Mutex_Test.cpp index 6d37316f314..449597455b8 100644 --- a/ACE/tests/Recursive_Mutex_Test.cpp +++ b/ACE/tests/Recursive_Mutex_Test.cpp @@ -211,6 +211,7 @@ test_timed_wait (int nesting_level, ACE_TEXT ("(%P|%t) = released on iteration %d\n"), i)); + // FUZZ: disable check_for_ACE_Guard // Basic ACE_Guard usage - automatically acquire the mutex on // guard construction and automatically release it on // destruction. @@ -269,7 +270,7 @@ test_timed_wait (int nesting_level, ACE_ASSERT (guard.locked () == 0); // ACE_Guard object's destructor will not release the mutex. - } + } // We are now responsible for releasing the mutex. result = rm->release (); ACE_ASSERT (result == 0); @@ -318,6 +319,7 @@ test_timed_wait (int nesting_level, // ACE_Guard object is destroyed when exiting scope and guard // destructor automatically releases mutex. } + // FUZZ: enable check_for_ACE_Guard } return; diff --git a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp index 014588b464c..a8d878dc3f4 100644 --- a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp @@ -26,8 +26,6 @@ #include "ace/Get_Opt.h" #include "ace/ACE.h" -ACE_RCSID(tests, Reference_Counted_Event_Handler_Test, "$Id$") - static const char message[] = "abcdefghijklmnopqrstuvwxyz"; static const int message_size = 26; static int test_select_reactor = 1; diff --git a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp index 176c425b893..c81d737ceff 100644 --- a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp +++ b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp @@ -296,7 +296,7 @@ Server_Service_Handler::~Server_Service_Handler (void) void Server_Service_Handler::open (ACE_HANDLE h, ACE_Message_Block&) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); if (this->ssl_stream_.open (*this, h, 0, this->proactor ()) != 0) { @@ -322,7 +322,7 @@ void Server_Service_Handler::handle_read_stream( const ACE_Asynch_Read_Stream::Result &result) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); this->pending_reads_--; @@ -389,7 +389,7 @@ void Server_Service_Handler::handle_write_stream ( const ACE_Asynch_Write_Stream::Result &result) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); this->pending_writes_--; @@ -428,7 +428,7 @@ Server_Service_Handler::handle_write_stream ( void Server_Service_Handler::handle_wakeup (void) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); this->handle_wakeup_received_ = 1; } @@ -436,7 +436,7 @@ Server_Service_Handler::handle_wakeup (void) void Server_Service_Handler::cancel_and_close (void) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); this->closing_ = 1; this->ssl_stream_.cancel (); @@ -446,9 +446,9 @@ Server_Service_Handler::cancel_and_close (void) int Server_Service_Handler::read_data (void) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_NORETURN(mb, ACE_Message_Block (DATA_SIZE)); int ret = this->read (*mb, DATA_SIZE); @@ -466,9 +466,9 @@ Server_Service_Handler::read_data (void) int Server_Service_Handler::write_data (void) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_NORETURN(mb, ACE_Message_Block (DATA_SIZE)); ACE_OS::memcpy (mb->wr_ptr (), DATA, DATA_SIZE); mb->wr_ptr (DATA_SIZE); @@ -488,7 +488,7 @@ Server_Service_Handler::write_data (void) int Server_Service_Handler::read (ACE_Message_Block &mb, size_t bytes_to_read) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); int ret; if ((ret = this->ssl_stream_.read (mb, bytes_to_read)) < 0) @@ -506,7 +506,7 @@ Server_Service_Handler::read (ACE_Message_Block &mb, size_t bytes_to_read) int Server_Service_Handler::write (ACE_Message_Block &mb, size_t bytes_to_write) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); int ret; if ((ret = this->ssl_stream_.write (mb, bytes_to_write)) < 0) @@ -524,7 +524,7 @@ Server_Service_Handler::write (ACE_Message_Block &mb, size_t bytes_to_write) int Server_Service_Handler::safe_to_delete (void) const { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); return 0 == this->pending_writes_ && 0 == this->pending_reads_ && @@ -581,7 +581,7 @@ Acceptor::~Acceptor (void) int Acceptor::cancel (void) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); this->cancel_flag_ = 1; this->reissue_accept (0); @@ -601,14 +601,14 @@ Acceptor::cancel (void) int Acceptor::safe_to_delete (void) const { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); return (this->cancel_flag_ != 0 && this->accept_cnt_ == 0) ? 1 : 0; } void Acceptor::prepare_for_connection (Server_Service_Handler *service_handler) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); this->service_handler_ = service_handler; } @@ -616,7 +616,7 @@ int Acceptor::validate_connection (const ACE_Asynch_Accept::Result& result, const ACE_INET_Addr & /*remote*/, const ACE_INET_Addr& /*local*/) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); if (0 != this->service_handler_ && result.success ()) { @@ -631,7 +631,7 @@ Acceptor::validate_connection (const ACE_Asynch_Accept::Result& result, Server_Service_Handler* Acceptor::make_handler (void) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); ACE_ASSERT (0 != this->service_handler_); Server_Service_Handler *service_handler = this->service_handler_; @@ -642,7 +642,7 @@ Acceptor::make_handler (void) int Acceptor::accept (size_t bytes_to_read, const void *act) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); if (this->cancel_flag_!= 0) return -1; @@ -659,7 +659,7 @@ Acceptor::accept (size_t bytes_to_read, const void *act) void Acceptor::handle_accept (const ACE_Asynch_Accept::Result &result) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); this->ACE_Asynch_Acceptor<Server_Service_Handler>::handle_accept (result); @@ -747,7 +747,7 @@ Client_Service_Handler::~Client_Service_Handler (void) void Client_Service_Handler::open (ACE_HANDLE h, ACE_Message_Block&) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); if (this->ssl_stream_.open (*this, h, 0, this->proactor ()) != 0) { @@ -758,7 +758,7 @@ Client_Service_Handler::open (ACE_HANDLE h, ACE_Message_Block&) } else { - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_NORETURN(mb, ACE_Message_Block (DATA_SIZE)); if (this->read_data () < 0 || this->write_data () < 0) @@ -772,7 +772,7 @@ void Client_Service_Handler::handle_read_stream ( const ACE_Asynch_Read_Stream::Result &result) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); this->pending_reads_--; @@ -850,7 +850,7 @@ void Client_Service_Handler::handle_write_stream ( const ACE_Asynch_Write_Stream::Result &result) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); this->pending_writes_--; @@ -889,7 +889,7 @@ Client_Service_Handler::handle_write_stream ( void Client_Service_Handler::handle_wakeup (void) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); this->handle_wakeup_received_ = 1; } @@ -897,7 +897,7 @@ Client_Service_Handler::handle_wakeup (void) void Client_Service_Handler::cancel_and_close (void) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); this->closing_ = 1; this->ssl_stream_.cancel (); @@ -907,9 +907,9 @@ Client_Service_Handler::cancel_and_close (void) int Client_Service_Handler::read_data (void) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_NORETURN(mb, ACE_Message_Block (DATA_SIZE)); int ret = this->read (*mb, DATA_SIZE); @@ -927,9 +927,9 @@ Client_Service_Handler::read_data (void) int Client_Service_Handler::write_data (void) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_NORETURN (mb, ACE_Message_Block (DATA_SIZE)); ACE_OS::memcpy (mb->wr_ptr (), DATA, DATA_SIZE); mb->wr_ptr (DATA_SIZE); @@ -949,7 +949,7 @@ Client_Service_Handler::write_data (void) int Client_Service_Handler::read (ACE_Message_Block &mb, size_t bytes_to_read) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); int ret; if ((ret = this->ssl_stream_.read (mb, bytes_to_read)) < 0) @@ -967,7 +967,7 @@ Client_Service_Handler::read (ACE_Message_Block &mb, size_t bytes_to_read) int Client_Service_Handler::write (ACE_Message_Block &mb, size_t bytes_to_write) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); int ret; if ((ret = this->ssl_stream_.write (mb, bytes_to_write)) < 0) @@ -985,7 +985,7 @@ Client_Service_Handler::write (ACE_Message_Block &mb, size_t bytes_to_write) int Client_Service_Handler::safe_to_delete (void) const { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); return 0 == this->pending_writes_ && 0 == this->pending_reads_ && @@ -1064,7 +1064,7 @@ int Connector::connect (const ACE_INET_Addr &remote_sap, const ACE_INET_Addr &local_sap, int reuse_addr, const void *act) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); this->connecting_ = 1; @@ -1076,7 +1076,7 @@ int Connector::validate_connection (const ACE_Asynch_Connect::Result& result, const ACE_INET_Addr &remote, const ACE_INET_Addr& local) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); ACE_UNUSED_ARG (result); ACE_UNUSED_ARG (remote); @@ -1097,7 +1097,7 @@ Connector::validate_connection (const ACE_Asynch_Connect::Result& result, void Connector::handle_connect (const ACE_Asynch_Connect::Result &result) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); this->ACE_Asynch_Connector<Client_Service_Handler>::handle_connect (result); @@ -1107,7 +1107,7 @@ Connector::handle_connect (const ACE_Asynch_Connect::Result &result) Client_Service_Handler* Connector::make_handler (void) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); ACE_ASSERT(0 != this->service_handler_); Client_Service_Handler *service_handler = this->service_handler_; @@ -1118,7 +1118,7 @@ Connector::make_handler (void) int Connector::safe_to_delete (void) const { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_, -1); return 0 == this->connecting_; } @@ -1126,7 +1126,7 @@ Connector::safe_to_delete (void) const void Connector::prepare_for_connection (Client_Service_Handler *service_handler) { - ACE_Guard<ACE_SYNCH_RECURSIVE_MUTEX> guard (this->mtx_); + ACE_GUARD (ACE_SYNCH_RECURSIVE_MUTEX, guard, this->mtx_); this->service_handler_ = service_handler; } diff --git a/ACE/tests/Simple_Message_Block_Test.cpp b/ACE/tests/Simple_Message_Block_Test.cpp index 6a7eb841240..d54b4f647c3 100644 --- a/ACE/tests/Simple_Message_Block_Test.cpp +++ b/ACE/tests/Simple_Message_Block_Test.cpp @@ -40,7 +40,7 @@ run_main (int, ACE_TCHAR *[]) { // Checks normal heap deletes. - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block, -1); mb->release (); @@ -79,7 +79,7 @@ run_main (int, ACE_TCHAR *[]) { // Checks normal heap deletes. - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block, -1); mb->locking_strategy (lock); mb->release (); diff --git a/ACE/tests/Svc_Handler_Test.cpp b/ACE/tests/Svc_Handler_Test.cpp index 23dba078c8e..a6e732f2a1f 100644 --- a/ACE/tests/Svc_Handler_Test.cpp +++ b/ACE/tests/Svc_Handler_Test.cpp @@ -26,8 +26,6 @@ #include "ace/Svc_Handler.h" #include "ace/Synch_Traits.h" -ACE_RCSID(tests, Svc_Handler_Test, "$Id$") - typedef ACE_Buffered_Svc_Handler <ACE_FILE_STREAM, ACE_NULL_SYNCH> SVC_HANDLER; static void diff --git a/ACE/tests/TP_Reactor_Test.cpp b/ACE/tests/TP_Reactor_Test.cpp index a47f51c46b2..156a5e9640c 100644 --- a/ACE/tests/TP_Reactor_Test.cpp +++ b/ACE/tests/TP_Reactor_Test.cpp @@ -270,7 +270,7 @@ Acceptor::Acceptor (void) total_w_ (0), total_r_ (0) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_); + ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, this->mutex_); for (size_t i = 0; i < MAX_RECEIVERS; ++i) this->list_receivers_[i] =0; @@ -288,7 +288,7 @@ Acceptor::stop (void) // this method can be called only after reactor event loop id done // in all threads - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_); + ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, this->mutex_); for (size_t i = 0; i < MAX_RECEIVERS; ++i) { @@ -300,7 +300,7 @@ Acceptor::stop (void) void Acceptor::on_new_receiver (Receiver &rcvr) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_); + ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, this->mutex_); this->sessions_++; this->list_receivers_[rcvr.index_] = & rcvr; ACE_DEBUG ((LM_DEBUG, @@ -311,7 +311,7 @@ Acceptor::on_new_receiver (Receiver &rcvr) void Acceptor::on_delete_receiver (Receiver &rcvr) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_); + ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, this->mutex_); this->sessions_--; @@ -359,7 +359,7 @@ Acceptor::start (const ACE_INET_Addr &addr) int Acceptor::make_svc_handler (Receiver *&sh) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, this->mutex_, -1); if (sessions_ >= MAX_RECEIVERS) return -1; @@ -423,7 +423,7 @@ Receiver::check_destroy (void) int Receiver::open (void *) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (mutex_); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, this->mutex_, -1); ACE_Reactor *TPReactor = ACE_Reactor::instance (); @@ -481,7 +481,7 @@ Receiver::handle_close (ACE_HANDLE, ACE_Reactor_Mask) int Receiver::handle_input (ACE_HANDLE h) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (mutex_); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, this->mutex_, -1); ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, @@ -564,7 +564,7 @@ Receiver::handle_input (ACE_HANDLE h) int Receiver::handle_output (ACE_HANDLE h) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (mutex_); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, this->mutex_, -1); ACE_Time_Value tv = ACE_Time_Value::zero; ACE_Message_Block *mb = 0; @@ -629,7 +629,7 @@ Connector::Connector (void) total_w_ (0), total_r_ (0) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_); + ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, this->mutex_); for (size_t i = 0; i < MAX_SENDERS; ++i) this->list_senders_[i] = 0; @@ -648,7 +648,7 @@ Connector::stop () // after reactor event loop id done // in all threads - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_); + ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, this->mutex_); for (size_t i = 0; i < MAX_SENDERS; ++i) { @@ -660,7 +660,7 @@ Connector::stop () void Connector::on_new_sender (Sender & sndr) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_); + ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, this->mutex_); this->sessions_++; this->list_senders_[sndr.index_] = &sndr; ACE_DEBUG ((LM_DEBUG, @@ -671,7 +671,7 @@ Connector::on_new_sender (Sender & sndr) void Connector::on_delete_sender (Sender & sndr) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_); + ACE_GUARD (ACE_Recursive_Thread_Mutex, locker, this->mutex_); this->sessions_--; this->total_snd_ += sndr.get_total_snd(); @@ -735,7 +735,7 @@ Connector::start (const ACE_INET_Addr & addr, int num) int Connector::make_svc_handler (Sender * & sh) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (this->mutex_); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, this->mutex_, -1); if (sessions_ >= MAX_SENDERS) return -1; @@ -801,7 +801,7 @@ Sender::check_destroy (void) int Sender::open (void *) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (mutex_); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, this->mutex_, -1); ACE_Reactor * TPReactor = ACE_Reactor::instance (); @@ -894,7 +894,7 @@ Sender::handle_close (ACE_HANDLE, ACE_Reactor_Mask) int Sender::handle_input (ACE_HANDLE h) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (mutex_); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, this->mutex_, -1); ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, @@ -961,7 +961,7 @@ Sender::handle_input (ACE_HANDLE h) int Sender::handle_output (ACE_HANDLE h) { - ACE_Guard<ACE_Recursive_Thread_Mutex> locker (mutex_); + ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, locker, this->mutex_, -1); ACE_Time_Value tv = ACE_Time_Value::zero; ACE_Message_Block *mb = 0; diff --git a/ACE/tests/TSS_Test.cpp b/ACE/tests/TSS_Test.cpp index 8ee832ba9cd..93b6639f03d 100644 --- a/ACE/tests/TSS_Test.cpp +++ b/ACE/tests/TSS_Test.cpp @@ -168,7 +168,7 @@ worker (void *c) // Demonstrate use of ACE_TSS_Type_Adapter to wrap built-in // types when used with ACE_TSS. See DESCRIPTION of template - // class ACE_TSS_Type_Adapter in ace/Synch_T.h for what this + // class ACE_TSS_Type_Adapter for what this // should look like. Unfortunately, some compilers have trouble // with the implicit type conversions. Others have problems with // the *explicit* type conversions. diff --git a/ACE/tests/Thread_Mutex_Test.cpp b/ACE/tests/Thread_Mutex_Test.cpp index 048aa855a6a..23d8485eb82 100644 --- a/ACE/tests/Thread_Mutex_Test.cpp +++ b/ACE/tests/Thread_Mutex_Test.cpp @@ -126,6 +126,7 @@ test (void *args) ACE_TEXT ("(%P|%t) = released on iteration %d\n"), i)); + // FUZZ: disable check_for_ACE_Guard // Basic ACE_Guard usage - automatically acquire the mutex on // guard construction and automatically release it on // destruction. @@ -233,6 +234,7 @@ test (void *args) // ACE_Guard object is destroyed when exiting scope and guard // destructor automatically releases mutex. } + // FUZZ: enable check_for_ACE_Guard } return 0; diff --git a/ACE/tests/Thread_Pool_Test.cpp b/ACE/tests/Thread_Pool_Test.cpp index 6c124e494cd..3284d571ebb 100644 --- a/ACE/tests/Thread_Pool_Test.cpp +++ b/ACE/tests/Thread_Pool_Test.cpp @@ -27,8 +27,6 @@ #include "test_config.h" #include "ace/Task.h" -ACE_RCSID(tests, Thread_Pool_Test, "$Id$") - #if defined (ACE_HAS_THREADS) #include "ace/Lock_Adapter_T.h" #include "ace/OS_NS_stdio.h" diff --git a/ACE/tests/Time_Service_Test.cpp b/ACE/tests/Time_Service_Test.cpp index faaaf4a5501..b70067e0cce 100644 --- a/ACE/tests/Time_Service_Test.cpp +++ b/ACE/tests/Time_Service_Test.cpp @@ -27,8 +27,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID(tests, Time_Service_Test, "$Id$") - #define APPLICATION \ ACE_TEXT ("..") ACE_DIRECTORY_SEPARATOR_STR \ ACE_TEXT ("netsvcs") ACE_DIRECTORY_SEPARATOR_STR \ diff --git a/ACE/tests/UPIPE_SAP_Test.cpp b/ACE/tests/UPIPE_SAP_Test.cpp index 296d746fbb6..17ee9296b71 100644 --- a/ACE/tests/UPIPE_SAP_Test.cpp +++ b/ACE/tests/UPIPE_SAP_Test.cpp @@ -48,7 +48,7 @@ connector (void *) if (con.connect (c_stream, addr) == -1) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) connector ACE_UPIPE_Connector failed\n"))); - ACE_Message_Block *mb; + ACE_Message_Block *mb = 0; ACE_NEW_RETURN (mb, ACE_Message_Block (sizeof ("hello thanks") * sizeof (char)), 0); diff --git a/ACE/tests/Upgradable_RW_Test.cpp b/ACE/tests/Upgradable_RW_Test.cpp index 9c8279fbc5b..946a8cb01ae 100644 --- a/ACE/tests/Upgradable_RW_Test.cpp +++ b/ACE/tests/Upgradable_RW_Test.cpp @@ -173,9 +173,9 @@ Reader_Task::svc (void) { #if defined (RW_MUTEX) - ACE_Read_Guard<ACE_RW_Thread_Mutex> g (rw_mutex); + ACE_READ_GUARD_RETURN (ACE_RW_Thread_Mutex, g, rw_mutex, 1); #else - ACE_Guard<ACE_Thread_Mutex> g (mutex); + ACE_GUARD (ACE_Thread_Mutex, g, mutex, 1); #endif /* RW_MUTEX */ find_last (); #if defined (RW_MUTEX) @@ -198,9 +198,9 @@ Reader_Task::svc (void) || !use_try_upgrade) // we did not try at all { #if defined (RW_MUTEX) - ACE_Write_Guard<ACE_RW_Thread_Mutex> g (rw_mutex); + ACE_WRITE_GUARD (ACE_RW_Thread_Mutex, g, rw_mutex, 1); #else - ACE_Guard<ACE_Thread_Mutex> g (mutex); + ACE_GUARD (ACE_Thread_Mutex, g, mutex, 1); #endif /* RW_MUTEX */ not_upgraded++; @@ -245,9 +245,9 @@ Writer_Task::svc (void) ACE_Thread::yield (); #if defined (RW_MUTEX) - ACE_Write_Guard<ACE_RW_Thread_Mutex> g (rw_mutex); + ACE_WRITE_GUARD (ACE_RW_Thread_Mutex, g, rw_mutex, 0); #else - ACE_Guard<ACE_Thread_Mutex> g (mutex); + ACE_GUARD (ACE_Thread_Mutex, g, mutex, 0); #endif /* RW_MUTEX */ find_last (); @@ -267,7 +267,7 @@ Writer_Task::svc (void) void Time_Calculation::report_time (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time) { - ACE_Guard<ACE_Thread_Mutex> g (mutex_); + ACE_GUARD (ACE_Thread_Mutex, g, mutex_); this->times_.real_time += elapsed_time.real_time; this->times_.user_time += elapsed_time.user_time; diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst index 6b755055c95..a04ef9e7a16 100644 --- a/ACE/tests/run_test.lst +++ b/ACE/tests/run_test.lst @@ -47,7 +47,7 @@ Bug_2820_Regression_Test Bug_2980_Regression_Test: !STATIC !Win32 !VxWorks !WCHAR Bug_3102_Regression_Test Bug_3319_Regression_Test -Bug_3334_Regression_Test: !STATIC +Bug_3334_Regression_Test: !STATIC Bug_3432_Regression_Test Bug_3500_Regression_Test Bug_3505_Regression_Test @@ -60,6 +60,7 @@ Bug_3710_Regression_Test Bug_3729_Regression_Test: Bug_3744_Regression_Test: !FIXED_BUGS_ONLY Bug_3758_Regression_Test: !FIXED_BUGS_ONLY +Bug_3878_Regression_Test CDR_Array_Test: !ACE_FOR_TAO CDR_File_Test: !ACE_FOR_TAO CDR_Test diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index d5403d3654b..38b215d412c 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -417,6 +417,13 @@ project(Bug_3758_Regression_Test) : acetest { } } +project(Bug_3878_Regression_Test) : acetest { + exename = Bug_3878_Regression_Test + Source_Files { + Bug_3878_Regression_Test.cpp + } +} + project(Cache Map Manager Test) : acetest { exename = Cache_Map_Manager_Test Source_Files { @@ -1908,7 +1915,7 @@ project(Bug_3334_Regression_Test) : acetest { } project(Missing_Svc_Conf_Test) : acetest { - exename = Missing_Svc_Conf_Test + exename = Missing_Svc_Conf_Test Source_Files { Missing_Svc_Conf_Test.cpp } |