From 74a10b86e021eb3b6977ed6f9042601f08d6903c Mon Sep 17 00:00:00 2001 From: Karol Lewandowski Date: Thu, 31 Mar 2022 13:55:08 +0200 Subject: [PATCH] update-manager: Drop get_result from service This commit reworks service to drop now unusued get_result function, previously used to retrieve upgrade status. Additionally, this commits drops generated code in favor of generating it at build time (this is necessary to drop get_result function prototype too). Change-Id: I74933c745e62f27cd6e57f29ccf81012f4ff1e75 --- CMakeLists.txt | 6 + include/update-manager-dbus.c | 1213 ------------------- include/update-manager-dbus.h | 206 ---- packaging/update-manager.xml | 5 +- src/update_control.c | 58 +- update-manager/common/common-dbus-manager.c | 16 +- update-manager/fota/fota-manager.h | 5 - update-manager/fota/fota-result-sender.c | 41 - update-manager/fota/fota-status-checker.c | 59 - update-manager/main.c | 10 - 10 files changed, 21 insertions(+), 1598 deletions(-) delete mode 100644 include/update-manager-dbus.c delete mode 100644 include/update-manager-dbus.h delete mode 100644 update-manager/fota/fota-result-sender.c delete mode 100644 update-manager/fota/fota-status-checker.c diff --git a/CMakeLists.txt b/CMakeLists.txt index a9183b1..fd517aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,6 +29,12 @@ SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib") +FIND_PROGRAM(GDBUS_CODEGEN NAMES gdbus-codegen) +EXEC_PROGRAM(${GDBUS_CODEGEN} ARGS "\\ + --generate-c-code update-manager-dbus \\ + --output-directory ${CMAKE_SOURCE_DIR}/include \\ + ${CMAKE_SOURCE_DIR}/packaging/update-manager.xml") + FILE(GLOB SOURCES "src/*.h" "src/*.c" "${INC_DIR}/update-manager-*.h" "${INC_DIR}/update-manager-*.c") ADD_LIBRARY(${fw_name} SHARED ${SOURCES}) diff --git a/include/update-manager-dbus.c b/include/update-manager-dbus.c deleted file mode 100644 index 2dc9db8..0000000 --- a/include/update-manager-dbus.c +++ /dev/null @@ -1,1213 +0,0 @@ -/* - * Generated by gdbus-codegen 2.56.4. DO NOT EDIT. - * - * The license of this code is the same as for the D-Bus interface description - * it was derived from. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "update-manager-dbus.h" - -#include -#ifdef G_OS_UNIX -# include -#endif - -typedef struct -{ - GDBusArgInfo parent_struct; - gboolean use_gvariant; -} _ExtendedGDBusArgInfo; - -typedef struct -{ - GDBusMethodInfo parent_struct; - const gchar *signal_name; - gboolean pass_fdlist; -} _ExtendedGDBusMethodInfo; - -typedef struct -{ - GDBusSignalInfo parent_struct; - const gchar *signal_name; -} _ExtendedGDBusSignalInfo; - -typedef struct -{ - GDBusPropertyInfo parent_struct; - const gchar *hyphen_name; - gboolean use_gvariant; -} _ExtendedGDBusPropertyInfo; - -typedef struct -{ - GDBusInterfaceInfo parent_struct; - const gchar *hyphen_name; -} _ExtendedGDBusInterfaceInfo; - -typedef struct -{ - const _ExtendedGDBusPropertyInfo *info; - guint prop_id; - GValue orig_value; /* the value before the change */ -} ChangedProperty; - -static void -_changed_property_free (ChangedProperty *data) -{ - g_value_unset (&data->orig_value); - g_free (data); -} - -static gboolean -_g_strv_equal0 (gchar **a, gchar **b) -{ - gboolean ret = FALSE; - guint n; - if (a == NULL && b == NULL) - { - ret = TRUE; - goto out; - } - if (a == NULL || b == NULL) - goto out; - if (g_strv_length (a) != g_strv_length (b)) - goto out; - for (n = 0; a[n] != NULL; n++) - if (g_strcmp0 (a[n], b[n]) != 0) - goto out; - ret = TRUE; -out: - return ret; -} - -static gboolean -_g_variant_equal0 (GVariant *a, GVariant *b) -{ - gboolean ret = FALSE; - if (a == NULL && b == NULL) - { - ret = TRUE; - goto out; - } - if (a == NULL || b == NULL) - goto out; - ret = g_variant_equal (a, b); -out: - return ret; -} - -G_GNUC_UNUSED static gboolean -_g_value_equal (const GValue *a, const GValue *b) -{ - gboolean ret = FALSE; - g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b)); - switch (G_VALUE_TYPE (a)) - { - case G_TYPE_BOOLEAN: - ret = (g_value_get_boolean (a) == g_value_get_boolean (b)); - break; - case G_TYPE_UCHAR: - ret = (g_value_get_uchar (a) == g_value_get_uchar (b)); - break; - case G_TYPE_INT: - ret = (g_value_get_int (a) == g_value_get_int (b)); - break; - case G_TYPE_UINT: - ret = (g_value_get_uint (a) == g_value_get_uint (b)); - break; - case G_TYPE_INT64: - ret = (g_value_get_int64 (a) == g_value_get_int64 (b)); - break; - case G_TYPE_UINT64: - ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b)); - break; - case G_TYPE_DOUBLE: - { - /* Avoid -Wfloat-equal warnings by doing a direct bit compare */ - gdouble da = g_value_get_double (a); - gdouble db = g_value_get_double (b); - ret = memcmp (&da, &db, sizeof (gdouble)) == 0; - } - break; - case G_TYPE_STRING: - ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0); - break; - case G_TYPE_VARIANT: - ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b)); - break; - default: - if (G_VALUE_TYPE (a) == G_TYPE_STRV) - ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b)); - else - g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a))); - break; - } - return ret; -} - -/* ------------------------------------------------------------------------ - * Code for interface org.tizen.update.manager - * ------------------------------------------------------------------------ - */ - -/** - * SECTION:OrgTizenUpdateManager - * @title: OrgTizenUpdateManager - * @short_description: Generated C code for the org.tizen.update.manager D-Bus interface - * - * This section contains code for working with the org.tizen.update.manager D-Bus interface in C. - */ - -/* ---- Introspection data for org.tizen.update.manager ---- */ - -static const _ExtendedGDBusArgInfo _org_tizen_update_manager_method_info_install_OUT_ARG_status = -{ - { - -1, - (gchar *) "status", - (gchar *) "i", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _org_tizen_update_manager_method_info_install_OUT_ARG_pointers[] = -{ - &_org_tizen_update_manager_method_info_install_OUT_ARG_status, - NULL -}; - -static const _ExtendedGDBusMethodInfo _org_tizen_update_manager_method_info_install = -{ - { - -1, - (gchar *) "install", - NULL, - (GDBusArgInfo **) &_org_tizen_update_manager_method_info_install_OUT_ARG_pointers, - NULL - }, - "handle-install", - FALSE -}; - -static const _ExtendedGDBusArgInfo _org_tizen_update_manager_method_info_result_OUT_ARG_status = -{ - { - -1, - (gchar *) "status", - (gchar *) "i", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _org_tizen_update_manager_method_info_result_OUT_ARG_pointers[] = -{ - &_org_tizen_update_manager_method_info_result_OUT_ARG_status, - NULL -}; - -static const _ExtendedGDBusMethodInfo _org_tizen_update_manager_method_info_result = -{ - { - -1, - (gchar *) "result", - NULL, - (GDBusArgInfo **) &_org_tizen_update_manager_method_info_result_OUT_ARG_pointers, - NULL - }, - "handle-result", - FALSE -}; - -static const _ExtendedGDBusMethodInfo * const _org_tizen_update_manager_method_info_pointers[] = -{ - &_org_tizen_update_manager_method_info_install, - &_org_tizen_update_manager_method_info_result, - NULL -}; - -static const _ExtendedGDBusInterfaceInfo _org_tizen_update_manager_interface_info = -{ - { - -1, - (gchar *) "org.tizen.update.manager", - (GDBusMethodInfo **) &_org_tizen_update_manager_method_info_pointers, - NULL, - NULL, - NULL - }, - "org-tizen-update-manager", -}; - - -/** - * org_tizen_update_manager_interface_info: - * - * Gets a machine-readable description of the org.tizen.update.manager D-Bus interface. - * - * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. - */ -GDBusInterfaceInfo * -org_tizen_update_manager_interface_info (void) -{ - return (GDBusInterfaceInfo *) &_org_tizen_update_manager_interface_info.parent_struct; -} - -/** - * org_tizen_update_manager_override_properties: - * @klass: The class structure for a #GObject derived class. - * @property_id_begin: The property id to assign to the first overridden property. - * - * Overrides all #GObject properties in the #OrgTizenUpdateManager interface for a concrete class. - * The properties are overridden in the order they are defined. - * - * Returns: The last property id. - */ -guint -org_tizen_update_manager_override_properties (GObjectClass *klass, guint property_id_begin) -{ - return property_id_begin - 1; -} - - - -/** - * OrgTizenUpdateManager: - * - * Abstract interface type for the D-Bus interface org.tizen.update.manager. - */ - -/** - * OrgTizenUpdateManagerIface: - * @parent_iface: The parent interface. - * @handle_install: Handler for the #OrgTizenUpdateManager::handle-install signal. - * @handle_result: Handler for the #OrgTizenUpdateManager::handle-result signal. - * - * Virtual table for the D-Bus interface org.tizen.update.manager. - */ - -typedef OrgTizenUpdateManagerIface OrgTizenUpdateManagerInterface; -G_DEFINE_INTERFACE (OrgTizenUpdateManager, org_tizen_update_manager, G_TYPE_OBJECT) - -static void -org_tizen_update_manager_default_init (OrgTizenUpdateManagerIface *iface) -{ - /* GObject signals for incoming D-Bus method calls: */ - /** - * OrgTizenUpdateManager::handle-install: - * @object: A #OrgTizenUpdateManager. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the install() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call org_tizen_update_manager_complete_install() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-install", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (OrgTizenUpdateManagerIface, handle_install), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - - /** - * OrgTizenUpdateManager::handle-result: - * @object: A #OrgTizenUpdateManager. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the result() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call org_tizen_update_manager_complete_result() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-result", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (OrgTizenUpdateManagerIface, handle_result), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - -} - -/** - * org_tizen_update_manager_call_install: - * @proxy: A #OrgTizenUpdateManagerProxy. - * @cancellable: (nullable): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the install() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call org_tizen_update_manager_call_install_finish() to get the result of the operation. - * - * See org_tizen_update_manager_call_install_sync() for the synchronous, blocking version of this method. - */ -void -org_tizen_update_manager_call_install ( - OrgTizenUpdateManager *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "install", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * org_tizen_update_manager_call_install_finish: - * @proxy: A #OrgTizenUpdateManagerProxy. - * @out_status: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to org_tizen_update_manager_call_install(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with org_tizen_update_manager_call_install(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -org_tizen_update_manager_call_install_finish ( - OrgTizenUpdateManager *proxy, - gint *out_status, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(i)", - out_status); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * org_tizen_update_manager_call_install_sync: - * @proxy: A #OrgTizenUpdateManagerProxy. - * @out_status: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (nullable): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the install() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See org_tizen_update_manager_call_install() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -org_tizen_update_manager_call_install_sync ( - OrgTizenUpdateManager *proxy, - gint *out_status, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "install", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(i)", - out_status); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * org_tizen_update_manager_call_result: - * @proxy: A #OrgTizenUpdateManagerProxy. - * @cancellable: (nullable): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the result() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call org_tizen_update_manager_call_result_finish() to get the result of the operation. - * - * See org_tizen_update_manager_call_result_sync() for the synchronous, blocking version of this method. - */ -void -org_tizen_update_manager_call_result ( - OrgTizenUpdateManager *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "result", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * org_tizen_update_manager_call_result_finish: - * @proxy: A #OrgTizenUpdateManagerProxy. - * @out_status: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to org_tizen_update_manager_call_result(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with org_tizen_update_manager_call_result(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -org_tizen_update_manager_call_result_finish ( - OrgTizenUpdateManager *proxy, - gint *out_status, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(i)", - out_status); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * org_tizen_update_manager_call_result_sync: - * @proxy: A #OrgTizenUpdateManagerProxy. - * @out_status: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (nullable): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the result() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See org_tizen_update_manager_call_result() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -org_tizen_update_manager_call_result_sync ( - OrgTizenUpdateManager *proxy, - gint *out_status, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "result", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(i)", - out_status); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * org_tizen_update_manager_complete_install: - * @object: A #OrgTizenUpdateManager. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @status: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the install() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -org_tizen_update_manager_complete_install ( - OrgTizenUpdateManager *object, - GDBusMethodInvocation *invocation, - gint status) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(i)", - status)); -} - -/** - * org_tizen_update_manager_complete_result: - * @object: A #OrgTizenUpdateManager. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @status: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the result() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -org_tizen_update_manager_complete_result ( - OrgTizenUpdateManager *object, - GDBusMethodInvocation *invocation, - gint status) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(i)", - status)); -} - -/* ------------------------------------------------------------------------ */ - -/** - * OrgTizenUpdateManagerProxy: - * - * The #OrgTizenUpdateManagerProxy structure contains only private data and should only be accessed using the provided API. - */ - -/** - * OrgTizenUpdateManagerProxyClass: - * @parent_class: The parent class. - * - * Class structure for #OrgTizenUpdateManagerProxy. - */ - -struct _OrgTizenUpdateManagerProxyPrivate -{ - GData *qdata; -}; - -static void org_tizen_update_manager_proxy_iface_init (OrgTizenUpdateManagerIface *iface); - -#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 -G_DEFINE_TYPE_WITH_CODE (OrgTizenUpdateManagerProxy, org_tizen_update_manager_proxy, G_TYPE_DBUS_PROXY, - G_ADD_PRIVATE (OrgTizenUpdateManagerProxy) - G_IMPLEMENT_INTERFACE (TYPE_ORG_TIZEN_UPDATE_MANAGER, org_tizen_update_manager_proxy_iface_init)) - -#else -G_DEFINE_TYPE_WITH_CODE (OrgTizenUpdateManagerProxy, org_tizen_update_manager_proxy, G_TYPE_DBUS_PROXY, - G_IMPLEMENT_INTERFACE (TYPE_ORG_TIZEN_UPDATE_MANAGER, org_tizen_update_manager_proxy_iface_init)) - -#endif -static void -org_tizen_update_manager_proxy_finalize (GObject *object) -{ - OrgTizenUpdateManagerProxy *proxy = ORG_TIZEN_UPDATE_MANAGER_PROXY (object); - g_datalist_clear (&proxy->priv->qdata); - G_OBJECT_CLASS (org_tizen_update_manager_proxy_parent_class)->finalize (object); -} - -static void -org_tizen_update_manager_proxy_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec G_GNUC_UNUSED) -{ -} - -static void -org_tizen_update_manager_proxy_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec G_GNUC_UNUSED) -{ -} - -static void -org_tizen_update_manager_proxy_g_signal (GDBusProxy *proxy, - const gchar *sender_name G_GNUC_UNUSED, - const gchar *signal_name, - GVariant *parameters) -{ - _ExtendedGDBusSignalInfo *info; - GVariantIter iter; - GVariant *child; - GValue *paramv; - gsize num_params; - gsize n; - guint signal_id; - info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_org_tizen_update_manager_interface_info.parent_struct, signal_name); - if (info == NULL) - return; - num_params = g_variant_n_children (parameters); - paramv = g_new0 (GValue, num_params + 1); - g_value_init (¶mv[0], TYPE_ORG_TIZEN_UPDATE_MANAGER); - g_value_set_object (¶mv[0], proxy); - g_variant_iter_init (&iter, parameters); - n = 1; - while ((child = g_variant_iter_next_value (&iter)) != NULL) - { - _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1]; - if (arg_info->use_gvariant) - { - g_value_init (¶mv[n], G_TYPE_VARIANT); - g_value_set_variant (¶mv[n], child); - n++; - } - else - g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); - g_variant_unref (child); - } - signal_id = g_signal_lookup (info->signal_name, TYPE_ORG_TIZEN_UPDATE_MANAGER); - g_signal_emitv (paramv, signal_id, 0, NULL); - for (n = 0; n < num_params + 1; n++) - g_value_unset (¶mv[n]); - g_free (paramv); -} - -static void -org_tizen_update_manager_proxy_g_properties_changed (GDBusProxy *_proxy, - GVariant *changed_properties, - const gchar *const *invalidated_properties) -{ - OrgTizenUpdateManagerProxy *proxy = ORG_TIZEN_UPDATE_MANAGER_PROXY (_proxy); - guint n; - const gchar *key; - GVariantIter *iter; - _ExtendedGDBusPropertyInfo *info; - g_variant_get (changed_properties, "a{sv}", &iter); - while (g_variant_iter_next (iter, "{&sv}", &key, NULL)) - { - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_org_tizen_update_manager_interface_info.parent_struct, key); - g_datalist_remove_data (&proxy->priv->qdata, key); - if (info != NULL) - g_object_notify (G_OBJECT (proxy), info->hyphen_name); - } - g_variant_iter_free (iter); - for (n = 0; invalidated_properties[n] != NULL; n++) - { - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_org_tizen_update_manager_interface_info.parent_struct, invalidated_properties[n]); - g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]); - if (info != NULL) - g_object_notify (G_OBJECT (proxy), info->hyphen_name); - } -} - -static void -org_tizen_update_manager_proxy_init (OrgTizenUpdateManagerProxy *proxy) -{ -#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 - proxy->priv = org_tizen_update_manager_proxy_get_instance_private (proxy); -#else - proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, TYPE_ORG_TIZEN_UPDATE_MANAGER_PROXY, OrgTizenUpdateManagerProxyPrivate); -#endif - - g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), org_tizen_update_manager_interface_info ()); -} - -static void -org_tizen_update_manager_proxy_class_init (OrgTizenUpdateManagerProxyClass *klass) -{ - GObjectClass *gobject_class; - GDBusProxyClass *proxy_class; - - gobject_class = G_OBJECT_CLASS (klass); - gobject_class->finalize = org_tizen_update_manager_proxy_finalize; - gobject_class->get_property = org_tizen_update_manager_proxy_get_property; - gobject_class->set_property = org_tizen_update_manager_proxy_set_property; - - proxy_class = G_DBUS_PROXY_CLASS (klass); - proxy_class->g_signal = org_tizen_update_manager_proxy_g_signal; - proxy_class->g_properties_changed = org_tizen_update_manager_proxy_g_properties_changed; - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38 - g_type_class_add_private (klass, sizeof (OrgTizenUpdateManagerProxyPrivate)); -#endif -} - -static void -org_tizen_update_manager_proxy_iface_init (OrgTizenUpdateManagerIface *iface) -{ -} - -/** - * org_tizen_update_manager_proxy_new: - * @connection: A #GDBusConnection. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: (nullable): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. - * @object_path: An object path. - * @cancellable: (nullable): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied. - * @user_data: User data to pass to @callback. - * - * Asynchronously creates a proxy for the D-Bus interface org.tizen.update.manager. See g_dbus_proxy_new() for more details. - * - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call org_tizen_update_manager_proxy_new_finish() to get the result of the operation. - * - * See org_tizen_update_manager_proxy_new_sync() for the synchronous, blocking version of this constructor. - */ -void -org_tizen_update_manager_proxy_new ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_async_initable_new_async (TYPE_ORG_TIZEN_UPDATE_MANAGER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.tizen.update.manager", NULL); -} - -/** - * org_tizen_update_manager_proxy_new_finish: - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to org_tizen_update_manager_proxy_new(). - * @error: Return location for error or %NULL - * - * Finishes an operation started with org_tizen_update_manager_proxy_new(). - * - * Returns: (transfer full) (type OrgTizenUpdateManagerProxy): The constructed proxy object or %NULL if @error is set. - */ -OrgTizenUpdateManager * -org_tizen_update_manager_proxy_new_finish ( - GAsyncResult *res, - GError **error) -{ - GObject *ret; - GObject *source_object; - source_object = g_async_result_get_source_object (res); - ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); - g_object_unref (source_object); - if (ret != NULL) - return ORG_TIZEN_UPDATE_MANAGER (ret); - else - return NULL; -} - -/** - * org_tizen_update_manager_proxy_new_sync: - * @connection: A #GDBusConnection. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: (nullable): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. - * @object_path: An object path. - * @cancellable: (nullable): A #GCancellable or %NULL. - * @error: Return location for error or %NULL - * - * Synchronously creates a proxy for the D-Bus interface org.tizen.update.manager. See g_dbus_proxy_new_sync() for more details. - * - * The calling thread is blocked until a reply is received. - * - * See org_tizen_update_manager_proxy_new() for the asynchronous version of this constructor. - * - * Returns: (transfer full) (type OrgTizenUpdateManagerProxy): The constructed proxy object or %NULL if @error is set. - */ -OrgTizenUpdateManager * -org_tizen_update_manager_proxy_new_sync ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error) -{ - GInitable *ret; - ret = g_initable_new (TYPE_ORG_TIZEN_UPDATE_MANAGER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.tizen.update.manager", NULL); - if (ret != NULL) - return ORG_TIZEN_UPDATE_MANAGER (ret); - else - return NULL; -} - - -/** - * org_tizen_update_manager_proxy_new_for_bus: - * @bus_type: A #GBusType. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: A bus name (well-known or unique). - * @object_path: An object path. - * @cancellable: (nullable): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied. - * @user_data: User data to pass to @callback. - * - * Like org_tizen_update_manager_proxy_new() but takes a #GBusType instead of a #GDBusConnection. - * - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call org_tizen_update_manager_proxy_new_for_bus_finish() to get the result of the operation. - * - * See org_tizen_update_manager_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. - */ -void -org_tizen_update_manager_proxy_new_for_bus ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_async_initable_new_async (TYPE_ORG_TIZEN_UPDATE_MANAGER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.tizen.update.manager", NULL); -} - -/** - * org_tizen_update_manager_proxy_new_for_bus_finish: - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to org_tizen_update_manager_proxy_new_for_bus(). - * @error: Return location for error or %NULL - * - * Finishes an operation started with org_tizen_update_manager_proxy_new_for_bus(). - * - * Returns: (transfer full) (type OrgTizenUpdateManagerProxy): The constructed proxy object or %NULL if @error is set. - */ -OrgTizenUpdateManager * -org_tizen_update_manager_proxy_new_for_bus_finish ( - GAsyncResult *res, - GError **error) -{ - GObject *ret; - GObject *source_object; - source_object = g_async_result_get_source_object (res); - ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); - g_object_unref (source_object); - if (ret != NULL) - return ORG_TIZEN_UPDATE_MANAGER (ret); - else - return NULL; -} - -/** - * org_tizen_update_manager_proxy_new_for_bus_sync: - * @bus_type: A #GBusType. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: A bus name (well-known or unique). - * @object_path: An object path. - * @cancellable: (nullable): A #GCancellable or %NULL. - * @error: Return location for error or %NULL - * - * Like org_tizen_update_manager_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. - * - * The calling thread is blocked until a reply is received. - * - * See org_tizen_update_manager_proxy_new_for_bus() for the asynchronous version of this constructor. - * - * Returns: (transfer full) (type OrgTizenUpdateManagerProxy): The constructed proxy object or %NULL if @error is set. - */ -OrgTizenUpdateManager * -org_tizen_update_manager_proxy_new_for_bus_sync ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error) -{ - GInitable *ret; - ret = g_initable_new (TYPE_ORG_TIZEN_UPDATE_MANAGER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.tizen.update.manager", NULL); - if (ret != NULL) - return ORG_TIZEN_UPDATE_MANAGER (ret); - else - return NULL; -} - - -/* ------------------------------------------------------------------------ */ - -/** - * OrgTizenUpdateManagerSkeleton: - * - * The #OrgTizenUpdateManagerSkeleton structure contains only private data and should only be accessed using the provided API. - */ - -/** - * OrgTizenUpdateManagerSkeletonClass: - * @parent_class: The parent class. - * - * Class structure for #OrgTizenUpdateManagerSkeleton. - */ - -struct _OrgTizenUpdateManagerSkeletonPrivate -{ - GValue *properties; - GList *changed_properties; - GSource *changed_properties_idle_source; - GMainContext *context; - GMutex lock; -}; - -static void -_org_tizen_update_manager_skeleton_handle_method_call ( - GDBusConnection *connection G_GNUC_UNUSED, - const gchar *sender G_GNUC_UNUSED, - const gchar *object_path G_GNUC_UNUSED, - const gchar *interface_name, - const gchar *method_name, - GVariant *parameters, - GDBusMethodInvocation *invocation, - gpointer user_data) -{ - OrgTizenUpdateManagerSkeleton *skeleton = ORG_TIZEN_UPDATE_MANAGER_SKELETON (user_data); - _ExtendedGDBusMethodInfo *info; - GVariantIter iter; - GVariant *child; - GValue *paramv; - gsize num_params; - guint num_extra; - gsize n; - guint signal_id; - GValue return_value = G_VALUE_INIT; - info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation); - g_assert (info != NULL); - num_params = g_variant_n_children (parameters); - num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra); - n = 0; - g_value_init (¶mv[n], TYPE_ORG_TIZEN_UPDATE_MANAGER); - g_value_set_object (¶mv[n++], skeleton); - g_value_init (¶mv[n], G_TYPE_DBUS_METHOD_INVOCATION); - g_value_set_object (¶mv[n++], invocation); - if (info->pass_fdlist) - { -#ifdef G_OS_UNIX - g_value_init (¶mv[n], G_TYPE_UNIX_FD_LIST); - g_value_set_object (¶mv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))); -#else - g_assert_not_reached (); -#endif - } - g_variant_iter_init (&iter, parameters); - while ((child = g_variant_iter_next_value (&iter)) != NULL) - { - _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra]; - if (arg_info->use_gvariant) - { - g_value_init (¶mv[n], G_TYPE_VARIANT); - g_value_set_variant (¶mv[n], child); - n++; - } - else - g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); - g_variant_unref (child); - } - signal_id = g_signal_lookup (info->signal_name, TYPE_ORG_TIZEN_UPDATE_MANAGER); - g_value_init (&return_value, G_TYPE_BOOLEAN); - g_signal_emitv (paramv, signal_id, 0, &return_value); - if (!g_value_get_boolean (&return_value)) - g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name); - g_value_unset (&return_value); - for (n = 0; n < num_params + num_extra; n++) - g_value_unset (¶mv[n]); - g_free (paramv); -} - -static GVariant * -_org_tizen_update_manager_skeleton_handle_get_property ( - GDBusConnection *connection G_GNUC_UNUSED, - const gchar *sender G_GNUC_UNUSED, - const gchar *object_path G_GNUC_UNUSED, - const gchar *interface_name G_GNUC_UNUSED, - const gchar *property_name, - GError **error, - gpointer user_data) -{ - OrgTizenUpdateManagerSkeleton *skeleton = ORG_TIZEN_UPDATE_MANAGER_SKELETON (user_data); - GValue value = G_VALUE_INIT; - GParamSpec *pspec; - _ExtendedGDBusPropertyInfo *info; - GVariant *ret; - ret = NULL; - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_org_tizen_update_manager_interface_info.parent_struct, property_name); - g_assert (info != NULL); - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); - if (pspec == NULL) - { - g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); - } - else - { - g_value_init (&value, pspec->value_type); - g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value); - ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature)); - g_value_unset (&value); - } - return ret; -} - -static gboolean -_org_tizen_update_manager_skeleton_handle_set_property ( - GDBusConnection *connection G_GNUC_UNUSED, - const gchar *sender G_GNUC_UNUSED, - const gchar *object_path G_GNUC_UNUSED, - const gchar *interface_name G_GNUC_UNUSED, - const gchar *property_name, - GVariant *variant, - GError **error, - gpointer user_data) -{ - OrgTizenUpdateManagerSkeleton *skeleton = ORG_TIZEN_UPDATE_MANAGER_SKELETON (user_data); - GValue value = G_VALUE_INIT; - GParamSpec *pspec; - _ExtendedGDBusPropertyInfo *info; - gboolean ret; - ret = FALSE; - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_org_tizen_update_manager_interface_info.parent_struct, property_name); - g_assert (info != NULL); - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); - if (pspec == NULL) - { - g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); - } - else - { - if (info->use_gvariant) - g_value_set_variant (&value, variant); - else - g_dbus_gvariant_to_gvalue (variant, &value); - g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value); - g_value_unset (&value); - ret = TRUE; - } - return ret; -} - -static const GDBusInterfaceVTable _org_tizen_update_manager_skeleton_vtable = -{ - _org_tizen_update_manager_skeleton_handle_method_call, - _org_tizen_update_manager_skeleton_handle_get_property, - _org_tizen_update_manager_skeleton_handle_set_property, - {NULL} -}; - -static GDBusInterfaceInfo * -org_tizen_update_manager_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) -{ - return org_tizen_update_manager_interface_info (); -} - -static GDBusInterfaceVTable * -org_tizen_update_manager_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) -{ - return (GDBusInterfaceVTable *) &_org_tizen_update_manager_skeleton_vtable; -} - -static GVariant * -org_tizen_update_manager_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton) -{ - OrgTizenUpdateManagerSkeleton *skeleton = ORG_TIZEN_UPDATE_MANAGER_SKELETON (_skeleton); - - GVariantBuilder builder; - guint n; - g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); - if (_org_tizen_update_manager_interface_info.parent_struct.properties == NULL) - goto out; - for (n = 0; _org_tizen_update_manager_interface_info.parent_struct.properties[n] != NULL; n++) - { - GDBusPropertyInfo *info = _org_tizen_update_manager_interface_info.parent_struct.properties[n]; - if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE) - { - GVariant *value; - value = _org_tizen_update_manager_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.tizen.update.manager", info->name, NULL, skeleton); - if (value != NULL) - { - g_variant_take_ref (value); - g_variant_builder_add (&builder, "{sv}", info->name, value); - g_variant_unref (value); - } - } - } -out: - return g_variant_builder_end (&builder); -} - -static void -org_tizen_update_manager_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton) -{ -} - -static void org_tizen_update_manager_skeleton_iface_init (OrgTizenUpdateManagerIface *iface); -#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 -G_DEFINE_TYPE_WITH_CODE (OrgTizenUpdateManagerSkeleton, org_tizen_update_manager_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, - G_ADD_PRIVATE (OrgTizenUpdateManagerSkeleton) - G_IMPLEMENT_INTERFACE (TYPE_ORG_TIZEN_UPDATE_MANAGER, org_tizen_update_manager_skeleton_iface_init)) - -#else -G_DEFINE_TYPE_WITH_CODE (OrgTizenUpdateManagerSkeleton, org_tizen_update_manager_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, - G_IMPLEMENT_INTERFACE (TYPE_ORG_TIZEN_UPDATE_MANAGER, org_tizen_update_manager_skeleton_iface_init)) - -#endif -static void -org_tizen_update_manager_skeleton_finalize (GObject *object) -{ - OrgTizenUpdateManagerSkeleton *skeleton = ORG_TIZEN_UPDATE_MANAGER_SKELETON (object); - g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free); - if (skeleton->priv->changed_properties_idle_source != NULL) - g_source_destroy (skeleton->priv->changed_properties_idle_source); - g_main_context_unref (skeleton->priv->context); - g_mutex_clear (&skeleton->priv->lock); - G_OBJECT_CLASS (org_tizen_update_manager_skeleton_parent_class)->finalize (object); -} - -static void -org_tizen_update_manager_skeleton_init (OrgTizenUpdateManagerSkeleton *skeleton) -{ -#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 - skeleton->priv = org_tizen_update_manager_skeleton_get_instance_private (skeleton); -#else - skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, TYPE_ORG_TIZEN_UPDATE_MANAGER_SKELETON, OrgTizenUpdateManagerSkeletonPrivate); -#endif - - g_mutex_init (&skeleton->priv->lock); - skeleton->priv->context = g_main_context_ref_thread_default (); -} - -static void -org_tizen_update_manager_skeleton_class_init (OrgTizenUpdateManagerSkeletonClass *klass) -{ - GObjectClass *gobject_class; - GDBusInterfaceSkeletonClass *skeleton_class; - - gobject_class = G_OBJECT_CLASS (klass); - gobject_class->finalize = org_tizen_update_manager_skeleton_finalize; - - skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass); - skeleton_class->get_info = org_tizen_update_manager_skeleton_dbus_interface_get_info; - skeleton_class->get_properties = org_tizen_update_manager_skeleton_dbus_interface_get_properties; - skeleton_class->flush = org_tizen_update_manager_skeleton_dbus_interface_flush; - skeleton_class->get_vtable = org_tizen_update_manager_skeleton_dbus_interface_get_vtable; - -#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38 - g_type_class_add_private (klass, sizeof (OrgTizenUpdateManagerSkeletonPrivate)); -#endif -} - -static void -org_tizen_update_manager_skeleton_iface_init (OrgTizenUpdateManagerIface *iface) -{ -} - -/** - * org_tizen_update_manager_skeleton_new: - * - * Creates a skeleton object for the D-Bus interface org.tizen.update.manager. - * - * Returns: (transfer full) (type OrgTizenUpdateManagerSkeleton): The skeleton object. - */ -OrgTizenUpdateManager * -org_tizen_update_manager_skeleton_new (void) -{ - return ORG_TIZEN_UPDATE_MANAGER (g_object_new (TYPE_ORG_TIZEN_UPDATE_MANAGER_SKELETON, NULL)); -} - diff --git a/include/update-manager-dbus.h b/include/update-manager-dbus.h deleted file mode 100644 index cb3fbc8..0000000 --- a/include/update-manager-dbus.h +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Generated by gdbus-codegen 2.56.4. DO NOT EDIT. - * - * The license of this code is the same as for the D-Bus interface description - * it was derived from. - */ - -#ifndef __UPDATE_MANAGER_DBUS_H__ -#define __UPDATE_MANAGER_DBUS_H__ - -#include - -G_BEGIN_DECLS - - -/* ------------------------------------------------------------------------ */ -/* Declarations for org.tizen.update.manager */ - -#define TYPE_ORG_TIZEN_UPDATE_MANAGER (org_tizen_update_manager_get_type ()) -#define ORG_TIZEN_UPDATE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_ORG_TIZEN_UPDATE_MANAGER, OrgTizenUpdateManager)) -#define IS_ORG_TIZEN_UPDATE_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_ORG_TIZEN_UPDATE_MANAGER)) -#define ORG_TIZEN_UPDATE_MANAGER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TYPE_ORG_TIZEN_UPDATE_MANAGER, OrgTizenUpdateManagerIface)) - -struct _OrgTizenUpdateManager; -typedef struct _OrgTizenUpdateManager OrgTizenUpdateManager; -typedef struct _OrgTizenUpdateManagerIface OrgTizenUpdateManagerIface; - -struct _OrgTizenUpdateManagerIface -{ - GTypeInterface parent_iface; - - gboolean (*handle_install) ( - OrgTizenUpdateManager *object, - GDBusMethodInvocation *invocation); - - gboolean (*handle_result) ( - OrgTizenUpdateManager *object, - GDBusMethodInvocation *invocation); - -}; - -GType org_tizen_update_manager_get_type (void) G_GNUC_CONST; - -GDBusInterfaceInfo *org_tizen_update_manager_interface_info (void); -guint org_tizen_update_manager_override_properties (GObjectClass *klass, guint property_id_begin); - - -/* D-Bus method call completion functions: */ -void org_tizen_update_manager_complete_install ( - OrgTizenUpdateManager *object, - GDBusMethodInvocation *invocation, - gint status); - -void org_tizen_update_manager_complete_result ( - OrgTizenUpdateManager *object, - GDBusMethodInvocation *invocation, - gint status); - - - -/* D-Bus method calls: */ -void org_tizen_update_manager_call_install ( - OrgTizenUpdateManager *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean org_tizen_update_manager_call_install_finish ( - OrgTizenUpdateManager *proxy, - gint *out_status, - GAsyncResult *res, - GError **error); - -gboolean org_tizen_update_manager_call_install_sync ( - OrgTizenUpdateManager *proxy, - gint *out_status, - GCancellable *cancellable, - GError **error); - -void org_tizen_update_manager_call_result ( - OrgTizenUpdateManager *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean org_tizen_update_manager_call_result_finish ( - OrgTizenUpdateManager *proxy, - gint *out_status, - GAsyncResult *res, - GError **error); - -gboolean org_tizen_update_manager_call_result_sync ( - OrgTizenUpdateManager *proxy, - gint *out_status, - GCancellable *cancellable, - GError **error); - - - -/* ---- */ - -#define TYPE_ORG_TIZEN_UPDATE_MANAGER_PROXY (org_tizen_update_manager_proxy_get_type ()) -#define ORG_TIZEN_UPDATE_MANAGER_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_ORG_TIZEN_UPDATE_MANAGER_PROXY, OrgTizenUpdateManagerProxy)) -#define ORG_TIZEN_UPDATE_MANAGER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_ORG_TIZEN_UPDATE_MANAGER_PROXY, OrgTizenUpdateManagerProxyClass)) -#define ORG_TIZEN_UPDATE_MANAGER_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_ORG_TIZEN_UPDATE_MANAGER_PROXY, OrgTizenUpdateManagerProxyClass)) -#define IS_ORG_TIZEN_UPDATE_MANAGER_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_ORG_TIZEN_UPDATE_MANAGER_PROXY)) -#define IS_ORG_TIZEN_UPDATE_MANAGER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_ORG_TIZEN_UPDATE_MANAGER_PROXY)) - -typedef struct _OrgTizenUpdateManagerProxy OrgTizenUpdateManagerProxy; -typedef struct _OrgTizenUpdateManagerProxyClass OrgTizenUpdateManagerProxyClass; -typedef struct _OrgTizenUpdateManagerProxyPrivate OrgTizenUpdateManagerProxyPrivate; - -struct _OrgTizenUpdateManagerProxy -{ - /*< private >*/ - GDBusProxy parent_instance; - OrgTizenUpdateManagerProxyPrivate *priv; -}; - -struct _OrgTizenUpdateManagerProxyClass -{ - GDBusProxyClass parent_class; -}; - -GType org_tizen_update_manager_proxy_get_type (void) G_GNUC_CONST; - -#if GLIB_CHECK_VERSION(2, 44, 0) -G_DEFINE_AUTOPTR_CLEANUP_FUNC (OrgTizenUpdateManagerProxy, g_object_unref) -#endif - -void org_tizen_update_manager_proxy_new ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -OrgTizenUpdateManager *org_tizen_update_manager_proxy_new_finish ( - GAsyncResult *res, - GError **error); -OrgTizenUpdateManager *org_tizen_update_manager_proxy_new_sync ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error); - -void org_tizen_update_manager_proxy_new_for_bus ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -OrgTizenUpdateManager *org_tizen_update_manager_proxy_new_for_bus_finish ( - GAsyncResult *res, - GError **error); -OrgTizenUpdateManager *org_tizen_update_manager_proxy_new_for_bus_sync ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error); - - -/* ---- */ - -#define TYPE_ORG_TIZEN_UPDATE_MANAGER_SKELETON (org_tizen_update_manager_skeleton_get_type ()) -#define ORG_TIZEN_UPDATE_MANAGER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_ORG_TIZEN_UPDATE_MANAGER_SKELETON, OrgTizenUpdateManagerSkeleton)) -#define ORG_TIZEN_UPDATE_MANAGER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_ORG_TIZEN_UPDATE_MANAGER_SKELETON, OrgTizenUpdateManagerSkeletonClass)) -#define ORG_TIZEN_UPDATE_MANAGER_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_ORG_TIZEN_UPDATE_MANAGER_SKELETON, OrgTizenUpdateManagerSkeletonClass)) -#define IS_ORG_TIZEN_UPDATE_MANAGER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_ORG_TIZEN_UPDATE_MANAGER_SKELETON)) -#define IS_ORG_TIZEN_UPDATE_MANAGER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_ORG_TIZEN_UPDATE_MANAGER_SKELETON)) - -typedef struct _OrgTizenUpdateManagerSkeleton OrgTizenUpdateManagerSkeleton; -typedef struct _OrgTizenUpdateManagerSkeletonClass OrgTizenUpdateManagerSkeletonClass; -typedef struct _OrgTizenUpdateManagerSkeletonPrivate OrgTizenUpdateManagerSkeletonPrivate; - -struct _OrgTizenUpdateManagerSkeleton -{ - /*< private >*/ - GDBusInterfaceSkeleton parent_instance; - OrgTizenUpdateManagerSkeletonPrivate *priv; -}; - -struct _OrgTizenUpdateManagerSkeletonClass -{ - GDBusInterfaceSkeletonClass parent_class; -}; - -GType org_tizen_update_manager_skeleton_get_type (void) G_GNUC_CONST; - -#if GLIB_CHECK_VERSION(2, 44, 0) -G_DEFINE_AUTOPTR_CLEANUP_FUNC (OrgTizenUpdateManagerSkeleton, g_object_unref) -#endif - -OrgTizenUpdateManager *org_tizen_update_manager_skeleton_new (void); - - -G_END_DECLS - -#endif /* __UPDATE_MANAGER_DBUS_H__ */ diff --git a/packaging/update-manager.xml b/packaging/update-manager.xml index 345d367..6191c5e 100644 --- a/packaging/update-manager.xml +++ b/packaging/update-manager.xml @@ -4,8 +4,5 @@ - - - - \ No newline at end of file + diff --git a/src/update_control.c b/src/update_control.c index 5879b0c..c348d8f 100644 --- a/src/update_control.c +++ b/src/update_control.c @@ -274,54 +274,22 @@ API int update_control_get_property(update_control_property_e property, void **v int ret = 0; int (*plugin_update_control_get_property)(update_control_property_e, void **) = NULL; - gint status = 0; - GError *error = NULL; - - switch(property) { - case UPDATE_CONTROL_PROPERTY_RESULT: - if (proxy == NULL) { - _E("Not initialized"); - return UPDATE_CONTROL_ERROR_SYSTEM_ERROR; - } - - org_tizen_update_manager_call_result_sync(proxy, &status, NULL, &error); - if (error != NULL) { - _E("Failed to method call to dbus : %s", error->message); - return UPDATE_CONTROL_ERROR_SYSTEM_ERROR; - } - - _I("Success to method call to dbus"); - if (status < 0) { - _E("Failed to get result : %d", status); - return UPDATE_CONTROL_ERROR_INVALID_OPERATION; - } - _I("Success to get result : %d", status); - *value = malloc(sizeof(int)); - if (!*value) { - _E("Failed to allocate memory"); - return UPDATE_CONTROL_ERROR_OUT_OF_MEMORY; - } - - *(int *)(*value) = status; - break; - default: - if (!plugin_handle) { - _E("plugin not opened"); - return UPDATE_CONTROL_ERROR_INVALID_OPERATION; - } + if (!plugin_handle) { + _E("plugin not opened"); + return UPDATE_CONTROL_ERROR_INVALID_OPERATION; + } - plugin_update_control_get_property = dlsym(plugin_handle, "update_control_get_property"); - if (!plugin_update_control_get_property) { - _E("dlsym failed: %s", dlerror()); - return UPDATE_CONTROL_ERROR_INVALID_OPERATION; - } + plugin_update_control_get_property = dlsym(plugin_handle, "update_control_get_property"); + if (!plugin_update_control_get_property) { + _E("dlsym failed: %s", dlerror()); + return UPDATE_CONTROL_ERROR_INVALID_OPERATION; + } - ret = plugin_update_control_get_property(property, value); - if (ret != UPDATE_CONTROL_ERROR_NONE) { - _E("update_control_get_property error: %d", ret); - return ret; - } + ret = plugin_update_control_get_property(property, value); + if (ret != UPDATE_CONTROL_ERROR_NONE) { + _E("update_control_get_property error: %d", ret); + return ret; } return UPDATE_CONTROL_ERROR_NONE; diff --git a/update-manager/common/common-dbus-manager.c b/update-manager/common/common-dbus-manager.c index eacabe0..ea1cd8b 100644 --- a/update-manager/common/common-dbus-manager.c +++ b/update-manager/common/common-dbus-manager.c @@ -37,19 +37,6 @@ static pid_t dbus_get_sender_pid(GDBusMethodInvocation *invocation) return pid; } -gboolean dbus_manager_result(OrgTizenUpdateManager *skeleton, GDBusMethodInvocation *invocation, gpointer user_data) -{ - int ret = 0; - - _FLOGD("Dbus status : result called"); - ret = fota_result_sender_execute(); - if (ret < 0) - _FLOGW("Failed to fetch result with fota : %d", ret); - org_tizen_update_manager_complete_result(skeleton, invocation, ret); - - return TRUE; -} - gboolean dbus_manager_install(OrgTizenUpdateManager *skeleton, GDBusMethodInvocation *invocation, gpointer user_data) { int ret = 0; @@ -75,7 +62,6 @@ void dbus_manager_on_name_acquired(GDBusConnection *connection, const gchar *nam OrgTizenUpdateManager *skeleton = org_tizen_update_manager_skeleton_new(); g_signal_connect(skeleton, "handle-install", G_CALLBACK(dbus_manager_install), NULL); - g_signal_connect(skeleton, "handle-result", G_CALLBACK(dbus_manager_result), NULL); g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(skeleton), connection, DBUS_NODE_NAME, NULL); } @@ -97,4 +83,4 @@ int dbus_manager_fini() g_bus_unown_name(owner_id); return 0; -} \ No newline at end of file +} diff --git a/update-manager/fota/fota-manager.h b/update-manager/fota/fota-manager.h index 0d9608e..cfda138 100644 --- a/update-manager/fota/fota-manager.h +++ b/update-manager/fota/fota-manager.h @@ -47,11 +47,6 @@ int fota_info_checker_fini(void); char *fota_info_get_build_string(void); int fota_installer_execute(pid_t pid); -int fota_result_sender_execute(void); - -int fota_status_checker_init(void); -int fota_status_checker_fini(void); -char *fota_status_get_result(void); void fota_storage_checker_plug(int, const char *); void fota_storage_checker_unplug(int, const char *); diff --git a/update-manager/fota/fota-result-sender.c b/update-manager/fota/fota-result-sender.c deleted file mode 100644 index e5b031f..0000000 --- a/update-manager/fota/fota-result-sender.c +++ /dev/null @@ -1,41 +0,0 @@ -#include "../common/common.h" -#include "fota-manager.h" - -int fota_result_sender_execute() -{ - char *fota_result = NULL; - int len = 0; - - fota_result = fota_status_get_result(); - if (fota_result == NULL) { - _FLOGI("Fota result : Not exist"); - return 4; - } - - len = strlen(fota_result); - _FLOGD("Fota result length : %d", len); - - if (len > 2 && fota_result[0] == 'F') { - if (fota_result[1] == 'D') { - _FLOGI("Fota result : RO failed, %s", fota_result); - return 3; - } - else if (fota_result[1] == 'A') { - _FLOGI("Fota result : RW failed, %s", fota_result); - return 2; - } - } - - if (len > 1 && fota_result[1] != '0') { - _FLOGI("Fota result : RO only success, %s", fota_result); - return 1; - } - - if (len > 1 && fota_result[0] == '0' && fota_result[1] == '0') { - _FLOGI("Fota result : RO/RW success, %s", fota_result); - return 0; - } - - _FLOGW("Unexpected result : %s", fota_result); - return -1; -} diff --git a/update-manager/fota/fota-status-checker.c b/update-manager/fota/fota-status-checker.c deleted file mode 100644 index 9608906..0000000 --- a/update-manager/fota/fota-status-checker.c +++ /dev/null @@ -1,59 +0,0 @@ -#include "../common/common.h" -#include "fota-manager.h" - -#define FOTA_STATUS_RESULT_PATH FOTA_STATUS_DIR "/result" - -static char *fota_result = NULL; - -char *fota_status_get_result() -{ - return fota_result; -} - -int fota_status_checker_init() -{ - int ret = 0; - char buf[MAX_BUFFER_SIZE] = {0, }; - - if (!g_file_test(FOTA_STATUS_RESULT_PATH, G_FILE_TEST_EXISTS)) { - _FLOGI("This boot doesn't have fota result"); - return 0; - } - - ret = util_file_read_single_line(FOTA_STATUS_RESULT_PATH, buf); - if (ret < 0) - return -1; - - fota_result = strndup(buf, strlen(buf)); - if (fota_result == NULL) { - _FLOGE("Failed to strndup value (%s) : %m", buf); - return -1; - } - - _FLOGI("Success to read fota result : %s", fota_result); - if (!g_file_test(FOTA_STATUS_FLAG_PATH, G_FILE_TEST_EXISTS)) { - _FLOGI("This boot isn't triggered with fota"); - return 0; - } - - ret = fota_client_controller_add_event(FOTA_EVENT_REBOOT, fota_result); - if (ret < 0) { - _FLOGE("Failed to add fota client event : %d, idx : %d, value : %s", - ret, FOTA_EVENT_REBOOT, fota_result); - return -1; - } - - ret = util_file_remove(FOTA_STATUS_FLAG_PATH); - if (ret < 0) - return -1; - - return 0; -} - -int fota_status_checker_fini() -{ - if (fota_result) - free(fota_result); - - return 0; -} diff --git a/update-manager/main.c b/update-manager/main.c index 67ab23a..efd1727 100644 --- a/update-manager/main.c +++ b/update-manager/main.c @@ -46,12 +46,6 @@ int main(int argc, char *argv[]) goto main_destroy; } - ret = fota_status_checker_init(); - if (ret < 0) { - _CLOGE("Failed to initialize fota status checker : %d", ret); - goto main_destroy; - } - /* Dbus */ ret = dbus_manager_init(); if (ret < 0) { @@ -85,10 +79,6 @@ main_destroy: if (ret < 0) _CLOGW("Failed to finalize fota info checker : %d", ret); - ret = fota_status_checker_fini(); - if (ret < 0) - _CLOGW("Failed to finalize fota status checker : %d", ret); - /* Dbus */ ret = dbus_manager_fini(); if (ret < 0) -- 2.34.1