activationLock.lock();
- if (!configFile.empty())
+ try
{
- m_config = new Configuration(configFile);
-
- if (m_config->isLoaded())
+ 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())
{
- 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())
+ 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(), '.', '/');
- bundleInfo->setActivatorName(activatorName);
- 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++)
+ OIC_LOG(INFO, CONTAINER_TAG, "Resource container started.");
+ }
+ catch (...)
{
- 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 failed starting.");
}
activationLock.unlock();
- OIC_LOG(INFO, CONTAINER_TAG, "Resource container started.");
}
void ResourceContainerImpl::stopContainer()
}
if (m_config)
+ {
delete m_config;
+ }
}
void ResourceContainerImpl::activateBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
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());
registerExtBundle(bundleInfo);
#endif
}
- else if(has_suffix(bundleInfo->getPath(), ".so"))
+ else if (has_suffix(bundleInfo->getPath(), ".so"))
{
bundleInfoInternal->setSoBundle(true);
bundleInfoInternal->setJavaBundle(false);
registerSoBundle(bundleInfo);
}
// other cases might be for example .apk for android, which are loaded in the wrapper
- else{
+ else
+ {
bundleInfoInternal->setSoBundle(false);
bundleInfoInternal->setJavaBundle(false);
registerExtBundle(bundleInfo);
{
unregisterBundleSo(bundleInfo->getID());
}
- else if(bundleInfoInternal->getJavaBundle())
+ else if (bundleInfoInternal->getJavaBundle())
{
#if(JAVA_SUPPORT)
unregisterBundleJava(bundleInfo->getID());
OIC_LOG_V(INFO, CONTAINER_TAG, "Unregister bundle: (%s)",
std::string(m_bundles[id]->getID()).c_str());
- const char *error;
+ const char *error = NULL;
dlclose(bundleHandle);
if ((error = dlerror()) != NULL)
registrationLock.lock();
if (m_mapResources.find(strUri) == m_mapResources.end())
{
- if (strInterface.empty()) {
+ if (strInterface.empty())
+ {
strInterface = "oic.if.baseline";
}
strResourceType).c_str());
discoverInputResource(strUri);
}
- else{
+ else
+ {
OIC_LOG_V(INFO, CONTAINER_TAG, "Resource has no input (%s)",
std::string(strUri + ", " +
strResourceType).c_str());
{
m_config->getResourceConfiguration(bundleId, configOutput);
}
- else{
+ else
+ {
OIC_LOG_V(DEBUG, CONTAINER_TAG, "no config present ");
}
}
{
RCSResourceAttributes attr;
std::string strResourceUri = request.getResourceUri();
+ const std::map< std::string, std::string > &queryParams = request.getQueryParams();
+
OIC_LOG_V(INFO, CONTAINER_TAG, "Container get request for %s",strResourceUri.c_str());
if (m_mapServers.find(strResourceUri) != m_mapServers.end()
{
if (m_mapResources[strResourceUri])
{
- auto getFunction = [this, &attr, &strResourceUri]()
+ auto getFunction = [this, &attr, &strResourceUri, queryParams]()
{
- attr = m_mapResources[strResourceUri]->handleGetAttributesRequest();
+ attr = m_mapResources[strResourceUri]->handleGetAttributesRequest(queryParams);
};
boost::thread getThread(getFunction);
getThread.timed_join(boost::posix_time::seconds(BUNDLE_SET_GET_WAIT_SEC));
}
}
- 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);
}
RCSResourceAttributes attr;
std::list<std::string> lstAttributes;
std::string strResourceUri = request.getResourceUri();
+ const std::map< std::string, std::string > &queryParams = request.getQueryParams();
- 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())
{
if (m_mapResources[strResourceUri])
{
- auto setFunction = [this, &lstAttributes, &strResourceUri, &attributes, &attr]()
+ auto setFunction = [this, &lstAttributes, &strResourceUri, &attributes, &attr, queryParams]()
{
lstAttributes = m_mapResources[strResourceUri]->getAttributeNames();
}
OIC_LOG_V(INFO, CONTAINER_TAG, "Calling handleSetAttributeRequest");
- m_mapResources[strResourceUri]->handleSetAttributesRequest(attr);
+ m_mapResources[strResourceUri]->handleSetAttributesRequest(attr, queryParams);
};
boost::thread setThread(setFunction);
setThread.timed_join(boost::posix_time::seconds(BUNDLE_SET_GET_WAIT_SEC));
if (m_bundles.find(bundleId) != m_bundles.end())
{
if (!m_bundles[bundleId]->isActivated())
+ {
activateBundle(m_bundles[bundleId]);
+ }
else
{
OIC_LOG(ERROR, CONTAINER_TAG, "Bundle already started");
if (m_bundles.find(bundleId) != m_bundles.end())
{
if (m_bundles[bundleId]->isActivated())
+ {
deactivateBundle(m_bundles[bundleId]);
+ }
else
{
OIC_LOG(ERROR, CONTAINER_TAG, "Bundle not activated");
(void) bundleUri;
if (m_bundles.find(bundleId) != m_bundles.end())
+ {
OIC_LOG(ERROR, CONTAINER_TAG, "BundleId already exist");
+ }
else
{
{
shared_ptr<BundleInfoInternal> bundleInfo = m_bundles[bundleId];
if (bundleInfo->isActivated())
+ {
deactivateBundle(bundleInfo);
+ }
if (bundleInfo->isLoaded())
+ {
unregisterBundle(bundleInfo);
+ }
}
else
{
newResourceInfo.uri = resourceUri;
if (params.find(OUTPUT_RESOURCE_NAME) != params.end())
+ {
newResourceInfo.name = params[OUTPUT_RESOURCE_NAME];
+ }
if (params.find(OUTPUT_RESOURCE_TYPE) != params.end())
+ {
newResourceInfo.resourceType = params[OUTPUT_RESOURCE_TYPE];
+ }
if (params.find(OUTPUT_RESOURCE_ADDR) != params.end())
+ {
newResourceInfo.address = params[OUTPUT_RESOURCE_ADDR];
+ }
addSoBundleResource(bundleId, newResourceInfo);
}
void ResourceContainerImpl::registerSoBundle(shared_ptr<RCSBundleInfo> bundleInfo)
{
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Register SO bundle");
- const char *error;
+ const char *error = NULL;
activator_t *bundleActivator = NULL;
deactivator_t *bundleDeactivator = NULL;
{
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
- else{
+ else
+ {
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
bundleInfoInternal->getActivatorName()
+ "_externalActivateBundle").c_str());
{
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
- else{
+ else
+ {
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
bundleInfoInternal->getActivatorName()
+ "_externalDeactivateBundle").c_str());
{
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
- else{
+ else
+ {
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
bundleInfoInternal->getActivatorName()
+ "_externalCreateResource").c_str());
{
OIC_LOG_V(ERROR, CONTAINER_TAG, "Error while loading .so bundle: (%s)", error);
}
- else{
+ else
+ {
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Looked up %s", ("" +
bundleInfoInternal->getActivatorName()
+ "_externalDestroyResource").c_str());
OIC_LOG_V(DEBUG, CONTAINER_TAG, "Register SO bundle finished");
}
- void ResourceContainerImpl::registerExtBundle(shared_ptr<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)",
void ResourceContainerImpl::addSoBundleResource(const std::string &bundleId,
resourceInfo newResourceInfo)
{
- resourceCreator_t *resourceCreator;
+ resourceCreator_t *resourceCreator = nullptr;
resourceCreator = m_bundles[bundleId]->getResourceCreator();
activateJavaBundle(id);
#endif
}
- else if(m_bundles[id]->getSoBundle())
+ else if (m_bundles[id]->getSoBundle())
{
activateSoBundle (id);
}
projects / platform / upstream / iotivity.git / blobdiff