MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

locAPIRemoveGeofences roolback to async result notification

Browse source 
locAPIRemoveGeofences is rolled back to async result notification,
using the RemoveGeofencesRequest, but using a new temporal bidict
of sessions & ids, to avoid a previous race condition using the
wrong id when removing and adding a geofence.

Change-Id: Icd85373b82e620ea4059431f0c3d13c95f99ca3c
CRs-fixed: 2132679
This commit is contained in:
Kevin Tang 2017-10-20 13:26:11 -07:00
parent 57640c9f33
commit 63c4d2f67b
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
location/LocationAPIClientBase.cpp Normal file → Executable file
View file

@ -614,26 +614,24 @@ void LocationAPIClientBase::locAPIRemoveGeofences(size_t count, uint32_t* ids)
} }
if (mRequestQueues[REQUEST_GEOFENCE].getSession() == GEOFENCE_SESSION_ID) { if (mRequestQueues[REQUEST_GEOFENCE].getSession() == GEOFENCE_SESSION_ID) {
BiDict<GeofenceBreachTypeMask>* removedGeofenceBiDict =
new BiDict<GeofenceBreachTypeMask>();
size_t j = 0; size_t j = 0;
uint32_t id_cb;
LocationError err;
for (size_t i = 0; i < count; i++) { for (size_t i = 0; i < count; i++) {
sessions[j] = mGeofenceBiDict.getSession(ids[i]); sessions[j] = mGeofenceBiDict.getSession(ids[i]);
id_cb = ids[i];
if (sessions[j] > 0) { if (sessions[j] > 0) {
GeofenceBreachTypeMask type = mGeofenceBiDict.getExtBySession(sessions[j]);
mGeofenceBiDict.rmBySession(sessions[j]); mGeofenceBiDict.rmBySession(sessions[j]);
err = LOCATION_ERROR_SUCCESS; removedGeofenceBiDict->set(ids[i], sessions[j], type);
onRemoveGeofencesCb(1, &err, &id_cb);
j++; j++;
} else {
err = LOCATION_ERROR_ID_UNKNOWN;
onRemoveGeofencesCb(1, &err, &id_cb);
} }
} }
if (j > 0) { if (j > 0) {
mRequestQueues[REQUEST_GEOFENCE].push(new RemoveGeofencesRequest(*this)); mRequestQueues[REQUEST_GEOFENCE].push(new RemoveGeofencesRequest(*this,
removedGeofenceBiDict));
mLocationAPI->removeGeofences(j, sessions); mLocationAPI->removeGeofences(j, sessions);
} else {
delete(removedGeofenceBiDict);
} }
} else { } else {
LOC_LOGE("%s:%d] invalid session: %d.", __FUNCTION__, __LINE__, LOC_LOGE("%s:%d] invalid session: %d.", __FUNCTION__, __LINE__,

18
location/LocationAPIClientBase.h
View file

@ -36,6 +36,7 @@
#include <map> #include <map>
#include "LocationAPI.h" #include "LocationAPI.h"
#include "platform_lib_log_util.h"
enum SESSION_MODE { enum SESSION_MODE {
SESSION_MODE_NONE = 0, SESSION_MODE_NONE = 0,
@ -469,11 +470,24 @@ private:
class RemoveGeofencesRequest : public LocationAPIRequest { class RemoveGeofencesRequest : public LocationAPIRequest {
public: public:
RemoveGeofencesRequest(LocationAPIClientBase& API) : mAPI(API) {} RemoveGeofencesRequest(LocationAPIClientBase& API,
BiDict<GeofenceBreachTypeMask>* removedGeofenceBiDict) :
mAPI(API), mRemovedGeofenceBiDict(removedGeofenceBiDict) {}
inline void onCollectiveResponse(size_t count, LocationError* errors, uint32_t* sessions) { inline void onCollectiveResponse(size_t count, LocationError* errors, uint32_t* sessions) {
// No need to handle collectiveResponse, cbs already notified if (nullptr != mRemovedGeofenceBiDict) {
uint32_t *ids = (uint32_t*)malloc(sizeof(uint32_t) * count);
for (size_t i = 0; i < count; i++) {
ids[i] = mRemovedGeofenceBiDict->getId(sessions[i]);
}
mAPI.onRemoveGeofencesCb(count, errors, ids);
free(ids);
delete(mRemovedGeofenceBiDict);
} else {
LOC_LOGE("%s:%d] Unable to access removed geofences data.", __FUNCTION__, __LINE__);
}
} }
LocationAPIClientBase& mAPI; LocationAPIClientBase& mAPI;
BiDict<GeofenceBreachTypeMask>* mRemovedGeofenceBiDict;
}; };
class ModifyGeofencesRequest : public LocationAPIRequest { class ModifyGeofencesRequest : public LocationAPIRequest {