beagle r4634 - trunk/libbeagle/beagle

[dbera svn gnome org]

Author: dbera
Date: Sun Mar 23 21:11:38 2008
New Revision: 4634
URL: http://svn.gnome.org/viewvc/beagle?rev=4634&view=rev

Log:
Catch EAGAIN during the non-blocking call to connect(). This can really happen, especially when requesting for lots of snippets.


Modified:
   trunk/libbeagle/beagle/beagle-request.c

Modified: trunk/libbeagle/beagle/beagle-request.c
==============================================================================
--- trunk/libbeagle/beagle/beagle-request.c	(original)
+++ trunk/libbeagle/beagle/beagle-request.c	Sun Mar 23 21:11:38 2008
@@ -36,6 +36,8 @@
 #include <sys/un.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
+#include <string.h>
 
 #include "beagle-error-response.h"
 #include "beagle-marshal.h"
@@ -174,6 +176,7 @@
 	int sockfd;
 	int ret;
 	int error, error_len;
+	int retries;
 	long mode;
 	fd_set select_set;
 	struct timeval tv;
@@ -205,8 +208,25 @@
 	sun.sun_family = AF_UNIX;
 	snprintf (sun.sun_path, sizeof (sun.sun_path), path);
 
-	if (connect (sockfd, (struct sockaddr *) &sun, sizeof (sun)) < 0) {
-		if (errno != EINPROGRESS) {
+	/* We retry on EGAIN or EINTR: since both of these mean the socket is active,
+	 * there is no harm in trying to retry a lot of times. A blocking socket would
+	 * have done the same.
+	 */
+#define MAX_RETRIES 500
+
+	for (retries = 0; retries < MAX_RETRIES; ++ retries) {
+		if (connect (sockfd, (struct sockaddr *) &sun, sizeof (sun)) >= 0)
+			break;
+
+		/* Else, connection un-successful */
+		if (errno == EALREADY) {
+			break;
+		} else if (errno == EAGAIN) {
+			usleep (200000); /* 200 milliseconds */
+			continue;
+		} else if (errno == EINTR) {
+			continue;
+		} else if (errno != EINPROGRESS) {
 			g_set_error (err, BEAGLE_ERROR, BEAGLE_ERROR,
 				"Unable to connect to Beagle daemon");
 			return -1;
@@ -229,6 +249,7 @@
 					return -1;
 				}
 				/* Else, connection successful */
+				/* FIXME: Catch EINTR during select() */
 			} else {
 				g_set_error (err, BEAGLE_ERROR, BEAGLE_ERROR,
 					"Unable to connect to Beagle daemon");
@@ -238,6 +259,12 @@
 		}
 	}
 
+	if (retries == MAX_RETRIES) {
+		g_set_error (err, BEAGLE_ERROR, BEAGLE_ERROR,
+			"Unable to connect to Beagle daemon");
+		return -1;
+	}
+
 	/* Set socket to blocking mode */
 	if ((mode = fcntl (sockfd, F_GETFL, NULL)) < 0) {
 		g_set_error (err, BEAGLE_ERROR, BEAGLE_ERROR,