From db9dc73fb458638973a458ba76a2d7f159c96c4d Mon Sep 17 00:00:00 2001 From: Manuel Traut Date: Sun, 3 Jun 2012 14:01:02 +0200 Subject: libdistrio_common: rename common -> helper - include 'common.h' in other components sounds bad Signed-off-by: Manuel Traut --- common/common.cpp | 89 ------------------------------------------------------- 1 file changed, 89 deletions(-) delete mode 100644 common/common.cpp (limited to 'common/common.cpp') diff --git a/common/common.cpp b/common/common.cpp deleted file mode 100644 index 9fd35e3..0000000 --- a/common/common.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/** - * @author Manuel Traut - * @licence GPLv2 - */ - -#include - -#include "common.h" - -int init_corba (int argc, char **argv) -{ - int ret = 0; - CORBA::Object_var obj, root_poa, naming_service; - - try { - ref.orb = CORBA::ORB_init (argc, argv); - root_poa = ref.orb->resolve_initial_references ("RootPOA"); - ref.poa = PortableServer::POA::_narrow (root_poa.in ()); - - naming_service = ref.orb->resolve_initial_references ("NameService"); - if (CORBA::is_nil (naming_service)) { - std::cerr << "can't resolve NameService" << std::endl; - ret = -EINVAL; - goto out; - } - ref.nc = CosNaming::NamingContext::_narrow (naming_service.in ()); - if (CORBA::is_nil (ref.nc)) { - std::cerr << "resolved invalid NameService object" << std::endl; - ret = -EINVAL; - goto out; - } - } catch (CORBA::Exception &e) { - std::cerr << "CORBA initialization failed: " << e << std::endl; - ret = -EINVAL; - goto out; - } - - ref.init = 1; - -out: - return ret; -} - -int register_digital (char *_name, Distrio_Digital_i *digital) -{ - CosNaming::Name name; - CORBA::Object_var obj; - PortableServer::ObjectId_var oid; - - if (!ref.init) { - std::cerr << "corba not initialized" << std::endl; - return -1; - } - - try { - oid = ref.poa->activate_object (digital); - obj = digital->_this (); - - /* TODO: find out how to build a tree @ the nameservice "distrio/manager" */ - name.length (1); - name[0].id = CORBA::string_dup (_name); - ref.nc->rebind (name, obj.in ()); - } catch (CORBA::Exception &e) { - std::cerr << "CORBA initialization failed: " << e << std::endl; - return -1; - } - - return 0; -} - -int run_orb () -{ - if (!ref.init) { - std::cerr << "corba not initialized" << std::endl; - return -1; - } - - try { - ref.poa_mgr = ref.poa->the_POAManager (); - ref.poa_mgr->activate (); - ref.orb->run (); - ref.orb->destroy (); - } catch (CORBA::Exception &e) { - std::cerr << "CORBA initialization failed: " << e << std::endl; - return -1; - } - - return 0; -} -- cgit v1.2.3