using namespace std;
using namespace OC;
-std::map <OCResourceHandle, OC::EntityHandler> entityHandlerMap;
-std::map <OCResourceHandle, std::string> resourceUriMap;
-EntityHandler defaultDeviceEntityHandler = 0;
+namespace OC
+{
+ namespace details
+ {
+ std::mutex serverWrapperLock;
+ std::map <OCResourceHandle, OC::EntityHandler> entityHandlerMap;
+ std::map <OCResourceHandle, std::string> resourceUriMap;
+ EntityHandler defaultDeviceEntityHandler = 0;
+ }
+}
void formResourceRequest(OCEntityHandlerFlag flag,
OCEntityHandlerRequest * entityHandlerRequest,
pRequest->setResourceUri(std::string(uri));
- if(defaultDeviceEntityHandler)
+ EntityHandler defHandler;
+ {
+ std::lock_guard<std::mutex> lock(OC::details::serverWrapperLock);
+ defHandler = OC::details::defaultDeviceEntityHandler;
+ }
+
+ if(defHandler)
{
- result = defaultDeviceEntityHandler(pRequest);
+ result = defHandler(pRequest);
}
else
{
formResourceRequest(flag, entityHandlerRequest, pRequest);
+ std::map <OCResourceHandle, std::string>::iterator resourceUriEntry;
+ std::map <OCResourceHandle, std::string>::iterator resourceUriEnd;
+ {
+ std::lock_guard<std::mutex> lock(OC::details::serverWrapperLock);
+ resourceUriEntry = OC::details::resourceUriMap.find(entityHandlerRequest->resource);
+ resourceUriEnd = OC::details::resourceUriMap.end();
+ }
// Finding the corresponding URI for a resource handle and set the URI in the request
- auto resourceUriEntry = resourceUriMap.find(entityHandlerRequest->resource);
- if(resourceUriEntry != resourceUriMap.end())
+ if(resourceUriEntry != resourceUriEnd)
{
pRequest->setResourceUri(resourceUriEntry->second);
}
return OC_EH_ERROR;
}
- // Finding the corresponding CPP Application entityHandler for a given resource
- auto entityHandlerEntry = entityHandlerMap.find(entityHandlerRequest->resource);
+ std::map <OCResourceHandle, OC::EntityHandler>::iterator entityHandlerEntry;
+ std::map <OCResourceHandle, OC::EntityHandler>::iterator entityHandlerEnd;
+ {
+ // Finding the corresponding CPP Application entityHandler for a given resource
+ std::lock_guard<std::mutex> lock(OC::details::serverWrapperLock);
+ entityHandlerEntry = OC::details::entityHandlerMap.find(entityHandlerRequest->resource);
+ entityHandlerEnd = OC::details::entityHandlerMap.end();
+ }
- if(entityHandlerEntry != entityHandlerMap.end())
+ if(entityHandlerEntry != entityHandlerEnd)
{
// Call CPP Application Entity Handler
if(entityHandlerEntry->second)
}
else
{
- entityHandlerMap[resourceHandle] = eHandler;
- resourceUriMap[resourceHandle] = resourceURI;
+ std::lock_guard<std::mutex> lock(OC::details::serverWrapperLock);
+ OC::details::entityHandlerMap[resourceHandle] = eHandler;
+ OC::details::resourceUriMap[resourceHandle] = resourceURI;
}
}
else
}
else
{
- entityHandlerMap[resourceHandle] = eHandler;
- resourceUriMap[resourceHandle] = resourceURI;
+ std::lock_guard<std::mutex> lock(OC::details::serverWrapperLock);
+ OC::details::entityHandlerMap[resourceHandle] = eHandler;
+ OC::details::resourceUriMap[resourceHandle] = resourceURI;
}
}
else
{
OCStackResult result = OC_STACK_ERROR;
- defaultDeviceEntityHandler = entityHandler;
+ {
+ std::lock_guard<std::mutex> lock(OC::details::serverWrapperLock);
+ OC::details::defaultDeviceEntityHandler = entityHandler;
+ }
if(entityHandler)
{
if(result == OC_STACK_OK)
{
- resourceUriMap.erase(resourceHandle);
+ std::lock_guard<std::mutex> lock(OC::details::serverWrapperLock);
+ OC::details::resourceUriMap.erase(resourceHandle);
}
else
{