Changeset 8 for trunk/src/sh_unix.c

Timestamp:

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

Author:

rainer

Message:

minor optimisations for speed

File:

• trunk/src/sh_unix.c (modified) (12 diffs)

trunk/src/sh_unix.c

@@ -1194 +1194 @@
   setrlimit (RLIMIT_NPROC,   &limits);
 #endif
+#ifdef RLIMIT_MEMLOCK
+  setrlimit (RLIMIT_MEMLOCK, &limits);
+#endif
+
+#if !defined(SL_DEBUG)
+  /* no core dumps
+   */
+  limits.rlim_cur = 0;
+  limits.rlim_max = 0;
+#ifdef RLIMIT_CORE
+  setrlimit (RLIMIT_CORE,    &limits);
+#endif
+#else
+#ifdef RLIMIT_CORE
+  setrlimit (RLIMIT_CORE,    &limits);
+#endif
+#endif
+
+  limits.rlim_cur = 1024;
+  limits.rlim_max = 1024;
+
 #if defined(RLIMIT_NOFILE)
   setrlimit (RLIMIT_NOFILE,  &limits);
@@ -1199 +1220 @@
   setrlimit (RLIMIT_OFILE,   &limits);
 #endif
-#ifdef RLIMIT_MEMLOCK
-  setrlimit (RLIMIT_MEMLOCK, &limits);
-#endif
-
-#if !defined(SL_DEBUG)
-  /* no core dumps
-   */
-  limits.rlim_cur = 0;
-  limits.rlim_max = 0;
-#ifdef RLIMIT_CORE
-  setrlimit (RLIMIT_CORE,    &limits);
-#endif
-#else
-#ifdef RLIMIT_CORE
-  setrlimit (RLIMIT_CORE,    &limits);
-#endif
-#endif
-
 
   SL_RET0(_("sh_unix_setlimits"));
@@ -2696 +2699 @@
   struct stat   fbuf;
   int           stat_return;
-  register int  i;
+
   ShFileType    type;
   unsigned int  mode;
@@ -2702 +2705 @@
   char        * tmp;
   char        * tmp2;
-  /* char        * p; */
+
   char        * linknamebuf;
   int           linksize;
@@ -2710 +2713 @@
   SL_TICKET     rval_open;
   int           fd;
-#if defined(__linux__)
-  int           fd_2;
-#endif
   int           fstat_return;
 
@@ -2738 +2738 @@
    */
   tstart = time(NULL);
+
   stat_return = retry_lstat (FIL__, __LINE__, 
                              path /* theFile->fullpath */, &buf);
 
+  fd           = -1;
+  fstat_return = -1;
+  rval_open    = -1;
+
   if (stat_return == 0 && S_ISREG(buf.st_mode)) 
     {
@@ -2747 +2752 @@
       alert_timeout = 120; /* this is per 8K block now ! */
 
-      if (path[0] == '/' && path[1] == 'p' && path[2] == 'r' &&
-          path[3] == 'o' && path[4] == 'c' && path[5] == '/')
+      if (path[1] == 'p' && path[5] == '/' && path[2] == 'r' &&
+          path[3] == 'o' && path[4] == 'c' && path[0] == '/')
         {
           /* seven is magic */
           alert_timeout = 7;
         }
-    }
-  else
-    rval_open = -1;
-
-  if (SL_ISERROR(rval_open))
-    fd = -1;
-  else
-    fd = get_the_fd(rval_open);
+
+      fd = get_the_fd(rval_open);
+    }
 
   tend = time(NULL);
@@ -2774 +2774 @@
       SH_FREE(tmp2);
     }
+
+  if (fd >= 0) 
+    fstat_return = retry_fstat (FIL__, __LINE__, fd, &fbuf);
+  else
+    fd = -1;
       
-  if (fd >= 0) 
-    {
-      fstat_return = retry_fstat (FIL__, __LINE__, fd, &fbuf);
-    }
-  else
-    {
-      fstat_return = -1;
-      fd           = -1;
-    }
-#if defined(__linux__)
-  fd_2 = fd;
-#endif
 
   /* ---  case 1: lstat failed  --- 
@@ -2809 +2802 @@
     }
 
-  /* ---  case 2: not a regular file, or [IgnoreAll]  --- 
+  /* ---  case 2: not a regular file  --- 
    */
   else if (! S_ISREG(buf.st_mode))
@@ -2906 +2899 @@
   /* --- Determine file type. ---
    */
-  for (i = 0; i < 10; ++i) theFile->c_mode[i] = '-';
+  memset (theFile->c_mode, '-', 10);
   theFile->c_mode[10] = '\0';
-  for (i = 0; i < 11; ++i) theFile->link_c_mode[i] = '-';
+
+  memset (theFile->link_c_mode, '-', 10);
   theFile->link_c_mode[10] = '\0';
 
@@ -2918 +2912 @@
   /* --- Determine file attributes. ---
    */
-  for (i = 0; i < 12; ++i) theFile->c_attributes[i] = '-';
+  memset (theFile->c_attributes, '-', 12);
   theFile->c_attributes[12] = '\0';
   theFile->attributes      =    0;
@@ -2925 +2919 @@
       theFile->c_mode[0] != 'l' )
     sh_unix_getinfo_attr(theFile->fullpath, 
-                         &theFile->attributes, theFile->c_attributes, fd_2);
+                         &theFile->attributes, theFile->c_attributes, fd);
 
 #endif