Changeset 140 for trunk/src/sh_error.c

Timestamp:

Oct 29, 2007, 1:09:10 AM (17 years ago)

Author:

rainer

Message:

Utility function for threaded modules.

File:

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

trunk/src/sh_error.c

@@ -56 +56 @@
 #include "sh_forward.h"
 #include "sh_prelude.h"
+#include "sh_pthread.h"
 
 #if defined(WITH_DATABASE)
@@ -857 +858 @@
  **********************************************************/
 
+SH_MUTEX_RECURSIVE(mutex_err_handle);
+
 void sh_error_handle (int sev, char * file, long line, 
                       long status, unsigned long msg_id, ...)
@@ -868 +871 @@
 
   int    flag_inet  = S_FALSE;
+
+#ifdef SH_WITH_SERVER
   int    class_inet = clt_class;      /* initialize from global */
-
-#ifdef SH_WITH_SERVER
   char   local_inet_peer[SH_MINIBUF];
 #endif
@@ -908 +911 @@
   SL_ENTER(_("sh_error_handle"));
 
+  SH_MUTEX_RECURSIVE_INIT(mutex_err_handle);
+  SH_MUTEX_RECURSIVE_LOCK(mutex_err_handle);
+
 #ifdef SH_WITH_SERVER
   /* copy the global string into a local array
@@ -918 +924 @@
   else
     local_inet_peer[0] = '\0';
-#endif
 
   clt_class = (-1);      /* reset global */
+#endif
+
 
   if (own_block == 1)
     {
-      SL_RET0(_("sh_error_handle"));
+      goto exit_here;
     }
 
   /* --- Initialize to default values. ---
    */
-  own_block = 1;
   if (IsInitialized == BAD) 
     (void) sh_error_init();
-  own_block = 0;
-
-  /* --- Consistency checks. ---
-   */
-  own_block = 1;
+
+  /* Returns pointer to (constant|thread-specific) static memory
+   */
   fmt = /*@i@*/get_format (msg_id, &severity, &class);
-  own_block = 0;
-
+
+#ifdef SH_WITH_SERVER
   if (class_inet != (-1))
     class = (unsigned int) class_inet;
-
+#endif
+
+  /* --- Consistency check. ---
+   */
   ASSERT((fmt != NULL), _("fmt != NULL"))
   if (fmt == NULL)
@@ -949 +956 @@
               _("ERROR: msg=<NULL format>, file=<%s>, line=<%ld>\n"), 
               file, line);
-      SL_RET0(_("sh_error_handle"));
+      goto exit_here;
     }
 
@@ -995 +1002 @@
        )
     {
-      SL_RET0(_("sh_error_handle"));
+      goto exit_here;
     }
 
   if ((severity & SH_ERR_NOT) != 0)
     {
-      SL_RET0(_("sh_error_handle"));
+      goto exit_here;
     }
 
@@ -1017 +1024 @@
   lmsg->line     = line;
   lmsg->status   = status;
-  own_block = 0;
-
 
   /* Format the log message with timestamp etc.
    * Allocate lmsg->msg
    */
-  own_block = 1;
   va_start (vl, msg_id);
   (void) sh_error_string (lmsg, vl);
@@ -1311 +1315 @@
   SH_FREE( lmsg );
   own_block = 0;
+
+ exit_here:
+
+  SH_MUTEX_RECURSIVE_UNLOCK(mutex_err_handle);
 
   /*@i@*/SL_RET0(_("sh_error_handle"));