Changeset 8 for trunk/src/slib.c

Timestamp:

Dec 31, 2005, 2:02:03 PM (19 years ago)

Author:

rainer

Message:

minor optimisations for speed

File:

• trunk/src/slib.c (modified) (9 diffs)

trunk/src/slib.c

@@ -566 +566 @@
 void *sl_memset(void *s, int c, size_t n)
 {
-  size_t i;
-  volatile char *p = s;
-
-  if (s == NULL || n <= 0)
-    return s;
-  
-  for (i = 0; i < n; ++i)
-    p[i] = (char) c;
+  volatile char *p = (char *) s;
+
+  if (s != NULL)
+    {
+      while (n--)
+        *p++ = c;
+    }
   return s;
 }
@@ -1673 +1672 @@
       fd = aud_open_noatime (FIL__, __LINE__, priv, filename, 
                              O_RDONLY|O_NONBLOCK, 0, &o_noatime);
+      /*
       if (fd >= 0) {
         sflags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
         retry_fcntl(FIL__, __LINE__, fd, F_SETFL, sflags & ~O_NONBLOCK);
       }
+      */
       if (fd < 0)
         SL_IRETURN(SL_EBADFILE, _("sl_open_file"));
@@ -2081 +2082 @@
 }
 
+int sl_read_timeout_prep (SL_TICKET ticket)
+{
+  int fd;
+  int sflags;
+
+  SL_ENTER(_("sl_read_timeout_prep"));
+
+  if (SL_ISERROR(fd = get_the_fd(ticket)))
+    {
+      TPT(( 0, FIL__, __LINE__, _("msg=<ticket error> errno=<%d>"), fd));
+      SL_IRETURN(fd, _("sl_read_timeout_prep"));
+    }
+
+  /* set to non-blocking mode 
+   */
+  sflags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
+  retry_fcntl(FIL__, __LINE__, fd, F_SETFL, sflags | O_NONBLOCK);
+
+  SL_IRETURN(SL_ENONE, _("sl_read_timeout_prep"));
+}
+  
 
 int sl_read_timeout (SL_TICKET ticket, void * buf_in, size_t count, 
@@ -2087 +2109 @@
   fd_set readfds;
   struct timeval tv;
-  int sflags;
+  /* int sflags; */
   int retval;
 
@@ -2100 +2122 @@
   extern volatile int sig_termfast;
  
-  if (count < 1)
-    {
-      TPT(( 0, FIL__, __LINE__, _("msg=<range error>")));
-      return(SL_ERANGE);
-    }
-  if (buf_in == NULL)
-    {
-      TPT(( 0, FIL__, __LINE__, _("msg=<null buffer>")));
-      return (SL_ENULL);
-    }
-
-  if (SL_ISERROR(fd = get_the_fd(ticket)))
-    {
-      TPT(( 0, FIL__, __LINE__, _("msg=<ticket error> errno=<%d>"), fd));
-      return (fd);
+  if (buf_in == NULL || SL_ISERROR(fd = get_the_fd(ticket)))
+    {
+      if (buf_in == NULL)
+        {
+          TPT(( 0, FIL__, __LINE__, _("msg=<null buffer>")));
+          return (SL_ENULL);
+        }
+      if (SL_ISERROR(fd = get_the_fd(ticket)))
+        {
+          TPT(( 0, FIL__, __LINE__, _("msg=<ticket error> errno=<%d>"), fd));
+          return (fd);
+        }
     }
 
   buf = (char *) buf_in;
-
-  /* set to non-blocking mode 
-   */
-  sflags = retry_fcntl(FIL__, __LINE__, fd, F_GETFL, 0);
-  retry_fcntl(FIL__, __LINE__, fd, F_SETFL, sflags | O_NONBLOCK);
 
   tstart = time(NULL);
@@ -2129 +2143 @@
   while (count > 0)
     {
-
-      if (sig_termfast == 1) 
-        {
-          retry_fcntl(FIL__, __LINE__, fd, F_SETFL, 
-                      sflags & ~O_NONBLOCK);
-          return (SL_EREAD);
-        }
-          
       FD_ZERO(&readfds);
       FD_SET(fd, &readfds);
-
-      if (tdiff >= timeout)
-        {
-          retry_fcntl(FIL__, __LINE__, fd, F_SETFL, 
-                      sflags & ~O_NONBLOCK);
-          return (SL_TIMEOUT);
-        }
-
-      /*
-      tnow  = time(NULL);
-      tdiff = tnow - tstart;
-      */
 
       tv.tv_sec  = timeout - tdiff;
@@ -2160 +2154 @@
         {
           byteread = read (fd, buf, count);
-          if (byteread != -1 && byteread != 0) 
+
+          if (byteread > 0) 
             {
               bytes += byteread; count -= byteread;
@@ -2182 +2177 @@
               else
                 {
-                  retry_fcntl(FIL__, __LINE__, fd, F_SETFL, 
-                              sflags & ~O_NONBLOCK);
                   return (SL_EREAD);
                 }
@@ -2197 +2190 @@
       else if (retval == 0)
         {
-          retry_fcntl(FIL__, __LINE__, fd, F_SETFL, 
-                      sflags & ~O_NONBLOCK);
           return (SL_TIMEOUT);
         }
       else
         {
-          retry_fcntl(FIL__, __LINE__, fd, F_SETFL, 
-                      sflags & ~O_NONBLOCK);
           return (SL_EREAD);
         }
+
+      if (sig_termfast == 1) 
+        {
+          return (SL_EREAD);
+        }
+          
       tnow  = time(NULL);
       tdiff = tnow - tstart;
-    }
-
-  retry_fcntl(FIL__, __LINE__, fd, F_SETFL, sflags & ~O_NONBLOCK);
+
+      if (tdiff > timeout)
+        {
+          return (SL_TIMEOUT);
+        }
+    }
+
   return ((int) bytes);
 }