Changeset 19 for trunk/src/sh_unix.c

Timestamp:

Feb 12, 2006, 10:49:56 PM (19 years ago)

Author:

rainer

Message:

Rewrite of test suite, checksum for growing logs, fix for minor bug with dead client detection.

File:

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

trunk/src/sh_unix.c

@@ -573 +573 @@
   if (mysignal == SIGUSR2)
     {
-      sig_suspend_switch    = 1;
+      ++sig_suspend_switch;
       ++sig_urgent;
     }
@@ -1582 +1582 @@
   if (skey->mlock_failed == SL_FALSE)
     {
-      if ( (-1) == sh_unix_mlock( (char *) skey, sizeof (sh_key_t)) ) 
+      if ( (-1) == sh_unix_mlock( FIL__, __LINE__, 
+                                  (char *) skey, sizeof (sh_key_t)) ) 
         {
           skey->mlock_failed = SL_TRUE;
@@ -2754 +2755 @@
 #include "sh_ignore.h"
 
+int sh_unix_checksum_size (char * filename, struct stat * fbuf, 
+                           char * fileHash, int alert_timeout)
+{
+  file_type tmpFile;
+  int status;
+
+  SL_ENTER(_("sh_unix_checksum_size"));
+
+  /* lookup file in database */
+  status = sh_hash_get_it (filename, &tmpFile);
+  if (status != 0) {
+    goto out;
+  }
+
+  /* if last < current get checksum */
+  if (tmpFile.size < fbuf->st_size)
+    {
+      strcpy(fileHash,                         /* known to fit */
+             sh_tiger_generic_hash (filename, TIGER_FD, tmpFile.size, 
+                                    alert_timeout));
+
+      /* return */
+      SL_RETURN( 0, _("sh_unix_checksum_size"));
+    }
+
+ out:
+  strcpy(fileHash,                              /* known to fit */
+         _("000000000000000000000000000000000000000000000000"));
+  SL_RETURN( -1, _("sh_unix_checksum_size"));
+}
+
 int sh_unix_getinfo (int level, char * filename, file_type * theFile, 
                      char * fileHash, int policy)
@@ -2891 +2923 @@
                      _("000000000000000000000000000000000000000000000000"));
             }
-          else if (policy == SH_LEVEL_PRELINK && 
+          else if ((theFile->check_mask & MODI_PREL) != 0 && 
                    S_TRUE == sh_prelink_iself(rval_open, fbuf.st_size, 
                                               alert_timeout))
@@ -2906 +2938 @@
                      sh_tiger_generic_hash (theFile->fullpath, TIGER_FD, 0, 
                                             alert_timeout));
+              if ((theFile->check_mask & MODI_SGROW) != 0)
+                {
+                  sl_rewind(rval_open);
+                  tiger_fd = rval_open;
+                  sh_unix_checksum_size (theFile->fullpath, &fbuf, 
+                                         &fileHash[KEY_LEN + 1], 
+                                         alert_timeout);
+                }
             }
         }
@@ -2939 +2979 @@
                                                 alert_timeout),
                          KEY_LEN + 1);
+              if ((theFile->check_mask & MODI_SGROW) != 0) 
+                {
+                  sl_rewind(rval_open);
+                  tiger_fd = rval_open;
+                  sh_unix_checksum_size (theFile->fullpath, &fbuf, 
+                                         &fileHash[KEY_LEN + 1], 
+                                         alert_timeout);
+                }
             }
         }
@@ -3648 +3696 @@
   unsigned long  page_start;
   int            page_refcount;
+  char           file[64];
+  int            line;
   struct sh_page_lt * next;
 } sh_page_l;
@@ -3691 +3741 @@
 
 #if defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK)
-int sh_unix_mlock (void * in_addr, size_t len)
+int sh_unix_mlock (char * file, int line, void * in_addr, size_t len)
 {
   int         num_pages;
@@ -3755 +3805 @@
       page_list->page_start = addr;
       page_list->page_refcount = 1;
+      sl_strlcpy(page_list->file, file, 64);
+      page_list->line = line;
       status = mlock( (void *) addr, pagesize);
       if (status != 0)
@@ -3929 +3981 @@
   while (page_list != NULL)
     {
+#ifdef WITH_TPT
+      sl_snprintf(str, 128, _("file: %s line: %d page: %d"), 
+                  page_list->file, page_list->line, i+1);
+      sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, i, MSG_E_SUBGEN,
+                  str, _("sh_unix_count_mlock"));
+#endif
       page_list = page_list->next;
       ++i;
     }
-  sprintf(str, _("%d pages locked"), i);               /* known to fit  */
+  sl_snprintf(str, 128, _("%d pages locked"), i);
   sh_error_handle(SH_ERR_INFO, FIL__, __LINE__, i, MSG_E_SUBGEN,
                   str, _("sh_unix_count_mlock"));