Remove system event callbacks except service application lifecycle.
The system event callbacks can be registered using service_app_add_event_handler().
Multiple system event callbacks can be registered.
Change-Id: Ie76dba858f41939c97c0ddd901e8b745bdb08b1d
Signed-off-by: Jiwoong Im <jiwoong.im@samsung.com>
INCLUDE(FindPkgConfig)
#pkg_check_modules(pkg_agent REQUIRED pmapi vconf sensor aul rua dlog x11)
-pkg_check_modules(pkg_agent REQUIRED aul dlog sysman capi-appfw-application vconf)
+pkg_check_modules(pkg_agent REQUIRED aul dlog sysman capi-appfw-application vconf ecore)
FOREACH(flag ${pkg_agent_CFLAGS})
SET(EXTRA_CFLAGS_agent "${EXTRA_CFLAGS_agent} ${flag}")
ENDFOREACH(flag)
int appcore_agent_terminate();
int appcore_agent_set_event_callback(enum appcore_agent_event event,
- int (*cb) (void *), void *data);
+ int (*cb) (void *, void *), void *data);
#ifdef __cplusplus
}
#include <tizen.h>
#include <app_service.h>
+#include <app.h>
#ifdef __cplusplus
/**
- * @brief The structure type to contain the set of callback functions for handling application events.
+ * @brief The structure type containing the set of callback functions for handling application events.
* @details It is one of the input parameters of the service_app_efl_main() function.
*
* @see service_app_main()
* @see service_app_create_cb()
* @see service_app_terminate_cb()
* @see service_app_service_cb()
- * @see service_app_low_memory_cb()
- * @see service_app_low_battery_cb()
*/
typedef struct
{
service_app_create_cb create; /**< This callback function is called at the start of the application. */
- service_app_terminate_cb terminate; /**< This callback function is called once after the main loop of application exits. */
- service_app_service_cb service; /**< This callback function is called when other application send the launch request to the application. */
- service_app_low_memory_cb low_memory; /**< The registered callback function is called when the system runs low on memory. */
- service_app_low_battery_cb low_battery; /**< The registered callback function is called when battery is low. */
-} service_app_event_callback_s;
+ service_app_terminate_cb terminate; /**< This callback function is called once after the main loop of the application exits. */
+ service_app_service_cb service; /**< This callback function is called when another application sends the launch request to the application. */
+} service_app_lifecycle_callback_s;
/**
- * @brief Runs the main loop of application until service_app_exit() is called
+ * @brief Adds the system event handler
*
- * @param [in] argc The argument count
- * @param [in] argv The argument vector
- * @param [in] callback The set of callback functions to handle application events
- * @param [in] user_data The user data to be passed to the callback functions
+ * @param[out] handler The event handler
+ * @param[in] event_type The system event type
+ * @param[in] callback The callback function
+ * @param[in] user_data The user data to be passed to the callback function
*
- * @return 0 on success, otherwise a negative error value.
- * @retval #SERVICE_APP_ERROR_NONE Successful
- * @retval #SERVICE_APP_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #SERVICE_APP_ERROR_INVALID_CONTEXT The application is illegally launched, not launched by the launch system.
- * @retval #SERVICE_APP_ERROR_ALREADY_RUNNING The main loop already starts
+ * @return 0 on success, otherwise a negative error value
+ * @retval #APP_ERROR_NONE Successfull
+ * @retval #APP_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #APP_ERROR_OUT_OF_MEMORY Out of memory
+ *
+ * @see app_event_type_e
+ * @see app_event_cb
+ * @see service_app_remove_event_handler
+ */
+int service_app_add_event_handler(app_event_handler_h *handler, app_event_type_e event_type, app_event_cb callback, void *user_data);
+
+
+/**
+ * @brief Removes registered event handler
+ *
+ * @param[in] event_handler The event handler
+ *
+ * @return 0 on success, otherwise a negative error value
+ * @retval #APP_ERROR_NONE Successfull
+ * @retval #APP_ERROR_INVALID_PARAMETER Invalid parameter
+ *
+ * @see service_app_add_event_handler
+ */
+int service_app_remove_event_handler(app_event_handler_h event_handler);
+
+
+/**
+ * @brief Runs the main loop of the application until service_app_exit() is called.
+ *
+ * @param[in] argc The argument count
+ * @param[in] argv The argument vector
+ * @param[in] callback The set of callback functions to handle application events
+ * @param[in] user_data The user data to be passed to the callback functions
+ *
+ * @return @c 0 on success,
+ * otherwise a negative error value.
+ * @retval #APP_ERROR_NONE Successful
+ * @retval #APP_ERROR_INVALID_PARAMETER Invalid parameter
+ * @retval #APP_ERROR_INVALID_CONTEXT The application is illegally launched, not launched by the launch system.
+ * @retval #APP_ERROR_ALREADY_RUNNING The main loop has already started
*
* @see service_app_create_cb()
* @see service_app_terminate_cb()
* @see service_app_service_cb()
- * @see service_app_low_memory_cb()
- * @see service_app_low_battery_cb()
* @see service_app_exit()
- * @see #service_app_event_callback_s
+ * @see #service_app_lifecycle_callback_s
*/
-int service_app_main(int argc, char **argv, service_app_event_callback_s *callback, void *user_data);
+int service_app_main(int argc, char **argv, service_app_lifecycle_callback_s *callback, void *user_data);
/**
- * @brief Exits the main loop of application.
+ * @brief Exits the main loop of the application.
+ *
+ * @details The main loop of the application stops and service_app_terminate_cb() is invoked.
*
- * @details The main loop of application stops and service_app_terminate_cb() is invoked
* @see service_app_main()
* @see service_app_terminate_cb()
*/
BuildRequires: pkgconfig(aul)
BuildRequires: pkgconfig(capi-appfw-application)
BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(ecore)
BuildRequires: pkgconfig(pmapi)
BuildRequires: pkgconfig(sysman)
BuildRequires: pkgconfig(vconf)
#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>
-#include <glib.h>
+#include <Ecore.h>
#include <sysman.h>
#include "aul.h"
struct agent_ops {
void *data;
- void (*cb_app)(int, void *, bundle *);
+ void (*cb_app)(enum agent_event, void *, bundle *);
};
/**
* Appcore system event operation
*/
struct sys_op {
- int (*func) (void *);
+ int (*func) (void *, void *);
void *data;
};
static struct agent_appcore core;
-GMainLoop *mainloop;
extern int service_create_request(bundle *data, service_h *service);
static int __sys_lowmem_post(void *data, void *evt);
}
};
+
+static void __exit_loop(void *data)
+{
+ ecore_main_loop_quit();
+}
+
static void __do_app(enum agent_event event, void *data, bundle * b)
{
int r = 0;
if (event == AGE_TERMINATE) {
svc->state = AGS_DYING;
- g_main_loop_quit(mainloop);
+ ecore_main_loop_thread_safe_call_sync((Ecore_Data_Cb)__exit_loop, NULL);
return;
}
return 0;
}
-static int __sys_do_default(struct appcore *ac, enum sys_event event)
+static int __sys_do_default(struct agent_appcore *ac, enum sys_event event)
{
int r;
return r;
}
-static int __sys_do(struct agent_appcore *ac, enum sys_event event)
+static int __sys_do(struct agent_appcore *ac, void *event_info, enum sys_event event)
{
struct sys_op *op;
if (op->func == NULL)
return __sys_do_default(ac, event);
- return op->func(op->data);
+ return op->func(event_info, op->data);
}
static int __sys_lowmem_post(void *data, void *evt)
static int __sys_lowmem(void *data, void *evt)
{
- return __sys_do(data, SE_LOWMEM);
+ keynode_t *key = evt;
+ int val;
+
+ val = vconf_keynode_get_int(key);
+
+ if (val >= VCONFKEY_SYSMAN_LOW_MEMORY_SOFT_WARNING)
+ return __sys_do(data, (void *)&val, SE_LOWMEM);
+
+ return 0;
}
static int __sys_lowbatt(void *data, void *evt)
/* VCONFKEY_SYSMAN_BAT_CRITICAL_LOW or VCONFKEY_SYSMAN_POWER_OFF */
if (val <= VCONFKEY_SYSMAN_BAT_CRITICAL_LOW)
- return __sys_do(data, SE_LOWBAT);
+ return __sys_do(data, (void *)&val, SE_LOWBAT);
return 0;
}
}
EXPORT_API int appcore_agent_set_event_callback(enum appcore_agent_event event,
- int (*cb) (void *), void *data)
+ int (*cb) (void *, void *), void *data)
{
struct agent_appcore *ac = &core;
struct sys_op *op;
{
int r;
- if (argc == NULL || argv == NULL) {
+ if (argc <= 0 || argv == NULL) {
errno = EINVAL;
return -1;
}
- g_type_init();
+ ecore_init();
r = appcore_agent_init(&s_ops, argc, argv);
_retv_if(r == -1, -1);
priv.state = AGS_DYING;
if (agent->ops && agent->ops->terminate)
agent->ops->terminate(agent->ops->data);
+ ecore_shutdown();
}
EXPORT_API int appcore_agent_terminate()
{
- g_main_loop_quit(mainloop);
+ ecore_main_loop_thread_safe_call_sync((Ecore_Data_Cb)__exit_loop, NULL);
return 0;
}
return -1;
}
- mainloop = g_main_loop_new(NULL, FALSE);
-
- g_main_loop_run(mainloop);
+ ecore_main_loop_begin();
+ aul_status_update(STATUS_DYING);
__after_loop(&priv);
#include <bundle.h>
#include <aul.h>
#include <dlog.h>
+#include <Eina.h>
#include <appcore-agent.h>
#include <service_app_private.h>
#endif
#define LOG_TAG "TIZEN_N_AGENT"
+#define SERVICE_APP_EVENT_MAX 2
+
+struct app_event_handler {
+ app_event_type_e type;
+ app_event_cb cb;
+ void *data;
+};
+
+struct app_event_info {
+ app_event_type_e type;
+ void *value;
+};
+
typedef enum {
SERVICE_APP_STATE_NOT_RUNNING, // The application has been launched or was running but was terminated
char *package;
char *service_app_name;
service_app_state_e state;
- service_app_event_callback_s *callback;
+ service_app_lifecycle_callback_s *callback;
void *data;
} service_app_context_s;
static int service_app_create(void *data);
static int service_app_terminate(void *data);
static int service_app_reset(service_h service, void *data);
-static int service_app_low_memory(void *data);
-static int service_app_low_battery(void *data);
+static int service_app_low_memory(void *event_info, void *data);
+static int service_app_low_battery(void *event_info, void *data);
static void service_app_set_appcore_event_cb(service_app_context_h service_app_context);
static void service_app_unset_appcore_event_cb(void);
+static Eina_List *handler_list[SERVICE_APP_EVENT_MAX] = {NULL, };
+static int _initialized = 0;
-EXPORT_API int service_app_main(int argc, char **argv, service_app_event_callback_s *callback, void *user_data)
+static void _free_handler_list(void)
+{
+ int i;
+ app_event_handler_h handler;
+
+ for (i = 0; i < SERVICE_APP_EVENT_MAX; i++) {
+ EINA_LIST_FREE(handler_list[i], handler)
+ free(handler);
+ }
+
+ eina_shutdown();
+}
+
+EXPORT_API int service_app_main(int argc, char **argv, service_app_lifecycle_callback_s *callback, void *user_data)
{
service_app_context_s service_app_context = {
.state = SERVICE_APP_STATE_NOT_RUNNING,
.service = service_app_reset,
};
- if (argc == NULL || argv == NULL || callback == NULL)
+ if (argc <= 0 || argv == NULL || callback == NULL)
{
return service_app_error(SERVICE_APP_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
}
appcore_agent_terminate();
}
+EXPORT_API int service_app_add_event_handler(app_event_handler_h *event_handler, app_event_type_e event_type, app_event_cb callback, void *user_data)
+{
+ app_event_handler_h handler;
+ Eina_List *l_itr;
+
+ if (!_initialized) {
+ eina_init();
+ _initialized = 1;
+ }
+
+ if (event_handler == NULL || callback == NULL)
+ return service_app_error(APP_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
+
+ if (event_type < APP_EVENT_LOW_MEMORY || event_type > APP_EVENT_LOW_BATTERY)
+ return service_app_error(APP_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
+
+ EINA_LIST_FOREACH(handler_list[event_type], l_itr, handler) {
+ if (handler->cb == callback)
+ return service_app_error(APP_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
+ }
+
+ handler = calloc(1, sizeof(struct app_event_handler));
+ if (!handler)
+ return service_app_error(APP_ERROR_OUT_OF_MEMORY, __FUNCTION__, NULL);
+
+ handler->type = event_type;
+ handler->cb = callback;
+ handler->data = user_data;
+ handler_list[event_type] = eina_list_append(handler_list[event_type], handler);
+
+ *event_handler = handler;
+
+ return APP_ERROR_NONE;
+}
+
+EXPORT_API int service_app_remove_event_handler(app_event_handler_h event_handler)
+{
+ app_event_handler_h handler;
+ app_event_type_e type;
+ Eina_List *l_itr;
+ Eina_List *l_next;
+
+ if (event_handler == NULL)
+ return service_app_error(APP_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
+
+ if (!_initialized) {
+ LOGI("handler list is not initialzed");
+ return APP_ERROR_NONE;
+ }
+
+ type = event_handler->type;
+ if (type < APP_EVENT_LOW_MEMORY || type > APP_EVENT_LOW_BATTERY)
+ return service_app_error(APP_ERROR_INVALID_PARAMETER, __FUNCTION__, NULL);
+
+ EINA_LIST_FOREACH_SAFE(handler_list[type], l_itr, l_next, handler) {
+ if (handler == event_handler) {
+ free(handler);
+ handler_list[type] = eina_list_remove_list(handler_list[type], l_itr);
+ return APP_ERROR_NONE;
+ }
+ }
+
+ return service_app_error(APP_ERROR_INVALID_PARAMETER, __FUNCTION__, "cannot find such handler");
+}
int service_app_create(void *data)
{
service_app_context_h service_app_context = data;
service_app_create_cb create_cb;
- char locale_dir[TIZEN_PATH_MAX] = {0, };
if (service_app_context == NULL)
{
service_app_unset_appcore_event_cb();
+ if (_initialized)
+ _free_handler_list();
+
return SERVICE_APP_ERROR_NONE;
}
}
-int service_app_low_memory(void *data)
+int service_app_low_memory(void *event_info, void *data)
{
- service_app_context_h service_app_context = data;
- service_app_low_memory_cb low_memory_cb;
+ Eina_List *l;
+ app_event_handler_h handler;
+ struct app_event_info event;
- if (service_app_context == NULL)
- {
- return service_app_error(SERVICE_APP_ERROR_INVALID_CONTEXT, __FUNCTION__, NULL);
- }
+ LOGI("service_app_low_memory");
- low_memory_cb = service_app_context->callback->low_memory;
+ event.type = APP_EVENT_LOW_MEMORY;
+ event.value = event_info;
- if (low_memory_cb != NULL)
- {
- low_memory_cb(service_app_context->data);
+ EINA_LIST_FOREACH(handler_list[APP_EVENT_LOW_MEMORY], l, handler) {
+ handler->cb(&event, handler->data);
}
- return SERVICE_APP_ERROR_NONE;
+ return APP_ERROR_NONE;
}
-int service_app_low_battery(void *data)
+int service_app_low_battery(void *event_info, void *data)
{
- service_app_context_h service_app_context = data;
- service_app_low_battery_cb low_battery_cb;
+ Eina_List *l;
+ app_event_handler_h handler;
+ struct app_event_info event;
- if (service_app_context == NULL)
- {
- return service_app_error(SERVICE_APP_ERROR_INVALID_CONTEXT, __FUNCTION__, NULL);
- }
+ LOGI("service_app_low_battery");
- low_battery_cb = service_app_context->callback->low_battery;
+ event.type = APP_EVENT_LOW_BATTERY;
+ event.value = event_info;
- if (low_battery_cb != NULL)
- {
- low_battery_cb(service_app_context->data);
+ EINA_LIST_FOREACH(handler_list[APP_EVENT_LOW_BATTERY], l, handler) {
+ handler->cb(&event, handler->data);
}
- return SERVICE_APP_ERROR_NONE;
+ return APP_ERROR_NONE;
}
void service_app_set_appcore_event_cb(service_app_context_h service_app_context)
{
- if (service_app_context->callback->low_memory != NULL)
- {
- //appcore_set_event_callback(APPCORE_EVENT_LOW_MEMORY, service_app_appcore_low_memory, service_app_context);
- }
-
- if (service_app_context->callback->low_battery != NULL)
- {
- //appcore_set_event_callback(APPCORE_EVENT_LOW_BATTERY, service_app_appcore_low_battery, service_app_context);
- }
+ appcore_agent_set_event_callback(APPCORE_AGENT_EVENT_LOW_MEMORY, service_app_low_memory, service_app_context);
+ appcore_agent_set_event_callback(APPCORE_AGENT_EVENT_LOW_BATTERY, service_app_low_battery, service_app_context);
}
void service_app_unset_appcore_event_cb(void)
{
- //appcore_set_event_callback(APPCORE_EVENT_LOW_MEMORY, NULL, NULL);
- //appcore_set_event_callback(APPCORE_EVENT_LOW_BATTERY, NULL, NULL);
+ appcore_agent_set_event_callback(APPCORE_AGENT_EVENT_LOW_MEMORY, NULL, NULL);
+ appcore_agent_set_event_callback(APPCORE_AGENT_EVENT_LOW_BATTERY, NULL, NULL);
}
projects / platform / core / appfw / appcore-agent.git / commitdiff