X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bus%2Fconnection.c;h=1f2c955c55ea1b5cf6e65a27556e3ad754f613c8;hb=05902801b49789f37426754fc6b77f3665afe3b0;hp=81f595d26583a282fd6e6ac1ea56e46b8697aeac;hpb=0ecd0a02b993685a456da58c5c03e2d3bab17d67;p=platform%2Fupstream%2Fdbus.git diff --git a/bus/connection.c b/bus/connection.c index 81f595d..1f2c955 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -2,6 +2,7 @@ /* connection.c Client connections * * Copyright (C) 2003 Red Hat, Inc. + * Copyright (C) 2013 Samsung Electronics * * Licensed under the Academic Free License version 2.1 * @@ -190,6 +191,9 @@ bus_connection_disconnected (DBusConnection *connection) BusConnectionData *d; BusService *service; BusMatchmaker *matchmaker; +#ifdef ENABLE_KDBUS_TRANSPORT + dbus_bool_t is_phantom = FALSE; +#endif d = BUS_CONNECTION_DATA (connection); _dbus_assert (d != NULL); @@ -197,6 +201,11 @@ bus_connection_disconnected (DBusConnection *connection) _dbus_verbose ("%s disconnected, dropping all service ownership and releasing\n", d->name ? d->name : "(inactive)"); +#ifdef ENABLE_KDBUS_TRANSPORT + if(bus_context_is_kdbus(d->connections->context) && (strcmp(bus_connection_get_name(connection), ":1.1"))) + is_phantom = TRUE; +#endif + /* Delete our match rules */ if (d->n_match_rules > 0) { @@ -305,8 +314,13 @@ bus_connection_disconnected (DBusConnection *connection) dbus_connection_set_data (connection, connection_data_slot, NULL, NULL); - - dbus_connection_unref (connection); + +#ifdef ENABLE_KDBUS_TRANSPORT + if(is_phantom) + dbus_connection_unref_phantom(connection); + else +#endif + dbus_connection_unref (connection); } static dbus_bool_t @@ -327,6 +341,15 @@ remove_connection_watch (DBusWatch *watch, _dbus_loop_remove_watch (connection_get_loop (connection), watch); } +static void +toggle_connection_watch (DBusWatch *watch, + void *data) +{ + DBusConnection *connection = data; + + _dbus_loop_toggle_watch (connection_get_loop (connection), watch); +} + static dbus_bool_t add_connection_timeout (DBusTimeout *timeout, void *data) @@ -403,14 +426,6 @@ free_connection_data (void *data) dbus_free (d); } -static void -call_timeout_callback (DBusTimeout *timeout, - void *data) -{ - /* can return FALSE on OOM but we just let it fire again later */ - dbus_timeout_handle (timeout); -} - BusConnections* bus_connections_new (BusContext *context) { @@ -605,8 +620,8 @@ bus_connections_setup_connection (BusConnections *connections, d->connections = connections; d->connection = connection; - _dbus_get_current_time (&d->connection_tv_sec, - &d->connection_tv_usec); + _dbus_get_monotonic_time (&d->connection_tv_sec, + &d->connection_tv_usec); _dbus_assert (connection_data_slot >= 0); @@ -639,7 +654,7 @@ bus_connections_setup_connection (BusConnections *connections, if (!dbus_connection_set_watch_functions (connection, add_connection_watch, remove_connection_watch, - NULL, + toggle_connection_watch, connection, NULL)) goto out; @@ -775,7 +790,7 @@ bus_connections_expire_incomplete (BusConnections *connections) DBusList *link; int auth_timeout; - _dbus_get_current_time (&tv_sec, &tv_usec); + _dbus_get_monotonic_time (&tv_sec, &tv_usec); auth_timeout = bus_context_get_auth_timeout (connections->context); link = _dbus_list_get_first_link (&connections->incomplete); @@ -838,12 +853,7 @@ bus_connection_get_unix_groups (DBusConnection *connection, int *n_groups, DBusError *error) { - BusConnectionData *d; unsigned long uid; - - d = BUS_CONNECTION_DATA (connection); - - _dbus_assert (d != NULL); *groups = NULL; *n_groups = 0; @@ -999,6 +1009,28 @@ bus_connections_foreach (BusConnections *connections, foreach_inactive (connections, function, data); } +#ifdef ENABLE_KDBUS_TRANSPORT +DBusConnection* +bus_connections_find_conn_by_name(BusConnections *connections, const char* name) +{ + DBusList *link; + + link = _dbus_list_get_first_link (&connections->completed); + while (link != NULL) + { + DBusConnection *connection = link->data; + DBusList *next = _dbus_list_get_next_link (&connections->completed, link); + + if (!strcmp(bus_connection_get_name(connection), name)) + return connection; + + link = next; + } + + return NULL; +} +#endif + BusContext* bus_connections_get_context (BusConnections *connections) { @@ -1355,6 +1387,18 @@ bus_connection_get_n_services_owned (DBusConnection *connection) return d->n_services_owned; } +#ifdef ENABLE_KDBUS_TRANSPORT +DBusList** +bus_connection_get_services_owned (DBusConnection *connection) +{ + BusConnectionData *d; + d = BUS_CONNECTION_DATA (connection); + _dbus_assert (d != NULL); + + return &d->services_owned; +} +#endif + dbus_bool_t bus_connection_complete (DBusConnection *connection, const DBusString *name, @@ -1459,13 +1503,7 @@ bus_connections_check_limits (BusConnections *connections, DBusConnection *requesting_completion, DBusError *error) { - BusConnectionData *d; unsigned long uid; - - d = BUS_CONNECTION_DATA (requesting_completion); - _dbus_assert (d != NULL); - - _dbus_assert (d->name == NULL); if (connections->n_completed >= bus_context_get_max_completed_connections (connections->context)) @@ -1782,8 +1820,8 @@ bus_connections_expect_reply (BusConnections *connections, cprd->pending = pending; cprd->connections = connections; - _dbus_get_current_time (&pending->expire_item.added_tv_sec, - &pending->expire_item.added_tv_usec); + _dbus_get_monotonic_time (&pending->expire_item.added_tv_sec, + &pending->expire_item.added_tv_usec); _dbus_verbose ("Added pending reply %p, replier %p receiver %p serial %u\n", pending, @@ -2026,7 +2064,10 @@ bus_transaction_send_from_driver (BusTransaction *transaction, if (!dbus_message_set_sender (message, DBUS_SERVICE_DBUS)) return FALSE; - if (bus_connection_is_active (connection)) +#ifdef ENABLE_KDBUS_TRANSPORT + if(!bus_context_is_kdbus(bus_transaction_get_context (transaction))) /* we can't set destination on the basis of connection when on kdbus*/ +#endif + if (bus_connection_is_active (connection)) { if (!dbus_message_set_destination (message, bus_connection_get_name (connection)))