activationLock.lock();
- if (!configFile.empty())
- {
- m_config = new Configuration(configFile);
-
- if (m_config->isLoaded())
+ try{
+ if (!configFile.empty())
{
- configInfo bundles;
- m_config->getConfiguredBundles(&bundles);
+ m_config = new Configuration(configFile);
- for (unsigned int i = 0; i < bundles.size(); i++)
+ if (m_config->isLoaded())
{
- BundleInfoInternal *bundleInfo = new BundleInfoInternal();
- bundleInfo->setPath(bundles[i][BUNDLE_PATH]);
- bundleInfo->setVersion(bundles[i][BUNDLE_VERSION]);
- bundleInfo->setID(bundles[i][BUNDLE_ID]);
- if (!bundles[i][BUNDLE_ACTIVATOR].empty())
+ configInfo bundles;
+ m_config->getConfiguredBundles(&bundles);
+
+ for (unsigned int i = 0; i < bundles.size(); i++)
{
- string activatorName = bundles[i][BUNDLE_ACTIVATOR];
- std::replace(activatorName.begin(), activatorName.end(), '.', '/');
- ((BundleInfoInternal *) bundleInfo)->setActivatorName(activatorName);
- ((BundleInfoInternal *) bundleInfo)->setLibraryPath(
- bundles[i][BUNDLE_LIBRARY_PATH]);
- }
+ shared_ptr<BundleInfoInternal> bundleInfo(new BundleInfoInternal);
+ bundleInfo->setPath(bundles[i][BUNDLE_PATH]);
+ bundleInfo->setVersion(bundles[i][BUNDLE_VERSION]);
+ bundleInfo->setID(bundles[i][BUNDLE_ID]);
+ if (!bundles[i][BUNDLE_ACTIVATOR].empty())
+ {
+ string activatorName = bundles[i][BUNDLE_ACTIVATOR];
+ std::replace(activatorName.begin(), activatorName.end(), '.', '/');
+ bundleInfo->setActivatorName(activatorName);
+ bundleInfo->setLibraryPath(bundles[i][BUNDLE_LIBRARY_PATH]);
+ }
- OIC_LOG_V(INFO, CONTAINER_TAG, "Init Bundle:(%s)",
- std::string(bundles[i][BUNDLE_ID] + ";" +
- bundles[i][BUNDLE_PATH]).c_str());
+ OIC_LOG_V(INFO, CONTAINER_TAG, "Init Bundle:(%s)",
+ std::string(bundles[i][BUNDLE_ID] + ";" +
+ bundles[i][BUNDLE_PATH]).c_str());
- registerBundle(bundleInfo);
- activateBundle(bundleInfo);
+ registerBundle(bundleInfo);
+ activateBundle(bundleInfo);
+ }
+ }
+ else
+ {
+ OIC_LOG_V(ERROR, CONTAINER_TAG, "Container started with invalid configfile path.");
}
}
else
{
- OIC_LOG_V(ERROR, CONTAINER_TAG, "Container started with invalid configfile path.");
+ OIC_LOG_V(INFO, CONTAINER_TAG, "No configuration file for the container provided.");
}
- }
- else
- {
- OIC_LOG_V(INFO, CONTAINER_TAG, "No configuration file for the container provided.");
- }
-
- map<std::string, boost::thread >::iterator activatorIterator;
- for (activatorIterator = m_activators.begin(); activatorIterator != m_activators.end();
- activatorIterator++)
- {
- activatorIterator->second.timed_join(
- boost::posix_time::seconds(BUNDLE_ACTIVATION_WAIT_SEC));
- // wait for bundles to be activated
+ OIC_LOG(INFO, CONTAINER_TAG, "Resource container started.");
+ }catch(...){
+ OIC_LOG(INFO, CONTAINER_TAG, "Resource container failed starting.");
}
activationLock.unlock();
- OIC_LOG(INFO, CONTAINER_TAG, "Resource container started.");
}
void ResourceContainerImpl::stopContainer()
{
OIC_LOG(INFO, CONTAINER_TAG, "Stopping resource container.");
- for (std::map< std::string, BundleInfoInternal * >::iterator it = m_bundles.begin();
+ for (std::map< std::string, shared_ptr<BundleInfoInternal> >::iterator it = m_bundles.begin();
it != m_bundles.end(); ++it)
{
- BundleInfoInternal *bundleInfo = it->second;
- deactivateBundle(bundleInfo);
- unregisterBundle(bundleInfo);
+ deactivateBundle(it->second);
+ unregisterBundle(it->second);
}
if (!m_mapServers.empty())
delete m_config;
}
- void ResourceContainerImpl::activateBundle(RCSBundleInfo *bundleInfo)
+ void ResourceContainerImpl::activateBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
activationLock.lock();
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) bundleInfo;
+
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
if (bundleInfoInternal->isLoaded())
{
activationLock.unlock();
}
- void ResourceContainerImpl::deactivateBundle(RCSBundleInfo *bundleInfo)
+ void ResourceContainerImpl::deactivateBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
- if (((BundleInfoInternal *) bundleInfo)->isActivated())
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
+ if (bundleInfoInternal->isActivated())
{
- deactivateBundle(bundleInfo->getID());
+ deactivateBundle(bundleInfoInternal->getID());
}
}
{
OIC_LOG_V(INFO, CONTAINER_TAG, "Activating bundle: (%s)",
std::string(m_bundles[id]->getID()).c_str());
+
activationLock.lock();
- auto f = std::bind(&ResourceContainerImpl::activateBundleThread, this,
- id);
- boost::thread activator(f);
- activator.timed_join(boost::posix_time::seconds(BUNDLE_SET_GET_WAIT_SEC));
+ try{
+ activateBundleThread(id);
+ }
+ catch(...){
+ OIC_LOG_V(INFO, CONTAINER_TAG, "Activating bundle: (%s) failed",
+ std::string(m_bundles[id]->getID()).c_str());
+ }
activationLock.unlock();
OIC_LOG_V(INFO, CONTAINER_TAG, "Bundle activated: (%s)",
std::string(m_bundles[id]->getID()).c_str());
}
// loads the bundle
- void ResourceContainerImpl::registerBundle(RCSBundleInfo *bundleInfo)
+ void ResourceContainerImpl::registerBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
OIC_LOG_V(INFO, CONTAINER_TAG, "Registering bundle: (%s)",
std::string(bundleInfo->getPath()).c_str());
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
if (has_suffix(bundleInfo->getPath(), ".jar"))
{
#if(JAVA_SUPPORT)
- ((BundleInfoInternal *) bundleInfo)->setJavaBundle(true);
- ((BundleInfoInternal *) bundleInfo)->setSoBundle(false);
+ bundleInfoInternal->setJavaBundle(true);
+ bundleInfoInternal->setSoBundle(false);
registerJavaBundle(bundleInfo);
#else
// android .jar library
- ((BundleInfoInternal *) bundleInfo)->setSoBundle(false);
- ((BundleInfoInternal *) bundleInfo)->setJavaBundle(false);
+ bundleInfoInternal->setSoBundle(false);
+ bundleInfoInternal->setJavaBundle(false);
registerExtBundle(bundleInfo);
#endif
}
else if(has_suffix(bundleInfo->getPath(), ".so"))
{
- ((BundleInfoInternal *) bundleInfo)->setSoBundle(true);
- ((BundleInfoInternal *) bundleInfo)->setJavaBundle(false);
+ bundleInfoInternal->setSoBundle(true);
+ bundleInfoInternal->setJavaBundle(false);
registerSoBundle(bundleInfo);
}
// other cases might be for example .apk for android, which are loaded in the wrapper
else{
- ((BundleInfoInternal *) bundleInfo)->setSoBundle(false);
- ((BundleInfoInternal *) bundleInfo)->setJavaBundle(false);
+ bundleInfoInternal->setSoBundle(false);
+ bundleInfoInternal->setJavaBundle(false);
registerExtBundle(bundleInfo);
}
}
- void ResourceContainerImpl::unregisterBundle(RCSBundleInfo *bundleInfo)
+ void ResourceContainerImpl::unregisterBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) bundleInfo;
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
if (bundleInfoInternal->isLoaded() && !bundleInfoInternal->isActivated())
{
if (bundleInfoInternal->getSoBundle())
}
else
{
- delete m_bundles[id];
m_bundles.erase(id);
}
}
}
}
- OIC_LOG_V(INFO, CONTAINER_TAG, "Container get request for %s finished, %d attributes",strResourceUri.c_str(), attr.size());
+ OIC_LOG_V(INFO, CONTAINER_TAG, "Container get request for %s finished, %zu attributes",strResourceUri.c_str(), attr.size());
return RCSGetResponse::create(std::move(attr), 200);
}
std::list<std::string> lstAttributes;
std::string strResourceUri = request.getResourceUri();
- OIC_LOG_V(INFO, CONTAINER_TAG, "Container set request for %s, %d attributes",strResourceUri.c_str(), attributes.size());
+ OIC_LOG_V(INFO, CONTAINER_TAG, "Container set request for %s, %zu attributes",strResourceUri.c_str(), attributes.size());
if (m_mapServers.find(strResourceUri) != m_mapServers.end()
&& m_mapResources.find(strResourceUri) != m_mapResources.end())
else
{
- BundleInfoInternal *bundleInfo = new BundleInfoInternal();
+ shared_ptr<BundleInfoInternal> bundleInfo = std::make_shared<BundleInfoInternal>();
bundleInfo->setID(bundleId);
bundleInfo->setPath(bundlePath);
bundleInfo->setActivatorName(activator);
{
string activatorName = activator; // modify activator for Java bundle
std::replace(activatorName.begin(), activatorName.end(), '.', '/');
- ((BundleInfoInternal *) bundleInfo)->setActivatorName(activatorName);
- ((BundleInfoInternal *)bundleInfo)->setLibraryPath(params[BUNDLE_LIBRARY_PATH]);
+ bundleInfo->setActivatorName(activatorName);
+ bundleInfo->setLibraryPath(params[BUNDLE_LIBRARY_PATH]);
}
OIC_LOG_V(INFO, CONTAINER_TAG, "Add Bundle: (%s)",
OIC_LOG_V(INFO, CONTAINER_TAG, "removeBundle %s",bundleId.c_str());
if (m_bundles.find(bundleId) != m_bundles.end())
{
- BundleInfoInternal *bundleInfo = m_bundles[bundleId];
+ shared_ptr<BundleInfoInternal> bundleInfo = m_bundles[bundleId];
if (bundleInfo->isActivated())
deactivateBundle(bundleInfo);
OIC_LOG_V(INFO, CONTAINER_TAG,
"list bundles (%d)", m_bundles.size());
std::list<std::unique_ptr<RCSBundleInfo> > ret;
- for (std::map< std::string, BundleInfoInternal * >::iterator it = m_bundles.begin();
+ for (std::map< std::string, shared_ptr<BundleInfoInternal> >::iterator it = m_bundles.begin();
it != m_bundles.end(); ++it)
{
{
std::unique_ptr<BundleInfoInternal> bundleInfo(new BundleInfoInternal);
- (bundleInfo)->setBundleInfo(it->second);
+ bundleInfo->setBundleInfo(it->second);
ret.push_back(std::move(bundleInfo));
}
}
void ResourceContainerImpl::removeResourceConfig(const std::string &bundleId,
const std::string &resourceUri)
{
- OIC_LOG_V(INFO, CONTAINER_TAG, "removeResourceConfig %s, %s",bundleId.c_str(), resourceUri.c_str());
+ OIC_LOG_V(INFO, CONTAINER_TAG, "removeResourceConfig %s, %s",bundleId.c_str(),
+ resourceUri.c_str());
if (m_bundles.find(bundleId) != m_bundles.end())
{
if (m_bundles[bundleId]->getSoBundle())
}
- void ResourceContainerImpl::registerSoBundle(RCSBundleInfo *bundleInfo)
+ void ResourceContainerImpl::registerSoBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Register SO bundle");
const char *error;
deactivator_t *bundleDeactivator = NULL;
resourceCreator_t *resourceCreator = NULL;
resourceDestroyer_t *resourceDestroyer = NULL;
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) bundleInfo;
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
+
void *bundleHandle = NULL;
bundleHandle = dlopen(bundleInfo->getPath().c_str(), RTLD_LAZY);
if ((error = dlerror()) != NULL)
if (bundleHandle != NULL)
{
- OIC_LOG_V(DEBUG, CONTAINER_TAG, "Activator name %s", bundleInfoInternal->getActivatorName().c_str());
+ OIC_LOG_V(DEBUG, CONTAINER_TAG, "Activator name %s",
+ bundleInfoInternal->getActivatorName().c_str());
bundleActivator =
(activator_t *) dlsym(bundleHandle,
("" + bundleInfoInternal->getActivatorName()
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
else{
- OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" + bundleInfoInternal->getActivatorName()
+ OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
+ bundleInfoInternal->getActivatorName()
+ "_externalActivateBundle").c_str());
}
bundleDeactivator =
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
else{
- OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" + bundleInfoInternal->getActivatorName()
+ OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
+ bundleInfoInternal->getActivatorName()
+ "_externalDeactivateBundle").c_str());
}
resourceCreator =
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
else{
- OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" + bundleInfoInternal->getActivatorName()
+ OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
+ bundleInfoInternal->getActivatorName()
+ "_externalCreateResource").c_str());
}
resourceDestroyer =
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
else{
- OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" + bundleInfoInternal->getActivatorName()
+ OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
+ bundleInfoInternal->getActivatorName()
+ "_externalDestroyResource").c_str());
}
}
else
{
- ((BundleInfoInternal *) bundleInfo)->setBundleActivator(bundleActivator);
- ((BundleInfoInternal *) bundleInfo)->setBundleDeactivator(bundleDeactivator);
- ((BundleInfoInternal *) bundleInfo)->setResourceCreator(resourceCreator);
- ((BundleInfoInternal *) bundleInfo)->setResourceDestroyer(resourceDestroyer);
- ((BundleInfoInternal *) bundleInfo)->setLoaded(true);
- ((BundleInfoInternal *) bundleInfo)->setBundleHandle(bundleHandle);
-
- m_bundles[bundleInfo->getID()] = ((BundleInfoInternal *) bundleInfo);
+ bundleInfoInternal->setBundleActivator(bundleActivator);
+ bundleInfoInternal->setBundleDeactivator(bundleDeactivator);
+ bundleInfoInternal->setResourceCreator(resourceCreator);
+ bundleInfoInternal->setResourceDestroyer(resourceDestroyer);
+ bundleInfoInternal->setLoaded(true);
+ bundleInfoInternal->setBundleHandle(bundleHandle);
+
+ m_bundles[bundleInfo->getID()] = bundleInfoInternal;
}
}
else
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Register SO bundle finished");
}
- void ResourceContainerImpl::registerExtBundle(RCSBundleInfo *bundleInfo){
+ void ResourceContainerImpl::registerExtBundle(shared_ptr<RCSBundleInfo> bundleInfo){
OIC_LOG_V(INFO, CONTAINER_TAG, "Registering ext bundle (%s)",
std::string(bundleInfo->getID()).c_str());
OIC_LOG_V(INFO, CONTAINER_TAG, "Activator name (%s)",
std::string(bundleInfo->getActivatorName()).c_str());
- m_bundles[bundleInfo->getID()] = ((BundleInfoInternal *)bundleInfo);
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
+
+ m_bundles[bundleInfo->getID()] = bundleInfoInternal;
// in this case at least the resource configuration needs to be loaded
// in order to mark potential input resources for soft sensors
std::vector< resourceInfo > temp;
OIC_LOG(ERROR, CONTAINER_TAG, "Activation unsuccessful.");
}
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) m_bundles[bundleId];
+ shared_ptr<BundleInfoInternal> bundleInfoInternal = m_bundles[bundleId];
bundleInfoInternal->setActivated(true);
}
{
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Discover input resource %s", outputResourceUri.c_str());
auto foundOutputResource = m_mapResources.find(outputResourceUri);
- // auto resourceProperty = foundOutputResource->second->m_mapResourceProperty;
resourceInfo info;
m_config->getResourceConfiguration(foundOutputResource->second->m_bundleId,
- foundOutputResource->second->m_name, &info);
+ outputResourceUri, &info);
map< string, vector< map< string, string > > > resourceProperty = info.resourceProperty;
try
return m_bundleVM[bundleId];
}
- void ResourceContainerImpl::registerJavaBundle(RCSBundleInfo *bundleInfo)
+ void ResourceContainerImpl::registerJavaBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
OIC_LOG_V(INFO, CONTAINER_TAG, "Registering Java bundle (%s)",
std::string(bundleInfo->getID()).c_str());
JavaVMInitArgs vm_args;
JavaVMOption options[3];
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) bundleInfo;
+ shared_ptr<BundleInfoInternal> bundleInfoInternal =
+ std::static_pointer_cast<BundleInfoInternal>(bundleInfo);
+
if (FILE *file = fopen(bundleInfo->getPath().c_str(), "r"))
{
options[0].optionString = optionString;
char classpath[1000];
strcpy(classpath, "-Djava.class.path=");
- strcat(classpath, bundleInfo->getPath().c_str());
+ strncat(classpath, bundleInfo->getPath().c_str(), BUNDLE_PATH_MAXLEN);
OIC_LOG(INFO, CONTAINER_TAG,
std::string("Configured classpath: ").append(classpath).c_str());
char libraryPath[1000];
strcpy(libraryPath, "-Djava.library.path=");
- strcat(libraryPath, bundleInfo->getLibraryPath().c_str());
+ strncat(libraryPath, bundleInfo->getLibraryPath().c_str(), BUNDLE_PATH_MAXLEN);
options[2].optionString = libraryPath;
OIC_LOG(INFO, CONTAINER_TAG,
bundleInfoInternal->setLoaded(true);
- m_bundles[bundleInfo->getID()] = ((BundleInfoInternal *)bundleInfo);
+ m_bundles[bundleInfo->getID()] = bundleInfoInternal;
OIC_LOG(INFO, CONTAINER_TAG, "Bundle registered");
OIC_LOG(INFO, CONTAINER_TAG, "Activating java bundle");
JavaVM *vm = getJavaVM(bundleId);
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) m_bundles[bundleId];
+ bundleInfoInternal = m_bundles[bundleId];
JNIEnv *env;
int envStat = vm->GetEnv((void **) &env, JNI_VERSION_1_4);
OIC_LOG(INFO, CONTAINER_TAG, "Deactivating java bundle");
JavaVM *vm = getJavaVM(bundleId);
- BundleInfoInternal *bundleInfoInternal = (BundleInfoInternal *) m_bundles[bundleId];
+ shared_ptr<BundleInfoInternal>bundleInfoInternal = m_bundles[bundleId];
JNIEnv *env;
int envStat = vm->GetEnv((void **) &env, JNI_VERSION_1_4);
m_bundleVM[id]->DestroyJavaVM();
- delete m_bundles[id];
m_bundles.erase(id);
}
#endif
projects / platform / upstream / iotivity.git / blobdiff