diff options
| author | Kevin Tang <zhikait@codeaurora.org> | 2019-06-06 14:01:52 -0700 |
|---|---|---|
| committer | Kevin Tang <zhikait@codeaurora.org> | 2019-06-06 16:21:18 -0700 |
| commit | 0677be4e4626d05880180f74bc97bbc357ff4663 (patch) | |
| tree | d8c993df08957db6ad32babb63739819e88e3206 /utils | |
| parent | 9fc8d7444d5f68d3978973dacf7618293f1fd4cd (diff) | |
| download | gps-0677be4e4626d05880180f74bc97bbc357ff4663.tar.gz | |
Removing LocIpc::createLocIpcQsock* APIs
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
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/LocIpc.cpp | 17 | ||||
| -rw-r--r-- | utils/LocIpc.h | 5 |
2 files changed, 4 insertions, 18 deletions
diff --git a/utils/LocIpc.cpp b/utils/LocIpc.cpp index 9496895..646d2d4 100644 --- a/utils/LocIpc.cpp +++ b/utils/LocIpc.cpp @@ -354,20 +354,11 @@ unique_ptr<LocIpcRecver> LocIpc::getLocIpcQrtrRecver(const shared_ptr<ILocIpcLis 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, +#ifdef USE_GLIB + "_ZN8loc_util22createLocIpcQrtrRecverERKSt10shared_ptrINS_15ILocIpcListenerEEii"); +#else "_ZN8loc_util22createLocIpcQrtrRecverERKNSt3__110shared_ptrINS_15ILocIpcListenerEEEii"); - return (nullptr == creator) ? nullptr : creator(listener, service, instance); -} -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"); +#endif return (nullptr == creator) ? nullptr : creator(listener, service, instance); } shared_ptr<LocIpcSender> LocIpc::getLocIpcInetTcpSender(const char* serverName, int32_t port) { diff --git a/utils/LocIpc.h b/utils/LocIpc.h index c71c4e0..b91966c 100644 --- a/utils/LocIpc.h +++ b/utils/LocIpc.h @@ -70,8 +70,6 @@ public: getLocIpcInetTcpSender(const char* serverName, int32_t port); static shared_ptr<LocIpcSender> getLocIpcQrtrSender(int service, int instance); - static shared_ptr<LocIpcSender> - getLocIpcQsockSender(int service, int instance); static unique_ptr<LocIpcRecver> getLocIpcLocalRecver(const shared_ptr<ILocIpcListener>& listener, @@ -82,9 +80,6 @@ public: static unique_ptr<LocIpcRecver> getLocIpcQrtrRecver(const shared_ptr<ILocIpcListener>& listener, 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>> getLocIpcQmiLocServiceSenderRecverPair(const shared_ptr<ILocIpcListener>& listener, |