Changeset 263 for trunk

Timestamp:

Dec 10, 2009, 9:28:09 PM (15 years ago)

Author:

katerina

Message:

Fix invalid use of mutex_mlock (ticket #181).

Location:

trunk

Files:

• docs/Changelog (modified) (1 diff)
• src/sh_unix.c (modified) (3 diffs)

trunk/docs/Changelog

@@ -3 +3 @@
         * support event correlation in log monitoring module
         * make sure host matching is done in a case insensitive way
+          (reported by Tracy)
+        * fix invalid use of mutex_mlock in src/sh_unix.c, function 
+          sh_unix_count_mlock() (reported by Remco Landegge).
         
 2.6.0:

trunk/src/sh_unix.c

@@ -1555 +1555 @@
 #include <arpa/inet.h>
 
-char * sh_unix_h_name (struct hostent * host_entry)
+const char * sh_unix_h_name (struct hostent * host_entry)
 {
         char ** p;
@@ -4859 +4859 @@
   SL_ENTER(_("sh_unix_count_mlock"));
 
+#if defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK)
   /* There's no cancellation point here, except if tracing is on
    */
   SH_MUTEX_LOCK_UNSAFE(mutex_mlock);
+#endif
 
   page_list = sh_page_locked;
@@ -4876 +4878 @@
     }
 
+#if defined(HAVE_MLOCK) && !defined(HAVE_BROKEN_MLOCK)
   SH_MUTEX_UNLOCK_UNSAFE(mutex_mlock);
+#endif
 
 #ifdef WITH_TPT