Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ace/Synch.h sanitizations #322

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

ace/Synch.h sanitizations #322

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
734d93f
ace/Synch.h sanitizations
invalid-email-address Nov 1, 2016
f00c6b3
resolved merge conflicts
invalid-email-address Nov 1, 2016
4f78fb2
Merge branch 'master' of https://github.com/DOCGroup/ACE_TAO
invalid-email-address Nov 1, 2016
c2cc3e8
fixed integration build errors
invalid-email-address Nov 1, 2016
b73cd50
fixed integration build (Win32)
invalid-email-address Nov 1, 2016
e2f1a76
fixing integration build (TAO)
invalid-email-address Nov 1, 2016
3cebc34
fixing integration build (TAO)
invalid-email-address Nov 1, 2016
7e3046f
fixing integration build (TAO)
invalid-email-address Nov 1, 2016
0592813
fixing integration build (TAO)
Nov 2, 2016
199cd41
repaired TAO build
Nov 11, 2016
98bc6c8
repairing TAO build
Nov 12, 2016
f2a1788
updated MPC build configuration
Nov 12, 2016
7723fd6
repaired TAO build (Win32)
Nov 12, 2016
f23e1db
repaired TAO build (Win32)
Nov 12, 2016
feaae5b
repaired TAO build (Win32)
Nov 12, 2016
c72e1b2
removed trailing whitespace (TAO)
Nov 12, 2016
7c7e6a2
removed trailing whitespace (TAO)
Nov 13, 2016
490adc4
Merge branch 'master' into master
esohns Aug 8, 2017
a1dddef
repaired Win32 compilation issues (related to pull request #322)
Aug 8, 2017
11ee519
Merge branch 'master' of github.com:esohns/ATCD
Aug 8, 2017
5d7fc09
Merge remote-tracking branch 'upstream/master'
esohns May 1, 2018
d986112
Merge branch 'master' into master
esohns Jan 13, 2019
0b35c20
Update ace_qt5.mpb
esohns Jan 13, 2019
292b2ad
Update ace_qt4.mpb
esohns Jan 13, 2019
fca50b0
Update ace_qt5.mpb
esohns Jan 13, 2019
c45c4ff
Merge branch 'master' into master
esohns May 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
10 changes: 7 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
*.vcxproj*
*.tlog
*.log
*.obj
*.[i]obj
*.ilk
*.exe
*.dll
*.lib
*.exp
*.[ip]db
*.pdb
*.ipdb
*.opensdf
*.sdf
*.sln
*.suo
*S_T.cpp
*S_T.h
*S_T.inl
ipch/
Debug/
Release/

.depend.*
GNUmakefile*
Expand All @@ -25,7 +29,7 @@ lib*.a
lib*.so*
lib*.dylib
*~
ipch/
build/

/ACE/ace/config.h
/ACE/bin/MakeProjectCreator/config/default.features
Expand Down
1 change: 1 addition & 0 deletions ACE/ACEXML/apps/svcconf/Svcconf_Handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "ace/Service_Gestalt.h"
#include "ace/DLL.h"
#include "ace/ARGV.h"
#include "ace/Synch.h"
#include "ace/Module.h"
#include "ace/OS_NS_strings.h"
#include "ace/SString.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/ACEXML/common/HttpCharStream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "ace/Auto_Ptr.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_NS_string.h"
#include "ace/Synch.h"
#include "ace/Truncate.h"

#include "ACEXML/common/HttpCharStream.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/ACEXML/common/Mem_Map_Stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "ace/FILE_Addr.h"
#include "ace/OS_NS_unistd.h"
#include "ace/Synch.h"
#include "ace/Truncate.h"

#include "ACEXML/common/Mem_Map_Stream.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/ACEXML/common/StreamFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include "ACEXML/common/StreamFactory.h"
#include "ACEXML/common/FileCharStream.h"
#include "ace/Synch.h"
#include "ACEXML/common/HttpCharStream.h"

#ifdef USE_ZZIP
Expand Down
1 change: 1 addition & 0 deletions ACE/ACEXML/examples/SAXPrint/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "ACEXML/common/FileCharStream.h"
#include "ace/Synch.h"
#include "ACEXML/common/HttpCharStream.h"
#include "ACEXML/common/StrCharStream.h"
#include "ACEXML/common/ZipCharStream.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/ACEXML/tests/HttpCharStream_Test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "ace/Synch.h"
#include "ACEXML/common/HttpCharStream.h"
#include "ace/OS_NS_stdio.h"
#include "ace/OS_main.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/Kokyu/Default_Dispatcher_Impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "ace/Synch.h"
#include "Default_Dispatcher_Impl.h"
#include "ace/Sched_Params.h"

Expand Down
1 change: 1 addition & 0 deletions ACE/Kokyu/Dispatcher_Task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "ace/Synch.h"
#include "Dispatcher_Task.h"

#include "ace/Malloc_T.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/Kokyu/Kokyu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "Kokyu.h"

#include "ace/Synch.h"
#include "Default_Dispatcher_Impl.h"

#if ! defined (__ACE_INLINE__)
Expand Down
1 change: 1 addition & 0 deletions ACE/Kokyu/tests/DSRT_MIF/MIF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "ace/ACE.h"
#include "ace/Auto_Ptr.h"
#include "ace/Synch.h"
#include "ace/Task.h"
#include "ace/Sched_Params.h"
#include "ace/Atomic_Op.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/Kokyu/tests/EDF/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "ace/Auto_Ptr.h"

#include "Kokyu.h"
#include "ace/Synch.h"
#include "ace/Task.h"
#include "ace/Sched_Params.h"
#include "ace/SString.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/Kokyu/tests/FIFO/test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "ace/Auto_Ptr.h"

#include "Kokyu.h"
#include "ace/Synch.h"
#include "ace/Task.h"
#include "ace/SString.h"
#include "ace/Get_Opt.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/TAO/rules.tao.GNU
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../TAO/TAO_IDL/rules.tao.GNU
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. Removed in commit 7723fd6

1 change: 1 addition & 0 deletions ACE/ace/Activation_Queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "ace/Synch.h"
#include "ace/Activation_Queue.h"

#if !defined (__ACE_INLINE__)
Expand Down
4 changes: 2 additions & 2 deletions ACE/ace/Activation_Queue.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */

#include "ace/Message_Queue.h"
#include "ace/Copy_Disabled.h"
#include "ace/Condition_Thread_Mutex.h"
#include "ace/Message_Queue.h"
#include "ace/Synch_Traits.h"

/// Define to be compatible with the terminology in the POSA2 book!
#define ACE_Activation_List ACE_Activation_Queue
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Asynch_IO.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)
// This only works on platforms with Asynchronous IO

#include "ace/Synch.h"
#include "ace/Proactor.h"
#include "ace/Message_Block.h"
#include "ace/INET_Addr.h"
Expand Down
18 changes: 7 additions & 11 deletions ACE/ace/Condition_T.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,13 @@ ACE_Condition<MUTEX>::wait (MUTEX &mutex,
{
// ACE_TRACE ("ACE_Condition<MUTEX>::wait");
if (abstime == 0)
{
return ACE_OS::cond_wait (&this->cond_,
&mutex.lock ());
}
else
{
ACE_Time_Value tv = *abstime;
return ACE_OS::cond_timedwait (&this->cond_,
&mutex.lock (),
&tv);
}
return ACE_OS::cond_wait (&this->cond_,
&mutex.lock ());

ACE_Time_Value tv = *abstime;
return ACE_OS::cond_timedwait (&this->cond_,
&mutex.lock (),
&tv);
}

// Peform an "alertable" timed wait. If the argument ABSTIME == 0
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Event_Handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include "ace/Event_Handler.h"
#include "ace/OS_Errno.h"
#include "ace/Reactor.h"
#include "ace/Synch.h"
#include "ace/Thread_Manager.h"
/* Need to see if ACE_HAS_BUILTIN_ATOMIC_OP defined */
#include "ace/Atomic_Op.h"
Expand Down
2 changes: 1 addition & 1 deletion ACE/ace/Future.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#if defined (ACE_HAS_THREADS)

# include "ace/Guard_T.h"
# include "ace/Recursive_Thread_Mutex.h"
# include "ace/Synch.h"

ACE_BEGIN_VERSIONED_NAMESPACE_DECL

Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Log_Msg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#define ACE_NTRACE 1

#include "ace/ACE.h"
#include "ace/Synch.h"
#include "ace/Thread_Manager.h"
#include "ace/Guard_T.h"
#include "ace/OS_NS_stdio.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Monitor_Control/Auto_Update_Starter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "ace/Synch.h"
#include "ace/Monitor_Control/Auto_Update_Starter.h"

#if defined (ACE_HAS_MONITOR_FRAMEWORK) && (ACE_HAS_MONITOR_FRAMEWORK == 1)
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/NT_Service.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "ace/config-all.h"
#if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_SERVICES)

#include "ace/Synch.h"
#include "ace/NT_Service.h"

#if !defined (__ACE_INLINE__)
Expand Down
4 changes: 1 addition & 3 deletions ACE/ace/Object_Manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#if !defined (ACE_LACKS_ACE_TOKEN)
# include "ace/Token_Manager.h"
#endif /* ! ACE_LACKS_ACE_TOKEN */
#include "ace/Synch.h"
#include "ace/Thread_Manager.h"
#if !defined (ACE_LACKS_ACE_SVCCONF)
# include "ace/Service_Manager.h"
Expand All @@ -25,9 +26,6 @@
#endif /* __ACE_INLINE__ */

#include "ace/Guard_T.h"
#include "ace/Null_Mutex.h"
#include "ace/Mutex.h"
#include "ace/RW_Thread_Mutex.h"
#if defined (ACE_DISABLE_WIN32_ERROR_WINDOWS) && !defined (ACE_HAS_WINCE)
#include "ace/OS_NS_stdlib.h"
#endif // ACE_DISABLE_WIN32_ERROR_WINDOWS
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/POSIX_Asynch_IO.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#if defined (ACE_HAS_AIO_CALLS)

#include "ace/Flag_Manip.h"
#include "ace/Synch.h"
#include "ace/Proactor.h"
#include "ace/Message_Block.h"
#include "ace/INET_Addr.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Parse_Node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "ace/Service_Config.h"
#include "ace/Service_Repository.h"
#include "ace/Service_Types.h"
#include "ace/Synch.h"
#include "ace/Task.h"
#include "ace/DLL.h"
#include "ace/ACE.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Proactor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include /**/ "ace/config-lite.h"
#include "ace/Synch.h"
#include "ace/Proactor.h"
#if defined (ACE_HAS_WIN32_OVERLAPPED_IO) || defined (ACE_HAS_AIO_CALLS)

Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Service_Gestalt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "ace/Containers.h"
#include "ace/Auto_Ptr.h"
#include "ace/Reactor.h"
#include "ace/Synch.h"
#include "ace/Thread_Manager.h"
#include "ace/DLL.h"
#include "ace/XML_Svc_Conf.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Service_Types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "ace/Service_Types.inl"
#endif /* __ACE_INLINE__ */

#include "ace/Synch.h"
#include "ace/Stream_Modules.h"
#include "ace/Stream.h"
#include "ace/OS_NS_stdio.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Svc_Conf.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#if (ACE_USES_CLASSIC_SVC_CONF == 1)

#include "ace/Synch.h"
#include "ace/Module.h"
#include "ace/Stream.h"
#include "ace/Service_Types.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Svc_Conf_y.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@

#if (ACE_USES_CLASSIC_SVC_CONF == 1)

#include "ace/Synch.h"
#include "ace/Module.h"
#include "ace/Stream.h"
#include "ace/Service_Types.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Task.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "ace/Synch.h"
#include "ace/Task.h"
#include "ace/Module.h"

Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Thread_Adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "ace/Thread_Adapter.h"
#include "ace/Synch.h"
#include "ace/Thread_Manager.h"
#include "ace/Thread_Exit.h"
#include "ace/Thread_Hook.h"
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Thread_Control.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "ace/Thread_Control.h"
#include "ace/Synch.h"
#include "ace/Thread_Manager.h"

#if !defined (ACE_HAS_INLINED_OSCALLS)
Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Thread_Exit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#include "ace/Thread_Exit.h"
#include "ace/Managed_Object.h"
#include "ace/Synch.h"
#include "ace/Thread_Manager.h"
#include "ace/Guard_T.h"

Expand Down
1 change: 1 addition & 0 deletions ACE/ace/Thread_Manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "ace/TSS_T.h"
#include "ace/Synch.h"
#include "ace/Thread_Manager.h"
#include "ace/Dynamic.h"
#include "ace/Object_Manager.h"
Expand Down
14 changes: 7 additions & 7 deletions ACE/ace/Thread_Manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */

#include "ace/Condition_Thread_Mutex.h"
#include "ace/Unbounded_Queue.h"
#include "ace/Basic_Types.h"
#include "ace/Condition_Attributes.h"
#include "ace/Containers.h"
#include "ace/Free_List.h"
#include "ace/Singleton.h"
#include "ace/Log_Category.h"
#include "ace/Singleton.h"
#include "ace/Synch_Traits.h"
#include "ace/Basic_Types.h"
#include "ace/Unbounded_Queue.h"

// The following macros control how a Thread Manager manages a pool of
// Thread_Descriptor. Currently, the default behavior is not to
Expand Down Expand Up @@ -1237,16 +1237,16 @@ class ACE_Export ACE_Thread_Manager
// = ACE_Thread_Mutex and condition variable for synchronizing termination.
#if defined (ACE_HAS_THREADS)
/// Serialize access to the <zero_cond_>.
ACE_Thread_Mutex lock_;
ACE_SYNCH_MUTEX lock_;

/// Keep track of when there are no more threads.
ACE_Condition_Thread_Mutex zero_cond_;
ACE_SYNCH_CONDITION zero_cond_;
#endif /* ACE_HAS_THREADS */

ACE_Locked_Free_List<ACE_Thread_Descriptor, ACE_SYNCH_MUTEX> thread_desc_freelist_;

#if defined (ACE_HAS_THREADS) && defined (ACE_LACKS_PTHREAD_JOIN)
ACE_Condition_Thread_Mutex join_cond_;
ACE_SYNCH_CONDITION join_cond_;
#endif

private:
Expand Down
13 changes: 7 additions & 6 deletions ACE/ace/Timer_Queue_Adapters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,18 @@
#define ACE_TIMER_QUEUE_ADAPTERS_H
#include /**/ "ace/pre.h"

#include "ace/Task.h"

#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */

#include "ace/Signal.h"
#include "ace/Event_Handler.h"
#include "ace/os_include/os_pthread.h"
#include "ace/os_include/os_ucontext.h"
#include "ace/Sig_Handler.h"
#include "ace/Condition_Recursive_Thread_Mutex.h"
#include "ace/Signal.h"
#include "ace/Synch_Traits.h"
#include "ace/Time_Value.h"
#include "ace/Task.h"

#if defined (ACE_HAS_DEFERRED_TIMER_COMMANDS)
# include "ace/Unbounded_Queue.h"
Expand All @@ -32,8 +35,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL

ACE_BEGIN_VERSIONED_NAMESPACE_DECL

class ACE_Sig_Set;

/**
* @class ACE_Async_Timer_Queue_Adapter
*
Expand Down
3 changes: 1 addition & 2 deletions ACE/ace/UPIPE_Acceptor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "ace/Synch.h"
#include "ace/UPIPE_Acceptor.h"



#if defined (ACE_HAS_THREADS)

#include "ace/OS_NS_unistd.h"
Expand Down
3 changes: 1 addition & 2 deletions ACE/ace/UPIPE_Connector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#include "ace/Synch.h"
#include "ace/UPIPE_Connector.h"



#if defined (ACE_HAS_THREADS)

#include "ace/Handle_Ops.h"
Expand Down
Loading