Changeset 143 for trunk/src/samhain.c

Timestamp:

Oct 31, 2007, 1:09:26 AM (17 years ago)

Author:

rainer

Message:

Bugfixes and threaded process check.

File:

• trunk/src/samhain.c (modified) (5 diffs)

trunk/src/samhain.c

@@ -114 +114 @@
 volatile  int      sh_global_suspend_flag;
 volatile  int      sig_fresh_trail;        /* SIGIOT  */
+volatile  int      sh_thread_pause_flag = S_FALSE;
 volatile  int      sig_config_read_again;  /* SIGHUP  */
 volatile  int      sig_terminate;          /* SIGQUIT */
@@ -1724 +1725 @@
               sh_error_handle ((-1), FIL__, __LINE__, 0, MSG_RECONF);
 
+              sh_thread_pause_flag = S_TRUE;
+
 #if defined(WITH_EXTERNAL)
               /* delete list of external tasks
@@ -1793 +1796 @@
                   sh.flag.loop     = S_FALSE;
                 }
+
+              sh_thread_pause_flag = S_FALSE;
 
               /* --- Initialize modules. ---
@@ -1829 +1834 @@
           if (sig_fresh_trail == 1) /* SIGIOT */
             {
-              /* Logfile access 
-               */
+              if (sh_global_suspend_flag == 0)
+                {
+                  SH_MUTEX_LOCK(mutex_thread_nolog);
+
+                  /* Logfile access 
+                   */
 #ifdef SH_USE_XML
-              (void) sh_log_file (NULL, NULL);
-#endif
-              TPT((0, FIL__, __LINE__, _("msg=<Logfile stop/restart.>\n")));
-              sh_error_only_stderr (S_TRUE);
-              (void) sh_unix_rm_lock_file(sh.srvlog.name);
-              (void) retry_msleep(3, 0);
-              sh.flag.log_start = S_TRUE;
-              sh_error_only_stderr (S_FALSE);
-              sig_fresh_trail       = 0;
-              --sig_raised;
+                  (void) sh_log_file (NULL, NULL);
+#endif
+                  TPT((0, FIL__, __LINE__, _("msg=<Logfile stop/restart.>\n")));
+                  sh_error_only_stderr (S_TRUE);
+                  (void) sh_unix_rm_lock_file(sh.srvlog.name);
+                  (void) retry_msleep(3, 0);
+                  sh.flag.log_start = S_TRUE;
+                  sh_error_only_stderr (S_FALSE);
+                  sh_thread_pause_flag = S_FALSE;
+                  sig_fresh_trail       = 0;
+                  --sig_raised;
+                  SH_MUTEX_UNLOCK(mutex_thread_nolog);
+                }
             }
           
@@ -1863 +1875 @@
             {
               TPT((0, FIL__, __LINE__, _("msg=<Suspend switch.>\n")));
-              if (sh_global_suspend_flag == 1) {
-                sh_global_suspend_flag = 0;
-              } else {
+              if (sh_global_suspend_flag != 1) {
+                SH_MUTEX_LOCK_UNSAFE(mutex_thread_nolog);
+                sh_global_suspend_flag = 1;
                 sh_error_handle((-1), FIL__, __LINE__, 0, MSG_SUSPEND, 
                                 sh.prg_name);
-                sh_global_suspend_flag = 1;
+              } else {
+                sh_global_suspend_flag = 0;
+                SH_MUTEX_UNLOCK_UNSAFE(mutex_thread_nolog);
               }
               --sig_suspend_switch;