Changes - SailfishOS Open Build Service

Changes of Revision 2

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:libgbinder.changes
@@ -1,65 +1,3 @@ -* Sat Jan 08 2022 Slava Monich <slava.monich@jolla.com> - 1.1.18 -- [gbinder] Disassociate auto-created proxies. JB#56889 -- [gbinder] Expose gbinder_ipc_name as an internal function -- [gbinder] Logging improvements - -* Fri Jan 07 2022 Slava Monich <slava.monich@jolla.com> - 1.1.17 -- [gbinder] Don't release remote proxy handle too early. JB#56889 - -* Mon Jan 03 2022 Slava Monich <slava.monich@jolla.com> - 1.1.16 -- [gbinder] Make sure stale object pointers don't hang around. JB#56341 -- [gbinder] Print transaction code in debug build. JB#42956 -- [gbinder] Properly shut down remote object inside the proxy. JB#56341 -- [gbinder] Read ref_count from GObject atomically. JB#42956 -- [license] Freshened up copyright -- [unit] Improved gbinder_ipc_find_local_object coverage - -* Mon Dec 27 2021 Slava Monich <slava.monich@jolla.com> - 1.1.15 -- [gbinder] Added readers for int8 and int16. JB#42956 -- [gbinder] Added writers for int8 and int16. JB#42956 -- [gbinder] Housekeeping -- [gbinder] Updated README - -* Wed Nov 24 2021 Slava Monich <slava.monich@jolla.com> - 1.1.14 -- [gbinder] Added "aidl3" variant of RPC protocol. JB#56344 -- [gbinder] Added "aidl3" variant of service manager. JB#56344 -- [gbinder] Added gbinder_client_rpc_header(). JB#55014 -- [gbinder] Added gbinder_reader_get_data(). JB#55014 -- [gbinder] Added gbinder_servicemanager_device(). JB#55014 -- [gbinder] Added gbinder_writer_get_data(). JB#55014 -- [gbinder] Add FMQ unit tests. JB#54946 -- [gbinder] Add preset gbinder config to support Android API version 30. JB#56344 -- [gbinder] Add support for FMQ (Fast Message Queue). JB#54946 -- [gbinder] Don't compile fmq code if __NR_memfd_create is undefined -- [gbinder] Housekeeping. JB#54946 -- [gbinder] Housekeeping. JB#56344 -- [gbinder] Replace use of stdatomic.h and linux/memfd.h. -- [gbinder] Support writing file descriptor via local reply -- [gbinder] Tolerate NULL const GBinderReader pointers. -- [rpm] Install license file. JB#55991 -- [unit] Added test for gbinder_local_reply_append_fd() -- [unit] Assert that dummy type functions don't get invoked. JB#42956 - -* Thu Oct 28 2021 Slava Monich <slava.monich@jolla.com> - 1.1.13 -- [gbinder] Added gbinder_writer_strdup(). JB#42956 -- [gbinder] Add gbinder_writer_append_hidl_string_copy(). JB#42956 -- [gbinder] Drop pkgconfig requirement for devel package. JB#42956 -- [gbinder] Simplify writer a bit. JB#42956 -- [test] Added ashmem-test. JB#42956 - -* Fri Sep 24 2021 Slava Monich <slava.monich@jolla.com> - 1.1.12 -- [test] Add binder-call. JB#55084 -- [test] Add binder-call to debian build. JB#55084 - -* Thu Sep 02 2021 Slava Monich <slava.monich@jolla.com> - 1.1.11 -- [debian] Bump libglibutil requirement -- [gbinder] Fix occasional crashes in pthread_setname_np(). JB#42956 -- [gbinder] Fix potential deadlock in gbinder_ipc_looper_free(). JB#42956 -- [unit] Allow side-by-side linking with libglibutil -- [unit] Make unit tests comptible with glib < 2.36 -- [unit] Pull in definition of _IOC_SIZE. JB#42254 -- [unit] Serialize execution of /ipc/transact_2way - * Mon May 10 2021 Slava Monich <slava.monich@jolla.com> - 1.1.10 - [build] Tweaked build dependencies - [gbinder] Housekeeping
[-] [+]	Changed	_service:tar_git:libgbinder.spec ^
@@ -1,6 +1,6 @@ Name: libgbinder -Version: 1.1.18+master.20220211181252.1.g59dee39 +Version: 1.1.10 Release: 0 Summary: Binder client library License: BSD @@ -11,14 +11,6 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libglibutil) >= %{libglibutil_version} -BuildRequires: pkgconfig -BuildRequires: bison -BuildRequires: flex - -# license macro requires rpm >= 4.11 -BuildRequires: pkgconfig(rpm) -%define license_support %(pkg-config --exists 'rpm >= 4.11'; echo $?) - Requires: libglibutil >= %{libglibutil_version} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -29,6 +21,7 @@ %package devel Summary: Development library for %{name} Requires: %{name} = %{version} +Requires: pkgconfig %description devel This package contains the development library for %{name}. @@ -41,7 +34,6 @@ make -C test/binder-bridge KEEP_SYMBOLS=1 release make -C test/binder-list KEEP_SYMBOLS=1 release make -C test/binder-ping KEEP_SYMBOLS=1 release -make -C test/binder-call KEEP_SYMBOLS=1 release %install rm -rf %{buildroot} @@ -49,7 +41,6 @@ make -C test/binder-bridge DESTDIR=%{buildroot} install make -C test/binder-list DESTDIR=%{buildroot} install make -C test/binder-ping DESTDIR=%{buildroot} install -make -C test/binder-call DESTDIR=%{buildroot} install %check make -C unit test @@ -61,9 +52,6 @@ %files %defattr(-,root,root,-) %{_libdir}/%{name}.so.* -%if %{license_support} == 0 -%license LICENSE -%endif %files devel %defattr(-,root,root,-) @@ -85,4 +73,3 @@ %{_bindir}/binder-bridge %{_bindir}/binder-list %{_bindir}/binder-ping -%{_bindir}/binder-call
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/mer-hybris/libgbinder.git</param> <param name="branch">master</param> - <param name="revision">HEAD</param> + <param name="revision">ca665ad3d190a19d767ff4cb3db753dce93e53fd</param> <param name="token"></param> <param name="debian"></param> <param name="dumb"></param>
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/AUTHORS ^
@@ -5,5 +5,3 @@ Andrew Branson <andrew.branson@jolla.com> Rinigus <rinigus.git@gmail.com> George Hopkins <george-hopkins@null.net> -Bart Ribbers <bribbers@disroot.org> -Gary Wang <gary.wang@canonical.com>
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/LICENSE ^
@@ -1,5 +1,5 @@ -Copyright (C) 2018-2022 Jolla Ltd. -Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com> +Copyright (C) 2018-2021 Jolla Ltd. +Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> You may use this file under the terms of BSD license as follows:
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/Makefile ^
@@ -16,7 +16,7 @@ VERSION_MAJOR = 1 VERSION_MINOR = 1 -VERSION_RELEASE = 18 +VERSION_RELEASE = 10 # Version for pkg-config PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) @@ -82,7 +82,6 @@ gbinder_config.c \ gbinder_driver.c \ gbinder_eventloop.c \ - gbinder_fmq.c \ gbinder_io_32.c \ gbinder_io_64.c \ gbinder_ipc.c \ @@ -104,7 +103,6 @@ gbinder_servicemanager.c \ gbinder_servicemanager_aidl.c \ gbinder_servicemanager_aidl2.c \ - gbinder_servicemanager_aidl3.c \ gbinder_servicemanager_hidl.c SRC += \
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/README ^
@@ -5,7 +5,7 @@ 1. Integration with GLib event loop 2. Detection of 32 vs 64 bit kernel at runtime 3. Asynchronous transactions that don't block the event thread -4. Stable service manager and low-level transaction APIs +4. Stable service manager and low-level transation APIs Android keeps changing both low-level RPC and service manager protocols from version to version. To counter that, libgbinder @@ -22,8 +22,8 @@ loaded one by one, overwriting the entries loaded from /etc/gbinder.conf or from the previously processed file. -Known protocol and service manager variants are aidl, aidl2, aidl3 and -hidl. This list is expected to expand further in the future. The default +Known protocol and service manager variants are aidl, aidl2 and hidl. +This list is expected to expand further in the future. The default configuration is as follows: [Protocol] @@ -36,11 +36,9 @@ /dev/binder = aidl /dev/hwbinder = hidl -Alternatively and preferably, one can specify the desired Android API -level: +Alternatively, one can specify the desired Android API level: [General] ApiLevel = 29 -and let libgbinder pick the appropriate preset. Full list of presets can -be found in src/gbinder_config.c +and let libgbinder pick the appropriate preset.
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/debian/changelog ^
@@ -1,66 +1,3 @@ -libgbinder (1.1.18) unstable; urgency=low - - * Disassociate auto-created proxies to stop them from piling up - - -- Slava Monich <slava.monich@jolla.com> Sat, 08 Jan 2022 15:35:56 +0200 - -libgbinder (1.1.17) unstable; urgency=low - - * Don't release remote proxy handle too early (sometimes hever) - - -- Slava Monich <slava.monich@jolla.com> Fri, 07 Jan 2022 14:43:51 +0200 - -libgbinder (1.1.16) unstable; urgency=low - - * Make sure stale object pointers don't hang around - * Properly shut down remote object inside the proxy - * Read ref_count from GObject atomically - - -- Slava Monich <slava.monich@jolla.com> Mon, 03 Jan 2022 13:58:44 +0200 - -libgbinder (1.1.15) unstable; urgency=low - - * Added readers and writers for int8 and int16 - - -- Slava Monich <slava.monich@jolla.com> Mon, 27 Dec 2021 15:13:23 +0200 - -libgbinder (1.1.14) unstable; urgency=low - - * Support for FMQ (Fast Message Queues) - * Support for Android 11 (API level 30) - * Made GBinderReader API slightly more NULL tolerant - * Added gbinder_client_rpc_header() - * Added gbinder_reader_get_data() - * Added gbinder_writer_get_data() - * Added gbinder_servicemanager_device() - * Added gbinder_local_reply_append_fd() - - -- Slava Monich <slava.monich@jolla.com> Wed, 24 Nov 2021 17:15:48 +0200 - -libgbinder (1.1.13) unstable; urgency=low - - * Added gbinder_writer_strdup() - * Added gbinder_writer_append_hidl_string_copy() - * Dropped pkgconfig requirement for devel package - - -- Slava Monich <slava.monich@jolla.com> Thu, 28 Oct 2021 14:31:01 +0300 - -libgbinder (1.1.12) unstable; urgency=low - - * Added binder-call test tool - - -- Slava Monich <slava.monich@jolla.com> Fri, 24 Sep 2021 16:46:05 +0300 - -libgbinder (1.1.11) unstable; urgency=low - - * Fix potential deadlock in gbinder_ipc_looper_free() - * Fix occasional crashes in pthread_setname_np() - * Fix unit tests on some musl-based systems - * Make unit tests comptible with glib < 2.36 - * Bump libglibutil requirement for debian build - - -- Slava Monich <slava.monich@jolla.com> Thu, 02 Sep 2021 12:32:39 +0300 - libgbinder (1.1.10) unstable; urgency=low * Release dead binder nodes
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/debian/control ^
@@ -2,13 +2,13 @@ Section: libs Priority: optional Maintainer: Slava Monich <slava.monich@jolla.com> -Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.0), libglibutil (>= 1.0.52), flex, bison +Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.0), libglibutil (>= 1.0.35) Standards-Version: 3.8.4 Package: libgbinder Section: libs Architecture: any -Depends: libglibutil (>= 1.0.52), ${shlibs:Depends}, ${misc:Depends} +Depends: libglibutil (>= 1.0.35), ${shlibs:Depends}, ${misc:Depends} Description: Binder client library Package: libgbinder-dev
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/debian/copyright ^
@@ -1,5 +1,5 @@ -Copyright (C) 2018-2022 Jolla Ltd. -Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com> +Copyright (C) 2018-2021 Jolla Ltd. +Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> You may use this file under the terms of BSD license as follows:
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/debian/rules ^
@@ -9,14 +9,12 @@ override_dh_auto_build: dh_auto_build -- LIBDIR=$(LIBDIR) release pkgconfig debian/libgbinder.install debian/libgbinder-dev.install dh_auto_build -- -C test/binder-bridge release - dh_auto_build -- -C test/binder-call release dh_auto_build -- -C test/binder-list release dh_auto_build -- -C test/binder-ping release override_dh_auto_install: dh_auto_install -- LIBDIR=$(LIBDIR) install-dev dh_auto_install -- -C test/binder-bridge - dh_auto_install -- -C test/binder-call dh_auto_install -- -C test/binder-list dh_auto_install -- -C test/binder-ping
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/include/gbinder.h ^
@@ -38,7 +38,6 @@ #include "gbinder_bridge.h" #include "gbinder_buffer.h" #include "gbinder_client.h" -#include "gbinder_fmq.h" #include "gbinder_local_object.h" #include "gbinder_local_reply.h" #include "gbinder_local_request.h"
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/include/gbinder_client.h ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2021 Jolla Ltd. - * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2020 Jolla Ltd. + * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -78,11 +78,6 @@ GBinderClient* client, guint32 code); /* since 1.0.42 / -GBytes -gbinder_client_rpc_header( - GBinderClient* client, - guint32 code); /* since 1.1.14 / - GBinderLocalRequest gbinder_client_new_request( GBinderClient* client);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/include/gbinder_local_reply.h ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2021 Jolla Ltd. - * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018 Jolla Ltd. + * Copyright (C) 2018 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -13,9 +13,9 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * 3. Neither the name of Jolla Ltd nor the names of its contributors may + * be used to endorse or promote products derived from this software + * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -112,11 +112,6 @@ GBinderLocalReply* reply, GBinderRemoteObject* obj); -GBinderLocalReply* -gbinder_local_reply_append_fd( - GBinderLocalReply* reply, - int fd); /* Since 1.1.14 / - G_END_DECLS #endif / GBINDER_LOCAL_OBJECT_H */
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/include/gbinder_reader.h ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2021 Jolla Ltd. - * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2019 Jolla Ltd. + * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -14,8 +14,8 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -66,26 +66,6 @@ gboolean* value); gboolean -gbinder_reader_read_int8( - GBinderReader* reader, - gint8* value); /* Since 1.1.15 / - -gboolean -gbinder_reader_read_uint8( - GBinderReader reader, - guint8* value); /* Since 1.1.15 / - -gboolean -gbinder_reader_read_int16( - GBinderReader reader, - gint16* value); /* Since 1.1.15 / - -gboolean -gbinder_reader_read_uint16( - GBinderReader reader, - guint16* value); /* Since 1.1.15 / - -gboolean gbinder_reader_read_int32( GBinderReader reader, gint32* value); @@ -221,11 +201,6 @@ GBinderReader* reader, gsize* len); /* Since 1.0.12 / -const void -gbinder_reader_get_data( - const GBinderReader* reader, - gsize* size); /* Since 1.1.14 / - gsize gbinder_reader_bytes_read( const GBinderReader reader);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/include/gbinder_servicemanager.h ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2022 Jolla Ltd. - * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2020 Jolla Ltd. + * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -112,10 +112,6 @@ gbinder_servicemanager_unref( GBinderServiceManager* sm); -const char* -gbinder_servicemanager_device( - GBinderServiceManager* sm); /* Since 1.1.14 / - gboolean gbinder_servicemanager_is_present( GBinderServiceManager sm); /* Since 1.0.25 / @@ -193,7 +189,7 @@ gulong ids, guint count); /* Since 1.0.25 */ -#define gbinder_servicemanager_remove_all_handlers(sm,ids) \ +#define gbinder_servicemanager_remove_all_handlers(r,ids) \ gbinder_servicemanager_remove_handlers(sm, ids, G_N_ELEMENTS(ids)) G_END_DECLS
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/include/gbinder_types.h ^
@@ -62,7 +62,6 @@ typedef struct gbinder_bridge GBinderBridge; /* Since 1.1.5 / typedef struct gbinder_buffer GBinderBuffer; typedef struct gbinder_client GBinderClient; -typedef struct gbinder_fmq GBinderFmq; / Since 1.1.14 */ typedef struct gbinder_ipc GBinderIpc; typedef struct gbinder_local_object GBinderLocalObject; typedef struct gbinder_local_reply GBinderLocalReply;
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/include/gbinder_writer.h ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2021 Jolla Ltd. - * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018 Jolla Ltd. + * Copyright (C) 2018 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -14,8 +14,8 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -56,16 +56,6 @@ }; void -gbinder_writer_append_int8( - GBinderWriter* writer, - guint8 value); /* Since 1.1.15 / - -void -gbinder_writer_append_int16( - GBinderWriter writer, - guint16 value); /* Since 1.1.15 / - -void gbinder_writer_append_int32( GBinderWriter writer, guint32 value); @@ -129,11 +119,15 @@ GBinderWriter* writer, int fd); /* Since 1.0.18 / +gsize +gbinder_writer_bytes_written( + GBinderWriter writer); /* since 1.0.21 / + void -gbinder_writer_append_fds( +gbinder_writer_overwrite_int32( GBinderWriter writer, - const GBinderFds* fds, - const GBinderParent* parent); /* Since 1.1.14 / + gsize offset, + gint32 value); / since 1.0.21 / guint gbinder_writer_append_buffer_object_with_parent( @@ -153,7 +147,7 @@ GBinderWriter writer, const void* base, guint count, - guint elemsize); /* Since 1.0.8 / + guint elemsize); / since 1.0.8 / void gbinder_writer_append_hidl_string( @@ -161,11 +155,6 @@ const char str); void -gbinder_writer_append_hidl_string_copy( - GBinderWriter* writer, - const char* str); /* Since 1.1.13 / - -void gbinder_writer_append_hidl_string_vec( GBinderWriter writer, const char* data[], @@ -185,39 +174,17 @@ gbinder_writer_append_byte_array( GBinderWriter* writer, const void* byte_array, - gint32 len); /* Since 1.0.12 / - -void -gbinder_writer_append_fmq_descriptor( - GBinderWriter writer, - const GBinderFmq* queue); /* since 1.1.14 / - -const void -gbinder_writer_get_data( - GBinderWriter* writer, - gsize* size); /* Since 1.1.14 / - -gsize -gbinder_writer_bytes_written( - GBinderWriter writer); /* Since 1.0.21 / - -void -gbinder_writer_overwrite_int32( - GBinderWriter writer, - gsize offset, - gint32 value); /* Since 1.0.21 / - -/ Note: memory allocated by GBinderWriter is owned by GBinderWriter / + gint32 len); / since 1.0.12 / void gbinder_writer_malloc( GBinderWriter* writer, - gsize size); /* Since 1.0.19 / + gsize size); / since 1.0.19 / void gbinder_writer_malloc0( GBinderWriter* writer, - gsize size); /* Since 1.0.19 / + gsize size); / since 1.0.19 / #define gbinder_writer_new(writer,type) \ ((type) gbinder_writer_malloc(writer, sizeof(type))) @@ -225,22 +192,17 @@ #define gbinder_writer_new0(writer,type) \ ((type) gbinder_writer_malloc0(writer, sizeof(type))) -void -gbinder_writer_add_cleanup( - GBinderWriter writer, - GDestroyNotify destroy, - gpointer data); /* Since 1.0.19 / - void gbinder_writer_memdup( GBinderWriter* writer, const void* buf, - gsize size); /* Since 1.0.19 / + gsize size); / since 1.0.19 / -char -gbinder_writer_strdup( +void +gbinder_writer_add_cleanup( GBinderWriter* writer, - const char* str); /* Since 1.1.13 / + GDestroyNotify destroy, + gpointer data); / since 1.0.19 */ G_END_DECLS
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_client.c ^
@@ -351,22 +351,6 @@ return NULL; } -GBytes* -gbinder_client_rpc_header( - GBinderClient* self, - guint32 code) /* since 1.1.14 / -{ - if (G_LIKELY(self)) { - const GBinderClientIfaceRange r = - gbinder_client_find_range(gbinder_client_cast(self), code); - - if (r) { - return r->rpc_header; - } - } - return NULL; -} - GBinderLocalRequest* gbinder_client_new_request( GBinderClient* self)
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_config.c ^
@@ -113,30 +113,9 @@ { NULL, NULL } }; -/* API level 30 / - -static const GBinderConfigPresetEntry gbinder_config_30_protocol[] = { - { "/dev/binder", "aidl3" }, - { "/dev/vndbinder", "aidl3" }, - { NULL, NULL } -}; - -static const GBinderConfigPresetEntry gbinder_config_30_servicemanager[] = { - { "/dev/binder", "aidl3" }, - { "/dev/vndbinder", "aidl3" }, - { NULL, NULL } -}; - -static const GBinderConfigPresetGroup gbinder_config_30[] = { - { GBINDER_CONFIG_GROUP_PROTOCOL, gbinder_config_30_protocol }, - { GBINDER_CONFIG_GROUP_SERVICEMANAGER, gbinder_config_30_servicemanager }, - { NULL, NULL } -}; - / Presets sorted by API level in descending order */ static const GBinderConfigPreset gbinder_config_presets[] = { - { 30, gbinder_config_30 }, { 29, gbinder_config_29 }, { 28, gbinder_config_28 } };
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_driver.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2022 Jolla Ltd. - * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2021 Jolla Ltd. + * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -82,7 +82,6 @@ void* vm; gsize vmsize; char* dev; - const char* name; const GBinderIo* io; const GBinderRpcProtocol* protocol; }; @@ -170,14 +169,6 @@ GVERBOSE("> %s %d (%u bytes, %u objects)", name, tx->status, (guint)tx->size, n); } - } else if (tx->code) { - if (tx->target) { - GVERBOSE("> %s %p 0x%08x (%u bytes, %u objects)", name, - tx->target, tx->code, (guint)tx->size, n); - } else { - GVERBOSE("> %s 0x%08x (%u bytes, %u objects)", name, - tx->code, (guint)tx->size, n); - } } else { if (tx->target) { GVERBOSE("> %s %p (%u bytes, %u objects)", name, @@ -196,14 +187,6 @@ GVERBOSE("> %s %d (%u bytes)", name, tx->status, (guint) tx->size); } - } else if (tx->code) { - if (tx->target) { - GVERBOSE("> %s %p 0x%08x (%u bytes)", name, - tx->target, tx->code, (guint)tx->size); - } else { - GVERBOSE("> %s 0x%08x (%u bytes)", name, - tx->code, (guint)tx->size); - } } else { if (tx->target) { GVERBOSE("> %s %p (%u bytes)", name, tx->target, (guint) @@ -566,8 +549,7 @@ tx.flags, &txstatus); break; default: - GWARN("Unhandled transaction %s 0x%08x from %s", iface, tx.code, - self->name); + GWARN("Unhandled transaction %s 0x%08x", iface, tx.code); break; } @@ -897,9 +879,6 @@ self->vm = vm; self->vmsize = vmsize; self->dev = g_strdup(dev); - self->name = self->dev + /* Shorter version for logging */ - (g_str_has_prefix(self->dev, "/dev/") ? 5 : 0); - if (gbinder_system_ioctl(fd, BINDER_SET_MAX_THREADS, &max_threads) < 0) { GERR("%s failed to set max threads (%u): %s", dev,
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_io.c ^
@@ -215,23 +215,6 @@ return sizeof(dest); } -static -guint -GBINDER_IO_FN(encode_fda_object)( - void out, - const GBinderFds fds, - const GBinderParent parent) -{ - struct binder_fd_array_object* dest = out; - - memset(dest, 0, sizeof(dest)); - dest->hdr.type = BINDER_TYPE_FDA; - dest->num_fds = fds->num_fds; - dest->parent = parent->index; - dest->parent_offset = parent->offset; - return sizeof(dest); -} - /* Encodes binder_buffer_object */ static guint @@ -654,7 +637,6 @@ .encode_local_object = GBINDER_IO_FN(encode_local_object), .encode_remote_object = GBINDER_IO_FN(encode_remote_object), .encode_fd_object = GBINDER_IO_FN(encode_fd_object), - .encode_fda_object = GBINDER_IO_FN(encode_fda_object), .encode_buffer_object = GBINDER_IO_FN(encode_buffer_object), .encode_handle_cookie = GBINDER_IO_FN(encode_handle_cookie), .encode_ptr_cookie = GBINDER_IO_FN(encode_ptr_cookie), @@ -681,10 +663,6 @@ G_STATIC_ASSERT(GBINDER_POINTER_SIZE <= GBINDER_MAX_POINTER_SIZE); G_STATIC_ASSERT(sizeof(struct flat_binder_object) <= GBINDER_MAX_BINDER_OBJECT_SIZE); -G_STATIC_ASSERT(sizeof(struct binder_fd_object) <= - GBINDER_MAX_BUFFER_OBJECT_SIZE); -G_STATIC_ASSERT(sizeof(struct binder_fd_array_object) <= - GBINDER_MAX_BUFFER_OBJECT_SIZE); G_STATIC_ASSERT(sizeof(struct binder_buffer_object) <= GBINDER_MAX_BUFFER_OBJECT_SIZE); G_STATIC_ASSERT(sizeof(struct binder_handle_cookie) <=
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_io.h ^
@@ -146,8 +146,6 @@ guint (encode_local_object)(void out, GBinderLocalObject* obj); guint (encode_remote_object)(void out, GBinderRemoteObject* obj); guint (encode_fd_object)(void out, int fd); - guint (encode_fda_object)(void out, const GBinderFds fds, - const GBinderParent parent); /* Encode binder_buffer_object */ #define GBINDER_MAX_BUFFER_OBJECT_SIZE (40)
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_ipc.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2022 Jolla Ltd. - * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2021 Jolla Ltd. + * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -207,6 +207,9 @@ GDestroyNotify fn_custom_destroy; } GBinderIpcTxCustom; +GBINDER_INLINE_FUNC const char* gbinder_ipc_name(GBinderIpc* self) + { return self->priv->name; } + static GBinderIpcLooper* gbinder_ipc_looper_new( @@ -426,7 +429,7 @@ gbinder_ipc_looper_free( GBinderIpcLooper* looper) { - if (!looper->joined && looper->thread != pthread_self()) { + if (!looper->joined) { pthread_join(looper->thread, NULL); } close(looper->pipefd[0]); @@ -763,13 +766,13 @@ GBinderIpcLooper* looper = data; GBinderDriver* driver = looper->driver; - g_mutex_lock(&looper->mutex); pthread_setname_np(looper->thread, looper->name); if (gbinder_driver_enter_looper(driver)) { struct pollfd pipefd; int res; GDEBUG("Looper %s running", looper->name); + g_mutex_lock(&looper->mutex); g_atomic_int_set(&looper->started, TRUE); g_cond_broadcast(&looper->start_cond); g_mutex_unlock(&looper->mutex); @@ -834,6 +837,7 @@ GDEBUG("Looper %s is abandoned", looper->name); } } else { + g_mutex_lock(&looper->mutex); g_atomic_int_set(&looper->started, TRUE); g_cond_broadcast(&looper->start_cond); g_mutex_unlock(&looper->mutex); @@ -865,7 +869,6 @@ g_atomic_int_set(&looper->refcount, 1); g_cond_init(&looper->start_cond); g_mutex_init(&looper->mutex); - g_mutex_lock(&looper->mutex); looper->name = g_strdup_printf("%s#%u", gbinder_ipc_name(ipc), id); looper->handler.f = &handler_functions; looper->ipc = ipc; @@ -874,13 +877,11 @@ looper)) { /* gbinder_ipc_looper_thread() will release this reference: / gbinder_ipc_looper_ref(looper); - g_mutex_unlock(&looper->mutex); GDEBUG("Starting looper %s", looper->name); return looper; } else { GERR("Failed to create looper thread %s", looper->name); } - g_mutex_unlock(&looper->mutex); gbinder_ipc_looper_unref(looper); } else { GERR("Failed to create looper pipe: %s", strerror(errno)); @@ -1114,23 +1115,6 @@ static void -gbinder_ipc_invalidate_local_object_locked( - GBinderIpc self, - GBinderLocalObject* obj) -{ - GBinderIpcPriv* priv = self->priv; - - if (priv->local_objects && g_hash_table_remove(priv->local_objects, obj)) { - GVERBOSE_("%p %s", obj, gbinder_ipc_name(self)); - if (g_hash_table_size(priv->local_objects) == 0) { - g_hash_table_unref(priv->local_objects); - priv->local_objects = NULL; - } - } -} - -static -void gbinder_ipc_invalidate_remote_handle_locked( GBinderIpc* self, guint32 handle) @@ -1155,20 +1139,6 @@ } void -gbinder_ipc_invalidate_local_object( - GBinderIpc* self, - GBinderLocalObject* obj) -{ - GBinderIpcPriv* priv = self->priv; - - /* Lock / - g_mutex_lock(&priv->local_objects_mutex); - gbinder_ipc_invalidate_local_object_locked(self, obj); - g_mutex_unlock(&priv->local_objects_mutex); - / Unlock / -} - -void gbinder_ipc_invalidate_remote_handle( GBinderIpc self, guint32 handle) @@ -1211,8 +1181,14 @@ /* Lock / g_mutex_lock(&priv->local_objects_mutex); - if (g_atomic_int_get(&obj->object.ref_count) == 1) { - gbinder_ipc_invalidate_local_object_locked(self, obj); + if (obj->object.ref_count == 1 && priv->local_objects) { + if (g_hash_table_remove(priv->local_objects, obj)) { + GVERBOSE_("%p %s", obj, gbinder_ipc_name(self)); + if (g_hash_table_size(priv->local_objects) == 0) { + g_hash_table_unref(priv->local_objects); + priv->local_objects = NULL; + } + } } g_mutex_unlock(&priv->local_objects_mutex); / Unlock / @@ -1225,32 +1201,9 @@ { GBinderIpcPriv priv = self->priv; - /* - * Check of ref_count for 1 makes it possible (albeit quite unlikely) - * that GBinderRemoteObject still remains in remote_objects table - * when it's being finalized. - * - * For this to happen, other thread must re-reference GBinderRemoteObject - * right before we grab the lock here (making ref_count greater than 1) - * and then release that reference before g_object_unref() re-checks the - * refcount. - * - * That's why another gbinder_ipc_invalidate_remote_handle() call from - * gbinder_remote_object_finalize() is necessary to make sure that stale - * object pointer isn't stored in the hashtable. - * - * We still have to invalidate the handle here because it's the last - * point when GObject can be legitimately re-referenced and brought - * back to life. Which means that GBinderIpc mutex has to acquired - * twice during GBinderRemoteObject destruction. - * - * The same applies to GBinderLocalObject too, except that it calls - * gbinder_ipc_invalidate_local_object() from its finalize() handler. - / - / Lock / g_mutex_lock(&priv->remote_objects_mutex); - if (g_atomic_int_get(&obj->object.ref_count) == 1) { + if (obj->object.ref_count == 1) { gbinder_ipc_invalidate_remote_handle_locked(self, obj->handle); } g_mutex_unlock(&priv->remote_objects_mutex); @@ -1295,10 +1248,10 @@ if (obj) { gbinder_local_object_ref(obj); } else { - GWARN("Unknown local object %p %s", pointer, priv->name); + GWARN("Unknown local object %p", pointer); } } else { - GWARN("Unknown local object %p %s", pointer, priv->name); + GWARN("Unknown local object %p", pointer); } g_mutex_unlock(&priv->local_objects_mutex); / Unlock / @@ -1342,8 +1295,6 @@ } GVERBOSE_("%p handle %u %s", obj, handle, gbinder_ipc_name(self)); g_hash_table_replace(priv->remote_objects, key, obj); - } else { - GWARN("Unknown handle %u %s", handle, priv->name); } g_mutex_unlock(&priv->remote_objects_mutex); / Unlock / @@ -1903,13 +1854,6 @@ } } -const char -gbinder_ipc_name( - GBinderIpc* self) -{ - return G_LIKELY(self) ? self->priv->name : NULL;
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_ipc.h ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2022 Jolla Ltd. - * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2021 Jolla Ltd. + * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -113,11 +113,6 @@ GBinderIpc* ipc) GBINDER_INTERNAL; -const char* -gbinder_ipc_name( - GBinderIpc* ipc) - GBINDER_INTERNAL; - void gbinder_ipc_looper_check( GBinderIpc* ipc) @@ -154,7 +149,7 @@ GBinderRemoteObject* gbinder_ipc_get_service_manager( - GBinderIpc* ipc) + GBinderIpc* self) GBINDER_INTERNAL G_GNUC_WARN_UNUSED_RESULT; @@ -201,27 +196,21 @@ /* Internal for GBinderLocalObject / void gbinder_ipc_local_object_disposed( - GBinderIpc ipc, - GBinderLocalObject* obj) - GBINDER_INTERNAL; - -void -gbinder_ipc_invalidate_local_object( - GBinderIpc* ipc, + GBinderIpc* self, GBinderLocalObject* obj) GBINDER_INTERNAL; /* Internal for GBinderRemoteObject / void gbinder_ipc_remote_object_disposed( - GBinderIpc ipc, + GBinderIpc* self, GBinderRemoteObject* obj) GBINDER_INTERNAL; /* Needed by unit tests / gboolean gbinder_ipc_set_max_threads( - GBinderIpc ipc, + GBinderIpc* self, gint max_threads) GBINDER_INTERNAL;
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_local_object.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2022 Jolla Ltd. - * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2021 Jolla Ltd. + * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -644,7 +644,6 @@ GBinderLocalObjectPriv* priv = self->priv; GASSERT(!self->strong_refs); - gbinder_ipc_invalidate_local_object(self->ipc, self); gbinder_ipc_unref(self->ipc); g_strfreev(priv->ifaces); G_OBJECT_CLASS(PARENT_CLASS)->finalize(object);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_local_reply.c ^
@@ -307,17 +307,6 @@ return self; } -GBinderLocalReply* -gbinder_local_reply_append_fd( - GBinderLocalReply* self, - int fd) /* Since 1.1.14 / -{ - if (G_LIKELY(self)) { - gbinder_writer_data_append_fd(&self->data, fd); - } - return self; -} - / * Local Variables: * mode: C
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_proxy_object.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2021-2022 Jolla Ltd. - * Copyright (C) 2021-2022 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2021 Jolla Ltd. + * Copyright (C) 2021 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -60,9 +60,11 @@ }; struct gbinder_proxy_object_priv { - gboolean acquired; + gulong remote_death_id; gboolean dropped; GBinderProxyTx* tx; + GMutex mutex; /* Protects the hashtable below / + GHashTable subproxies; }; G_DEFINE_TYPE(GBinderProxyObject, gbinder_proxy_object, \ @@ -74,12 +76,79 @@ #define THIS_TYPE GBINDER_TYPE_PROXY_OBJECT #define PARENT_CLASS gbinder_proxy_object_parent_class +static +void +gbinder_proxy_object_subproxy_gone( + gpointer proxy, + GObject* subproxy) +{ + GBinderProxyObject* self = THIS(proxy); + GBinderProxyObjectPriv* priv = self->priv; + + /* Lock / + g_mutex_lock(&priv->mutex); + g_hash_table_remove(priv->subproxies, subproxy); + if (g_hash_table_size(priv->subproxies) == 0) { + g_hash_table_unref(priv->subproxies); + priv->subproxies = NULL; + } + g_mutex_unlock(&priv->mutex); + / Unlock / +} + +static +void +gbinder_proxy_object_drop_subproxies( + GBinderProxyObject self) +{ + GBinderProxyObjectPriv* priv = self->priv; + GSList* list = NULL; + + /* Lock / + g_mutex_lock(&priv->mutex); + if (priv->subproxies) { + GHashTableIter it; + gpointer value; + + g_hash_table_iter_init(&it, priv->subproxies); + while (g_hash_table_iter_next(&it, NULL, &value)) { + list = g_slist_append(list, gbinder_local_object_ref(value)); + g_object_weak_unref(G_OBJECT(value), + gbinder_proxy_object_subproxy_gone, self); + } + g_hash_table_destroy(priv->subproxies); + priv->subproxies = NULL; + } + g_mutex_unlock(&priv->mutex); + / Unlock / + + / Drop (and possibly destroy) the objects outside of the lock / + g_slist_free_full(list, (GDestroyNotify) gbinder_local_object_drop); +} + +static +void +gbinder_proxy_remote_death_proc( + GBinderRemoteObject obj, + void* proxy) +{ + GBinderProxyObject* self = THIS(proxy); + GBinderProxyObjectPriv* priv = self->priv; + + GDEBUG("Remote object %u died on %s", obj->handle, obj->ipc->dev); + gbinder_remote_object_remove_handler(obj, priv->remote_death_id); + priv->remote_death_id = 0; + /* Drop the implicit reference / + gbinder_local_object_unref(&self->parent); +} + /==========================================================================* * Converter ==========================================================================/ typedef struct gbinder_proxy_object_converter { GBinderObjectConverter pub; + GBinderProxyObject* proxy; GBinderIpc* remote; GBinderIpc* local; } GBinderProxyObjectConverter; @@ -113,6 +182,8 @@ guint32 handle) { GBinderProxyObjectConverter* c = gbinder_proxy_object_converter_cast(pub); + GBinderProxyObject* proxy = c->proxy; + GBinderProxyObjectPriv* priv = proxy->priv; GBinderObjectRegistry* reg = gbinder_ipc_object_registry(c->remote); GBinderRemoteObject* remote = gbinder_object_registry_get_remote(reg, handle, REMOTE_REGISTRY_CAN_CREATE /* but don't acquire /); @@ -121,7 +192,32 @@ if (!local && !remote->dead) { / GBinderProxyObject will reference GBinderRemoteObject / - local = &gbinder_proxy_object_new(c->local, remote)->parent; + GBinderProxyObject subp = gbinder_proxy_object_new(c->local, remote); + + /* + * Auto-created proxies may get spontaneously destroyed and + * not necessarily on the UI thread. + / + subp->priv->remote_death_id = gbinder_remote_object_add_death_handler + (remote, gbinder_proxy_remote_death_proc, subp); + + / + * Remote keeps an implicit reference to this auto-created + * proxy. The reference gets released when the remote object + * dies, i.e. by gbinder_proxy_remote_death_proc(). + / + gbinder_local_object_ref(local = GBINDER_LOCAL_OBJECT(subp)); + + / Lock / + g_mutex_lock(&priv->mutex); + if (!priv->subproxies) { + priv->subproxies = g_hash_table_new(g_direct_hash, g_direct_equal); + } + g_hash_table_insert(priv->subproxies, subp, subp); + g_object_weak_ref(G_OBJECT(subp), + gbinder_proxy_object_subproxy_gone, proxy); + g_mutex_unlock(&priv->mutex); + / Unlock / } / Release the reference returned by gbinder_object_registry_get_remote / @@ -145,6 +241,7 @@ GBinderIpc dest = proxy->parent.ipc; memset(convert, 0, sizeof(convert)); + convert->proxy = proxy; convert->remote = remote; convert->local = local; pub->f = &gbinder_converter_fn; @@ -249,7 +346,7 @@ GBinderProxyObjectPriv priv = self->priv; GBinderRemoteObject* remote = self->remote; - if (!priv->dropped && !remote->dead) { + if (!priv->dropped && !gbinder_remote_object_is_dead(remote)) { GBinderLocalRequest* fwd; GBinderProxyTx* tx = g_slice_new0(GBinderProxyTx); GBinderProxyObjectConverter convert; @@ -277,7 +374,6 @@ gbinder_local_request_unref(fwd); status = GBINDER_STATUS_OK; } else { - GVERBOSE_("dropped: %d dead:%d", priv->dropped, remote->dead); status = (-EBADMSG); } return NULL; @@ -301,11 +397,11 @@ { GBinderProxyObject* self = THIS(object); GBinderProxyObjectPriv* priv = self->priv; - GBinderRemoteObject* remote = self->remote; - if (!remote->dead && !priv->dropped && !priv->acquired) { - /* Not acquired yet / - priv->acquired = TRUE; + if (priv->remote_death_id && !object->strong_refs) { + GBinderRemoteObject remote = self->remote; + + /* First strong ref, acquire the attached remote object / gbinder_driver_acquire(remote->ipc->driver, remote->handle); } GBINDER_LOCAL_OBJECT_CLASS(PARENT_CLASS)->acquire(object); @@ -313,6 +409,23 @@ static void +gbinder_proxy_object_release( + GBinderLocalObject object) +{ + GBinderProxyObject* self = THIS(object); + GBinderProxyObjectPriv* priv = self->priv; + + if (priv->remote_death_id && object->strong_refs == 1) { + GBinderRemoteObject* remote = self->remote; + + /* Last strong ref, release the attached remote object */
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_reader.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2021 Jolla Ltd. - * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2019 Jolla Ltd. + * Copyright (C) 2018-2019 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -14,8 +14,8 @@ * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -90,7 +90,7 @@ { const GBinderReaderPriv* p = gbinder_reader_cast_c(reader); - return !p \|\| p->ptr >= p->end; + return p->ptr >= p->end; } static @@ -139,62 +139,6 @@ } gboolean -gbinder_reader_read_int8( - GBinderReader* reader, - gint8* value) /* Since 1.1.15 / -{ - return gbinder_reader_read_uint8(reader, (guint8)value); -} - -gboolean -gbinder_reader_read_uint8( - GBinderReader* reader, - guint8* value) /* Since 1.1.15 / -{ - / Primitive values are supposed to be padded to 4-byte boundary / - if (value) { - guint32 padded; - - if (gbinder_reader_read_uint32(reader, &padded)) { - value = (guint8)padded; - return TRUE; - } else { - return FALSE; - } - } else { - return gbinder_reader_read_uint32(reader, NULL); - } -} - -gboolean -gbinder_reader_read_int16( - GBinderReader* reader, - gint16* value) /* Since 1.1.15 / -{ - return gbinder_reader_read_uint16(reader, (guint16)value); -} - -gboolean -gbinder_reader_read_uint16( - GBinderReader* reader, - guint16* value) /* Since 1.1.15 / -{ - / Primitive values are supposed to be padded to 4-byte boundary / - if (value) { - guint32 padded; - - if (gbinder_reader_read_uint32(reader, &padded)) { - value = (guint16)padded; - return TRUE; - } else { - return FALSE; - } - } else { - return gbinder_reader_read_uint32(reader, NULL); - } -} - -gboolean gbinder_reader_read_int32( GBinderReader* reader, gint32* value) @@ -736,38 +680,13 @@ return data; } -const void* -gbinder_reader_get_data( - const GBinderReader* reader, - gsize* size) /* Since 1.1.14 / -{ - const GBinderReaderPriv p = gbinder_reader_cast_c(reader); - - if (p) { - const GBinderReaderData* data = p->data; - - if (data && data->buffer) { - if (size) { - size = data->buffer->size; - } - return data->buffer->data; - } - } - - / No data / - if (size) { - size = 0; - } - return NULL; -} - gsize gbinder_reader_bytes_read( const GBinderReader* reader) { const GBinderReaderPriv* p = gbinder_reader_cast_c(reader); - return p ? (p->ptr - p->start) : 0; + return p->ptr - p->start; } gsize @@ -776,7 +695,7 @@ { const GBinderReaderPriv* p = gbinder_reader_cast_c(reader); - return p ? (p->end - p->ptr) : 0; + return p->end - p->ptr; } void @@ -784,11 +703,8 @@ GBinderReader* dest, const GBinderReader* src) { - if (src) { - memcpy(dest, src, sizeof(dest)); - } else { - memset(dest, 0, sizeof(dest)); - } + /* It's actually quite simple :) / + memcpy(dest, src, sizeof(dest)); } /*
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_remote_object.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2022 Jolla Ltd. - * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2021 Jolla Ltd. + * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -149,7 +149,6 @@ GBinderRemoteObjectPriv* priv = self->priv; self->dead = TRUE; - gbinder_driver_clear_death_notification(driver, self); if (priv->acquired) { priv->acquired = FALSE; /* Release the dead node / @@ -295,7 +294,6 @@ GBinderIpc ipc = self->ipc; GBinderDriver* driver = ipc->driver; - gbinder_ipc_invalidate_remote_handle(ipc, self->handle); if (!self->dead) { gbinder_driver_clear_death_notification(driver, self); }
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_rpc_protocol.c ^
@@ -40,9 +40,6 @@ #define BINDER_RPC_FLAGS (STRICT_MODE_PENALTY_GATHER) #define UNSET_WORK_SOURCE (-1) -#define BINDER_VND_HEADER GBINDER_FOURCC('V', 'N', 'D', 'R') -#define BINDER_SYS_HEADER GBINDER_FOURCC('S', 'Y', 'S', 'T') - /========================================================================== * GBinderIpcProtocol callbacks (see Parcel::writeInterfaceToken in Android) * Note that there are two slightly different kinds of Parcels: @@ -177,50 +174,6 @@ }; /========================================================================== - * AIDL protocol appeared in Android 11 (API level 30) - ==========================================================================/ - -static -void -gbinder_rpc_protocol_aidl3_write_rpc_header( - GBinderWriter* writer, - const char* iface) -{ - gbinder_writer_append_int32(writer, BINDER_RPC_FLAGS); - gbinder_writer_append_int32(writer, UNSET_WORK_SOURCE); - gbinder_writer_append_int32(writer, BINDER_SYS_HEADER); - gbinder_writer_append_string16(writer, iface); -} - -static -const char* -gbinder_rpc_protocol_aidl3_read_rpc_header( - GBinderReader* reader, - guint32 txcode, - char** iface) -{ - if (txcode > GBINDER_TRANSACTION(0,0,0)) { - iface = NULL; - } else if (gbinder_reader_read_int32(reader, NULL) / flags / && - gbinder_reader_read_int32(reader, NULL) / work source / && - gbinder_reader_read_int32(reader, NULL) / sys header /) { - iface = gbinder_reader_read_string16(reader); - } else { - iface = NULL; - } - - return iface; -} - -static const GBinderRpcProtocol gbinder_rpc_protocol_aidl3 = { - .name = "aidl3", - .ping_tx = GBINDER_PING_TRANSACTION, - .write_ping = gbinder_rpc_protocol_aidl_write_ping, /* no payload / - .write_rpc_header = gbinder_rpc_protocol_aidl3_write_rpc_header, - .read_rpc_header = gbinder_rpc_protocol_aidl3_read_rpc_header -}; - -/==========================================================================* * The original /dev/hwbinder protocol. ==========================================================================/ @@ -272,7 +225,6 @@ static const GBinderRpcProtocol* gbinder_rpc_protocol_list[] = { &gbinder_rpc_protocol_aidl, &gbinder_rpc_protocol_aidl2, - &gbinder_rpc_protocol_aidl3, &gbinder_rpc_protocol_hidl };
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_servicemanager.c ^
@@ -82,12 +82,11 @@ static const GBinderServiceManagerType gbinder_servicemanager_types[] = { { "aidl", gbinder_servicemanager_aidl_get_type }, { "aidl2", gbinder_servicemanager_aidl2_get_type }, - { "aidl3", gbinder_servicemanager_aidl3_get_type }, { "hidl", gbinder_servicemanager_hidl_get_type } }; #define SERVICEMANAGER_TYPE_AIDL (gbinder_servicemanager_types + 0) -#define SERVICEMANAGER_TYPE_HIDL (gbinder_servicemanager_types + 3) +#define SERVICEMANAGER_TYPE_HIDL (gbinder_servicemanager_types + 2) #define SERVICEMANAGER_TYPE_DEFAULT SERVICEMANAGER_TYPE_AIDL static GHashTable* gbinder_servicemanager_map = NULL; @@ -699,13 +698,6 @@ } } -const char* -gbinder_servicemanager_device( - GBinderServiceManager* self) /* Since 1.1.14 / -{ - return G_LIKELY(self) ? self->dev : NULL; -} - gboolean gbinder_servicemanager_is_present( GBinderServiceManager self) /* Since 1.0.25 */
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_servicemanager_aidl.c ^
@@ -61,6 +61,16 @@ #define GBINDER_SERVICEMANAGER_AIDL(obj) \ G_TYPE_CHECK_INSTANCE_CAST((obj), GBINDER_TYPE_SERVICEMANAGER_AIDL, \ GBinderServiceManagerAidl) +#define GBINDER_SERVICEMANAGER_AIDL_GET_CLASS(obj) \ + G_TYPE_INSTANCE_GET_CLASS((obj), GBINDER_TYPE_SERVICEMANAGER_AIDL, \ + GBinderServiceManagerAidlClass) + +enum gbinder_servicemanager_aidl_calls { + GET_SERVICE_TRANSACTION = GBINDER_FIRST_CALL_TRANSACTION, + CHECK_SERVICE_TRANSACTION, + ADD_SERVICE_TRANSACTION, + LIST_SERVICES_TRANSACTION +}; #define SERVICEMANAGER_AIDL_IFACE "android.os.IServiceManager"
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_servicemanager_aidl.h ^
@@ -55,20 +55,6 @@ G_TYPE_CHECK_CLASS_CAST((klass), GBINDER_TYPE_SERVICEMANAGER_AIDL, \ GBinderServiceManagerAidlClass) -#define GBINDER_SERVICEMANAGER_AIDL_GET_CLASS(obj) \ - G_TYPE_INSTANCE_GET_CLASS((obj), GBINDER_TYPE_SERVICEMANAGER_AIDL, \ - GBinderServiceManagerAidlClass) - -enum gbinder_servicemanager_aidl_calls { - GET_SERVICE_TRANSACTION = GBINDER_FIRST_CALL_TRANSACTION, - CHECK_SERVICE_TRANSACTION, - ADD_SERVICE_TRANSACTION, - LIST_SERVICES_TRANSACTION -}; - -#define DUMP_FLAG_PRIORITY_DEFAULT (0x08) -#define DUMP_FLAG_PRIORITY_ALL (0x0f) - #endif /* GBINDER_SERVICEMANAGER_AIDL_H / / @@ -78,4 +64,3 @@ * indent-tabs-mode: nil * End: */ -
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_servicemanager_p.h ^
@@ -110,7 +110,6 @@ GType gbinder_servicemanager_aidl_get_type(void) GBINDER_INTERNAL; GType gbinder_servicemanager_aidl2_get_type(void) GBINDER_INTERNAL; -GType gbinder_servicemanager_aidl3_get_type(void) GBINDER_INTERNAL; GType gbinder_servicemanager_hidl_get_type(void) GBINDER_INTERNAL; #endif /* GBINDER_SERVICEMANAGER_PRIVATE_H */
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_writer.c ^
@@ -32,7 +32,6 @@ #include "gbinder_writer_p.h" #include "gbinder_buffer_p.h" -#include "gbinder_fmq_p.h" #include "gbinder_local_object.h" #include "gbinder_object_converter.h" #include "gbinder_io.h" @@ -156,6 +155,30 @@ gutil_int_array_append(data->offsets, offset); } +static +void +gbinder_writer_data_write_buffer_object( + GBinderWriterData* data, + const void* ptr, + gsize size, + const GBinderParent* parent) +{ + GByteArray* buf = data->bytes; + const guint offset = buf->len; + guint n; + + /* Preallocate enough space / + g_byte_array_set_size(buf, offset + GBINDER_MAX_BUFFER_OBJECT_SIZE); + / Write the object / + n = data->io->encode_buffer_object(buf->data + offset, ptr, size, parent); + / Fix the data size / + g_byte_array_set_size(buf, offset + n); + / Record the offset / + gbinder_writer_data_record_offset(data, offset); + / The driver seems to require each buffer to be 8-byte aligned / + data->buffers_size += G_ALIGN8(size); +} + void gbinder_writer_init( GBinderWriter self, @@ -165,35 +188,12 @@ gbinder_writer_cast(self)->data = data; } -const void* -gbinder_writer_get_data( - GBinderWriter* self, - gsize* size) /* Since 1.1.14 / -{ - GBinderWriterData data = gbinder_writer_data(self); - - if (G_LIKELY(data)) { - GByteArray* buf = data->bytes; - - if (size) { - size = buf->len; - } - return buf->data; - } else { - if (size) { - size = 0; - } - return NULL; - } -} - gsize gbinder_writer_bytes_written( GBinderWriter* self) /* since 1.0.21 / { GBinderWriterData data = gbinder_writer_data(self); - - return G_LIKELY(data) ? data->bytes->len : 0; + return data->bytes->len; } void @@ -213,34 +213,12 @@ GBinderWriterData* data, gboolean value) { - /* Primitive values are padded to 4-byte boundary / - gbinder_writer_data_append_int32(data, value != FALSE); -} - -void -gbinder_writer_append_int8( - GBinderWriter self, - guint8 value) /* Since 1.1.15 / -{ - GBinderWriterData data = gbinder_writer_data(self); + guint8 padded[4]; - if (G_LIKELY(data)) { - /* Primitive values are padded to 4-byte boundary / - gbinder_writer_data_append_int32(data, value); - } -} - -void -gbinder_writer_append_int16( - GBinderWriter self, - guint16 value) /* Since 1.1.15 / -{ - GBinderWriterData data = gbinder_writer_data(self); - - if (G_LIKELY(data)) { - /* Primitive values are padded to 4-byte boundary / - gbinder_writer_data_append_int32(data, value); - } + / Boolean values are padded to 4-byte boundary / + padded[0] = (value != FALSE); + padded[1] = padded[2] = padded[3] = 0; + g_byte_array_append(data->bytes, padded, sizeof(padded)); } void @@ -604,6 +582,17 @@ } static +guint +gbinder_writer_data_prepare( + GBinderWriterData data) +{ + if (!data->offsets) { + data->offsets = gutil_int_array_new(); + } + return data->offsets->count; +} + +static void gbinder_writer_data_close_fd( gpointer data) @@ -615,6 +604,7 @@ } } +static void gbinder_writer_data_append_fd( GBinderWriterData* data, @@ -656,50 +646,6 @@ } } -void -gbinder_writer_data_append_fda_object( - GBinderWriterData* data, - const GBinderFds fds, - const GBinderParent parent) -{ - GByteArray* buf = data->bytes; - const guint offset = buf->len; - guint written; - - /* Preallocate enough space / - g_byte_array_set_size(buf, offset + GBINDER_MAX_BINDER_OBJECT_SIZE); - - written = data->io->encode_fda_object(buf->data + offset, fds, parent); - - / Fix the data size / - g_byte_array_set_size(buf, offset + written); - / Record the offset / - gbinder_writer_data_record_offset(data, offset); -} - -void -gbinder_writer_data_append_fds( - GBinderWriterData data, - const GBinderFds fds, - const GBinderParent parent) -{ - if (fds) { - /* Size, fds data buffer and fd_array_object / - const gsize fds_total = sizeof(GBinderFds) + - sizeof(int) (fds->num_fds + fds->num_ints); - GBinderParent fds_parent; - - gbinder_writer_data_append_int64(data, fds_total); - fds_parent.index = gbinder_writer_data_append_buffer_object(data, - fds, fds_total, parent); - fds_parent.offset = sizeof(GBinderFds); - gbinder_writer_data_append_fda_object(data, fds, &fds_parent); - } else { - /* If the pointer is null only write zero size / - gbinder_writer_data_append_int64(data, 0); - } -} - guint gbinder_writer_append_buffer_object_with_parent( GBinderWriter self, @@ -736,21 +682,9 @@ gsize size, const GBinderParent* parent) { - const guint index = data->offsets ? data->offsets->count : 0; - GByteArray* buf = data->bytes; - const guint offset = buf->len;
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/src/gbinder_writer_p.h ^
@@ -163,12 +163,6 @@ GBinderRemoteObject* obj) GBINDER_INTERNAL; -void -gbinder_writer_data_append_fd( - GBinderWriterData* data, - int fd) - GBINDER_INTERNAL; - #endif /* GBINDER_WRITER_PRIVATE_H / /
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/test/Makefile ^
@@ -8,5 +8,4 @@ @$(MAKE) -C binder-list $* @$(MAKE) -C binder-ping $* @$(MAKE) -C binder-service $* - @$(MAKE) -C binder-call $* @$(MAKE) -C rild-card-status $*
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/Makefile ^
@@ -9,7 +9,6 @@ @$(MAKE) -C unit_config $* @$(MAKE) -C unit_driver $* @$(MAKE) -C unit_eventloop $* - @$(MAKE) -C unit_fmq $* @$(MAKE) -C unit_ipc $* @$(MAKE) -C unit_local_object $* @$(MAKE) -C unit_local_reply $* @@ -24,7 +23,6 @@ @$(MAKE) -C unit_servicemanager $* @$(MAKE) -C unit_servicemanager_aidl $* @$(MAKE) -C unit_servicemanager_aidl2 $* - @$(MAKE) -C unit_servicemanager_aidl3 $* @$(MAKE) -C unit_servicemanager_hidl $* @$(MAKE) -C unit_servicename $* @$(MAKE) -C unit_servicepoll $*
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/common/Makefile ^
@@ -18,31 +18,7 @@ # Required packages # -PKGS += glib-2.0 gobject-2.0 - -ifeq ($(LIBGLIBUTIL_PATH),) - -# Assume that libglibutil devel package is installed -PKGS += libglibutil - -else - -# Side-by-side build -INCLUDES += -I$(LIBGLIBUTIL_PATH)/include -DEBUG_LIBS = -L$(LIBGLIBUTIL_PATH)/build/debug -lglibutil -RELEASE_LIBS = -L$(LIBGLIBUTIL_PATH)/build/release -lglibutil -DEBUG_DEPS = libglibutil_debug -RELEASE_DEPS = libglibutil_release - -.PHONY: libglibutil_debug libglibutil_release - -libglibutil_debug: - make -C $(LIBGLIBUTIL_PATH) debug - -libglibutil_release: - make -C $(LIBGLIBUTIL_PATH) release - -endif +PKGS += libglibutil glib-2.0 gobject-2.0 # # Default target @@ -98,9 +74,9 @@ RELEASE_LIB = $(LIB_DIR)/$(RELEASE_LIB_FILE) COVERAGE_LIB = $(LIB_DIR)/$(COVERAGE_LIB_FILE) -DEBUG_LIBS += $(DEBUG_LIB) $(LIBS) -RELEASE_LIBS += $(RELEASE_LIB) $(LIBS) -COVERAGE_LIBS += $(COVERAGE_LIB) $(LIBS) +DEBUG_LIBS = $(DEBUG_LIB) $(LIBS) +RELEASE_LIBS = $(RELEASE_LIB) $(LIBS) +COVERAGE_LIBS = $(COVERAGE_LIB) $(LIBS) # # Files @@ -131,8 +107,8 @@ $(RELEASE_LIB): \| release_lib $(COVERAGE_LIB): \| coverage_lib -$(DEBUG_OBJS): \| $(DEBUG_BUILD_DIR) $(DEBUG_DEPS) -$(RELEASE_OBJS): \| $(RELEASE_BUILD_DIR) $(RELEASE_DEPS) +$(DEBUG_OBJS): \| $(DEBUG_BUILD_DIR) +$(RELEASE_OBJS): \| $(RELEASE_BUILD_DIR) $(COVERAGE_OBJS): \| $(COVERAGE_BUILD_DIR) #
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/common/test_binder.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2022 Jolla Ltd. - * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2021 Jolla Ltd. + * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -47,7 +47,6 @@ #include <sys/socket.h> #include <sys/types.h> #include <sys/syscall.h> -#include <linux/ioctl.h> #define gettid() ((int)syscall(SYS_gettid)) @@ -55,7 +54,6 @@ static GHashTable* test_node_map = NULL; static GPrivate test_looper = G_PRIVATE_INIT(NULL); static GPrivate test_tx_state = G_PRIVATE_INIT(NULL); -static guint32 last_auto_handle = 0; G_LOCK_DEFINE_STATIC(test_binder); static GMainLoop* test_binder_exit_loop = NULL; @@ -126,7 +124,6 @@ struct test_binder_node { int fd; char* path; - const char* name; TestBinder* binder; TestBinderNode* other; TEST_LOOPER looper_enabled; @@ -148,6 +145,7 @@ GHashTable* object_map; /* GBinderLocalObject* => handle / GHashTable handle_map; /* handle => GBinderLocalObject* / TestBinderSubmitThread submit_thread; + guint32 last_auto_handle; GMutex mutex; gboolean passthrough; TestBinderNode node[2]; @@ -438,16 +436,13 @@ g_assert(!g_hash_table_contains(binder->object_map, obj)); g_assert(!g_hash_table_contains(binder->handle_map, GINT_TO_POINTER(h))); if (h == AUTO_HANDLE) { - h = ++last_auto_handle; + h = ++(binder->last_auto_handle); while (g_hash_table_contains(binder->handle_map, GINT_TO_POINTER(h)) \|\| g_hash_table_contains(binder->object_map, GINT_TO_POINTER(h))) { - h = ++last_auto_handle; + h = ++(binder->last_auto_handle); } - } else if (last_auto_handle < h) { - /* Avoid re-using handles, to make debugging easier / - last_auto_handle = h; } - GDEBUG("Object %p <=> handle %u %s", obj, h, binder->node[0].name); + GDEBUG("Object %p <=> handle %u", obj, h); g_hash_table_insert(binder->handle_map, GINT_TO_POINTER(h), obj); g_hash_table_insert(binder->object_map, obj, GINT_TO_POINTER(h)); g_object_weak_ref(G_OBJECT(obj), test_binder_local_object_gone, binder); @@ -467,10 +462,10 @@ gpointer obj = g_hash_table_lookup(binder->handle_map, key); GDEBUG("Handle %u => object %p %s", (guint) handle, obj, - binder->node[0].name); + binder->node[0].path); return GPOINTER_TO_SIZE(obj); } - GDEBUG("Unexpected handle %u %s", (guint) handle, binder->node[0].name); + GDEBUG("Unexpected handle %u %s", (guint) handle, binder->node[0].path); return 0; } @@ -488,13 +483,13 @@ guint64 handle = GPOINTER_TO_SIZE(value); GDEBUG("Object %p => handle %u %s", key, (guint) handle, - binder->node[0].name); + binder->node[0].path); return handle; } else if (key) { - GDEBUG("Auto-registering object %p %s", key, binder->node[0].name); + GDEBUG("Auto-registering object %p %s", key, binder->node[0].path); return test_binder_register_object_locked(binder, key, AUTO_HANDLE); } else { - GDEBUG("Unexpected object %p %s", key, binder->node[0].name); + GDEBUG("Unexpected object %p %s", key, binder->node[0].path); return 0; } } @@ -569,7 +564,7 @@ const guint32 cmd = node->next_cmd[0]; const guint total = 4 + _IOC_SIZE(cmd); - / Already have one ready / + / Alread have one ready / if (!(test_binder_cmd_read_flags(cmd) & flags)) { GDEBUG("Cmd 0x%08x not for %d", cmd, gettid()); bytes_read = 0; @@ -671,7 +666,7 @@ while (g_atomic_pointer_get(&node->tx_state) != my_tx_state && !g_atomic_pointer_compare_and_exchange(&node->tx_state, NULL, my_tx_state)) { - GDEBUG("Thread %d is waiting to become a transaction thread", + GDEBUG("Thread %d is waiting to become a transacton thread", my_tx_state->tid); test_io_short_wait(); } @@ -700,7 +695,7 @@ my_tx_state->depth--; my_tx_state->stack = g_renew(TEST_TX_STATE, my_tx_state->stack, my_tx_state->depth); - GDEBUG("Thread %d is still a transaction thread", my_tx_state->tid); + GDEBUG("Thread %d is still a transacton thread", my_tx_state->tid); } } @@ -847,8 +842,6 @@ buffer->buffer = GPOINTER_TO_SIZE(copy); g_hash_table_replace(fd->destroy_map, copy, NULL); } - } else { - GDEBUG("Unexpected object type 0x%08x", obj_ptr); } } g_hash_table_replace(fd->destroy_map, data_offsets, NULL); @@ -1600,7 +1593,6 @@ binder_fd->node = node; binder_fd->fd = dup(node->fd); binder_fd->destroy_map = g_hash_table_new(g_direct_hash, g_direct_equal); - GDEBUG("fd %d => %d", binder_fd->fd, node->fd); return binder_fd; } @@ -1609,12 +1601,11 @@ const char path, int flags) { - static const char path_prefix[] = "/dev/"; static const char binder_suffix[] = "binder"; static const char binder_private_suffix[] = "binder-private"; static const char private_suffix[] = "-private"; - if (path && g_str_has_prefix(path, path_prefix) && + if (path && g_str_has_prefix(path, "/dev/") && (g_str_has_suffix(path, binder_suffix) \|\| g_str_has_suffix(path, binder_private_suffix))) { TestBinderFd* fd; @@ -1639,7 +1630,7 @@ node = binder->node + PRIVATE; node->path = g_strdup(path); binder->node[PUBLIC].path = g_strndup(path, - strlen(path) - strlen(private_suffix)); + strlen(path) - strlen(private_suffix) - 1); } if (!test_node_map) { @@ -1652,7 +1643,6 @@ this_node->binder = binder; this_node->fd = fds[i]; this_node->other = binder->node + ((i + 1) % 2); - this_node->name = this_node->path + strlen(path_prefix); g_hash_table_replace(test_node_map, this_node->path, this_node); } binder->object_map = g_hash_table_new @@ -1660,8 +1650,8 @@ binder->handle_map = g_hash_table_new (g_direct_hash, g_direct_equal); GDEBUG("Created %s (%d) <=> %s (%d) binder", - binder->node[0].name, binder->node[0].fd, - binder->node[1].name, binder->node[1].fd); + binder->node[0].path, binder->node[0].fd, + binder->node[1].path, binder->node[1].fd); } fd = test_binder_fd_new(node); if (!test_fd_map) {
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/common/test_common.h ^
@@ -80,10 +80,6 @@ /* Helper macros */ #if G_BYTE_ORDER == G_LITTLE_ENDIAN -# define TEST_INT8_BYTES_4(v) \ - (guint8)(v), 0, 0, 0 -# define TEST_INT16_BYTES_4(v) \ - (guint8)(v), (guint8)((v) >> 8), 0, 0 # define TEST_INT16_BYTES(v) \ (guint8)(v), (guint8)((v) >> 8) # define TEST_INT32_BYTES(v) \ @@ -95,10 +91,6 @@ (guint8)(((guint64)(v)) >> 32), (guint8)(((guint64)(v)) >> 40), \ (guint8)(((guint64)(v)) >> 48), (guint8)(((guint64)(v)) >> 56) #elif G_BYTE_ORDER == G_BIG_ENDIAN -# define TEST_INT8_BYTES_4(v) \ - 0, 0, 0, (guint8)(v) -# define TEST_INT16_BYTES_4(v) \ - 0, 0, (guint8)((v) >> 8), (guint8)(v) # define TEST_INT16_BYTES(v) \ (guint8)((v) >> 8), (guint8)(v) # define TEST_INT32_BYTES(v) \
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/coverage/run ^
@@ -11,7 +11,6 @@ unit_config \ unit_driver \ unit_eventloop \ -unit_fmq \ unit_ipc \ unit_local_object \ unit_local_reply \ @@ -26,7 +25,6 @@ unit_servicemanager \ unit_servicemanager_aidl \ unit_servicemanager_aidl2 \ -unit_servicemanager_aidl3 \ unit_servicemanager_hidl \ unit_servicename \ unit_servicepoll \
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_bridge/unit_bridge.c ^
@@ -482,9 +482,6 @@ int main(int argc, char* argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_("null"), test_null); g_test_add_func(TEST_("basic"), test_basic);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_client/unit_client.c ^
@@ -41,7 +41,6 @@ #include "gbinder_output_data.h" #include "gbinder_remote_object_p.h" #include "gbinder_remote_reply.h" -#include "gbinder_writer.h" #include <gutil_log.h> @@ -80,7 +79,6 @@ g_assert(!gbinder_client_ref(NULL)); g_assert(!gbinder_client_interface(NULL)); g_assert(!gbinder_client_interface2(NULL, 0)); - g_assert(!gbinder_client_rpc_header(NULL, 0)); gbinder_client_unref(NULL); g_assert(!gbinder_client_new_request(NULL)); g_assert(!gbinder_client_new_request2(NULL, 0)); @@ -133,11 +131,6 @@ }; GBinderClient* client = gbinder_client_new2(obj, ifaces, G_N_ELEMENTS(ifaces)); - GBinderWriter writer; - GBinderLocalRequest* req; - GBytes* rpc_header; - gsize len; - const void* hdr; g_assert(client); g_assert_cmpstr(gbinder_client_interface(client), == ,"11"); @@ -145,25 +138,12 @@ g_assert_cmpstr(gbinder_client_interface2(client, 22), == ,"22"); g_assert_cmpstr(gbinder_client_interface2(client, 33), == ,"33"); g_assert(!gbinder_client_interface2(client, 34)); - g_assert(!gbinder_client_rpc_header(client, 34)); g_assert(!gbinder_client_new_request2(client, 34)); /* Those fail to allocate default request for out-of-range codes: / g_assert(!gbinder_client_transact_sync_reply(client, 34, NULL, NULL)); g_assert_cmpint(gbinder_client_transact_sync_oneway(client, 34, NULL), == ,-EINVAL); g_assert(!gbinder_client_transact(client, 34, 0, NULL, NULL, NULL, NULL)); - - / Check the RPC header / - rpc_header = gbinder_client_rpc_header(client, 33); - req = gbinder_client_new_request2(client, 33); - g_assert(rpc_header); - g_assert(req); - gbinder_local_request_init_writer(req, &writer); - hdr = gbinder_writer_get_data(&writer, &len); - g_assert(hdr); - g_assert_cmpuint(len, == ,g_bytes_get_size(rpc_header)); - g_assert(!memcmp(hdr, g_bytes_get_data(rpc_header, NULL), len)); - gbinder_local_request_unref(req); gbinder_client_unref(client); / Client with no interface info / @@ -457,9 +437,6 @@ int main(int argc, char argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_("null"), test_null); g_test_add_func(TEST_("basic"), test_basic);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_config/unit_config.c ^
@@ -230,7 +230,6 @@ char* file = g_build_filename(dir, "test.conf", NULL); char* file1 = g_build_filename(subdir, "a.conf", NULL); char* file2 = g_build_filename(subdir, "b.conf", NULL); - char* file3 = g_build_filename(subdir, "c.conf", NULL); char* random_file = g_build_filename(subdir, "foo", NULL); static const char garbage[] = "foo"; static const char config[] = @@ -247,18 +246,12 @@ "/dev/binder = aidl2\n" "[ServiceManager]\n" "/dev/binder = aidl2\n"; - static const char config3[] = - "[Protocol]\n" - "/dev/binder3 = aidl3\n" - "[ServiceManager]\n" - "/dev/binder3 = aidl3\n"; g_assert_cmpint(mkdir(subdir, 0700), == ,0); g_assert_cmpint(mkdir(notafile, 0700), == ,0); g_assert(g_file_set_contents(file, config, -1, NULL)); g_assert(g_file_set_contents(file1, config1, -1, NULL)); g_assert(g_file_set_contents(file2, config2, -1, NULL)); - g_assert(g_file_set_contents(file3, config3, -1, NULL)); g_assert(g_file_set_contents(random_file, garbage, -1, NULL)); /* Reset the state / @@ -270,11 +263,9 @@ k = gbinder_config_get(); g_assert(k); g_assert_cmpstr(test_value(k,"Protocol","/dev/binder",b), == ,"aidl2"); - g_assert_cmpstr(test_value(k,"Protocol","/dev/binder3",b), == ,"aidl3"); g_assert_cmpstr(test_value(k,"Protocol","/dev/hbinder",b), == ,"hidl"); g_assert_cmpstr(test_value(k,"Protocol","/dev/hwbinder",b), == ,"hidl"); g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder",b),==,"aidl2"); - g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder3",b),==,"aidl3"); / Remove the default file and try again / gbinder_config_exit(); @@ -283,10 +274,8 @@ g_assert(k); g_assert(!test_value(k,"Protocol","/dev/hbinder",b)); g_assert_cmpstr(test_value(k,"Protocol","/dev/binder",b), == ,"aidl2"); - g_assert_cmpstr(test_value(k,"Protocol","/dev/binder3",b), == ,"aidl3"); g_assert_cmpstr(test_value(k,"Protocol","/dev/hwbinder",b), == ,"hidl"); g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder",b),==,"aidl2"); - g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder3",b),==,"aidl3"); / Damage one of the files and try again / gbinder_config_exit(); @@ -296,9 +285,7 @@ g_assert(!test_value(k,"Protocol","/dev/hbinder",b)); g_assert(!test_value(k,"Protocol","/dev/hwbinder",b)); g_assert_cmpstr(test_value(k,"Protocol","/dev/binder",b), == ,"aidl2"); - g_assert_cmpstr(test_value(k,"Protocol","/dev/binder3",b), == ,"aidl3"); g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder",b),==,"aidl2"); - g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder3",b),==,"aidl3"); / Disallow access to one of the files and try again / gbinder_config_exit(); @@ -308,15 +295,12 @@ g_assert(!test_value(k,"Protocol","/dev/hbinder",b)); g_assert(!test_value(k,"Protocol","/dev/hwbinder",b)); g_assert_cmpstr(test_value(k,"Protocol","/dev/binder",b), == ,"aidl2"); - g_assert_cmpstr(test_value(k,"Protocol","/dev/binder3",b), == ,"aidl3"); g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder",b),==,"aidl2"); - g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder3",b),==,"aidl3"); / Delete the remaining files and try again / gbinder_config_exit(); g_assert_cmpint(remove(file1), == ,0); g_assert_cmpint(remove(file2), == ,0); - g_assert_cmpint(remove(file3), == ,0); g_assert(!gbinder_config_get()); / Undo all the damage */ @@ -328,7 +312,6 @@ g_free(file); g_free(file1); g_free(file2); - g_free(file3); g_free(random_file); remove(notafile); @@ -481,20 +464,6 @@ "[ServiceManager]\n" "/dev/binder = aidl2\n" "/dev/vndbinder = aidl2\n" - },{ - "30", - - "[General]\n" - "ApiLevel = 30", - - "[General]\n" - "ApiLevel = 30\n" - "[Protocol]\n" - "/dev/binder = aidl3\n" - "/dev/vndbinder = aidl3\n" - "[ServiceManager]\n" - "/dev/binder = aidl3\n" - "/dev/vndbinder = aidl3\n" } };
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_ipc/unit_ipc.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2022 Jolla Ltd. - * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2021 Jolla Ltd. + * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -121,22 +121,12 @@ } static -gboolean -test_basic_find( - GBinderLocalObject* obj, - void* user_data) -{ - return obj == user_data; -} - -static void test_basic( void) { GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER); GBinderIpc* ipc2 = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER); - GBinderLocalObject* obj; g_assert(ipc); g_assert(ipc2); @@ -146,12 +136,6 @@ g_assert(!gbinder_ipc_find_local_object(NULL, test_basic_find_none, NULL)); g_assert(!gbinder_ipc_find_local_object(ipc, test_basic_find_none, NULL)); - obj = gbinder_local_object_new(ipc, NULL, NULL, NULL); - g_assert(obj); - g_assert(!gbinder_ipc_find_local_object(ipc, test_basic_find_none, NULL)); - g_assert(gbinder_ipc_find_local_object(ipc, test_basic_find, obj) == obj); - gbinder_local_object_unref(obj); /* Above call added a reference / - gbinder_local_object_unref(obj); / Second gbinder_ipc_new returns the same (default) object / g_assert(gbinder_ipc_new(NULL) == ipc); @@ -772,7 +756,7 @@ static void -test_transact_2way_run( +test_transact_2way( void) { GBinderIpc ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER); @@ -829,14 +813,6 @@ g_main_loop_unref(loop); } -static -void -test_transact_2way( - void) -{ - test_run_in_context(&test_opt, test_transact_2way_run); -} - /========================================================================== * transact_unhandled ==========================================================================/ @@ -1344,9 +1320,6 @@ int main(int argc, char* argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_("null"), test_null); g_test_add_func(TEST_("basic"), test_basic);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_local_object/unit_local_object.c ^
@@ -815,9 +815,6 @@ int main(int argc, char* argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_PREFIX "null", test_null); g_test_add_func(TEST_PREFIX "basic", test_basic);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_local_reply/unit_local_reply.c ^
@@ -106,7 +106,6 @@ g_assert(!gbinder_local_reply_append_hidl_string_vec(NULL, NULL, 0)); g_assert(!gbinder_local_reply_append_local_object(NULL, NULL)); g_assert(!gbinder_local_reply_append_remote_object(NULL, NULL)); - g_assert(!gbinder_local_reply_append_fd(NULL, 0)); } /========================================================================== @@ -172,31 +171,6 @@ } /========================================================================== - * fd - ==========================================================================/ - -static -void -test_fd( - void) -{ - const gint32 fd = 1; - GBinderLocalReply* reply = gbinder_local_reply_new(&gbinder_io_32); - GBinderOutputData* data; - GUtilIntArray* offsets; - - g_assert(gbinder_local_reply_append_fd(reply, fd)); - data = gbinder_local_reply_data(reply); - offsets = gbinder_output_data_offsets(data); - g_assert(offsets); - g_assert(offsets->count == 1); - g_assert(offsets->data[0] == 0); - g_assert(!gbinder_output_data_buffers_size(data)); - g_assert(data->bytes->len == BINDER_OBJECT_SIZE_32); - gbinder_local_reply_unref(reply); -} - -/========================================================================== * int32 ==========================================================================/ @@ -530,14 +504,10 @@ int main(int argc, char* argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_PREFIX "null", test_null); g_test_add_func(TEST_PREFIX "cleanup", test_cleanup); g_test_add_func(TEST_PREFIX "bool", test_bool); - g_test_add_func(TEST_PREFIX "fd", test_fd); g_test_add_func(TEST_PREFIX "int32", test_int32); g_test_add_func(TEST_PREFIX "int64", test_int64); g_test_add_func(TEST_PREFIX "float", test_float);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_protocol/unit_protocol.c ^
@@ -49,7 +49,6 @@ #define STRICT_MODE_PENALTY_GATHER (0x40 << 16) #define BINDER_RPC_FLAGS (STRICT_MODE_PENALTY_GATHER) #define UNSET_WORK_SOURCE (-1) -#define BINDER_SYS_HEADER GBINDER_FOURCC('S', 'Y', 'S', 'T') typedef struct test_data { const char* name; @@ -81,15 +80,6 @@ TEST_INT16_BYTES('o'), 0x00, 0x00 }; -static const guint8 test_header_aidl3 [] = { - TEST_INT32_BYTES(BINDER_RPC_FLAGS), - TEST_INT32_BYTES(UNSET_WORK_SOURCE), - TEST_INT32_BYTES(BINDER_SYS_HEADER), - TEST_INT32_BYTES(3), - TEST_INT16_BYTES('f'), TEST_INT16_BYTES('o'), - TEST_INT16_BYTES('o'), 0x00, 0x00 -}; - static const guint8 test_header_hidl [] = { 'f', 'o', 'o', 0x00 }; @@ -107,14 +97,6 @@ test_header_aidl2, 5 }, /* Short packet / { "aidl2/short/3", "adl2", GBINDER_DEFAULT_BINDER, NULL, test_header_aidl2, 9 }, / Short packet / - { "aidl3/ok", "aidl3", GBINDER_DEFAULT_BINDER, "foo", - TEST_ARRAY_AND_SIZE(test_header_aidl3) }, - { "aidl3/short/1", "aidl3", GBINDER_DEFAULT_BINDER, NULL, - test_header_aidl3, 1 }, / Short packet / - { "aidl3/short/2", "aidl3", GBINDER_DEFAULT_BINDER, NULL, - test_header_aidl3, 5 }, / Short packet / - { "aidl3/short/3", "adl3", GBINDER_DEFAULT_BINDER, NULL, - test_header_aidl3, 9 }, / Short packet / { "hidl/ok", "hidl", GBINDER_DEFAULT_HWBINDER, "foo", TEST_ARRAY_AND_SIZE(test_header_hidl) }, { "hidl/short", "hidl", GBINDER_DEFAULT_HWBINDER, NULL, @@ -366,7 +348,6 @@ static const TestData test_no_header_data[] = { { "aidl", "aidl", GBINDER_DEFAULT_BINDER }, { "aidl2", "aidl2", GBINDER_DEFAULT_BINDER }, - { "aidl3", "aidl3", GBINDER_DEFAULT_BINDER }, }; /==========================================================================*
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_proxy_object/unit_proxy_object.c ^
@@ -438,7 +438,7 @@ typedef struct test_obj_data { GMainLoop* loop; - GBinderLocalObject* obj2; + GBinderLocalObject* tmp_proxy; gboolean obj_call_handled; gboolean obj_call_finished; gboolean obj2_call_handled; @@ -539,9 +539,9 @@ g_assert(gbinder_reader_at_end(&reader)); /* Make sure temporary proxy won't get destroyed too early / - test->obj2 = test_binder_object(gbinder_driver_fd(obj->ipc->driver), + test->tmp_proxy = test_binder_object(gbinder_driver_fd(obj->ipc->driver), obj2->handle); - g_assert(test->obj2); + g_assert(test->tmp_proxy); / Call remote object / client2 = gbinder_client_new(obj2, TEST_IFACE2); @@ -599,54 +599,39 @@ GBinderRemoteObject remote_obj; GBinderRemoteObject* remote_proxy; GBinderClient* proxy_client; - GBinderIpc* ipc_remote_obj; GBinderIpc* ipc_obj; GBinderIpc* ipc_proxy; - GBinderIpc* ipc_remote_proxy; GBinderLocalRequest* req; - int fd_remote_obj, fd_obj, fd_proxy, fd_remote_proxy; + int fd_obj, fd_proxy; test_config_init(&config, NULL); memset(&test, 0, sizeof(test)); test.loop = g_main_loop_new(NULL, FALSE); - ipc_remote_obj = gbinder_ipc_new(DEV_PRIV); - ipc_obj = gbinder_ipc_new(DEV); - ipc_proxy = gbinder_ipc_new(DEV2); - ipc_remote_proxy = gbinder_ipc_new(DEV2_PRIV); - - fd_remote_obj = gbinder_driver_fd(ipc_remote_obj->driver); - fd_obj = gbinder_driver_fd(ipc_obj->driver); + ipc_proxy = gbinder_ipc_new(DEV); + ipc_obj = gbinder_ipc_new(DEV_PRIV); fd_proxy = gbinder_driver_fd(ipc_proxy->driver); - fd_remote_proxy = gbinder_driver_fd(ipc_remote_proxy->driver); - - obj = gbinder_local_object_new(ipc_remote_obj, TEST_IFACES, test_obj_cb, &test); - GDEBUG("obj %p", obj); - remote_obj = gbinder_remote_object_new(ipc_obj, + fd_obj = gbinder_driver_fd(ipc_obj->driver); + obj = gbinder_local_object_new(ipc_obj, TEST_IFACES, test_obj_cb, &test); + obj2 = gbinder_local_object_new(ipc_obj, TEST_IFACES2, test_obj2_cb, &test); + remote_obj = gbinder_remote_object_new(ipc_proxy, test_binder_register_object(fd_obj, obj, AUTO_HANDLE), REMOTE_OBJECT_CREATE_ALIVE); - /* remote_proxy(DEV2_PRIV) => proxy (DEV) => obj(DEV2_PRIV) / + / remote_proxy(DEV_PRIV) => proxy (DEV) => obj (DEV) => DEV_PRIV / + g_assert(!gbinder_proxy_object_new(NULL, remote_obj)); g_assert((proxy = gbinder_proxy_object_new(ipc_proxy, remote_obj))); - GDEBUG("proxy %p", proxy); - remote_proxy = gbinder_remote_object_new(ipc_remote_proxy, + remote_proxy = gbinder_remote_object_new(ipc_obj, test_binder_register_object(fd_proxy, &proxy->parent, AUTO_HANDLE), REMOTE_OBJECT_CREATE_ALIVE); proxy_client = gbinder_client_new(remote_proxy, TEST_IFACE); - test_binder_set_passthrough(fd_remote_obj, TRUE); test_binder_set_passthrough(fd_obj, TRUE); test_binder_set_passthrough(fd_proxy, TRUE); - test_binder_set_passthrough(fd_remote_proxy, TRUE); - - test_binder_set_looper_enabled(fd_remote_obj, TEST_LOOPER_ENABLE); test_binder_set_looper_enabled(fd_obj, TEST_LOOPER_ENABLE); test_binder_set_looper_enabled(fd_proxy, TEST_LOOPER_ENABLE); - test_binder_set_looper_enabled(fd_remote_proxy, TEST_LOOPER_ENABLE); / Pass object reference via proxy / - obj2 = gbinder_local_object_new(ipc_remote_proxy, TEST_IFACES2, test_obj2_cb, &test); - GDEBUG("obj2 %p", obj2); req = gbinder_client_new_request(proxy_client); gbinder_local_request_append_int32(req, TX_PARAM1); gbinder_local_request_append_local_object(req, obj2); @@ -661,24 +646,19 @@ g_assert(test.obj_call_finished); g_assert(test.obj2_call_handled); g_assert(test.obj2_call_finished); - g_assert(test.obj2); - gbinder_local_object_unref(test.obj2); + g_assert(test.tmp_proxy); + gbinder_local_object_unref(test.tmp_proxy); - test_binder_unregister_objects(fd_remote_obj); test_binder_unregister_objects(fd_obj); test_binder_unregister_objects(fd_proxy); - test_binder_unregister_objects(fd_remote_proxy); - gbinder_local_object_drop(obj); gbinder_local_object_drop(obj2); gbinder_local_object_drop(&proxy->parent); gbinder_remote_object_unref(remote_obj); gbinder_remote_object_unref(remote_proxy); gbinder_client_unref(proxy_client); - gbinder_ipc_unref(ipc_remote_obj); gbinder_ipc_unref(ipc_obj); gbinder_ipc_unref(ipc_proxy); - gbinder_ipc_unref(ipc_remote_proxy); gbinder_ipc_exit(); test_binder_exit_wait(&test_opt, test.loop); test_config_deinit(&config); @@ -701,9 +681,6 @@ int main(int argc, char argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_("null"), test_null); g_test_add_func(TEST_("basic"), test_basic);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_reader/unit_reader.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2021 Jolla Ltd. - * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2020 Jolla Ltd. + * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -66,27 +66,6 @@ G_STATIC_ASSERT(sizeof(BinderObject64) == BUFFER_OBJECT_SIZE_64); /========================================================================== - * null - ==========================================================================/ - -static -void -test_null( - void) -{ - GBinderReader reader; - - /* NULL const pointers are tolerated / - g_assert(gbinder_reader_at_end(NULL)); - g_assert(!gbinder_reader_bytes_read(NULL)); - g_assert(!gbinder_reader_bytes_remaining(NULL)); - g_assert(!gbinder_reader_get_data(NULL, NULL)); - - gbinder_reader_copy(&reader, NULL); - g_assert(gbinder_reader_at_end(&reader)); -} - -/==========================================================================* * empty ==========================================================================/ @@ -97,19 +76,14 @@ { GBinderReader reader; gsize count = 1, elemsize = 1; - gsize size = 1; + gsize len; gbinder_reader_init(&reader, NULL, 0, 0); g_assert(gbinder_reader_at_end(&reader)); - g_assert(!gbinder_reader_get_data(&reader, NULL)); - g_assert(!gbinder_reader_get_data(&reader, &size)); - g_assert(!size); g_assert(!gbinder_reader_bytes_read(&reader)); g_assert(!gbinder_reader_bytes_remaining(&reader)); g_assert(!gbinder_reader_read_byte(&reader, NULL)); g_assert(!gbinder_reader_read_bool(&reader, NULL)); - g_assert(!gbinder_reader_read_int8(&reader, NULL)); - g_assert(!gbinder_reader_read_int16(&reader, NULL)); g_assert(!gbinder_reader_read_int32(&reader, NULL)); g_assert(!gbinder_reader_read_uint32(&reader, NULL)); g_assert(!gbinder_reader_read_int64(&reader, NULL)); @@ -133,7 +107,7 @@ g_assert(!gbinder_reader_read_string8(&reader)); g_assert(!gbinder_reader_read_string16(&reader)); g_assert(!gbinder_reader_skip_string16(&reader)); - g_assert(!gbinder_reader_read_byte_array(&reader, &size)); + g_assert(!gbinder_reader_read_byte_array(&reader, &len)); } /========================================================================== @@ -178,8 +152,8 @@ test_bool( void) { - const guint8 in_true[] = { TEST_INT8_BYTES_4(TRUE) }; - const guint8 in_false[] = { TEST_INT8_BYTES_4(FALSE) }; + const guint8 in_true[4] = { 0x01, 0xff, 0xff, 0xff }; + const guint8 in_false[4] = { 0x00, 0xff, 0xff, 0xff }; gboolean out = FALSE; GBinderDriver* driver = gbinder_driver_new(GBINDER_DEFAULT_BINDER, NULL); GBinderReader reader; @@ -219,108 +193,6 @@ } /========================================================================== - * int8 - ==========================================================================/ - -static -void -test_int8( - void) -{ - const guint8 in = 42; - const guint8 in4[] = { TEST_INT8_BYTES_4(42) }; - guint8 out1 = 0; - gint8 out2 = 0; - GBinderDriver* driver = gbinder_driver_new(GBINDER_DEFAULT_BINDER, NULL); - GBinderReader reader; - GBinderReaderData data; - - g_assert(driver); - memset(&data, 0, sizeof(data)); - - /* Not enough data / - data.buffer = gbinder_buffer_new(driver, g_memdup(&in, sizeof(in)), - sizeof(in), NULL); - - gbinder_reader_init(&reader, &data, 0, sizeof(in)); - g_assert(!gbinder_reader_read_uint8(&reader, &out1)); - g_assert(!gbinder_reader_at_end(&reader)); - gbinder_buffer_free(data.buffer); - - / Enough data / - data.buffer = gbinder_buffer_new(driver, g_memdup(in4, sizeof(in4)), - sizeof(in4), NULL); - - gbinder_reader_init(&reader, &data, 0, sizeof(in4)); - g_assert(gbinder_reader_read_uint8(&reader, &out1)); - g_assert(gbinder_reader_at_end(&reader)); - g_assert_cmpuint(in, == ,out1); - - gbinder_reader_init(&reader, &data, 0, sizeof(in4)); - g_assert(gbinder_reader_read_int8(&reader, &out2)); - g_assert(gbinder_reader_at_end(&reader)); - g_assert_cmpint(in, == ,out2); - - gbinder_reader_init(&reader, &data, 0, sizeof(in4)); - g_assert(gbinder_reader_read_int8(&reader, NULL)); - g_assert(gbinder_reader_at_end(&reader)); - - gbinder_buffer_free(data.buffer); - gbinder_driver_unref(driver); -} - -/==========================================================================* - * int16 - ==========================================================================/ - -static -void -test_int16( - void) -{ - const guint16 in = 42; - const guint8 in4[] = { TEST_INT16_BYTES_4(42) }; - guint16 out1 = 0; - gint16 out2 = 0; - GBinderDriver* driver = gbinder_driver_new(GBINDER_DEFAULT_BINDER, NULL); - GBinderReader reader; - GBinderReaderData data; - - g_assert(driver); - memset(&data, 0, sizeof(data)); - - /* Not enough data / - data.buffer = gbinder_buffer_new(driver, g_memdup(&in, sizeof(in)), - sizeof(in), NULL); - - gbinder_reader_init(&reader, &data, 0, sizeof(in)); - g_assert(!gbinder_reader_read_uint16(&reader, &out1)); - g_assert(!gbinder_reader_at_end(&reader)); - gbinder_buffer_free(data.buffer); - - / Enough data / - data.buffer = gbinder_buffer_new(driver, g_memdup(in4, sizeof(in4)), - sizeof(in4), NULL); - - gbinder_reader_init(&reader, &data, 0, sizeof(in4)); - g_assert(gbinder_reader_read_uint16(&reader, &out1)); - g_assert(gbinder_reader_at_end(&reader)); - g_assert_cmpuint(in, == ,out1); - - gbinder_reader_init(&reader, &data, 0, sizeof(in4)); - g_assert(gbinder_reader_read_int16(&reader, &out2)); - g_assert(gbinder_reader_at_end(&reader)); - g_assert_cmpint(in, == ,out2); - - gbinder_reader_init(&reader, &data, 0, sizeof(in4)); - g_assert(gbinder_reader_read_int16(&reader, NULL)); - g_assert(gbinder_reader_at_end(&reader)); - - gbinder_buffer_free(data.buffer); - gbinder_driver_unref(driver); -} - -/==========================================================================* * int32 ==========================================================================/ @@ -1992,6 +1864,7 @@ TEST_INT64_BYTES(2), TEST_INT64_BYTES(sizeof(GBinderHidlString) + GBINDER_HIDL_STRING_BUFFER_OFFSET) + }; static const char* const result[] = { str1, str2, NULL }; @@ -2117,6 +1990,7 @@ TEST_INT64_BYTES(sizeof(str2)), TEST_INT64_BYTES(2), TEST_INT64_BYTES(GBINDER_HIDL_STRING_BUFFER_OFFSET) +
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_remote_object/unit_remote_object.c ^
@@ -148,9 +148,6 @@ int main(int argc, char* argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_PREFIX "null", test_null); g_test_add_func(TEST_PREFIX "basic", test_basic);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_servicemanager/unit_servicemanager.c ^
@@ -386,17 +386,8 @@ GType gbinder_servicemanager_aidl2_get_type() { - /* Dummy function to avoid pulling in gbinder_servicemanager_aidl2 / - g_assert_not_reached(); - return 0; -} - -GType -gbinder_servicemanager_aidl3_get_type() -{ - / Dummy function to avoid pulling in gbinder_servicemanager_aidl3 / - g_assert_not_reached(); - return 0; + / Avoid pulling in gbinder_servicemanager_aidl2 object / + return TEST_TYPE_DEFSERVICEMANAGER; } /==========================================================================* @@ -412,7 +403,6 @@ g_assert(!gbinder_servicemanager_new_with_type(0, NULL)); g_assert(!gbinder_servicemanager_new_local_object(NULL, NULL, NULL, NULL)); g_assert(!gbinder_servicemanager_ref(NULL)); - g_assert(!gbinder_servicemanager_device(NULL)); g_assert(!gbinder_servicemanager_is_present(NULL)); g_assert(!gbinder_servicemanager_wait(NULL, 0)); g_assert(!gbinder_servicemanager_list(NULL, NULL, NULL)); @@ -497,7 +487,6 @@ obj = gbinder_servicemanager_new_local_object(sm, "foo.bar", test_transact_func, NULL); g_assert(obj); - g_assert_cmpstr(gbinder_servicemanager_device(sm), == ,dev); gbinder_local_object_unref(obj); g_assert(gbinder_servicemanager_ref(sm) == sm); @@ -1201,9 +1190,6 @@ int main(int argc, char* argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_("null"), test_null); g_test_add_func(TEST_("invalid"), test_invalid);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_servicemanager_aidl/unit_servicemanager_aidl.c ^
@@ -50,24 +50,14 @@ GType gbinder_servicemanager_hidl_get_type() { - /* Dummy function to avoid pulling in gbinder_servicemanager_hidl / - g_assert_not_reached(); + / Avoid pulling in gbinder_servicemanager_hidl object / return 0; } GType gbinder_servicemanager_aidl2_get_type() { - / Dummy function to avoid pulling in gbinder_servicemanager_aidl2 / - g_assert_not_reached(); - return 0; -} - -GType -gbinder_servicemanager_aidl3_get_type() -{ - / Dummy function to avoid pulling in gbinder_servicemanager_aidl3 / - g_assert_not_reached(); + / Avoid pulling in gbinder_servicemanager_aidl2 object / return 0; } @@ -605,9 +595,6 @@ int main(int argc, char argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_("get"), test_get); g_test_add_func(TEST_("list"), test_list);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_servicemanager_aidl2/unit_servicemanager_aidl2.c ^
@@ -53,8 +53,7 @@ GType gbinder_servicemanager_hidl_get_type() { - /* Dummy function to avoid pulling in gbinder_servicemanager_hidl / - g_assert_not_reached(); + / Avoid pulling in gbinder_servicemanager_hidl object / return 0; } @@ -436,9 +435,6 @@ int main(int argc, char argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_("get"), test_get); g_test_add_func(TEST_("list"), test_list);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_servicemanager_hidl/unit_servicemanager_hidl.c ^
@@ -61,24 +61,14 @@ GType gbinder_servicemanager_aidl_get_type() { - /* Dummy function to avoid pulling in gbinder_servicemanager_aidl / - g_assert_not_reached(); + / Avoid pulling in gbinder_servicemanager_aidl object / return 0; } GType gbinder_servicemanager_aidl2_get_type() { - / Dummy function to avoid pulling in gbinder_servicemanager_aidl2 / - g_assert_not_reached(); - return 0; -} - -GType -gbinder_servicemanager_aidl3_get_type() -{ - / Dummy function to avoid pulling in gbinder_servicemanager_aidl3 / - g_assert_not_reached(); + / Avoid pulling in gbinder_servicemanager_aidl2 object / return 0; } @@ -474,9 +464,6 @@ int main(int argc, char argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_("get"), test_get); g_test_add_func(TEST_("list"), test_list);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_servicename/unit_servicename.c ^
@@ -235,12 +235,6 @@ } GType -gbinder_servicemanager_aidl3_get_type() -{ - return TEST_TYPE_SERVICEMANAGER; -} - -GType gbinder_servicemanager_hidl_get_type() { return TEST_TYPE_SERVICEMANAGER; @@ -526,9 +520,6 @@ int main(int argc, char* argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_("null"), test_null); g_test_add_func(TEST_("basic"), test_basic);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_servicepoll/unit_servicepoll.c ^
@@ -201,12 +201,6 @@ } GType -gbinder_servicemanager_aidl3_get_type() -{ - return TEST_TYPE_SERVICEMANAGER; -} - -GType gbinder_servicemanager_hidl_get_type() { return TEST_TYPE_SERVICEMANAGER; @@ -483,9 +477,6 @@ int main(int argc, char* argv[]) { - G_GNUC_BEGIN_IGNORE_DEPRECATIONS; - g_type_init(); - G_GNUC_END_IGNORE_DEPRECATIONS; g_test_init(&argc, &argv, NULL); g_test_add_func(TEST_("null"), test_null); g_test_add_func(TEST_("basic"), test_basic);
[-] [+]	Changed	_service:tar_git:libgbinder-1.1.10.tar.bz2/unit/unit_writer/unit_writer.c ^
@@ -1,6 +1,6 @@ /* - * Copyright (C) 2018-2021 Jolla Ltd. - * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com> + * Copyright (C) 2018-2020 Jolla Ltd. + * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com> * * You may use this file under the terms of BSD license as follows: * @@ -32,17 +32,14 @@ #include "test_common.h" -#include "gbinder_fmq_p.h" #include "gbinder_local_request_p.h" #include "gbinder_output_data.h" #include "gbinder_writer_p.h" #include "gbinder_io.h" #include <gutil_intarray.h> -#include <gutil_log.h> #include <unistd.h> -#include <errno.h> static TestOpt test_opt; @@ -61,13 +58,8 @@ void) { GBinderWriter writer; - gsize size = 1; gbinder_local_request_init_writer(NULL, &writer); - gbinder_writer_append_int8(NULL, 0); - gbinder_writer_append_int8(&writer, 0); - gbinder_writer_append_int16(NULL, 0); - gbinder_writer_append_int16(&writer, 0); gbinder_writer_append_int32(NULL, 0); gbinder_writer_append_int32(&writer, 0); gbinder_writer_append_int64(NULL, 0); @@ -92,7 +84,6 @@ gbinder_writer_append_bytes(&writer, NULL, 0); gbinder_writer_append_hidl_vec(NULL, NULL, 0, 0); gbinder_writer_append_hidl_string(NULL, NULL); - gbinder_writer_append_hidl_string_copy(NULL, NULL); gbinder_writer_append_hidl_string(&writer, NULL); gbinder_writer_append_hidl_string_vec(NULL, NULL, 0); gbinder_writer_append_hidl_string_vec(&writer, NULL, 0); @@ -110,23 +101,12 @@ gbinder_writer_add_cleanup(NULL, g_free, 0); gbinder_writer_overwrite_int32(NULL, 0, 0); -#if GBINDER_FMQ_SUPPORTED - gbinder_writer_append_fmq_descriptor(NULL, NULL); - gbinder_writer_append_fmq_descriptor(&writer, NULL); -#endif - - g_assert(!gbinder_writer_bytes_written(NULL)); - g_assert(!gbinder_writer_get_data(NULL, NULL)); - g_assert(!gbinder_writer_get_data(NULL, &size)); - g_assert_cmpuint(size, ==, 0); g_assert(!gbinder_output_data_offsets(NULL)); g_assert(!gbinder_output_data_buffers_size(NULL)); g_assert(!gbinder_writer_malloc(NULL, 0)); g_assert(!gbinder_writer_malloc0(NULL, 0)); g_assert(!gbinder_writer_memdup(&writer, NULL, 0)); g_assert(!gbinder_writer_memdup(NULL, &writer, 0)); - g_assert(!gbinder_writer_strdup(&writer, NULL)); - g_assert(!gbinder_writer_strdup(NULL, "")); } /========================================================================== @@ -148,78 +128,20 @@ { GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL); GBinderWriter writer; - const int value = 42; - const char* str = "foo"; int cleanup_count = 0; + int value = 42; int* zero; int* copy; - char* scopy; gbinder_local_request_init_writer(req, &writer); zero = gbinder_writer_new0(&writer, int); copy = gbinder_writer_memdup(&writer, &value, sizeof(value)); - scopy = gbinder_writer_strdup(&writer, str); - g_assert_cmpint(zero, == ,0); - g_assert_cmpint(copy, == ,value); - g_assert_cmpstr(scopy, == ,str); + g_assert(zero == 0); + g_assert(copy == value); gbinder_writer_add_cleanup(&writer, test_cleanup_fn, &cleanup_count); gbinder_writer_add_cleanup(&writer, test_cleanup_fn, &cleanup_count); gbinder_local_request_unref(req); - g_assert_cmpint(cleanup_count, == ,2); -} - -/========================================================================== - * int8 - ==========================================================================/ - -static -void -test_int8( - void) -{ - const char encoded[] = { - TEST_INT8_BYTES_4(0x80) - }; - GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL); - GBinderOutputData* data; - GBinderWriter writer; - - gbinder_local_request_init_writer(req, &writer); - gbinder_writer_append_int8(&writer, 0x80); - - data = gbinder_local_request_data(req); - g_assert(!gbinder_output_data_offsets(data)); - g_assert(!gbinder_output_data_buffers_size(data)); - g_assert_cmpuint(data->bytes->len, == ,sizeof(encoded)); - g_assert(!memcmp(data->bytes->data, encoded, data->bytes->len)); - gbinder_local_request_unref(req); -} - -/========================================================================== - * int16 - ==========================================================================/ - -static -void -test_int16( - void) -{ - const char encoded[] = { - TEST_INT16_BYTES_4(0x80ff) - }; - GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL); - GBinderOutputData* data; - GBinderWriter writer; - - gbinder_local_request_init_writer(req, &writer); - gbinder_writer_append_int16(&writer, 0x80ff); - - data = gbinder_local_request_data(req); - g_assert(!gbinder_output_data_offsets(data)); - g_assert(!gbinder_output_data_buffers_size(data)); - g_assert_cmpuint(data->bytes->len, == ,sizeof(encoded)); - g_assert(!memcmp(data->bytes->data, encoded, data->bytes->len)); - gbinder_local_request_unref(req); + g_assert(cleanup_count == 2); } /========================================================================== @@ -251,11 +173,11 @@ g_assert(!gbinder_output_data_buffers_size(data)); g_assert(data->bytes->len == sizeof(value2)); g_assert(!memcmp(data->bytes->data, &value2, data->bytes->len)); - + // test overlap over the end of the buffer gbinder_writer_overwrite_int32(&writer, 2, value2); g_assert(data->bytes->len == sizeof(value2)); - + gbinder_local_request_unref(req); } @@ -341,9 +263,9 @@ void) { const char encoded[] = { - TEST_INT8_BYTES_4(0), - TEST_INT8_BYTES_4(1), - TEST_INT8_BYTES_4(1) + 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00 }; GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL); GBinderOutputData* data; @@ -629,18 +551,12 @@ { "32/null", &gbinder_io_32, NULL, TEST_ARRAY_AND_COUNT(test_hidl_string_offsets_32), sizeof(GBinderHidlString) }, - { "32/empty", &gbinder_io_32, "", - TEST_ARRAY_AND_COUNT(test_hidl_string_offsets_32), - sizeof(GBinderHidlString) + 8 /* string data aligned at 8 bytes / }, { "32/xxx", &gbinder_io_32, "xxx", TEST_ARRAY_AND_COUNT(test_hidl_string_offsets_32), sizeof(GBinderHidlString) + 8 / string data aligned at 8 bytes / }, { "64/null", &gbinder_io_64, NULL, TEST_ARRAY_AND_COUNT(test_hidl_string_offsets_64), sizeof(GBinderHidlString) }, - { "64/empty", &gbinder_io_64, "", - TEST_ARRAY_AND_COUNT(test_hidl_string_offsets_64), - sizeof(GBinderHidlString) + 8 / string data aligned at 8 bytes */ }, { "64/xxxxxxx", &gbinder_io_64, "xxxxxxx",
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/include/gbinder_fmq.h ^
@@ -1,154 +0,0 @@ -/* - * Copyright (C) 2021 Jolla Ltd. - * - * You may use this file under the terms of BSD license as follows: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - / - -#ifndef GBINDER_FMQ_H -#define GBINDER_FMQ_H - -#include <gbinder_types.h> - -G_BEGIN_DECLS - -/ Since 1.1.14 / - -typedef enum gbinder_fmq_type { - GBINDER_FMQ_TYPE_SYNC_READ_WRITE = 1, - GBINDER_FMQ_TYPE_UNSYNC_WRITE -} GBINDER_FMQ_TYPE; - -typedef enum gbinder_fmq_flags { - GBINDER_FMQ_FLAG_CONFIGURE_EVENT_FLAG = 0x1, - GBINDER_FMQ_FLAG_NO_RESET_POINTERS = 0x2 -} GBINDER_FMQ_FLAGS; - -GBinderFmq -gbinder_fmq_new( - gsize item_size, - gsize max_num_items, - GBINDER_FMQ_TYPE type, - GBINDER_FMQ_FLAGS flags, - gint fd, - gsize buffer_size); - -GBinderFmq* -gbinder_fmq_ref( - GBinderFmq* fmq); - -void -gbinder_fmq_unref( - GBinderFmq* fmq); - -/* Functions for checking how many items are available in queue / -gsize -gbinder_fmq_available_to_read( - GBinderFmq fmq); - -gsize -gbinder_fmq_available_to_write( - GBinderFmq* fmq); - -gsize -gbinder_fmq_available_to_read_contiguous( - GBinderFmq* fmq); - -gsize -gbinder_fmq_available_to_write_contiguous( - GBinderFmq* fmq); - -/* Functions for obtaining data pointer for zero copy read/write / -const void -gbinder_fmq_begin_read( - GBinderFmq* fmq, - gsize items); - -void* -gbinder_fmq_begin_write( - GBinderFmq* fmq, - gsize items); - -/* Functions for ending zero copy read/write - * The number of items must match the value provided to gbinder_fmq_begin_read - * or gbinder_fmq_begin_write / -void -gbinder_fmq_end_read( - GBinderFmq fmq, - gsize items); - -void -gbinder_fmq_end_write( - GBinderFmq* fmq, - gsize items); - -/* Regular read/write functions (non-zero-copy) / -gboolean -gbinder_fmq_read( - GBinderFmq fmq, - void* data, - gsize items); - -gboolean -gbinder_fmq_write( - GBinderFmq* fmq, - const void* data, - gsize items); - -/* - * Functions for waiting and waking message queue. - * Requires configured event flag in message queue. - / -int -gbinder_fmq_wait_timeout( - GBinderFmq fmq, - guint32 bit_mask, - guint32* state, - int timeout_ms); - -#define gbinder_fmq_try_wait(fmq, mask, state) \ - gbinder_fmq_wait_timeout(fmq, mask, state, 0) - -#define gbinder_fmq_wait(fmq, mask, state) \ - gbinder_fmq_wait_timeout(fmq, mask, state, -1) - -int -gbinder_fmq_wake( - GBinderFmq* fmq, - guint32 bit_mask); - -G_END_DECLS - -#endif /* GBINDER_FMQ_H / - -/ - * Local Variables: - * mode: C - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/src/gbinder_fmq.c ^
@@ -1,699 +0,0 @@ -/* - * Copyright (C) 2021 Jolla Ltd. - * - * You may use this file under the terms of BSD license as follows: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - / - -#include "gbinder_fmq_p.h" -#include "gbinder_log.h" - -#include <gutil_macros.h> - -#include <errno.h> -#include <fcntl.h> -#include <linux/futex.h> -#include <stdint.h> -#include <sys/mman.h> -#include <unistd.h> - -#if GBINDER_FMQ_SUPPORTED - -/ Grantor data positions / -enum { - READ_PTR_POS = 0, - WRITE_PTR_POS, - DATA_PTR_POS, - EVENT_FLAG_PTR_POS -}; - -typedef struct gbinder_fmq { - GBinderMQDescriptor desc; - guint8* ring; - guint64* read_ptr; - guint64* write_ptr; - guint32* event_flag_ptr; - guint32 refcount; -} GBinderFmq; - -GBINDER_INLINE_FUNC -GBinderFmqGrantorDescriptor* -gbinder_fmq_get_grantor_descriptor( - GBinderFmq* self, - gint index) -{ - return (GBinderFmqGrantorDescriptor)(self->desc->grantors.data.ptr) + - index; -} - -static -gsize -gbinder_fmq_available_to_read_bytes( - GBinderFmq self, - gboolean contiguous) -{ - const guint64 read_ptr = __atomic_load_n(self->read_ptr, __ATOMIC_ACQUIRE); - const gsize available_total = __atomic_load_n(self->write_ptr, - __ATOMIC_ACQUIRE) - read_ptr; - - if (contiguous) { - /* - * The number of bytes that can be read contiguously from - * read offset without wrapping around the ring buffer. - / - const gsize size = gbinder_fmq_get_grantor_descriptor(self, - DATA_PTR_POS)->extent; - const gsize available_contiguous = size - (read_ptr % size); - - return (available_contiguous < available_total) ? - available_contiguous : available_total; - } else { - return available_total; - } -} - -static -gsize -gbinder_fmq_available_to_write_bytes( - GBinderFmq self, - gboolean contiguous) -{ - const guint32 size = gbinder_fmq_get_grantor_descriptor(self, - DATA_PTR_POS)->extent; - const gsize available_total = size - - gbinder_fmq_available_to_read_bytes(self, FALSE); - - if (contiguous) { - /* - * The number of bytes that can be written contiguously starting from - * write_offset without wrapping around the ring buffer. - / - const guint64 write_ptr = __atomic_load_n(self->write_ptr, - __ATOMIC_RELAXED); - const gsize available_contiguous = size - (write_ptr % size); - - return (available_contiguous < available_total) ? - available_contiguous : available_total; - } else { - return available_total; - } -} - -static -GBinderFmqGrantorDescriptor -gbinder_fmq_create_grantors( - gsize queue_size_bytes, - gsize num_fds, - gboolean configure_event_flag) -{ - const gsize num_grantors = configure_event_flag ? - (EVENT_FLAG_PTR_POS + 1) : (DATA_PTR_POS + 1); - GBinderFmqGrantorDescriptor* grantors = - g_new0(GBinderFmqGrantorDescriptor, num_grantors); - gsize pos, offset; - gsize mem_sizes[] = { - sizeof(guint64), /* read pointer counter / - sizeof(guint64), / write pointer counter / - queue_size_bytes, / data buffer / - sizeof(guint32) / event flag pointer / - }; - - for (pos = 0, offset = 0; pos < num_grantors; pos++) { - GBinderFmqGrantorDescriptor grantor = grantors + pos; - guint32 grantor_fd_index; - gsize grantor_offset; - - if (pos == DATA_PTR_POS && num_fds == 2) { - grantor_fd_index = 1; - grantor_offset = 0; - } else { - grantor_fd_index = 0; - grantor_offset = offset; - offset += mem_sizes[pos]; - } - grantor->fd_index = grantor_fd_index; - grantor->offset = (guint32)G_ALIGN8(grantor_offset); - grantor->extent = mem_sizes[pos]; - } - return grantors; -} - -static -void* -gbinder_fmq_map_grantor_descriptor( - GBinderFmq* self, - guint32 index) -{ - if (index < self->desc->grantors.count) { - const GBinderFmqGrantorDescriptor* desc = - gbinder_fmq_get_grantor_descriptor(self, index); - /* Offset for mmap must be a multiple of PAGE_SIZE / - const guint32 map_offset = (desc->offset & ~(getpagesize()-1)); - const guint32 map_length = desc->offset - map_offset + desc->extent; - const GBinderFds fds = self->desc->data.fds; - void* address = mmap(0, map_length, PROT_READ \| PROT_WRITE, MAP_SHARED, - gbinder_fds_get_fd(fds, desc->fd_index), map_offset); - - if (address != MAP_FAILED) { - return (guint8)address + (desc->offset - map_offset); - } else { - GWARN("mmap failed: %d", errno); - } - } - return NULL; -} - -static -void -gbinder_fmq_unmap_grantor_descriptor( - GBinderFmq self, - void* address, - guint index) -{ - if (index < self->desc->grantors.count && address) { - const GBinderFmqGrantorDescriptor* desc = - gbinder_fmq_get_grantor_descriptor(self, index);
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/src/gbinder_fmq_p.h ^
@@ -1,102 +0,0 @@ -/* - * Copyright (C) 2021 Jolla Ltd. - * - * You may use this file under the terms of BSD license as follows: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - / - -#ifndef GBINDER_FMQ_PRIVATE_H -#define GBINDER_FMQ_PRIVATE_H - -#include <gbinder_fmq.h> - -#include "gbinder_types_p.h" - -/ FMQ functionality requires __NR_memfd_create syscall / -#include <sys/syscall.h> - -#ifdef __NR_memfd_create -# define GBINDER_FMQ_SUPPORTED 1 -#else -# define GBINDER_FMQ_SUPPORTED 0 -#endif - -/ - * From linux/memfd.h - / -#ifndef MFD_CLOEXEC -# define MFD_CLOEXEC 0x0001U -#endif - -/ - * FMQ types - / -typedef struct gbinder_fmq_grantor_descriptor { - guint32 flags GBINDER_ALIGNED(4); - guint32 fd_index GBINDER_ALIGNED(4); - guint32 offset GBINDER_ALIGNED(4); - guint64 extent GBINDER_ALIGNED(8); -} GBinderFmqGrantorDescriptor; - -G_STATIC_ASSERT(G_STRUCT_OFFSET(GBinderFmqGrantorDescriptor, flags) == 0); -G_STATIC_ASSERT(G_STRUCT_OFFSET(GBinderFmqGrantorDescriptor, fd_index) == 4); -G_STATIC_ASSERT(G_STRUCT_OFFSET(GBinderFmqGrantorDescriptor, offset) == 8); -G_STATIC_ASSERT(G_STRUCT_OFFSET(GBinderFmqGrantorDescriptor, extent) == 16); -G_STATIC_ASSERT(sizeof(GBinderFmqGrantorDescriptor) == 24); - -typedef struct gbinder_mq_descriptor { - GBinderHidlVec grantors; - union { - guint64 value; - const GBinderFds fds; - } data; - guint32 quantum; - guint32 flags; -} GBinderMQDescriptor; - -#define GBINDER_MQ_DESCRIPTOR_GRANTORS_OFFSET (0) -#define GBINDER_MQ_DESCRIPTOR_FDS_OFFSET (16) -G_STATIC_ASSERT(G_STRUCT_OFFSET(GBinderMQDescriptor, grantors) == - GBINDER_MQ_DESCRIPTOR_GRANTORS_OFFSET); -G_STATIC_ASSERT(G_STRUCT_OFFSET(GBinderMQDescriptor, data) == - GBINDER_MQ_DESCRIPTOR_FDS_OFFSET); -G_STATIC_ASSERT(sizeof(GBinderMQDescriptor) == 32); - -GBinderMQDescriptor* -gbinder_fmq_get_descriptor( - const GBinderFmq* self) - GBINDER_INTERNAL; - -#endif /* GBINDER_FMQ_PRIVATE_H / - -/ - * Local Variables: - * mode: C - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/src/gbinder_servicemanager_aidl3.c ^
@@ -1,176 +0,0 @@ -/* - * Copyright (C) 2021 Jolla Ltd. - * Copyright (C) 2021 Slava Monich <slava.monich@jolla.com> - * Copyright (C) 2021 Gary Wang <gary.wang@canonical.com> - * Copyright (C) 2021 Madhushan Nishantha <jlmadushan@gmail.com> - * - * You may use this file under the terms of BSD license as follows: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - / - -#include "gbinder_servicemanager_aidl.h" -#include "gbinder_client_p.h" -#include "gbinder_reader_p.h" - -#include <gbinder_local_request.h> -#include <gbinder_remote_reply.h> - -/ Variant of AIDL servicemanager appeared in Android 11 (API level 30) / - -typedef GBinderServiceManagerAidl GBinderServiceManagerAidl3; -typedef GBinderServiceManagerAidlClass GBinderServiceManagerAidl3Class; - -G_DEFINE_TYPE(GBinderServiceManagerAidl3, - gbinder_servicemanager_aidl3, - GBINDER_TYPE_SERVICEMANAGER_AIDL) - -#define PARENT_CLASS gbinder_servicemanager_aidl3_parent_class - -enum gbinder_stability_level { - UNDECLARED = 0, - VENDOR = 0b000011, - SYSTEM = 0b001100, - VINTF = 0b111111 -}; - -static -GBinderRemoteObject -gbinder_servicemanager_aidl3_get_service( - GBinderServiceManager* self, - const char* name, - int* status, - const GBinderIpcSyncApi* api) -{ - GBinderClient* client = self->client; - GBinderLocalRequest* req = gbinder_client_new_request(client); - GBinderRemoteObject* obj; - GBinderRemoteReply* reply; - GBinderReader reader; - - gbinder_local_request_append_string16(req, name); - reply = gbinder_client_transact_sync_reply2(client, - CHECK_SERVICE_TRANSACTION, req, status, api); - - gbinder_remote_reply_init_reader(reply, &reader); - gbinder_reader_read_int32(&reader, NULL /* stability /); - obj = gbinder_reader_read_object(&reader); - - gbinder_remote_reply_unref(reply); - gbinder_local_request_unref(req); - return obj; -} - -static -GBinderLocalRequest -gbinder_servicemanager_aidl3_add_service_req( - GBinderClient* client, - const char* name, - GBinderLocalObject* obj) -{ - GBinderLocalRequest* req = gbinder_client_new_request(client); - - gbinder_local_request_append_string16(req, name); - gbinder_local_request_append_local_object(req, obj); - /* - * Starting from Android 11, to add a service, Android framework requires - * an additional field `stability` when reading a strong binder. - / - gbinder_local_request_append_int32(req, SYSTEM); - gbinder_local_request_append_int32(req, 0); - gbinder_local_request_append_int32(req, DUMP_FLAG_PRIORITY_DEFAULT); - return req; -} - -static -char* -gbinder_servicemanager_aidl3_list( - GBinderServiceManager* manager, - const GBinderIpcSyncApi* api) -{ - GPtrArray* list = g_ptr_array_new(); - GBinderClient* client = manager->client; - GBinderRemoteReply* reply; - GBinderLocalRequest* req = gbinder_client_new_request(client); - - /* - * Starting from Android 11, no `index` field is required but - * only with `dump priority` field to request to list services. - * As a result, a vector of strings which stands for service - * list is given in the binder response. - / - gbinder_local_request_append_int32(req, DUMP_FLAG_PRIORITY_ALL); - reply = gbinder_client_transact_sync_reply2(client, - LIST_SERVICES_TRANSACTION, req, NULL, api); - - if (reply) { - GBinderReader reader; - gint32 count; - - gbinder_remote_reply_init_reader(reply, &reader); - gbinder_reader_read_int32(&reader, NULL / status /); - if (gbinder_reader_read_int32(&reader, &count)) { - int i; - - / Iterate each service name / - for (i = 0; i < count; i++) { - g_ptr_array_add(list, gbinder_reader_read_string16(&reader)); - } - } - gbinder_remote_reply_unref(reply); - } - - gbinder_local_request_unref(req); - g_ptr_array_add(list, NULL); - return (char)g_ptr_array_free(list, FALSE); -} - -static -void -gbinder_servicemanager_aidl3_init( - GBinderServiceManagerAidl3 self) -{ -} - -static -void -gbinder_servicemanager_aidl3_class_init( - GBinderServiceManagerAidl3Class* klass) -{ - GBinderServiceManagerClass* manager = GBINDER_SERVICEMANAGER_CLASS(klass); - - klass->add_service_req = gbinder_servicemanager_aidl3_add_service_req; - manager->list = gbinder_servicemanager_aidl3_list; - manager->get_service = gbinder_servicemanager_aidl3_get_service; -} - -/* - * Local Variables: - * mode: C - * c-basic-offset: 4 - * indent-tabs-mode: nil - * End: - */
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/test/ashmem-test/Makefile ^
@@ -1,140 +0,0 @@ -# -- Mode: makefile-gmake -- - -.PHONY: all debug release clean cleaner -.PHONY: libgbinder-release libgbinder-debug - -# -# Required packages -# - -PKGS = glib-2.0 gio-2.0 gio-unix-2.0 libglibutil - -# -# Default target -# - -all: debug release - -# -# Executable -# - -EXE = ashmem-test - -# -# Sources -# - -SRC = $(EXE).c - -# -# Directories -# - -SRC_DIR = . -BUILD_DIR = build -LIB_DIR = ../.. -DEBUG_BUILD_DIR = $(BUILD_DIR)/debug -RELEASE_BUILD_DIR = $(BUILD_DIR)/release - -# -# Tools and flags -# - -CC ?= $(CROSS_COMPILE)gcc -LD = $(CC) -WARNINGS = -Wall -INCLUDES = -I$(LIB_DIR)/include -BASE_FLAGS = -fPIC -CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \ - $(shell pkg-config --cflags $(PKGS)) -LDFLAGS = $(BASE_FLAGS) $(shell pkg-config --libs $(PKGS)) -QUIET_MAKE = make --no-print-directory -DEBUG_FLAGS = -g -RELEASE_FLAGS = - -ifndef KEEP_SYMBOLS -KEEP_SYMBOLS = 0 -endif - -ifneq ($(KEEP_SYMBOLS),0) -RELEASE_FLAGS += -g -SUBMAKE_OPTS += KEEP_SYMBOLS=1 -endif - -DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS) -RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS) -DEBUG_CFLAGS = $(CFLAGS) $(DEBUG_FLAGS) -DDEBUG -RELEASE_CFLAGS = $(CFLAGS) $(RELEASE_FLAGS) -O2 - -# -# Files -# - -DEBUG_OBJS = $(SRC:%.c=$(DEBUG_BUILD_DIR)/%.o) -RELEASE_OBJS = $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o) -DEBUG_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_so) -RELEASE_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_so) -DEBUG_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_link) -RELEASE_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_link) -DEBUG_SO = $(LIB_DIR)/$(DEBUG_SO_FILE) -RELEASE_SO = $(LIB_DIR)/$(RELEASE_SO_FILE) - -# -# Dependencies -# - -DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d) -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(DEPS)),) --include $(DEPS) -endif -endif - -$(DEBUG_OBJS): \| $(DEBUG_BUILD_DIR) -$(RELEASE_OBJS): \| $(RELEASE_BUILD_DIR) - -# -# Rules -# - -DEBUG_EXE = $(DEBUG_BUILD_DIR)/$(EXE) -RELEASE_EXE = $(RELEASE_BUILD_DIR)/$(EXE) - -debug: libgbinder-debug $(DEBUG_EXE) - -release: libgbinder-release $(RELEASE_EXE) - -clean: - rm -f *~ - rm -fr $(BUILD_DIR) - -cleaner: clean - @make -C $(LIB_DIR) clean - -$(DEBUG_BUILD_DIR): - mkdir -p $@ - -$(RELEASE_BUILD_DIR): - mkdir -p $@ - -$(DEBUG_BUILD_DIR)/%.o : $(SRC_DIR)/%.c - $(CC) -c $(DEBUG_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@ - -$(RELEASE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c - $(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@ - -$(DEBUG_EXE): $(DEBUG_SO) $(DEBUG_BUILD_DIR) $(DEBUG_OBJS) - $(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) $< -o $@ - -$(RELEASE_EXE): $(RELEASE_SO) $(RELEASE_BUILD_DIR) $(RELEASE_OBJS) - $(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) $< -o $@ -ifeq ($(KEEP_SYMBOLS),0) - strip $@ -endif - -libgbinder-debug: - @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(DEBUG_SO_FILE) $(DEBUG_LINK_FILE) - -libgbinder-release: - @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE)
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/test/ashmem-test/ashmem-test.c ^
@@ -1,260 +0,0 @@ -/* - * Copyright (C) 2021 Jolla Ltd. - * Copyright (C) 2021 Slava Monich <slava.monich@jolla.com> - * - * You may use this file under the terms of BSD license as follows: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - / - -#include <gbinder.h> - -#include <gutil_misc.h> -#include <gutil_log.h> - -#include <sys/mman.h> - -#define RET_OK (0) -#define RET_NOTFOUND (1) -#define RET_INVARG (2) -#define RET_ERR (3) - -#define DEFAULT_BINDER GBINDER_DEFAULT_HWBINDER -#define ALLOCATOR_IFACE "android.hidl.allocator@1.0::IAllocator" -#define DEFAULT_FQNAME ALLOCATOR_IFACE "/ashmem" -#define TX_ALLOCATE GBINDER_FIRST_CALL_TRANSACTION - -typedef struct app_options { - const char fqname; - char* dev; - gsize size; -} AppOptions; - -static -void -app_dumpmem( - const GBinderHidlMemory* mem) -{ - const GBinderFds* fds = mem->data.fds; - - GDEBUG("Name: %s", mem->name.data.str); - GDEBUG("Size: %" G_GUINT64_FORMAT " bytes", mem->size); - - GASSERT(fds->version == GBINDER_HIDL_FDS_VERSION); - GDEBUG("Contains %u fd(s)", fds->num_fds); - if (fds->num_fds) { - guint i; - - for (i = 0; i < fds->num_fds; i++) { - int fd = gbinder_fds_get_fd(fds, i); - guint8* ptr = mmap(NULL, mem->size, PROT_READ \| PROT_WRITE, - MAP_SHARED, fd, 0); - - if (ptr) { - gsize off = 0; - - GDEBUG("fd %d => %p", fd, ptr); - while (off < mem->size) { - char line[GUTIL_HEXDUMP_BUFSIZE]; - guint n = gutil_hexdump(line, ptr + off, mem->size - off); - - GDEBUG("%04X: %s", (uint) off, line); - off += n; - } - munmap(ptr, mem->size); - } else { - GDEBUG("fd %d", fd); - } - } - } -} - -static -int -app_allocate( - const AppOptions* opt, - GBinderClient* client) -{ - GBinderLocalRequest* request = gbinder_client_new_request(client); - GBinderRemoteReply* reply; - int status, ret; - - gbinder_local_request_append_int64(request, opt->size); - reply = gbinder_client_transact_sync_reply(client, TX_ALLOCATE, - request, &status); - - if (reply) { - GBinderReader reader; - gint32 tx_status; - gboolean success; - - gbinder_remote_reply_init_reader(reply, &reader); - if (gbinder_reader_read_int32(&reader, &tx_status) && - gbinder_reader_read_bool(&reader, &success) && - tx_status == GBINDER_STATUS_OK && - success) { - const GBinderHidlMemory* mem = gbinder_reader_read_hidl_struct - (&reader, GBinderHidlMemory); - - if (mem) { - GINFO("OK"); - app_dumpmem(mem); - } else { - GINFO("OOPS"); - } - } else { - GINFO("FAILED"); - } - ret = RET_OK; - } else { - GERR("Call failed (%d)", status); - ret = RET_ERR; - } - - gbinder_local_request_unref(request); - gbinder_remote_reply_unref(reply); - return ret; -} - -static -int -app_run( - const AppOptions* opt) -{ - int ret = RET_NOTFOUND; - GBinderServiceManager* sm = gbinder_servicemanager_new(opt->dev); - - if (sm) { - int status = 0; - GBinderRemoteObject* remote = gbinder_servicemanager_get_service_sync - (sm, opt->fqname, &status); - - if (remote) { - GBinderClient* client = gbinder_client_new(remote, ALLOCATOR_IFACE); - - ret = app_allocate(opt, client); - gbinder_client_unref(client); - } else { - GERR("%s not found", opt->fqname); - } - gbinder_servicemanager_unref(sm); - } else { - GERR("No servicemanager at %s", opt->dev); - } - return ret; -} - -static -gboolean -app_log_verbose( - const gchar* name, - const gchar* value, - gpointer data, - GError** error) -{ - gutil_log_default.level = GLOG_LEVEL_VERBOSE; - return TRUE; -} - -static -gboolean -app_log_quiet( - const gchar* name, - const gchar* value, - gpointer data, - GError** error) -{ - gutil_log_default.level = GLOG_LEVEL_NONE; - return TRUE; -} - -static -gboolean -app_init( - AppOptions* opt, - int argc, - char* argv[])
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/test/binder-call/Makefile ^
@@ -1,178 +0,0 @@ -# -- Mode: makefile-gmake -- - -.PHONY: all debug release install clean cleaner -.PHONY: libgbinder-release libgbinder-debug - -# -# Required packages -# - -PKGS = glib-2.0 gio-2.0 gio-unix-2.0 libglibutil - -# -# Default target -# - -all: debug release - -# -# Executable -# - -EXE = binder-call - -# -# Sources -# - -SRC = $(EXE).c -GEN_SRC = \ - cmdline.tab.c \ - lex.cmdline.c - -# -# Directories -# - -SRC_DIR = . -BUILD_DIR = build -GEN_DIR = $(BUILD_DIR) -LIB_DIR = ../.. -DEBUG_BUILD_DIR = $(BUILD_DIR)/debug -RELEASE_BUILD_DIR = $(BUILD_DIR)/release - -# -# Tools and flags -# - -CC ?= $(CROSS_COMPILE)gcc -LD = $(CC) -WARNINGS = -Wall -INCLUDES = -I$(LIB_DIR)/include -I$(GEN_DIR) -I$(SRC_DIR) -BASE_FLAGS = -fPIC -CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \ - $(shell pkg-config --cflags $(PKGS)) -LDFLAGS = $(BASE_FLAGS) $(shell pkg-config --libs $(PKGS)) -QUIET_MAKE = make --no-print-directory -DEBUG_FLAGS = -g -RELEASE_FLAGS = - -KEEP_SYMBOLS ?= 0 -ifneq ($(KEEP_SYMBOLS),0) -RELEASE_FLAGS += -g -SUBMAKE_OPTS += KEEP_SYMBOLS=1 -endif - -DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS) -RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS) -DEBUG_CFLAGS = $(CFLAGS) $(DEBUG_FLAGS) -DDEBUG -RELEASE_CFLAGS = $(CFLAGS) $(RELEASE_FLAGS) -O2 - -# -# Files -# - -DEBUG_OBJS = \ - $(GEN_SRC:%.c=$(DEBUG_BUILD_DIR)/%.o) \ - $(SRC:%.c=$(DEBUG_BUILD_DIR)/%.o) -RELEASE_OBJS = \ - $(GEN_SRC:%.c=$(RELEASE_BUILD_DIR)/%.o) \ - $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o) - -DEBUG_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_so) -RELEASE_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_so) -DEBUG_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_link) -RELEASE_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_link) -DEBUG_SO = $(LIB_DIR)/$(DEBUG_SO_FILE) -RELEASE_SO = $(LIB_DIR)/$(RELEASE_SO_FILE) -GEN_FILES = $(GEN_SRC:%=$(GEN_DIR)/%) -.PRECIOUS: $(GEN_FILES) - -# -# Dependencies -# - -DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d) -ifneq ($(MAKECMDGOALS),clean) -ifneq ($(strip $(DEPS)),) --include $(DEPS) -endif -endif - -$(GEN_FILES): \| $(GEN_DIR) -$(DEBUG_OBJS): \| $(DEBUG_BUILD_DIR) -$(RELEASE_OBJS): \| $(RELEASE_BUILD_DIR) - -# -# Rules -# - -DEBUG_EXE = $(DEBUG_BUILD_DIR)/$(EXE) -RELEASE_EXE = $(RELEASE_BUILD_DIR)/$(EXE) - -debug: libgbinder-debug $(DEBUG_EXE) - -release: libgbinder-release $(RELEASE_EXE) - -clean: - rm -f *~ - rm -fr $(BUILD_DIR) - -cleaner: clean - @make -C $(LIB_DIR) clean - -$(DEBUG_BUILD_DIR): - mkdir -p $@ - -$(RELEASE_BUILD_DIR): - mkdir -p $@ - -$(GEN_DIR): - mkdir -p $@ - -$(GEN_DIR)/%.tab.c : $(SRC_DIR)/%.y - bison -pcmdline -bcmdline -d -o $@ $< - -$(GEN_DIR)/lex.%.c : $(SRC_DIR)/%.l - flex -o $@ $< - -$(DEBUG_BUILD_DIR)/%.o : $(GEN_DIR)/%.c - $(CC) -c $(DEBUG_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@ - -$(RELEASE_BUILD_DIR)/%.o : $(GEN_DIR)/%.c - $(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@ - -$(DEBUG_BUILD_DIR)/%.o : $(SRC_DIR)/%.c - $(CC) -c $(DEBUG_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@ - -$(RELEASE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c - $(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@ - -$(DEBUG_EXE): $(DEBUG_SO) $(DEBUG_BUILD_DIR) $(DEBUG_OBJS) - $(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) $< -o $@ - -$(RELEASE_EXE): $(RELEASE_SO) $(RELEASE_BUILD_DIR) $(RELEASE_OBJS) - $(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) $< -o $@ -ifeq ($(KEEP_SYMBOLS),0) - strip $@ -endif - -libgbinder-debug: - @$(MAKE) $(SUBMAKE_OPTS) -C $(LIB_DIR) $(DEBUG_SO_FILE) $(DEBUG_LINK_FILE) - -libgbinder-release: - @$(MAKE) $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE) - -# -# Install -# - -INSTALL = install - -INSTALL_BIN_DIR = $(DESTDIR)/usr/bin - -install: release $(INSTALL_BIN_DIR) - $(INSTALL) -m 755 $(RELEASE_EXE) $(INSTALL_BIN_DIR) - -$(INSTALL_BIN_DIR): - $(INSTALL) -d $@
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/test/binder-call/binder-call.c ^
@@ -1,814 +0,0 @@ -/* - * Copyright (C) 2021 Jolla Ltd. - * Copyright (C) 2021 Franz-Josef Haider <franz.haider@jolla.com> - * - * You may use this file under the terms of BSD license as follows: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - / - -#include <gbinder.h> -#include <gutil_log.h> - -#include <unistd.h> -#include <binder-call.h> -#include <stdlib.h> - -#define RET_OK (0) -#define RET_NOTFOUND (1) -#define RET_INVARG (2) -#define RET_ERR (3) - -#define DEFAULT_DEVICE GBINDER_DEFAULT_BINDER - -#define GBINDER_TRANSACTION(c2,c3,c4) GBINDER_FOURCC('_',c2,c3,c4) -#define GBINDER_INTERFACE_TRANSACTION GBINDER_TRANSACTION('N','T','F') - -static const char pname[] = "binder-call"; - -struct transaction_and_reply ast; - -enum transaction_pass { - COMPUTE_SIZES = 0, - FILL_BUFFERS, - BUILD_TRANSACTION -}; - -enum reply_pass { - PRINT_REPLY = 0, - COMPUTE_SIZES_REPLY -}; - -static -int -go_through_transaction_ast( - App* app, - GList* node_list, - int parent_idx, - void* buf, - enum transaction_pass cur_pass, - int cont_offset) -{ - GList* l; - int offset = cont_offset; - - for (l = node_list; l; l = l->next) { - struct value_info* v = l->data; - - switch(v->type) { - case INT8_TYPE: - if (cur_pass == BUILD_TRANSACTION) GDEBUG("int8"); - if (parent_idx == -1) { - gbinder_writer_append_int32(&app->writer, ((int)v->value)); - } else if (cur_pass == FILL_BUFFERS) { - ((unsigned char)(((char)buf)+offset)) = - ((unsigned char)v->value); - } - offset++; - break; - - case INT32_TYPE: - if (cur_pass == BUILD_TRANSACTION) GDEBUG("int32"); - if (parent_idx == -1) { - gbinder_writer_append_int32(&app->writer, ((int)v->value)); - } else if (cur_pass == FILL_BUFFERS) { - ((int)(((char)buf)+offset)) = ((int)v->value); - } - offset += sizeof(gint32); - break; - - case INT64_TYPE: - if (cur_pass == BUILD_TRANSACTION) GDEBUG("int64"); - if (parent_idx == -1) { - gbinder_writer_append_int64(&app->writer, ((gint64)v->value)); - } else if (cur_pass == FILL_BUFFERS) { - ((gint64)(((char)buf)+offset)) = ((gint64)v->value); - } - offset += sizeof(gint64); - break; - - case FLOAT_TYPE: - if (cur_pass == BUILD_TRANSACTION) GDEBUG("float"); - if (parent_idx == -1) { - gbinder_writer_append_float(&app->writer, ((float)v->value)); - } else if (cur_pass == FILL_BUFFERS) { - ((float)(((char)buf)+offset)) = ((float)v->value); - } - offset += sizeof(float); - break; - case DOUBLE_TYPE: - if (cur_pass == BUILD_TRANSACTION) GDEBUG("double"); - if (parent_idx == -1) { - gbinder_writer_append_double(&app->writer,((double)v->value)); - } else if (cur_pass == FILL_BUFFERS) { - ((double)(((char)buf)+offset)) = ((double)v->value); - } - offset += sizeof(double); - break; - - case STRING8_TYPE: - if (cur_pass == BUILD_TRANSACTION) GDEBUG("string8"); - gbinder_writer_append_string8(&app->writer, v->value); - / offset not incremented since it only makes sense for hidl / - break; - - case STRING16_TYPE: - if (cur_pass == BUILD_TRANSACTION) GDEBUG("string16"); - gbinder_writer_append_string16(&app->writer, v->value); - / offset not incremented since it only makes sense for hidl / - break; - - case HSTRING_TYPE: - if (cur_pass == BUILD_TRANSACTION) GDEBUG("hstring"); - if (parent_idx == -1) { - gbinder_writer_append_hidl_string(&app->writer, v->value); - } else { - GBinderHidlString hidl_str = (GBinderHidlString) - (((char)buf)+offset); - - if (cur_pass == FILL_BUFFERS) { - hidl_str->data.str = v->value; - hidl_str->len = strlen(v->value); - hidl_str->owns_buffer = TRUE; - } else if (cur_pass == BUILD_TRANSACTION) { - GBinderParent p; - - p.index = parent_idx; - p.offset = offset; - gbinder_writer_append_buffer_object_with_parent - (&app->writer, hidl_str->data.str, hidl_str->len+1, &p); - } - } - offset += sizeof(GBinderHidlString); - break; - - case STRUCT_TYPE: - if (cur_pass == BUILD_TRANSACTION) GDEBUG("struct"); - if (!app->opt->aidl) { - if (parent_idx == -1) { - int s = go_through_transaction_ast(app, v->value, 0, - NULL, COMPUTE_SIZES, 0); - void* new_buf = gbinder_writer_malloc(&app->writer, s); - int new_parent_idx; - - go_through_transaction_ast(app, v->value, 0, new_buf, - FILL_BUFFERS, 0); - new_parent_idx = gbinder_writer_append_buffer_object - (&app->writer, new_buf, s); - /* - * if parent_idx == -1 there is no need to update the - * offset, since we are processing the argument list - * and are not inside an argument. - / - go_through_transaction_ast(app, v->value, - new_parent_idx, new_buf, BUILD_TRANSACTION, 0); - } else { - if (cur_pass == FILL_BUFFERS) { - / fill struct mode / - offset += go_through_transaction_ast(app, - v->value, 0, ((char)buf)+offset, cur_pass, 0); - } else if (cur_pass == BUILD_TRANSACTION) { - int s = go_through_transaction_ast(app, - v->value, 0, NULL, COMPUTE_SIZES, 0); - - go_through_transaction_ast(app, v->value, 0, - buf, FILL_BUFFERS, offset); - go_through_transaction_ast(app, v->value, parent_idx,
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/test/binder-call/binder-call.h ^
@@ -1,97 +0,0 @@ -/* - * Copyright (C) 2021 Jolla Ltd. - * - * You may use this file under the terms of BSD license as follows: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - / - -#ifndef BINDER_CALL_H__ -#define BINDER_CALL_H__ - -#include <gbinder.h> - -typedef struct app_options { - char dev; - char* iface; - gboolean oneway; - gboolean aidl; - gint transaction; - int argc; - char** argv; -} AppOptions; - -typedef struct app { - const AppOptions* opt; - GMainLoop* loop; - GBinderServiceManager* sm; - GBinderWriter writer; - GBinderReader reader; - int code; - int rargc; - int ret; -} App; - -enum TYPE_INFO { - INT8_TYPE = 0, - INT32_TYPE, - INT64_TYPE, - FLOAT_TYPE, - DOUBLE_TYPE, - STRING8_TYPE, - STRING16_TYPE, - HSTRING_TYPE, - STRUCT_TYPE, - VECTOR_TYPE -}; - -struct type_info { - enum TYPE_INFO type; - void* data; -}; - -struct value_info { - enum TYPE_INFO type; - void* value; -}; - -struct transaction_and_reply { - GList* tree_transaction; - GList* tree_reply; -}; - -int -cmdline_parse( - App* app); - -int -cmdlinelex( - void* args); - -extern struct transaction_and_reply* ast; - -#endif -
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/test/binder-call/cmdline.l ^
@@ -1,98 +0,0 @@ -D [0-9] -l "l" -L "L" -u "u" -U "U" -h "h" -H "H" -COLON ":" -EIGHT "8" - -INT8_SUFFIX {COLON}{EIGHT} -INT64_SUFFIX [lL] -UTF16_SUFFIX [uU] -HSTRING_SUFFIX [hH] - -%{ -#include <glib.h> -#include "cmdline.tab.h" -#include "binder-call.h" - -#define YY_SKIP_YYWRAP -int cmdlinewrap(App* app); -#undef yywrap -#define yywrap() cmdlinewrap( (App) args ) -#define YY_DECL int cmdlinelex( void args ) - -char* handle_str(char* text) { - // extract str from "str"X - char* str = g_strndup(text + 1, strlen(text) - 3); - return str; -} - -char* handle_str8(char* text) { - // extract str from "str" - char* str = g_strndup(text + 1, strlen(text) - 2); - return str; -} - -%} - -%option never-interactive noinput nounput - -%% -"i8" { return(INT8); } -"i32" { return(INT32); } -"i64" { return(INT64); } -"s8" { return(STRING8); } -"s16" { return(STRING16); } -"float" { return(FLOAT); } -"double" { return(DOUBLE); } -"f" { return(FLOAT); } -"d" { return(DOUBLE); } -"hstr" { return(HSTRING); } -"{" { return('{'); } -"}" { return('}'); } -"[" { return('['); } -"]" { return(']'); } -{D}{INT8_SUFFIX} { cmdlinelval.int8_value = atoi(yytext); return(INT8_VALUE); } -{D}{INT64_SUFFIX} { cmdlinelval.int64_value = atol(yytext); return(INT64_VALUE); } -{D}* { cmdlinelval.int32_value = atoi(yytext); return(INT32_VALUE); } -{D}+"."{D}{INT64_SUFFIX} { cmdlinelval.double_value = atof(yytext); return(DOUBLE_VALUE); } -{D}+"."{D} { cmdlinelval.float_value = atof(yytext); return(FLOAT_VALUE); } -"reply" { return(REPLY); } -\".\"{HSTRING_SUFFIX} { cmdlinelval.hstring_value = handle_str(yytext); return(HSTRING_VALUE); } -\".\"{UTF16_SUFFIX} { cmdlinelval.string16_value = handle_str(yytext); return(STRING16_VALUE); } -\".\" { cmdlinelval.string8_value = handle_str8(yytext); return(STRING8_VALUE); } -" " { / eat / } -. { fprintf(stderr, "Unrecognized character: '%c'\n", yytext[0]); } - -%% - -#include "binder-call.h" - -int cmdlinewrap(App app) -{ - if (YY_CURRENT_BUFFER) { - yy_delete_buffer( YY_CURRENT_BUFFER ); - } - - if (app->rargc == app->opt->argc) { - return 1; - } - - yy_scan_string(app->opt->argv[app->rargc++]); - - return 0; -} - -int cmdline_parse(App* app) { - if (app->opt->argc > app->rargc) { - cmdlinewrap(app); - } else { - return 1; - } - - return cmdlineparse (app); -} -
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/test/binder-call/cmdline.y ^
@@ -1,399 +0,0 @@ -%{ -#include <glib.h> -#include "binder-call.h" - -struct transaction_and_reply* make_transaction_and_reply(GList* transaction, GList* reply); -struct value_info* handle_int8(App* app, int value); -struct value_info* handle_int32(App* app, int value); -struct value_info* handle_int64(App* app, long value); -struct value_info* handle_float(App* app, float value); -struct value_info* handle_double(App* app, double value); -struct value_info* handle_string8(App* app, char* value); -struct value_info* handle_string16(App* app, char* value); -struct value_info* handle_hstring(App* app, char* value); -struct value_info* handle_vector(App* app, GList* values); -struct value_info* handle_struct(App* app, GList* values); - -void cmdlineerror(App* app, char const* s); - -struct type_info* handle_type_int8(App* app); -struct type_info* handle_type_int32(App* app); -struct type_info* handle_type_int64(App* app); -struct type_info* handle_type_float(App* app); -struct type_info* handle_type_double(App* app); -struct type_info* handle_type_string8(App* app); -struct type_info* handle_type_string16(App* app); -struct type_info* handle_type_hstring(App* app); - - -struct type_info* handle_type_vector(App* app, struct type_info* t); -struct type_info* handle_type_struct(App* app, GList* l); - -%} - -%union { - union { - int int8_value; - int int32_value; - long int64_value; - float float_value; - double double_value; - char* string8_value; - char* string16_value; - char* hstring_value; - }; - struct value_info* value; - struct type_info* type; - GList* value_list; - GList* type_list; - GList* struct_type_list; - struct transaction_and_reply* trans_and_reply; -} - -%parse-param { void* args } -%lex-param { void* args } - -%token INT8 INT32 INT64 FLOAT DOUBLE STRING8 STRING16 HSTRING - -%token INT8_VALUE INT32_VALUE INT64_VALUE FLOAT_VALUE DOUBLE_VALUE STRING8_VALUE STRING16_VALUE HSTRING_VALUE -%type <value> values - -%type <value> struct_values -%type <value> vec_values -%type <value> value_specifiers -%type <trans_and_reply> translation_unit - -%type <value_list> values_list -%type <type_list> specifiers_list - -%type <type> specifiers -%type <type> type_specifier -%type <type> vec_specifier -%type <type> struct_specifier -%type <struct_type_list> struct_declaration_list - -%token REPLY - -%start translation_unit -%% - -type_specifier - : INT8 { $$ = handle_type_int8(args); } - \| INT32 { $$ = handle_type_int32(args); } - \| INT64 { $$ = handle_type_int64(args); } - \| STRING8 { $$ = handle_type_string8(args); } - \| STRING16 { $$ = handle_type_string16(args); } - \| FLOAT { $$ = handle_type_float(args); } - \| DOUBLE { $$ = handle_type_double(args); } - \| HSTRING { $$ = handle_type_hstring(args); } - ; - -values - : INT8_VALUE { $$ = handle_int8(args, cmdlinelval.int8_value); } - \| INT32_VALUE { $$ = handle_int32(args, cmdlinelval.int32_value); } - \| INT64_VALUE { $$ = handle_int64(args, cmdlinelval.int64_value); } - \| STRING8_VALUE { $$ = handle_string8(args, cmdlinelval.string8_value); } - \| STRING16_VALUE { $$ = handle_string16(args, cmdlinelval.string16_value); } - \| HSTRING_VALUE { $$ = handle_hstring(args, cmdlinelval.hstring_value); } - \| FLOAT_VALUE { $$ = handle_float(args, cmdlinelval.float_value); } - \| DOUBLE_VALUE { $$ = handle_double(args, cmdlinelval.double_value); } - ; - -struct - : '{' - ; - -struct_end - : '}' - ; - -vec - : '[' - ; - -vec_end - : ']' - ; - -struct_specifier - : struct struct_declaration_list struct_end { $$ = handle_type_struct(args, $2); } - ; - -vec_specifier - : vec specifiers vec_end { $$ = handle_type_vector(args, $2); } - ; - -struct_declaration_list - : specifiers { $$ = NULL; $$ = g_list_append($$, $1); } - \| struct_declaration_list specifiers { $$ = g_list_append($$, $2); } - ; - -specifiers - : type_specifier - \| struct_specifier - \| vec_specifier - ; - -specifiers_list - : specifiers { $$ = NULL; $$ = g_list_append($$, $1); } - \| specifiers_list specifiers { $$ = g_list_append($$, $2); } - ; - -struct_values - : struct values_list struct_end { $$ = handle_struct(args, $2); } - ; - -vec_values - : vec values_list vec_end { $$ = handle_vector(args, $2); } - ; - -value_specifiers - : values - \| struct_values - \| vec_values - ; - -values_list - : value_specifiers { $$ = NULL; $$ = g_list_append($$, $1); } - \| values_list value_specifiers { $$ = g_list_append($$, $2); } - ; - -reply - : REPLY - ; - -translation_unit - : values_list reply specifiers_list { $$ = make_transaction_and_reply($1, $3); ast = $$; } - \| values_list { $$ = make_transaction_and_reply($1, 0); ast = $$; } - \| reply specifiers_list { $$ = make_transaction_and_reply(0, $2); ast = $$; } - ; - -%% - -#include <stdio.h> -#include <glib.h> -#include <gutil_log.h> -#include <binder-call.h> - -extern char yytext[]; - -struct value_info* handle_int8(App* app, int value) -{ - struct value_info* v = g_new0(struct value_info, 1); - - v->type = INT8_TYPE; - v->value = g_new0(unsigned char, 1); - * ((unsigned char)v->value) = value; - - return v; -} - -struct value_info handle_int32(App* app, int value) -{ - struct value_info* v = g_new0(struct value_info, 1); - - v->type = INT32_TYPE; - v->value = g_new0(int, 1); - * ((int*)v->value) = value; - - return v;
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/unit/unit_fmq/Makefile ^
@@ -1,5 +0,0 @@ -# -- Mode: makefile-gmake -- - -EXE = unit_fmq - -include ../common/Makefile
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/unit/unit_fmq/unit_fmq.c ^
@@ -1,597 +0,0 @@ -/* - * Copyright (C) 2018-2021 Jolla Ltd. - * - * You may use this file under the terms of BSD license as follows: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - / - -#include "test_common.h" - -#include "gbinder_fmq_p.h" - -#if GBINDER_FMQ_SUPPORTED - -#include "gbinder_log.h" - -#include <errno.h> -#include <sys/mman.h> -#include <sys/syscall.h> -#include <unistd.h> - -static TestOpt test_opt; - -typedef struct test_fmq_data { - const char name; - gsize item_size; - gsize max_num_items; - gint type; - gint flags; - gint fd; - gsize buffer_size; -} TestFmqData; - -/========================================================================== - * null - ==========================================================================/ - -static const TestFmqData test_fmq_tests_null[] = { - { "wrong_size", 0, 8, - GBINDER_FMQ_TYPE_SYNC_READ_WRITE, 0, -1, 0 }, - { "wrong_count", sizeof(guint32), 0, - GBINDER_FMQ_TYPE_SYNC_READ_WRITE, 0, -1, 0 }, - { "wrong_buffer_size", sizeof(guint32), 8, - GBINDER_FMQ_TYPE_SYNC_READ_WRITE, 0, 1, 0 }, -}; - -static -void -test_null( - gconstpointer test_data) -{ - const TestFmqData* test = test_data; - GBinderFmq* fmq = gbinder_fmq_new(test->item_size, test->max_num_items, - test->type, test->flags, test->fd, test->buffer_size); - - g_assert(!fmq); - g_assert(!gbinder_fmq_ref(fmq)); - gbinder_fmq_unref(fmq); - - g_assert(gbinder_fmq_available_to_read(fmq) == 0); - g_assert(gbinder_fmq_available_to_write(fmq) == 0); - g_assert(gbinder_fmq_available_to_read_contiguous(fmq) == 0); - g_assert(gbinder_fmq_available_to_write_contiguous(fmq) == 0); - - g_assert(!gbinder_fmq_begin_read(fmq, 1)); - g_assert(!gbinder_fmq_begin_read((GBinderFmq)0x1, 0)); - g_assert(!gbinder_fmq_begin_write(fmq, 1)); - g_assert(!gbinder_fmq_begin_write((GBinderFmq)0x1, 0)); - - g_assert(!gbinder_fmq_read(fmq, (void)0x1, 1)); - g_assert(!gbinder_fmq_read((GBinderFmq)0x1, NULL, 1)); - g_assert(!gbinder_fmq_read((GBinderFmq)0x1, (void)0x1, 0)); - - g_assert(!gbinder_fmq_write(fmq, (const void)0x1, 1)); - g_assert(!gbinder_fmq_write((GBinderFmq)0x1, NULL, 1)); - g_assert(!gbinder_fmq_write((GBinderFmq)0x1, (const void)0x1, 0)); - - g_assert(gbinder_fmq_wait_timeout(fmq, 0, (guint32)0x1, 0) == -EINVAL); - g_assert(gbinder_fmq_wait_timeout((GBinderFmq)0x1, 0, NULL, 0) == -EINVAL); - g_assert(gbinder_fmq_wait(fmq, 0, (guint32)0x1) == -EINVAL); - g_assert(gbinder_fmq_wait((GBinderFmq)0x1, 0, NULL) == -EINVAL); - g_assert(gbinder_fmq_wake(fmq, 0) == -EINVAL); -} - -/========================================================================== - * read/write guint8 - ==========================================================================/ - -static const TestFmqData test_fmq_tests_read_write_guint8[] = { - { "event_flag", sizeof(guint8), 8, GBINDER_FMQ_TYPE_SYNC_READ_WRITE, - GBINDER_FMQ_FLAG_CONFIGURE_EVENT_FLAG, -1, 0 }, - { "no_event_flag", sizeof(guint8), 8, GBINDER_FMQ_TYPE_SYNC_READ_WRITE, - 0, -1, 0 }, - { "no_reset", sizeof(guint8), 8, GBINDER_FMQ_TYPE_SYNC_READ_WRITE, - GBINDER_FMQ_FLAG_CONFIGURE_EVENT_FLAG \| - GBINDER_FMQ_FLAG_NO_RESET_POINTERS, -1, 0 }, - { "unsync", sizeof(guint8), 8, GBINDER_FMQ_TYPE_UNSYNC_WRITE, - GBINDER_FMQ_FLAG_CONFIGURE_EVENT_FLAG, -1, 0 }, - { "unsync_no_reset", sizeof(guint8), 8, GBINDER_FMQ_TYPE_UNSYNC_WRITE, - GBINDER_FMQ_FLAG_CONFIGURE_EVENT_FLAG \| - GBINDER_FMQ_FLAG_NO_RESET_POINTERS, -1, 0 }, -}; - -static -void -test_read_write_guint8( - gconstpointer test_data) -{ - const TestFmqData* test = test_data; - guint i; - guint8 in_data[test->max_num_items]; - guint8 out_data[test->max_num_items]; - GBinderFmq* fmq = gbinder_fmq_new(test->item_size, test->max_num_items, - test->type, test->flags, test->fd, test->buffer_size); - - g_assert(fmq); - - /* Intiailize input data with random numbers / - for (i = 0; i < test->max_num_items; ++i) { - in_data[i] = g_random_int() % G_MAXUINT8; - } - memset(out_data, 0, test->max_num_items); - - / Write data one value at a time / - for (i = 0; i < test->max_num_items; ++i) { - g_assert(gbinder_fmq_write(fmq, &in_data[i], 1)); - g_assert(gbinder_fmq_available_to_read(fmq) == i + 1); - } - - / Try to write one item to full buffer - * only sync write fails if buffer is full / - if (test->type == GBINDER_FMQ_TYPE_SYNC_READ_WRITE) { - g_assert(!gbinder_fmq_write(fmq, &in_data[0], 1)); - g_assert(gbinder_fmq_available_to_read(fmq) == test->max_num_items); - } - - / Read data one value at a time / - for (i = 0; i < test->max_num_items; ++i) { - g_assert(gbinder_fmq_read(fmq, &out_data, 1)); - g_assert(out_data[0] == in_data[i]); - g_assert(gbinder_fmq_available_to_read(fmq) == - test->max_num_items - i - 1); - } - / Try to read when there is no data / - g_assert(!gbinder_fmq_read(fmq, &out_data, 1)); - - memset(out_data, 0, test->max_num_items); - - / Fill whole buffer with data / - g_assert(gbinder_fmq_write(fmq, in_data, test->max_num_items)); - g_assert(gbinder_fmq_available_to_read(fmq) == test->max_num_items); - / Read whole buffer / - g_assert(gbinder_fmq_read(fmq, &out_data, test->max_num_items)); - g_assert(!memcmp(in_data, out_data, test->max_num_items test->item_size)); - - memset(out_data, 0, test->max_num_items); - - /* Try to write too many items / - g_assert(!gbinder_fmq_write(fmq, in_data, test->max_num_items + 1)); - - / Overwrite unsync queue / - if (test->type == GBINDER_FMQ_TYPE_UNSYNC_WRITE) { - g_assert(gbinder_fmq_write(fmq, in_data, test->max_num_items)); - g_assert(gbinder_fmq_write(fmq, in_data, 1)); - / Writing too much data to unsync queue causes read pointer to reset - * on next read / - g_assert(!gbinder_fmq_read(fmq, &out_data, 1)); - g_assert(gbinder_fmq_available_to_read(fmq) == 0); - } - - gbinder_fmq_unref(fmq); -} - -/==========================================================================* - * read/write gint64 - ==========================================================================/
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/unit/unit_servicemanager_aidl3/Makefile ^
@@ -1,5 +0,0 @@ -# -- Mode: makefile-gmake -- - -EXE = unit_servicemanager_aidl3 - -include ../common/Makefile
[-] [+]	Deleted	_service:tar_git:libgbinder-1.1.18+master.20220211181252.1.g59dee39.tar.bz2/unit/unit_servicemanager_aidl3/unit_servicemanager_aidl3.c ^
@@ -1,473 +0,0 @@ -/* - * Copyright (C) 2020-2021 Jolla Ltd. - * Copyright (C) 2020-2021 Slava Monich <slava.monich@jolla.com> - * - * You may use this file under the terms of BSD license as follows: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the names of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - / - -#include "test_binder.h" - -#include "gbinder_driver.h" -#include "gbinder_config.h" -#include "gbinder_ipc.h" -#include "gbinder_reader.h" -#include "gbinder_servicemanager_p.h" -#include "gbinder_rpc_protocol.h" -#include "gbinder_local_object_p.h" -#include "gbinder_local_reply.h" -#include "gbinder_remote_request.h" -#include "gbinder_remote_object.h" -#include "gbinder_writer.h" - -#include <gutil_strv.h> -#include <gutil_log.h> - -static TestOpt test_opt; -static const char TMP_DIR_TEMPLATE[] = - "gbinder-test-servicemanager_aidl3-XXXXXX"; - -enum gbinder_stability_level { - UNDECLARED = 0, - VENDOR = 0b000011, - SYSTEM = 0b001100, - VINTF = 0b111111 -}; - -GType -gbinder_servicemanager_hidl_get_type() -{ - / Dummy function to avoid pulling in gbinder_servicemanager_hidl / - g_assert_not_reached(); - return 0; -} - -/==========================================================================* - * Test service manager - ==========================================================================/ - -#define SVCMGR_HANDLE (0) -static const char SVCMGR_IFACE[] = "android.os.IServiceManager"; -enum servicemanager_aidl_tx { - GET_SERVICE_TRANSACTION = GBINDER_FIRST_CALL_TRANSACTION, - CHECK_SERVICE_TRANSACTION, - ADD_SERVICE_TRANSACTION, - LIST_SERVICES_TRANSACTION -}; - -const char* const servicemanager_aidl_ifaces[] = { SVCMGR_IFACE, NULL }; - -typedef GBinderLocalObjectClass ServiceManagerAidl3Class; -typedef struct service_manager_aidl3 { - GBinderLocalObject parent; - GHashTable* objects; - gboolean handle_on_looper_thread; -} ServiceManagerAidl3; - -#define SERVICE_MANAGER_AIDL3_TYPE (service_manager_aidl3_get_type()) -#define SERVICE_MANAGER_AIDL3(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \ - SERVICE_MANAGER_AIDL3_TYPE, ServiceManagerAidl3)) -G_DEFINE_TYPE(ServiceManagerAidl3, service_manager_aidl3, \ - GBINDER_TYPE_LOCAL_OBJECT) - -static -GBinderLocalReply* -servicemanager_aidl3_handler( - GBinderLocalObject* obj, - GBinderRemoteRequest* req, - guint code, - guint flags, - int* status, - void* user_data) -{ - ServiceManagerAidl3* self = user_data; - GBinderLocalReply* reply = NULL; - GBinderReader reader; - GBinderRemoteObject* remote_obj; - guint32 allow_isolated, dumpsys_priority; - gint32 stability; - char* str; - - g_assert(!flags); - GDEBUG("%s %u", gbinder_remote_request_interface(req), code); - g_assert_cmpstr(gbinder_remote_request_interface(req), == ,SVCMGR_IFACE); - status = -1; - switch (code) { - case GET_SERVICE_TRANSACTION: - case CHECK_SERVICE_TRANSACTION: - gbinder_remote_request_init_reader(req, &reader); - str = gbinder_reader_read_string16(&reader); - if (str) { - reply = gbinder_local_object_new_reply(obj); - remote_obj = g_hash_table_lookup(self->objects, str); - if (remote_obj) { - GBinderWriter writer; - - GDEBUG("Found name '%s' => %p", str, remote_obj); - gbinder_local_reply_init_writer(reply, &writer); - gbinder_writer_append_int32(&writer, UNDECLARED); - gbinder_writer_append_remote_object(&writer, remote_obj); - } else { - GDEBUG("Name '%s' not found", str); - gbinder_local_reply_append_int32(reply, GBINDER_STATUS_OK); - } - g_free(str); - } - break; - case ADD_SERVICE_TRANSACTION: - gbinder_remote_request_init_reader(req, &reader); - str = gbinder_reader_read_string16(&reader); - remote_obj = gbinder_reader_read_object(&reader); - gbinder_reader_read_int32(&reader, &stability); - if (str && remote_obj && stability == 0b001100 && - gbinder_reader_read_uint32(&reader, &allow_isolated) && - gbinder_reader_read_uint32(&reader, &dumpsys_priority)) { - GDEBUG("Adding '%s'", str); - g_hash_table_replace(self->objects, str, remote_obj); - remote_obj = NULL; - str = NULL; - reply = gbinder_local_object_new_reply(obj); - status = GBINDER_STATUS_OK; - } - g_free(str); - gbinder_remote_object_unref(remote_obj); - break; - case LIST_SERVICES_TRANSACTION: - gbinder_remote_request_init_reader(req, &reader); - if (gbinder_reader_read_uint32(&reader, &dumpsys_priority)) { - if (g_hash_table_size(self->objects) == 1) { - GList* keys = g_hash_table_get_keys(self->objects); - GList* l = g_list_nth(keys, 0); - gint32 srv_size = 1; - GBinderWriter writer; - - reply = gbinder_local_object_new_reply(obj); - gbinder_local_reply_init_writer(reply, &writer); - gbinder_writer_append_int32(&writer, GBINDER_STATUS_OK); - gbinder_writer_append_int32(&writer, srv_size); - gbinder_writer_append_string16(&writer, l->data); - g_list_free(keys); - status = GBINDER_STATUS_OK; - } else { - GDEBUG("Incorrect number of services %u", - g_hash_table_size(self->objects)); - } - } - break; - default: - GDEBUG("Unhandled command %u", code); - break; - } - return reply; -} - -static -ServiceManagerAidl3 -servicemanager_aidl3_new( - const char* dev, - gboolean handle_on_looper_thread) -{ - ServiceManagerAidl3* self = g_object_new(SERVICE_MANAGER_AIDL3_TYPE, NULL); - GBinderLocalObject* obj = GBINDER_LOCAL_OBJECT(self); - GBinderIpc* ipc = gbinder_ipc_new(dev); - const int fd = gbinder_driver_fd(ipc->driver); - - self->handle_on_looper_thread = handle_on_looper_thread;