Attachment 5968 Details for Bug 2134 – this one should work, adapted to new API. Not sure about tests.

[patch] this one should work, adapted to new API. Not sure about tests.

ListActivatableNames.diff (text/plain), 15.53 KB, created by Marcin Krzyzanowski on 2006-06-18 16:25:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Krzyzanowski

Created: 2006-06-18 16:25:42 UTC

Size: 15.53 KB

patch

obsolete

>Index: bus/activation.c
>===================================================================
>RCS file: /cvs/dbus/dbus/bus/activation.c,v
>retrieving revision 1.41
>diff -u -a -r1.41 activation.c
>--- bus/activation.c	22 Nov 2005 20:37:00 -0000	1.41
>+++ bus/activation.c	18 Jun 2006 20:34:28 -0000
>@@ -1565,6 +1565,54 @@
>   return TRUE;
> }
> 
>+dbus_bool_t
>+bus_get_activatable_services(BusActivation	*activation, char ***listp, int *array_len)
>+{
>+  DBusHashIter  iter;
>+  int		len, i, j;
>+  char          **activatable_list;
>+
>+  _dbus_assert (activation);
>+  
>+  len = _dbus_hash_table_get_n_entries(activation->entries);
>+  activatable_list = dbus_new (char *, len + 1);
>+  
>+  if (!activatable_list)
>+    return FALSE;
>+    
>+  i = 0;
>+  _dbus_hash_iter_init (activation->entries, &iter);
>+  while (_dbus_hash_iter_next (&iter))
>+    {
>+      BusActivationEntry *entry;
>+      entry = _dbus_hash_iter_get_value (&iter);
>+      
>+      activatable_list[i] = _dbus_strdup(entry->name);
>+      if (activatable_list[i] == NULL)
>+	goto error;
>+
>+      i++;
>+    }
>+    
>+  activatable_list[i] = NULL;
>+  
>+  if (array_len)
>+    *array_len = len;
>+    
>+  *listp = activatable_list;
>+  
>+  return TRUE;
>+
>+ error:
>+  for (j = 0; j < i; j++)
>+    dbus_free (activatable_list[i]);
>+    
>+  dbus_free(activatable_list);
>+
>+  return FALSE;
>+}						      
>+
>+
> #ifdef DBUS_BUILD_TESTS
> 
> #include <stdio.h>
>Index: bus/activation.h
>===================================================================
>RCS file: /cvs/dbus/dbus/bus/activation.h,v
>retrieving revision 1.13
>diff -u -a -r1.13 activation.h
>--- bus/activation.h	10 Aug 2004 03:06:59 -0000	1.13
>+++ bus/activation.h	18 Jun 2006 20:34:28 -0000
>@@ -26,6 +26,7 @@
> 
> #include <dbus/dbus.h>
> #include <dbus/dbus-list.h>
>+#include <dbus/dbus-hash.h>
> #include "bus.h"
> 
> BusActivation* bus_activation_new              (BusContext        *context,
>@@ -45,7 +46,9 @@
> 						const char        *service_name,
> 						BusTransaction    *transaction,
> 						DBusError         *error);
>-
>+dbus_bool_t    bus_get_activatable_services    (BusActivation     *activation,
>+						char            ***listp,
>+						int               *array_len);
> dbus_bool_t    bus_activation_send_pending_auto_activation_messages (BusActivation     *activation,
> 								     BusService        *service,
> 								     BusTransaction    *transaction,
>Index: bus/dispatch.c
>===================================================================
>RCS file: /cvs/dbus/dbus/bus/dispatch.c,v
>retrieving revision 1.74
>diff -u -a -r1.74 dispatch.c
>--- bus/dispatch.c	22 Nov 2005 20:37:00 -0000	1.74
>+++ bus/dispatch.c	18 Jun 2006 23:20:30 -0000
>@@ -1051,6 +1051,73 @@
>  * but the correct thing may include OOM errors.
>  */
> static dbus_bool_t
>+check_ListActivatableNames_message (BusContext     *context,
>+                    		     DBusConnection *connection)
>+{
>+  const char *ret;
>+  DBusMessage *message;
>+  DBusMessage *reply;
>+  DBusMessageIter iter;
>+  DBusMessageIter array_iter;
>+  DBusError error;
>+  
>+  dbus_error_init (&error);
>+  
>+  _dbus_verbose ("check_ListActivatableNames_message for %p\n", connection);
>+
>+  message = dbus_message_new_method_call (DBUS_SERVICE_DBUS,
>+                                          DBUS_PATH_DBUS,
>+                                          DBUS_INTERFACE_DBUS,
>+                                          "ListActivatableNames");
>+
>+  if (message == NULL)
>+    return TRUE;
>+
>+  reply = dbus_connection_send_with_reply_and_block (connection, message, 1000, &error);
>+
>+  if (reply == NULL)
>+    {
>+      _dbus_verbose ("did not get reply for ListActivatableNames\n");
>+      return FALSE;
>+    }
>+
>+  _dbus_verbose ("got reply for ListActivatableNames\n");
>+  
>+  if (!dbus_message_iter_init(reply, &iter))
>+    {
>+      _dbus_verbose ("Message has no arguments\n");
>+      return FALSE;
>+    }
>+  
>+  if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY)
>+    {
>+      _dbus_verbose ("malformed reply arg\n");
>+      return FALSE;
>+    }
>+
>+  dbus_message_iter_recurse(&iter, &array_iter);
>+  if (dbus_message_iter_get_element_type(&array_iter) != DBUS_TYPE_STRING)
>+    {
>+      _dbus_verbose ("malformed reply element\n");
>+      return FALSE;
>+    }
>+  
>+  do {
>+	dbus_message_iter_get_basic(&array_iter,&ret);
>+	_dbus_verbose("Found activatable service: %s\n",ret);
>+    } while (dbus_message_iter_next(&array_iter));
>+  
>+  dbus_message_unref (message);
>+  dbus_message_unref (reply);
>+  dbus_error_free(&error);
>+  _dbus_verbose ("ListActivatableNames check finished\n");
>+  return TRUE;
>+}
>+
>+/* returns TRUE if the correct thing happens,
>+ * but the correct thing may include OOM errors.
>+ */
>+static dbus_bool_t
> check_get_connection_unix_user (BusContext     *context,
>                                 DBusConnection *connection)
> {
>@@ -3587,6 +3654,9 @@
>   if (!check_double_hello_message (context, foo))
>     _dbus_assert_not_reached ("double hello message failed");
> 
>+  if (!check_ListActivatableNames_message (context, foo))
>+    _dbus_assert_not_reached ("ListActivatableNames failed");
>+
>   if (!check_add_match_all (context, foo))
>     _dbus_assert_not_reached ("AddMatch message failed");
>   
>@@ -3625,7 +3695,7 @@
> 
>   if (!check_get_connection_unix_process_id (context, baz))
>     _dbus_assert_not_reached ("GetConnectionUnixProcessID message failed");
>-  
>+
>   if (!check_no_leftovers (context))
>     {
>       _dbus_warn ("Messages were left over after setting up initial connections");
>Index: bus/driver.c
>===================================================================
>RCS file: /cvs/dbus/dbus/bus/driver.c,v
>retrieving revision 1.76
>diff -u -a -r1.76 driver.c
>--- bus/driver.c	22 Nov 2005 20:37:00 -0000	1.76
>+++ bus/driver.c	18 Jun 2006 21:38:32 -0000
>@@ -460,6 +460,111 @@
> }
> 
> static dbus_bool_t
>+bus_driver_handle_list_activatable_services (DBusConnection *connection,
>+                                 BusTransaction *transaction,
>+                                 DBusMessage    *message,
>+                                 DBusError      *error)
>+{
>+  DBusMessage *reply;
>+  int len,i;
>+  char **services;
>+  const char *v_STRING = DBUS_SERVICE_DBUS;
>+  BusRegistry *registry;
>+  DBusMessageIter iter;
>+  DBusMessageIter sub;
>+
>+  _DBUS_ASSERT_ERROR_IS_CLEAR (error);
>+  
>+  registry = bus_connection_get_registry (connection);
>+  
>+  reply = dbus_message_new_method_return (message);
>+  if (reply == NULL)
>+    {
>+      BUS_SET_OOM (error);
>+      return FALSE;
>+    }
>+
>+  if (!bus_registry_list_activatable_services (registry, &services, &len))
>+    {
>+      dbus_message_unref (reply);
>+      BUS_SET_OOM (error);
>+      return FALSE;
>+    }
>+  
>+  dbus_message_iter_init_append(reply, &iter);
>+  
>+  if (!dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY,
>+                                         DBUS_TYPE_STRING_AS_STRING,
>+                                         &sub))
>+    {
>+      dbus_free_string_array (services);
>+      dbus_message_unref (reply);
>+      BUS_SET_OOM (error);
>+      return FALSE;
>+    }
>+  
>+  
>+/*
>+  if (!dbus_message_append_args (reply,
>+                                 DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, services, len,
>+                                 DBUS_TYPE_INVALID))
>+    {
>+      dbus_free_string_array (services);
>+      dbus_message_unref (reply);
>+      BUS_SET_OOM (error);
>+      return FALSE;
>+    }
>+*/
>+  /* Include the bus driver in the list */
>+  
>+  if (!dbus_message_iter_append_basic (&sub, DBUS_TYPE_STRING,
>+                                       &v_STRING))
>+    {
>+      dbus_free_string_array (services);
>+      dbus_message_unref (reply);
>+      BUS_SET_OOM (error);
>+      return FALSE;
>+    }
>+  
>+  i = 0;
>+  while (i < len)
>+    {
>+      if (!dbus_message_iter_append_basic (&sub, DBUS_TYPE_STRING,
>+                                           &services[i]))
>+        {
>+          dbus_free_string_array (services);
>+          dbus_message_unref (reply);
>+          BUS_SET_OOM (error);
>+          return FALSE;
>+        }
>+      ++i;
>+    }
>+
>+    
>+  if (!dbus_message_iter_close_container (&iter, &sub))
>+    {
>+      dbus_free_string_array (services);
>+      dbus_message_unref (reply);
>+      BUS_SET_OOM (error);
>+      return FALSE;
>+    }    
>+
>+  dbus_free_string_array (services);
>+  
>+  if (!bus_transaction_send_from_driver (transaction, connection, reply))
>+    {
>+      dbus_message_unref (reply);
>+      BUS_SET_OOM (error);
>+      return FALSE;
>+    }
>+  else
>+    {
>+      dbus_message_unref (reply);
>+      return TRUE;
>+    }
>+}
>+
>+static dbus_bool_t
> bus_driver_handle_acquire_service (DBusConnection *connection,
>                                    BusTransaction *transaction,
>                                    DBusMessage    *message,
>@@ -1328,6 +1433,10 @@
>     "",
>     DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING,
>     bus_driver_handle_list_services },
>+  { "ListActivatableNames",
>+    "",
>+    DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING,
>+    bus_driver_handle_list_activatable_services },
>   { "AddMatch",
>     DBUS_TYPE_STRING_AS_STRING,
>     "",
>Index: bus/services.c
>===================================================================
>RCS file: /cvs/dbus/dbus/bus/services.c,v
>retrieving revision 1.33
>diff -u -a -r1.33 services.c
>--- bus/services.c	22 Nov 2005 20:37:00 -0000	1.33
>+++ bus/services.c	18 Jun 2006 20:34:28 -0000
>@@ -373,6 +373,31 @@
> }
> 
> dbus_bool_t
>+bus_registry_list_activatable_services (BusRegistry *registry,
>+                            char      ***listp,
>+                            int         *array_len)
>+{
>+  BusActivation *activation;
>+  char **activatable_list;
>+  int activatable_list_len;
>+  
>+  activation = bus_context_get_activation (registry->context);
>+
>+  if (!activation)
>+    return FALSE;
>+    
>+  if (!bus_get_activatable_services(activation,&activatable_list,&activatable_list_len))
>+    return FALSE;
>+  
>+  if (array_len)
>+    *array_len = activatable_list_len;
>+  
>+  *listp = activatable_list;
>+  return TRUE;
>+}
>+
>+
>+dbus_bool_t
> bus_registry_acquire_service (BusRegistry      *registry,
>                               DBusConnection   *connection,
>                               const DBusString *service_name,
>Index: bus/services.h
>===================================================================
>RCS file: /cvs/dbus/dbus/bus/services.h,v
>retrieving revision 1.15
>diff -u -a -r1.15 services.h
>--- bus/services.h	22 Nov 2005 20:37:00 -0000	1.15
>+++ bus/services.h	18 Jun 2006 20:34:28 -0000
>@@ -50,6 +50,9 @@
> dbus_bool_t  bus_registry_list_services   (BusRegistry                 *registry,
>                                            char                      ***listp,
>                                            int                         *array_len);
>+dbus_bool_t  bus_registry_list_activatable_services   (BusRegistry     *registry,
>+                                        	      char                      ***listp,
>+                                        	      int                         *array_len);
> dbus_bool_t  bus_registry_acquire_service (BusRegistry                 *registry,
>                                            DBusConnection              *connection,
>                                            const DBusString            *service_name,
>Index: bus/test-main.c
>===================================================================
>RCS file: /cvs/dbus/dbus/bus/test-main.c,v
>retrieving revision 1.21
>diff -u -a -r1.21 test-main.c
>--- bus/test-main.c	3 Nov 2004 16:38:35 -0000	1.21
>+++ bus/test-main.c	18 Jun 2006 23:22:18 -0000
>@@ -99,6 +99,7 @@
>     die ("initializing debug threads");
> #endif
>  
>+
>   test_pre_hook ();
>   printf ("%s: Running expire list test\n", argv[0]);
>   if (!bus_expire_list_test (&test_data_dir))
>@@ -129,12 +130,14 @@
>     die ("sha1");
>   test_post_hook ();
> 
>+
>   test_pre_hook ();
>   printf ("%s: Running message dispatch test\n", argv[0]);
>   if (!bus_dispatch_test (&test_data_dir)) 
>     die ("dispatch");
>   test_post_hook ();
> 
>+
>   test_pre_hook ();
>   printf ("%s: Running service files reloading test\n", argv[0]);
>   if (!bus_activation_service_reload_test (&test_data_dir))
>Index: doc/dbus-specification.xml
>===================================================================
>RCS file: /cvs/dbus/dbus/doc/dbus-specification.xml,v
>retrieving revision 1.39
>diff -u -a -r1.39 dbus-specification.xml
>--- doc/dbus-specification.xml	3 May 2006 22:56:35 -0000	1.39
>+++ doc/dbus-specification.xml	18 Jun 2006 20:34:28 -0000
>@@ -3267,6 +3267,37 @@
>           Returns a list of all currently-owned names on the bus.
>         </para>
>       </sect3>
>+      <sect3 id="bus-messages-list-activatable-names">
>+	<title><literal>org.freedesktop.DBus.ListActivatableNames</literal></title>
>+	<para>
>+	    As a method:
>+           <programlisting>
>+             STRING_ARRAY ListActivatableNames ()
>+           </programlisting>
>+           Reply arguments:
>+           <informaltable>
>+             <tgroup cols="3">
>+               <thead>
>+                 <row>
>+                   <entry>Argument</entry>
>+                   <entry>Type</entry>
>+                   <entry>Description</entry>
>+                 </row>
>+               </thead>
>+               <tbody>
>+                 <row>
>+                   <entry>0</entry>
>+                   <entry>STRING_ARRAY</entry>
>+                   <entry>Array of strings where each string is a bus name</entry>
>+                 </row>
>+               </tbody>
>+             </tgroup>
>+           </informaltable>
>+        </para>
>+        <para>
>+           Returns a list of all activatable names on the bus.
>+        </para>
>+      </sect3>
>       <sect3 id="bus-messages-name-exists">
>         <title><literal>org.freedesktop.DBus.NameHasOwner</literal></title>
>         <para>
>Index: mono/BusDriver.cs
>===================================================================
>RCS file: /cvs/dbus/dbus/mono/BusDriver.cs,v
>retrieving revision 1.4
>diff -u -a -r1.4 BusDriver.cs
>--- mono/BusDriver.cs	13 Mar 2005 02:15:09 -0000	1.4
>+++ mono/BusDriver.cs	18 Jun 2006 20:34:28 -0000
>@@ -14,6 +14,9 @@
>     public abstract string[] ListNames ();
> 
>     [Method]
>+    public abstract string[] ListActivatableNames ();
>+
>+    [Method]
>     public abstract string GetNameOwner (string name);
> 
>     [Method]
>Index: qt/src/qdbusbus.cpp
>===================================================================
>RCS file: /cvs/dbus/dbus/qt/src/qdbusbus.cpp,v
>retrieving revision 1.2
>diff -u -a -r1.2 qdbusbus.cpp
>--- qt/src/qdbusbus.cpp	5 Jun 2006 18:13:07 -0000	1.2
>+++ qt/src/qdbusbus.cpp	18 Jun 2006 20:34:28 -0000
>@@ -151,6 +151,15 @@
> }
> 
> /*!
>+    \fn QDBusBusService::listACtivatableNames()
>+    Lists all activatables names currently existing on the bus.
>+*/
>+QDBusReply<QStringList> QDBusBusService::ListActivatableNames()
>+{
>+    return call(QLatin1String("ListActivatableNames"));
>+}
>+
>+/*!
>     \fn QDBusBusService::listQueuedOwners(const QString &serviceName)
>     Returns a list of all unique connection names in queue for the service name \a service.
> */
>Index: qt/src/qdbusbus.h
>===================================================================
>RCS file: /cvs/dbus/dbus/qt/src/qdbusbus.h,v
>retrieving revision 1.3
>diff -u -a -r1.3 qdbusbus.h
>--- qt/src/qdbusbus.h	12 Jun 2006 09:18:45 -0000	1.3
>+++ qt/src/qdbusbus.h	18 Jun 2006 20:34:28 -0000
>@@ -90,6 +90,7 @@
>     QDBusReply<void> ReloadConfig();
> 
>     QDBusReply<QStringList> ListNames();
>+    QDBusReply<QStringList> ListActivatableNames();
>         
>     QDBusReply<bool> NameHasOwner(const QString &service);
>     QDBusReply<QString> GetNameOwner(const QString &name);
>@@ -121,6 +122,8 @@
> 
>     QDBusReply<QStringList> listNames()
>     { return ListNames(); }
>+    QDBusReply<QStringList> listActivatableNames()
>+    { return ListActivatableNames(); }
>         
>     QDBusReply<bool> nameHasOwner(const QString &serviceName)
>     { return NameHasOwner(serviceName); }

Actions: View | Splinter Review

Attachments on bug 2134: 1588 | 5966 | 5968

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.