diff options
author | bala <balanatarajan@users.noreply.github.com> | 2002-12-29 13:50:32 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2002-12-29 13:50:32 +0000 |
commit | aaef35839d437c108f28951cba77ec61d67ca441 (patch) | |
tree | 4aa63c7792e8f81ec672f004dce4eaba8fad16a0 /TAO | |
parent | 2698b91c612879fb10c815b8343d85bac3ba30c2 (diff) | |
download | ATCD-aaef35839d437c108f28951cba77ec61d67ca441.tar.gz |
ChangeLogTag: Sun Dec 29 08:44:06 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
Diffstat (limited to 'TAO')
32 files changed, 81 insertions, 5 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 727f27d38eb..d504935ef6c 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,47 @@ +Sun Dec 29 08:44:06 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * TAO_IDL/ast/ast_array.cpp: + * TAO_IDL/ast/ast_sequence.cpp: + * TAO_IDL/be/be_array.cpp: + * TAO_IDL/be/be_decl.cpp: + * TAO_IDL/be/be_sequence.cpp: + * TAO_IDL/be/be_union_branch.cpp: + * TAO_IDL/be/be_valuetype.cpp: + * TAO_IDL/be/be_visitor_amh_pre_proc.cpp: + * TAO_IDL/be/be_visitor_ami_pre_proc.cpp: + * TAO_IDL/be/be_visitor_argument.cpp: + * TAO_IDL/be/be_visitor_array.cpp: + * TAO_IDL/be/be_visitor_attribute.cpp: + * TAO_IDL/be/be_visitor_component.cpp: + * TAO_IDL/be/be_visitor_decl.cpp: + * TAO_IDL/be/be_visitor_exception.cpp: + * TAO_IDL/be/be_visitor_field.cpp: + * TAO_IDL/be/be_visitor_interface_fwd.cpp: + * TAO_IDL/be/be_visitor_operation.cpp: + * TAO_IDL/be/be_visitor_scope.cpp: + * TAO_IDL/be/be_visitor_sequence.cpp: + * TAO_IDL/be/be_visitor_structure.cpp: + * TAO_IDL/be/be_visitor_typedef.cpp: + * TAO_IDL/be/be_visitor_union.cpp: + * TAO_IDL/be/be_visitor_union_branch.cpp: + * TAO_IDL/be/be_visitor_valuetype_fwd.cpp: #include'd + ace/Log_Msg.h to all the above files. This helps compilation to + go smooth on AIX. + + * TAO_IDL/include/ast_module.h: #include'd ace/Unbounded_Set.h. + + * tao/Condition.h: #include'd tao/orbconf.h + * tao/FILE_Parser.cpp: + * tao/Typecode.cpp: #include'd ace/Malloc_Base.h. + + All the above changes help compilation on AIX. Thanks to Jon + Wackley <jonw@mountaincable.net> for providing these patches. + + * tao/Muxed_TMS.cpp: + * tao/Muxed_TMS.h: Use recursive mutex instead of a simple + mutex. This prevents deadlock that might occur, when a thread + tries to send a request during reply dispatching. + Sat Dec 28 13:09:53 2002 Nanbor Wang <nanbor@cs.wustl.edu> * tao/Strategies/SHMIOP_Transport.cpp (recv_i): Changed the recv_i diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp index 3814be32892..c6a33ceddef 100644 --- a/TAO/TAO_IDL/ast/ast_array.cpp +++ b/TAO/TAO_IDL/ast/ast_array.cpp @@ -75,6 +75,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_visitor.h" #include "utl_exprlist.h" #include "utl_identifier.h" +#include "ace/Log_Msg.h" + ACE_RCSID (ast, ast_array, diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp index 99f5fbdf6d9..99fa1fd9ff5 100644 --- a/TAO/TAO_IDL/ast/ast_sequence.cpp +++ b/TAO/TAO_IDL/ast/ast_sequence.cpp @@ -74,6 +74,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_expression.h" #include "ast_visitor.h" #include "utl_identifier.h" +#include "ace/Log_Msg.h" ACE_RCSID (ast, ast_sequence, diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp index e598750ab63..f564a48276a 100644 --- a/TAO/TAO_IDL/be/be_array.cpp +++ b/TAO/TAO_IDL/be/be_array.cpp @@ -26,6 +26,7 @@ #include "be_visitor.h" #include "utl_identifier.h" #include "idl_defines.h" +#include "ace/Log_Msg.h" ACE_RCSID (be, be_array, diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp index f07e0c102b6..40c5f59507c 100644 --- a/TAO/TAO_IDL/be/be_decl.cpp +++ b/TAO/TAO_IDL/be/be_decl.cpp @@ -38,6 +38,7 @@ #include "be_sequence.h" #include "be_visitor.h" #include "utl_identifier.h" +#include "ace/Log_Msg.h" ACE_RCSID (be, be_decl, diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp index 89b440663da..758d442bd1f 100644 --- a/TAO/TAO_IDL/be/be_sequence.cpp +++ b/TAO/TAO_IDL/be/be_sequence.cpp @@ -27,6 +27,7 @@ #include "be_visitor.h" #include "utl_identifier.h" #include "idl_defines.h" +#include "ace/Log_Msg.h" ACE_RCSID (be, be_sequence, diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp index 9e5a934b76b..9f14a203006 100644 --- a/TAO/TAO_IDL/be/be_union_branch.cpp +++ b/TAO/TAO_IDL/be/be_union_branch.cpp @@ -26,6 +26,7 @@ #include "be_visitor.h" #include "be_helper.h" #include "ast_union_label.h" +#include "ace/Log_Msg.h" ACE_RCSID (be, be_union_branch, diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index 28d8955aef1..e3a1a2465ec 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -25,6 +25,7 @@ #include "ast_module.h" #include "idl_defines.h" #include "nr_extern.h" +#include "ace/Log_Msg.h" ACE_RCSID (be, be_valuetype, diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp index a38874c9b05..9b5aa0ad019 100644 --- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp @@ -24,6 +24,7 @@ #include "be_predefined_type.h" #include "be_argument.h" #include "utl_identifier.h" +#include "ace/Log_Msg.h" be_visitor_amh_pre_proc::be_visitor_amh_pre_proc (be_visitor_context *ctx) : be_visitor_scope (ctx) diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp index 5ef405317c4..765e5c5d427 100644 --- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp +++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp @@ -36,6 +36,7 @@ #include "be_argument.h" #include "utl_identifier.h" #include "nr_extern.h" +#include "ace/Log_Msg.h" ACE_RCSID (be, be_visitor_ami_pre_proc, diff --git a/TAO/TAO_IDL/be/be_visitor_argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument.cpp index 870b7d999fd..05f16bdf2b6 100644 --- a/TAO/TAO_IDL/be/be_visitor_argument.cpp +++ b/TAO/TAO_IDL/be/be_visitor_argument.cpp @@ -43,6 +43,7 @@ #include "be_operation.h" #include "be_helper.h" #include "utl_identifier.h" +#include "ace/Log_Msg.h" #include "be_visitor_argument/arglist.cpp" #include "be_visitor_argument/argument.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_array.cpp b/TAO/TAO_IDL/be/be_visitor_array.cpp index fab845d54b1..56e7c32de25 100644 --- a/TAO/TAO_IDL/be/be_visitor_array.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array.cpp @@ -34,6 +34,7 @@ #include "be_helper.h" #include "be_extern.h" #include "utl_identifier.h" +#include "ace/Log_Msg.h" #include "be_visitor_array.h" #include "be_visitor_context.h" diff --git a/TAO/TAO_IDL/be/be_visitor_attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute.cpp index b85b330d9a0..16fc6f39917 100644 --- a/TAO/TAO_IDL/be/be_visitor_attribute.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attribute.cpp @@ -27,6 +27,7 @@ #include "be_visitor_attribute.h" #include "be_visitor_context.h" #include "be_visitor_operation.h" +#include "ace/Log_Msg.h" #include "be_visitor_attribute/attribute.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_component.cpp b/TAO/TAO_IDL/be/be_visitor_component.cpp index 3db3df2e7f7..ade5a3cfb74 100644 --- a/TAO/TAO_IDL/be/be_visitor_component.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component.cpp @@ -37,6 +37,7 @@ #include "be_helper.h" #include "be_extern.h" #include "idl_defines.h" +#include "ace/Log_Msg.h" #include "be_visitor_component/component.cpp" #include "be_visitor_component/component_ch.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_decl.cpp b/TAO/TAO_IDL/be/be_visitor_decl.cpp index 5fc92908f1b..edcdd67a50b 100644 --- a/TAO/TAO_IDL/be/be_visitor_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_decl.cpp @@ -24,6 +24,7 @@ #include "be_visitor_context.h" #include "be_typedef.h" #include "be_type.h" +#include "ace/Log_Msg.h" ACE_RCSID (be, be_visitor_decl, diff --git a/TAO/TAO_IDL/be/be_visitor_exception.cpp b/TAO/TAO_IDL/be/be_visitor_exception.cpp index 872abd3895f..93f13290788 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception.cpp @@ -38,6 +38,7 @@ #include "be_visitor_exception.h" #include "be_visitor_context.h" #include "be_visitor_field.h" +#include "ace/Log_Msg.h" #include "be_visitor_exception/exception.cpp" #include "be_visitor_exception/exception_ch.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_field.cpp b/TAO/TAO_IDL/be/be_visitor_field.cpp index 26726796307..599bf0b7089 100644 --- a/TAO/TAO_IDL/be/be_visitor_field.cpp +++ b/TAO/TAO_IDL/be/be_visitor_field.cpp @@ -43,6 +43,7 @@ #include "be_visitor_structure.h" #include "be_visitor_union.h" #include "be_visitor_context.h" +#include "ace/Log_Msg.h" #include "be_visitor_field/field_ch.cpp" #include "be_visitor_field/field_ci.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp index 0818c2bee1e..f38aa9b9b4c 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp @@ -25,6 +25,7 @@ #include "be_visitor_interface_fwd.h" #include "be_visitor_context.h" +#include "ace/Log_Msg.h" #include "be_visitor_interface_fwd/interface_fwd_ch.cpp" #include "be_visitor_interface_fwd/cdr_op_ch.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation.cpp index 7017329c857..7031f1831e0 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation.cpp @@ -49,6 +49,7 @@ #include "be_visitor_operation.h" #include "be_visitor_argument.h" #include "be_visitor_context.h" +#include "ace/Log_Msg.h" #include "be_visitor_operation/operation.cpp" #include "be_visitor_operation/arglist.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_scope.cpp b/TAO/TAO_IDL/be/be_visitor_scope.cpp index a50a4c17c14..b00aaced949 100644 --- a/TAO/TAO_IDL/be/be_visitor_scope.cpp +++ b/TAO/TAO_IDL/be/be_visitor_scope.cpp @@ -23,6 +23,7 @@ #include "be_scope.h" #include "be_visitor_scope.h" #include "be_visitor_context.h" +#include "ace/Log_Msg.h" ACE_RCSID (be, be_visitor_scope, diff --git a/TAO/TAO_IDL/be/be_visitor_sequence.cpp b/TAO/TAO_IDL/be/be_visitor_sequence.cpp index c13e473c54a..288ceca735c 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence.cpp @@ -39,6 +39,7 @@ #include "be_visitor_sequence.h" #include "be_visitor_context.h" +#include "ace/Log_Msg.h" #include "be_visitor_sequence/any_op_ch.cpp" #include "be_visitor_sequence/any_op_cs.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_structure.cpp b/TAO/TAO_IDL/be/be_visitor_structure.cpp index 288b9ef1fc4..28fcfe6fc3e 100644 --- a/TAO/TAO_IDL/be/be_visitor_structure.cpp +++ b/TAO/TAO_IDL/be/be_visitor_structure.cpp @@ -27,6 +27,7 @@ #include "be_visitor_field.h" #include "be_visitor_typecode.h" #include "be_visitor_context.h" +#include "ace/Log_Msg.h" #include "be_visitor_structure/structure.cpp" #include "be_visitor_structure/structure_ch.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_typedef.cpp b/TAO/TAO_IDL/be/be_visitor_typedef.cpp index 964aa163a76..05442c460eb 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef.cpp @@ -39,6 +39,7 @@ #include "be_visitor_typecode.h" #include "be_visitor_union.h" #include "be_visitor_context.h" +#include "ace/Log_Msg.h" #include "be_visitor_typedef/typedef.cpp" #include "be_visitor_typedef/typedef_ch.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_union.cpp b/TAO/TAO_IDL/be/be_visitor_union.cpp index 74e16f5ad55..505701dc9f2 100644 --- a/TAO/TAO_IDL/be/be_visitor_union.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union.cpp @@ -33,6 +33,7 @@ #include "be_visitor_union_branch.h" #include "be_visitor_typecode.h" #include "be_visitor_context.h" +#include "ace/Log_Msg.h" #include "be_visitor_union/discriminant_ch.cpp" #include "be_visitor_union/discriminant_ci.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp index 21dd19b7c64..fcb53b6924f 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp @@ -41,6 +41,7 @@ #include "be_visitor_structure.h" #include "be_visitor_union.h" #include "be_visitor_context.h" +#include "ace/Log_Msg.h" #include "be_visitor_union_branch/private_ch.cpp" #include "be_visitor_union_branch/public_assign_cs.cpp" diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp index 925c5e847a5..5a594084c15 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp @@ -25,6 +25,7 @@ #include "be_visitor_valuetype_fwd.h" #include "be_visitor_context.h" +#include "ace/Log_Msg.h" #include "be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp" #include "be_visitor_valuetype_fwd/any_op_ch.cpp" diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h index 8d46aa7b860..13bf036df1a 100644 --- a/TAO/TAO_IDL/include/ast_module.h +++ b/TAO/TAO_IDL/include/ast_module.h @@ -69,6 +69,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. #include "ast_decl.h" #include "utl_scope.h" +#include "ace/Unbounded_Set.h" // Representation of module. // diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index 56adaf57084..c5b7e065636 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -13,12 +13,15 @@ #ifndef TAO_CONDITION_H #define TAO_CONDITION_H #include "ace/pre.h" +#include "orbconf.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +class ACE_Time_Value; + /** * @class TAO_Condition diff --git a/TAO/tao/FILE_Parser.cpp b/TAO/tao/FILE_Parser.cpp index 5d96c6ac8e1..8b0fe141eb4 100644 --- a/TAO/tao/FILE_Parser.cpp +++ b/TAO/tao/FILE_Parser.cpp @@ -7,6 +7,7 @@ #include "tao/Exception.h" #include "tao/Environment.h" #include "ace/Read_Buffer.h" +#include "ace/Malloc_Base.h" #if !defined(__ACE_INLINE__) #include "FILE_Parser.i" diff --git a/TAO/tao/Muxed_TMS.cpp b/TAO/tao/Muxed_TMS.cpp index 22a4d97ad03..62e933ada9f 100644 --- a/TAO/tao/Muxed_TMS.cpp +++ b/TAO/tao/Muxed_TMS.cpp @@ -28,7 +28,7 @@ CORBA::ULong TAO_Muxed_TMS::request_id (void) { // @@ What is a good error return value? - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, + ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, 0); ++this->request_id_generator_; @@ -80,7 +80,7 @@ TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id, int TAO_Muxed_TMS::unbind_dispatcher (CORBA::ULong request_id) { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, + ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, -1); @@ -99,7 +99,7 @@ TAO_Muxed_TMS::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) // Grab the reply dispatcher for this id. { - ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); + ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_, -1); result = this->dispatcher_table_.unbind (params.request_id_, rd); if (TAO_debug_level > 8) @@ -177,7 +177,7 @@ TAO_Muxed_TMS::idle_after_reply (void) void TAO_Muxed_TMS::connection_closed (void) { - ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); + ACE_GUARD (TAO_SYNCH_RECURSIVE_MUTEX, ace_mon, this->lock_); // @@ This should be done using a mutex, the table REQUEST_DISPATCHER_TABLE::ITERATOR end = diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h index fc942ddb610..893d06440eb 100644 --- a/TAO/tao/Muxed_TMS.h +++ b/TAO/tao/Muxed_TMS.h @@ -65,7 +65,7 @@ public: protected: /// Lock to protect the state of this class - TAO_SYNCH_MUTEX lock_; + TAO_SYNCH_RECURSIVE_MUTEX lock_; /// Used to generate a different request_id on each call to /// request_id(). diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 8927d7bd29c..48068a7624e 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -20,6 +20,7 @@ #include "tao/Principal.h" #include "tao/Marshal.h" #include "tao/debug.h" +#include "ace/Malloc_Base.h" #if !defined (__ACE_INLINE__) # include "tao/Typecode.i" |