Changeset 315 for trunk/src

Timestamp:

Mar 11, 2011, 8:30:55 PM (14 years ago)

Author:

katerina

Message:

Fix for ticket #236 (blocking on NFS mounts).

Location:

trunk/src

Files:

• sh_calls.c (modified) (6 diffs)
• sh_forward.c (modified) (2 diffs)
• sh_port2proc.c (modified) (1 diff)
• sh_pthread.c (modified) (2 diffs)
• sh_readconf.c (modified) (1 diff)
• sh_socket.c (modified) (1 diff)
• sh_unix.c (modified) (1 diff)

trunk/src/sh_calls.c

@@ -52 +52 @@
 #include "sh_calls.h"
 #include "sh_ipvx.h"
+#include "sh_sub.h"
+#include "sh_utils.h"
 
 #undef  FIL__
@@ -240 +242 @@
 }
 
+static int sh_use_sub = 0;
+
+int sh_calls_set_sub (const char * str)
+{
+  return sh_util_flagval(str, &sh_use_sub);
+}
+
 long int retry_lstat(const char * file, int line, 
                      const char *file_name, struct stat *buf)
@@ -249 +258 @@
   SL_ENTER(_("retry_lstat"));
 
-  do {
-    val_retry = /*@-unrecog@*/lstat (file_name, buf)/*@+unrecog@*/;
-  } while (val_retry < 0 && errno == EINTR);
+  if (sh_use_sub)
+    {
+      val_retry = sh_sub_lstat (file_name, buf);
+    }
+  else
+    {
+      do {
+        val_retry = /*@-unrecog@*/lstat (file_name, buf)/*@+unrecog@*/;
+      } while (val_retry < 0 && errno == EINTR);
+    }
+
   error = errno;
   if (val_retry < 0) {
@@ -260 +277 @@
   }
   errno = error;    
+
   SL_RETURN(val_retry, _("retry_lstat"));
 }
@@ -272 +290 @@
   SL_ENTER(_("retry_stat"));
 
-  do {
-    val_retry = stat (file_name, buf);
-  } while (val_retry < 0 && errno == EINTR);
+  if (sh_use_sub)
+    {
+      val_retry = sh_sub_stat (file_name, buf);
+    }
+  else
+    {
+      do {
+        val_retry = stat (file_name, buf);
+      } while (val_retry < 0 && errno == EINTR);
+    }
+
   error = errno;
   if (val_retry < 0) {
@@ -283 +309 @@
   }
   errno = error;    
+
   SL_RETURN(val_retry, _("retry_stat"));
 }

trunk/src/sh_forward.c

@@ -4862 +4862 @@
   int flag   = 1; /* non-zero to enable an option */
 
+  /* fprintf(stderr, "FIXME IPVX: bind addr %s (%d) :%d\n", 
+          sh_ipvx_print_sockaddr (sa, domain), salen,
+          sh_ipvx_get_port(sa, domain)); */
+
   /* create the socket, bind() it and listen()
    */
@@ -4940 +4944 @@
       hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
       hints.ai_socktype = SOCK_STREAM;
+      hints.ai_family   = AF_UNSPEC;
       sl_snprintf(port, sizeof(port), "%d", server_port);
 

trunk/src/sh_port2proc.c

@@ -422 +422 @@
 
                 sh_ipvx_ntoa(a, sizeof(a), &ss);
-                sh_ipvx_ntoa(b, sizeof(b), &ss);
+                sh_ipvx_ntoa(b, sizeof(b), saddr);
 
                 fprintf(stderr, " -> inode %u, iface/port %s,%u, status %u, searching %s,%u, %u\n", 

trunk/src/sh_pthread.c

@@ -15 +15 @@
 SH_MUTEX_INIT(mutex_readdir,      PTHREAD_MUTEX_INITIALIZER);
 SH_MUTEX_INIT(mutex_thread_nolog, PTHREAD_MUTEX_INITIALIZER);
+
+int sh_pthread_setsigmask(int how, const void *set, void *oldset)
+{
+  return pthread_sigmask(how, (const sigset_t *)set, (sigset_t *)oldset);
+}
 
 void sh_pthread_mutex_unlock (void *arg)
@@ -288 +293 @@
 #endif
 
+#else
+
+#include <signal.h>
+
+int sh_pthread_setsigmask(int how, const void *set, void *oldset)
+{
+  return sigprocmask(how, (const sigset_t *)set, (sigset_t *)oldset);
+}
+
 
 #endif

trunk/src/sh_readconf.c

@@ -1227 +1227 @@
     sh_util_sigtype },
 
+  { N_("avoidblock"),     SH_SECTION_MISC,  SH_SECTION_NONE, 
+    sh_calls_set_sub },
+
   { NULL,    0,   0,  NULL}
 };

trunk/src/sh_socket.c

@@ -683 +683 @@
       {
         ++retry;
-        retry_msleep(0, 1);
+        retry_msleep(0, 10);
       }
   } while ((nbytes < 0) && (retry < 3));

trunk/src/sh_unix.c

@@ -1529 +1529 @@
   do {
     errno = 0;
-    test  = sigprocmask(SIG_UNBLOCK, &set_proc, NULL);
+    test  = SH_SETSIGMASK(SIG_UNBLOCK, &set_proc, NULL);
   } while (test < 0 && errno == EINTR);