diff options
Diffstat (limited to 'TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp')
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp | 179 |
1 files changed, 101 insertions, 78 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp index 6c3be5f1597..e0e82be331a 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_handler_servant_cs.cpp @@ -12,6 +12,7 @@ // // = DESCRIPTION // Visitor generating code for Interfaces in the server skeletons file. +// !!!!!!!!!!!!!!! NOT USED ANY MORE !!!!!!!!!!!!!!!!!!!! // // = AUTHOR // Aniruddha Gokhale @@ -43,18 +44,18 @@ be_visitor_interface_ami_handler_servant_cs::~be_visitor_interface_ami_handler_s int be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node) { - TAO_OutStream *os; // output stream + be_interface_type_strategy *old_strategy = + node->set_strategy (new be_interface_ami_handler_strategy (node)); + + TAO_OutStream *os = this->ctx_->stream (); // output stream if (node->srv_skel_gen () || node->imported ()) return 0; - os = this->ctx_->stream (); - // generate the skeleton class name os->indent (); // start with whatever indentation level we are at - /* @@ Michael if (node->gen_operation_table () == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -64,25 +65,23 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node -1); } - */ // constructor *os << "// skeleton constructor" << be_nl; // find if we are at the top scope or inside some module if (!node->is_nested ()) { // we are outermost. So the POA_ prefix is prepended to our name - *os << node->ami_handler_full_skel_name () << "::POA_" << node->ami_handler_local_name () << + *os << node->full_skel_name () << "::POA_" << node->local_name () << " (void)" << be_nl; } else { // the POA_ prefix is prepended to our outermost module name - *os << node->ami_handler_full_skel_name () << "::" << node->ami_handler_local_name () << + *os << node->full_skel_name () << "::" << node->local_name () << " (void)" << be_nl; } - *os << "{" << be_idt_nl - << "this->optable_ = &tao_" << node->flatname () + << "this->optable_ = &tao_" << node->flat_name () << "_optable;" << be_uidt_nl << "}\n\n"; @@ -91,19 +90,18 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node if (!node->is_nested ()) { // we are outermost. So the POA_ prefix is prepended to our name - *os << node->ami_handler_full_skel_name () << "::POA_" - << node->ami_handler_local_name () << " (" - << "const POA_" << node->ami_handler_local_name () << "& rhs)"; + *os << node->full_skel_name () << "::POA_" + << node->local_name () << " (" + << "const POA_" << node->local_name () << "& rhs)"; } else { // the POA_ prefix is prepended to our outermost module name - *os << node->ami_handler_full_skel_name () << "::" - << node->ami_handler_local_name () << " (const " - << node->ami_handler_local_name () << "& rhs)"; + *os << node->full_skel_name () << "::" + << node->local_name () << " (const " + << node->local_name () << "& rhs)"; } - *os << be_idt_nl - << ": "; + *os << be_idt_nl << ": "; if (node->traverse_inheritance_graph (be_interface::copy_ctor_helper, os) == -1) ACE_ERROR_RETURN ((LM_ERROR, @@ -111,20 +109,18 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node " copy ctor generation failed\n"), -1); *os << " TAO_ServantBase (rhs)" << be_uidt_nl << "{}\n" << be_nl; - *os << "// skeleton destructor" << be_nl; - if (!node->is_nested ()) { // we are outermost. So the POA_ prefix is prepended to our name - *os << node->ami_handler_full_skel_name () << "::~POA_" << node->ami_handler_local_name () << - " (void)" << be_nl; + *os << node->full_skel_name () << "::~POA_" << node->local_name () + << " (void)" << be_nl; } else { // the POA_ prefix is prepended to our outermost module name - *os << node->ami_handler_full_skel_name () << "::~" << node->ami_handler_local_name () << - " (void)" << be_nl; + *os << node->full_skel_name () << "::~" << node->local_name () + << " (void)" << be_nl; } *os << "{\n"; *os << "}\n\n"; @@ -145,7 +141,7 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node // generate code for the _is_a skeleton os->indent (); - *os << "void " << node->ami_handler_full_skel_name () + *os << "void " << node->full_skel_name () << "::_is_a_skel (" << be_idt << be_idt_nl << "CORBA::ServerRequest &_tao_server_request, " << be_nl << "void * _tao_object_reference," << be_nl @@ -154,8 +150,8 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node << ")" << be_uidt_nl; *os << "{" << be_idt_nl; *os << "TAO_InputCDR &_tao_in = _tao_server_request.incoming ();" << be_nl; - *os << node->ami_handler_full_skel_name () << " *_tao_impl = (" - << node->ami_handler_full_skel_name () << " *) _tao_object_reference;" << be_nl; + *os << node->full_skel_name () << " *_tao_impl = (" + << node->full_skel_name () << " *) _tao_object_reference;" << be_nl; *os << "CORBA::Boolean _tao_retval = 0;" << be_nl; *os << "CORBA::String_var value;" << be_nl; *os << "if (!((_tao_in >> value.out ())))" << be_idt_nl; @@ -172,7 +168,7 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node // generate code for the _non_existent skeleton os->indent (); - *os << "void " << node->ami_handler_full_skel_name () + *os << "void " << node->full_skel_name () << "::_non_existent_skel (" << be_idt << be_idt_nl << "CORBA::ServerRequest &_tao_server_request, " << be_nl << "void * _tao_object_reference," << be_nl @@ -180,8 +176,8 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl << ")" << be_uidt_nl; *os << "{" << be_idt_nl; - *os << node->ami_handler_full_skel_name () << " *_tao_impl = (" - << node->ami_handler_full_skel_name () << " *) _tao_object_reference;" << be_nl; + *os << node->full_skel_name () << " *_tao_impl = (" + << node->full_skel_name () << " *) _tao_object_reference;" << be_nl; *os << "CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);" << be_nl; *os << "ACE_CHECK;" << be_nl << be_nl; *os << "_tao_server_request.init_reply (ACE_TRY_ENV);" << be_nl; @@ -193,7 +189,7 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node os->indent (); - *os << "CORBA::Boolean " << node->ami_handler_full_skel_name () + *os << "CORBA::Boolean " << node->full_skel_name () << "::_is_a (" << be_idt << be_idt_nl << "const char* value," << be_nl << "CORBA::Environment &ACE_TRY_ENV" << be_uidt_nl @@ -208,7 +204,6 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node "traversal of inhertance graph failed\n"), -1); } - os->indent (); *os << "(!ACE_OS::strcmp ((char *)value, " << "CORBA::_tc_Object->id (ACE_TRY_ENV))))" @@ -217,14 +212,14 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node << "return 0;" << be_uidt << be_uidt << be_uidt_nl << "}\n\n"; + // the downcast method. os->indent (); - *os << "void* " << node->ami_handler_full_skel_name () + *os << "void* " << node->full_skel_name () << "::_downcast (" << be_idt << be_idt_nl << "const char* logical_type_id" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl; - if (node->traverse_inheritance_graph (be_interface::downcast_helper, os) == -1) { ACE_ERROR_RETURN ((LM_ERROR, @@ -233,19 +228,17 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node "traversal of inhertance graph failed\n"), -1); } - *os << "if (ACE_OS::strcmp (logical_type_id, " << "\"IDL:omg.org/CORBA/Object:1.0\") == 0)" << be_idt_nl << "return ACE_static_cast(PortableServer::Servant, this);" << be_uidt_nl; - *os << "return 0;" << be_uidt_nl << "}\n\n"; // now the dispatch method os->indent (); - *os << "void " << node->ami_handler_full_skel_name () << + *os << "void " << node->full_skel_name () << "::_dispatch (CORBA::ServerRequest &req, " << "void *context, CORBA::Environment &ACE_TRY_ENV)" << be_nl; *os << "{\n"; @@ -265,83 +258,113 @@ be_visitor_interface_ami_handler_servant_cs::visit_interface (be_interface *node *os << "else" << be_idt_nl; *os << "skel (req, this, context, ACE_TRY_ENV);" << be_uidt << be_uidt_nl; *os << "}\n\n"; - os->indent (); - *os << "const char* " << node->ami_handler_full_skel_name () + *os << "const char* " << node->full_skel_name () << "::_interface_repository_id (void) const" << be_nl; *os << "{\n"; os->incr_indent (); *os << "return \"" << node->repoID () << "\";\n"; os->decr_indent (); - *os << "}\n\n"; - - *os << "\n"; + *os << "}\n\n\n"; // the _this () operation - *os << node->name () << "*" << be_nl - << node->ami_handler_full_skel_name () + + *os << node->full_name () << "*" << be_nl + << node->full_skel_name () << "::_this (CORBA_Environment &ACE_TRY_ENV)" << be_nl << "{" << be_idt_nl << "TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);" << be_nl - << "ACE_CHECK_RETURN (0);" << be_nl - // << "if (ACE_TRY_ENV.exception () != 0)" << be_idt_nl - // << "return 0;" << be_uidt_nl - - // @@ Michael: We need to check this value being passed. I am - // passing 1 right now. (Alex). - << "return new " << node->full_coll_name (1) - << " (this, stub);" << be_uidt_nl; - - *os << "}\n\n"; + << "ACE_CHECK_RETURN (0);" << be_nl + << "return new " ; + if (idl_global->gen_direct_collocation ()) + *os << node->full_coll_name (be_interface::DIRECT); + else if (idl_global->gen_thru_poa_collocation ()) + *os << node->full_coll_name (be_interface::THRU_POA); + *os << " (this, stub);" << be_uidt_nl + << "}\n\n"; // the _create_collocated_objref method *os << "void*" << be_nl - << node->ami_handler_full_skel_name () + << node->full_skel_name () << "::_create_collocated_objref (const char* repository_id, " << "CORBA::ULong type, TAO_Stub *stub)" << be_nl << "{" << be_idt_nl << "if (!ACE_OS::strcmp (\"" << node->repoID () << "\", repository_id))" << be_idt_nl << "return ACE_static_cast (" << be_idt << be_idt_nl - << node->name () << "_ptr," << be_nl + // @@ Michael: I changed the following line from node->name + // to "node->local_name". This might be wrong, but right + // now I think it is right .. + << node->local_name () << "_ptr," << be_nl + << "new "; - // @@ Michael: We need to check this value being passed. I am - // passing 1 right now. (Alex). - << "new " << node->full_coll_name (1) - << " (this, stub)" << be_uidt_nl + if (idl_global->gen_direct_collocation ()) + *os << node->full_coll_name (be_interface::DIRECT); + else if (idl_global->gen_thru_poa_collocation ()) + *os << node->full_coll_name (be_interface::THRU_POA); + + *os << " (this, stub)" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "return 0;" << be_uidt_nl << "}" << be_nl << be_nl; - // @@ Michael - /* + + // generate the collocated class impl - be_visitor_context ctx (*this->ctx_); - ctx.state (TAO_CodeGen::TAO_INTERFACE_COLLOCATED_SS); - be_visitor *visitor = tao_cg->make_visitor (&ctx); - if (!visitor) + if (idl_global->gen_thru_poa_collocation ()) { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_interface_ami_handler_servant_cs::" - "visit_interface - " - "Bad visitor for collocated class\n"), - -1); + be_visitor_context ctx (*this->ctx_); + ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_THRU_POA_COLLOCATED_CS); + be_visitor *visitor = tao_cg->make_visitor (&ctx); + if (!visitor) + { + ACE_ERROR_RETURN ((LM_ERROR, + "be_visitor_interface::" + "ami_handler_servant_cs- " + "Bad visitor for thru_poa collocated class\n"), + -1); + } + + if (node->accept (visitor) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "be_visitor_interface::" + "ami_handler_servant_cs - " + "codegen for thru_poa collocated class failed\n"), + -1); + } + delete visitor; } - if (node->accept (visitor) == -1) + if (idl_global->gen_direct_collocation ()) { - ACE_ERROR_RETURN ((LM_ERROR, - "be_visitor_interface_ami_handler_servant_cs::" - "visit_interface - " - "codegen for collocated class failed\n"), - -1); + be_visitor_context ctx (*this->ctx_); + ctx.state (TAO_CodeGen::TAO_AMI_HANDLER_INTERFACE_DIRECT_COLLOCATED_CS); + be_visitor *visitor = tao_cg->make_visitor (&ctx); + if (!visitor) + { + ACE_ERROR_RETURN ((LM_ERROR, + "be_visitor_interface::" + "ami_handler_servant_cs - " + "Bad visitor for direct collocated class\n"), + -1); + } + + if (node->accept (visitor) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "be_visitor_interface::" + "ami_handler_servant_cs - " + "codegen for direct collocated class failed\n"), + -1); + } + delete visitor; } - delete visitor; *os << "\n\n"; - */ + delete node->set_strategy (old_strategy); return 0; } |