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

Removing LocIpc::createLocIpcQsock* APIs

Browse source 
Qrtr and Qsock bot have createLocIpc*Sender and Recver
APIs in LocIpc. But Qrtr is really next gen of Qsock.
The two will not co-exist. Their existence depends on
kernel versions, i.e. 4.9 and earlier is Qsock; while
4.14 and later is Qrtr. Having 2 sets of APIs doesn't
make sense, as client would have to know what are the
right ones to use, which there is really only one set
of backing implementations.

Change-Id: Ia473f282bb271ae213d7dc5020b0b8c7b0a8cb8f
CRs-Fixed: 2466857
This commit is contained in:
Kevin Tang 2019-06-06 14:01:52 -07:00
parent 9fc8d7444d
commit 0677be4e46
2 changed files with 4 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
utils/LocIpc.cpp
View file

@ -354,20 +354,11 @@ unique_ptr<LocIpcRecver> LocIpc::getLocIpcQrtrRecver(const shared_ptr<ILocIpcLis
int service, int instance) { int service, int instance) {
typedef unique_ptr<LocIpcRecver> (*creator_t)(const shared_ptr<ILocIpcListener>&, int, int); typedef unique_ptr<LocIpcRecver> (*creator_t)(const shared_ptr<ILocIpcListener>&, int, int);
static creator_t creator = (creator_t)dlGetSymFromLib(sLibQrtrHandle, sLibQrtrName, static creator_t creator = (creator_t)dlGetSymFromLib(sLibQrtrHandle, sLibQrtrName,
#ifdef USE_GLIB
"_ZN8loc_util22createLocIpcQrtrRecverERKSt10shared_ptrINS_15ILocIpcListenerEEii");
#else
"_ZN8loc_util22createLocIpcQrtrRecverERKNSt3__110shared_ptrINS_15ILocIpcListenerEEEii"); "_ZN8loc_util22createLocIpcQrtrRecverERKNSt3__110shared_ptrINS_15ILocIpcListenerEEEii");
return (nullptr == creator) ? nullptr : creator(listener, service, instance); #endif
}
shared_ptr<LocIpcSender> LocIpc::getLocIpcQsockSender(int service, int instance) {
typedef shared_ptr<LocIpcSender> (*creator_t) (int, int);
static creator_t creator = (creator_t)dlGetSymFromLib(sLibQrtrHandle, sLibQrtrName,
"_ZN8loc_util23createLocIpcQsockSenderEii");
return (nullptr == creator) ? nullptr : creator(service, instance);
}
unique_ptr<LocIpcRecver> LocIpc::getLocIpcQsockRecver(const shared_ptr<ILocIpcListener>& listener,
int service, int instance) {
typedef unique_ptr<LocIpcRecver> (*creator_t)(const shared_ptr<ILocIpcListener>&, int, int);
static creator_t creator = (creator_t)dlGetSymFromLib(sLibQrtrHandle, sLibQrtrName,
"_ZN8loc_util23createLocIpcQsockRecverERKSt10shared_ptrINS_15ILocIpcListenerEEii");
return (nullptr == creator) ? nullptr : creator(listener, service, instance); return (nullptr == creator) ? nullptr : creator(listener, service, instance);
} }
shared_ptr<LocIpcSender> LocIpc::getLocIpcInetTcpSender(const char* serverName, int32_t port) { shared_ptr<LocIpcSender> LocIpc::getLocIpcInetTcpSender(const char* serverName, int32_t port) {

5
utils/LocIpc.h
View file

@ -70,8 +70,6 @@ public:
getLocIpcInetTcpSender(const char* serverName, int32_t port); getLocIpcInetTcpSender(const char* serverName, int32_t port);
static shared_ptr<LocIpcSender> static shared_ptr<LocIpcSender>
getLocIpcQrtrSender(int service, int instance); getLocIpcQrtrSender(int service, int instance);
static shared_ptr<LocIpcSender>
getLocIpcQsockSender(int service, int instance);
static unique_ptr<LocIpcRecver> static unique_ptr<LocIpcRecver>
getLocIpcLocalRecver(const shared_ptr<ILocIpcListener>& listener, getLocIpcLocalRecver(const shared_ptr<ILocIpcListener>& listener,
@ -82,9 +80,6 @@ public:
static unique_ptr<LocIpcRecver> static unique_ptr<LocIpcRecver>
getLocIpcQrtrRecver(const shared_ptr<ILocIpcListener>& listener, getLocIpcQrtrRecver(const shared_ptr<ILocIpcListener>& listener,
int service, int instance); int service, int instance);
static unique_ptr<LocIpcRecver>
getLocIpcQsockRecver(const shared_ptr<ILocIpcListener>& listener,
int service, int instance);
static pair<shared_ptr<LocIpcSender>, unique_ptr<LocIpcRecver>> static pair<shared_ptr<LocIpcSender>, unique_ptr<LocIpcRecver>>
getLocIpcQmiLocServiceSenderRecverPair(const shared_ptr<ILocIpcListener>& listener, getLocIpcQmiLocServiceSenderRecverPair(const shared_ptr<ILocIpcListener>& listener,