Changeset ff8348650ab13cd736fb6ce92ca6e552d7b5c955

Timestamp:

12/02/10 05:22:05 (2 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

68049ee6cb9d9109c9fb235345d54e500c384036

Parents:

b8852eaf9f2cba6aaa741a3baaef583c5efb755d

git-author:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-12-02T05:21:51Z+0200

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-12-02T05:22:05Z+0200

Message:

Move the dbus call default timeout define out of the interface header

The default timeout is a property of the implementation, not the interface

Files:

• dbus/helpers.c (modified) (5 diffs)
• dbus/helpers.h (modified) (2 diffs)
• proxies/jack_proxy.c (modified) (4 diffs)

dbus/helpers.c

@@ -39 +39 @@
 #include "../common/klist.h"
 
+#define DBUS_CALL_DEFAULT_TIMEOUT 3000 // in milliseconds
+
 DBusConnection * g_dbus_connection;
 DBusError g_dbus_error;
@@ -331 +333 @@
 
   return true;
+}
+
+DBusMessage *
+dbus_call_raw(
+  unsigned int timeout,
+  DBusMessage * request_ptr)
+{
+  DBusMessage * reply_ptr;
+
+  if (timeout == 0)
+  {
+    timeout = DBUS_CALL_DEFAULT_TIMEOUT;
+  }
+
+  reply_ptr = dbus_connection_send_with_reply_and_block(
+    g_dbus_connection,
+    request_ptr,
+    timeout,
+    &g_dbus_error);
+  if (reply_ptr == NULL)
+  {
+    //log_error("calling method '%s' failed, error is '%s'", method, g_dbus_error.message);
+    dbus_error_free(&g_dbus_error);
+  }
+
+  return reply_ptr;
 }
 
@@ -356 +384 @@
   //log_info("dbus_call('%s', '%s', '%s', '%s')", service, object, iface, method);
 
-  if (timeout == 0)
-  {
-    timeout = DBUS_CALL_DEFAULT_TIMEOUT;
-  }
-
   ret = false;
   va_start(ap, input_signature);
@@ -411 +434 @@
   output_signature = va_arg(ap, const char *);
 
-  reply_ptr = dbus_connection_send_with_reply_and_block(
-    g_dbus_connection,
-    request_ptr,
-    timeout,
-    &g_dbus_error);
+  reply_ptr = dbus_call_raw(timeout, request_ptr);
 
   if (input_signature != NULL)
@@ -424 +443 @@
   if (reply_ptr == NULL)
   {
-    //log_error("calling method '%s' failed, error is '%s'", method, g_dbus_error.message);
-    dbus_error_free(&g_dbus_error);
     goto fail;
   }

dbus/helpers.h

@@ -43 +43 @@
 bool dbus_add_dict_entry_uint32(DBusMessageIter * dict_iter_ptr, const char * key, dbus_uint32_t value);
 bool dbus_add_dict_entry_bool(DBusMessageIter * dict_iter_ptr, const char * key, dbus_bool_t value);
+
+DBusMessage *
+dbus_call_raw(
+  unsigned int timeout,         /* in milliseconds */
+  DBusMessage * request_ptr);
 
 bool
@@ -107 +112 @@
   const char * service);
 
-#define DBUS_CALL_DEFAULT_TIMEOUT 3000 // in milliseconds
-
 #include "method.h"
 #include "signal.h"

proxies/jack_proxy.c

@@ -227 +227 @@
   }
 
-  // send message and get a handle for a reply
-  reply_ptr = dbus_connection_send_with_reply_and_block(
-    g_dbus_connection,
-    request_ptr,
-    DBUS_CALL_DEFAULT_TIMEOUT,
-    &g_dbus_error);
-
+  reply_ptr = dbus_call_raw(0, request_ptr);
   dbus_message_unref(request_ptr);
-
   if (reply_ptr == NULL)
   {
-    log_error("no reply from JACK server, error is '%s'", g_dbus_error.message);
-    dbus_error_free(&g_dbus_error);
     return false;
   }
@@ -359 +350 @@
   }
 
-  // send message and get a handle for a reply
-  reply_ptr = dbus_connection_send_with_reply_and_block(
-    g_dbus_connection,
-    request_ptr,
-    DBUS_CALL_DEFAULT_TIMEOUT,
-    &g_dbus_error);
-
+  reply_ptr = dbus_call_raw(0, request_ptr);
   dbus_message_unref(request_ptr);
-
   if (reply_ptr == NULL)
   {
-    log_error("no reply from JACK server, error is '%s'", g_dbus_error.message);
-    dbus_error_free(&g_dbus_error);
     return false;
   }
@@ -477 +459 @@
   }
 
-  // send message and get a handle for a reply
-  reply_ptr = dbus_connection_send_with_reply_and_block(
-    g_dbus_connection,
-    request_ptr,
-    DBUS_CALL_DEFAULT_TIMEOUT,
-    &g_dbus_error);
-
+  reply_ptr = dbus_call_raw(0, request_ptr);
   dbus_message_unref(request_ptr);
-
   if (reply_ptr == NULL)
   {
-    log_error("no reply from JACK server, error is '%s'", g_dbus_error.message);
-    dbus_error_free(&g_dbus_error);
     return false;
   }
@@ -530 +503 @@
   }
 
-  // send message and get a handle for a reply
-  reply_ptr = dbus_connection_send_with_reply_and_block(
-    g_dbus_connection,
-    request_ptr,
-    DBUS_CALL_DEFAULT_TIMEOUT,
-    &g_dbus_error);
-
+  reply_ptr = dbus_call_raw(0, request_ptr);
   dbus_message_unref(request_ptr);
-
   if (reply_ptr == NULL)
   {
-    log_error("no reply from JACK server, error is '%s'", g_dbus_error.message);
-    dbus_error_free(&g_dbus_error);
     return false;
   }