X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fnotifier.c;h=a39d54c7a69a41a19eaf4b45ea049fae99801f7f;hb=refs%2Ftags%2Fupstream%2F1.38;hp=fa32d3ab8ac65243f9452c18a92cd59692ee7567;hpb=6c6403261c2c99a3beb9b2596eee03048a7c6fbf;p=platform%2Fupstream%2Fconnman.git diff --git a/src/notifier.c b/src/notifier.c index fa32d3a..a39d54c 100644 --- a/src/notifier.c +++ b/src/notifier.c @@ -2,7 +2,7 @@ * * Connection Manager * - * Copyright (C) 2007-2010 Intel Corporation. All rights reserved. + * Copyright (C) 2007-2013 Intel Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -32,6 +32,8 @@ static DBusConnection *connection = NULL; static GSList *notifier_list = NULL; static GHashTable *service_hash = NULL; +static const char *notifier_state; + static gint compare_priority(gconstpointer a, gconstpointer b) { const struct connman_notifier *notifier1 = a; @@ -48,11 +50,11 @@ static gint compare_priority(gconstpointer a, gconstpointer b) * * Returns: %0 on success */ -int connman_notifier_register(struct connman_notifier *notifier) +int connman_notifier_register(const struct connman_notifier *notifier) { DBG("notifier %p name %s", notifier, notifier->name); - notifier_list = g_slist_insert_sorted(notifier_list, notifier, + notifier_list = g_slist_insert_sorted(notifier_list, (void*)notifier, compare_priority); return 0; @@ -64,67 +66,75 @@ int connman_notifier_register(struct connman_notifier *notifier) * * Remove a previously registered notifier module */ -void connman_notifier_unregister(struct connman_notifier *notifier) +void connman_notifier_unregister(const struct connman_notifier *notifier) { DBG("notifier %p name %s", notifier, notifier->name); notifier_list = g_slist_remove(notifier_list, notifier); } -#define MAX_TECHNOLOGIES 10 - -static volatile int connected[MAX_TECHNOLOGIES]; +static int connected[MAX_CONNMAN_SERVICE_TYPES]; +static int online[MAX_CONNMAN_SERVICE_TYPES]; -unsigned int __connman_notifier_count_connected(void) +static bool notifier_is_online(void) { - unsigned int i, count = 0; + unsigned int i; __sync_synchronize(); - for (i = 0; i < MAX_TECHNOLOGIES; i++) { - if (connected[i] > 0) - count++; + for (i = 0; i < MAX_CONNMAN_SERVICE_TYPES; i++) { + if (online[i] > 0) + return true; } - return count; + return false; } -const char *__connman_notifier_get_state(void) +bool __connman_notifier_is_connected(void) { - unsigned int count = __connman_notifier_count_connected(); + unsigned int i; - if (count > 0) - return "online"; + __sync_synchronize(); + for (i = 0; i < MAX_CONNMAN_SERVICE_TYPES; i++) { + if (connected[i] > 0) + return true; + } - return "offline"; + return false; } -static void state_changed(connman_bool_t connected) +static const char *evaluate_notifier_state(void) { - unsigned int count = __connman_notifier_count_connected(); - char *state = "offline"; + if (notifier_is_online()) + return "online"; - if (count > 1) - return; + if (__connman_notifier_is_connected()) + return "ready"; - if (count == 1) { - if (connected == FALSE) - return; + if (__connman_technology_get_offlinemode()) + return "offline"; - state = "online"; - } + return "idle"; +} - connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "State", - DBUS_TYPE_STRING, &state); +const char *__connman_notifier_get_state(void) +{ + return notifier_state; } -static void technology_connected(enum connman_service_type type, - connman_bool_t connected) +static void state_changed(void) { - DBG("type %d connected %d", type, connected); + const char *state; - __connman_technology_set_connected(type, connected); - state_changed(connected); + state = evaluate_notifier_state(); + + if (g_strcmp0(state, notifier_state) == 0) + return; + + notifier_state = state; + + connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, + CONNMAN_MANAGER_INTERFACE, "State", + DBUS_TYPE_STRING, ¬ifier_state); } void __connman_notifier_connect(enum connman_service_type type) @@ -136,27 +146,39 @@ void __connman_notifier_connect(enum connman_service_type type) case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: - case CONNMAN_SERVICE_TYPE_GADGET: return; case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_GADGET: case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_P2P: break; } - if (__sync_fetch_and_add(&connected[type], 1) == 0) - technology_connected(type, TRUE); + if (__sync_fetch_and_add(&connected[type], 1) == 0) { + __connman_technology_set_connected(type, true); + state_changed(); + } +} + +void __connman_notifier_enter_online(enum connman_service_type type) +{ + DBG("type %d", type); + + if (__sync_fetch_and_add(&online[type], 1) == 0) + state_changed(); } -void __connman_notifier_online(enum connman_service_type type) +void __connman_notifier_leave_online(enum connman_service_type type) { DBG("type %d", type); + + if (__sync_fetch_and_sub(&online[type], 1) == 1) + state_changed(); } -void __connman_notifier_disconnect(enum connman_service_type type, - enum connman_service_state old_state) +void __connman_notifier_disconnect(enum connman_service_type type) { DBG("type %d", type); @@ -171,44 +193,29 @@ void __connman_notifier_disconnect(enum connman_service_type type, case CONNMAN_SERVICE_TYPE_SYSTEM: case CONNMAN_SERVICE_TYPE_GPS: case CONNMAN_SERVICE_TYPE_VPN: - case CONNMAN_SERVICE_TYPE_GADGET: return; case CONNMAN_SERVICE_TYPE_ETHERNET: + case CONNMAN_SERVICE_TYPE_GADGET: case CONNMAN_SERVICE_TYPE_WIFI: - case CONNMAN_SERVICE_TYPE_WIMAX: case CONNMAN_SERVICE_TYPE_BLUETOOTH: case CONNMAN_SERVICE_TYPE_CELLULAR: + case CONNMAN_SERVICE_TYPE_P2P: break; } if (__sync_fetch_and_sub(&connected[type], 1) != 1) return; - technology_connected(type, FALSE); -} - -static void technology_default(enum connman_service_type type) -{ - const char *str; - - str = __connman_service_type2string(type); - if (str == NULL) - str = ""; - - connman_dbus_property_changed_basic(CONNMAN_MANAGER_PATH, - CONNMAN_MANAGER_INTERFACE, "DefaultTechnology", - DBUS_TYPE_STRING, &str); + __connman_technology_set_connected(type, false); + state_changed(); } void __connman_notifier_default_changed(struct connman_service *service) { - enum connman_service_type type = connman_service_get_type(service); GSList *list; - technology_default(type); - for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->default_changed) notifier->default_changed(service); @@ -221,7 +228,7 @@ void __connman_notifier_service_add(struct connman_service *service, GSList *list; for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->service_add) notifier->service_add(service, name); @@ -232,9 +239,9 @@ void __connman_notifier_service_remove(struct connman_service *service) { GSList *list; - if (g_hash_table_lookup(service_hash, service) != NULL) { + if (g_hash_table_lookup(service_hash, service)) { /* - * This is a tempory check for consistency. It can be + * This is a temporary check for consistency. It can be * removed when there are no reports for the following * error message. */ @@ -244,7 +251,7 @@ void __connman_notifier_service_remove(struct connman_service *service) } for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->service_remove) notifier->service_remove(service); @@ -256,7 +263,7 @@ void __connman_notifier_proxy_changed(struct connman_service *service) GSList *list; for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->proxy_changed) notifier->proxy_changed(service); @@ -272,30 +279,31 @@ static void offlinemode_changed(dbus_bool_t enabled) DBUS_TYPE_BOOLEAN, &enabled); } -void __connman_notifier_offlinemode(connman_bool_t enabled) +void __connman_notifier_offlinemode(bool enabled) { GSList *list; DBG("enabled %d", enabled); offlinemode_changed(enabled); + state_changed(); for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->offline_mode) notifier->offline_mode(enabled); } } -static void notify_idle_state(connman_bool_t idle) +static void notify_idle_state(bool idle) { GSList *list; DBG("idle %d", idle); for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->idle_state) notifier->idle_state(idle); @@ -307,41 +315,41 @@ void __connman_notifier_service_state_changed(struct connman_service *service, { GSList *list; unsigned int old_size; - connman_bool_t found; + bool found; for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->service_state_changed) notifier->service_state_changed(service, state); } old_size = g_hash_table_size(service_hash); - found = g_hash_table_lookup(service_hash, service) != NULL; + found = g_hash_table_lookup(service_hash, service); switch (state) { case CONNMAN_SERVICE_STATE_UNKNOWN: case CONNMAN_SERVICE_STATE_FAILURE: case CONNMAN_SERVICE_STATE_DISCONNECT: case CONNMAN_SERVICE_STATE_IDLE: - if (found == FALSE) + if (!found) break; g_hash_table_remove(service_hash, service); if (old_size == 1) - notify_idle_state(TRUE); + notify_idle_state(true); break; case CONNMAN_SERVICE_STATE_ASSOCIATION: case CONNMAN_SERVICE_STATE_CONFIGURATION: case CONNMAN_SERVICE_STATE_READY: case CONNMAN_SERVICE_STATE_ONLINE: - if (found == TRUE) + if (found) break; g_hash_table_insert(service_hash, service, service); if (old_size == 0) - notify_idle_state(FALSE); + notify_idle_state(false); break; } @@ -353,7 +361,7 @@ void __connman_notifier_ipconfig_changed(struct connman_service *service, GSList *list; for (list = notifier_list; list; list = list->next) { - struct connman_notifier *notifier = list->data; + const struct connman_notifier *notifier = list->data; if (notifier->ipconfig_changed) notifier->ipconfig_changed(service, ipconfig); @@ -369,6 +377,8 @@ int __connman_notifier_init(void) service_hash = g_hash_table_new_full(g_direct_hash, g_direct_equal, NULL, NULL); + notifier_state = evaluate_notifier_state(); + return 0; }