Changeset 163 for branches

Timestamp:

Jan 22, 2009, 9:34:20 AM (17 years ago)

Author:

Paul Smedley

Message:

Partial fix for ticket 69

File:

• branches/samba-3.0/source/lib/system.c (modified) (3 diffs)

branches/samba-3.0/source/lib/system.c

@@ -29 +29 @@
 #endif
 
+#ifdef __OS2__
+unsigned long _System DosSleep (unsigned long ulInterval);
+// On OS/2 - we randomly get 'Resource Temporarily Unavailable' errors - ignore these
+// ticket:69 code may enter an infinite loop, added a 60sec timeout
+#define OS2_EAGAIN_RETRY_INIT time_t t1 = time(NULL);
+#define OS2_EAGAIN_RETRY_CHECK \
+        if (ret == -1) {                        \
+                DEBUG(10,("sys_read: op failed, errno: %d,%s\n", errno, strerror(errno))); \
+        }                                       \
+        if (ret==-1 && errno==EAGAIN) {         \
+                DosSleep(100);                  \
+                if (time(NULL) - t1 > 60)       \
+                        break;                  \
+                errno = EINTR;                  \
+        }
+#else
+#define OS2_EAGAIN_RETRY_INIT
+#define OS2_EAGAIN_RETRY_CHECK
+#endif
+
 /*
    The idea is that this file will eventually have wrappers around all
@@ -122 +142 @@
 ssize_t sys_read(int fd, void *buf, size_t count)
 {
+        OS2_EAGAIN_RETRY_INIT;
         ssize_t ret;
-DEBUG(0,("sys_read - count = %d\n",count));
         do {
                 ret = read(fd, buf, count);
-#ifndef __OS2__x
+                OS2_EAGAIN_RETRY_CHECK;
+        } while (ret == -1 && errno == EINTR);
+        return ret;
+}
+
+/*******************************************************************
+A write wrapper that will deal with EINTR.
+********************************************************************/
+
+ssize_t sys_write(int fd, const void *buf, size_t count)
+{
+        ssize_t ret;
+        do {
+                ret = write(fd, buf, count);
+#ifndef __OS2__
         } while (ret == -1 && errno == EINTR);
 #else
@@ -133 +167 @@
 #endif
         if (errno == EAGAIN)
-                DEBUG(0,("sys_read - EAGAIN returned - count = %d\n",count));
-        return ret;
-}
-
-/*******************************************************************
-A write wrapper that will deal with EINTR.
-********************************************************************/
-
-ssize_t sys_write(int fd, const void *buf, size_t count)
-{
-        ssize_t ret;
-DEBUG(0,("sys_write - count = %d\n",count));
-        do {
-                ret = write(fd, buf, count);
-#ifndef __OS2__x
-        } while (ret == -1 && errno == EINTR);
-#else
-/* On OS/2 - we randomly get 'Resource Temporarily Unavailable' errors - ignore these */
-        } while (ret == -1 && ((errno == EINTR)||(errno == EAGAIN)));
-#endif
-        if (errno == EAGAIN)
-                DEBUG(0,("sys_write - EAGAIN returned - count = %d\n",count));
         return ret;
 }