Bug #26927386: REDUCE COMPILATION TIME [noclose]

Remove some links to my_sys.h. This included splitting out the Valgrind
macros (TRASH etc.) into a separate header file.

Change-Id: If300f1bcdc6783b30bd9d3507d8fe476a5250c55

Author: Steinar H. Gunderson

client/mysql_secure_installation.cc

@@ -20,6 +20,9 @@
 #include <sys/types.h>
 
 #include "client/client_priv.h"
+#ifdef _WIN32
+#include "m_ctype.h"
+#endif
 #include "my_alloc.h"
 #include "my_compiler.h"
 #include "my_dbug.h"

client/mysql_ssl_rsa_setup.cc

@@ -31,6 +31,9 @@
 
 #include "client/logger.h"
 #include "client/path.h"
+#ifdef _WIN32
+#include "m_ctype.h"
+#endif
 #include "my_alloc.h"
 #include "my_compiler.h"
 #include "my_dbug.h"

include/memory_debugging.h

@@ -0,0 +1,72 @@
+/* Copyright (c)  2017, Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#ifndef MEMORY_DEBUGGING_INCLUDED
+#define MEMORY_DEBUGGING_INCLUDED
+
+/**
+  @file memory_debugging.h
+
+  Various macros useful for communicating with memory debuggers,
+  such as Valgrind.
+*/
+
+#ifdef HAVE_VALGRIND
+# include <valgrind/valgrind.h>
+
+# define MEM_MALLOCLIKE_BLOCK(p1, p2, p3, p4) VALGRIND_MALLOCLIKE_BLOCK(p1, p2, p3, p4)
+# define MEM_FREELIKE_BLOCK(p1, p2) VALGRIND_FREELIKE_BLOCK(p1, p2)
+# include <valgrind/memcheck.h>
+
+# define MEM_UNDEFINED(a,len) VALGRIND_MAKE_MEM_UNDEFINED(a,len)
+# define MEM_DEFINED_IF_ADDRESSABLE(a,len) \
+    VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(a,len)
+# define MEM_NOACCESS(a,len) VALGRIND_MAKE_MEM_NOACCESS(a,len)
+# define MEM_CHECK_ADDRESSABLE(a,len) VALGRIND_CHECK_MEM_IS_ADDRESSABLE(a,len)
+
+#else /* HAVE_VALGRIND */
+
+# define MEM_MALLOCLIKE_BLOCK(p1, p2, p3, p4) do {} while (0)
+# define MEM_FREELIKE_BLOCK(p1, p2) do {} while (0)
+# define MEM_UNDEFINED(a,len) ((void) 0)
+# define MEM_DEFINED_IF_ADDRESSABLE(a,len) ((void) 0)
+# define MEM_NOACCESS(a,len) ((void) 0)
+# define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
+
+#endif
+
+
+#if !defined(DBUG_OFF) || defined(HAVE_VALGRIND)
+
+/**
+  Put bad content in memory to be sure it will segfault if dereferenced.
+  With Valgrind, verify that memory is addressable, and mark it undefined.
+  We cache value of B because if B is expression which depends on A, memset()
+  trashes value of B.
+*/
+#define TRASH(A,B) do {                                                 \
+    const size_t l= (B);                                                \
+    MEM_CHECK_ADDRESSABLE(A, l);                                        \
+    memset(A, 0x8F, l);                                                 \
+    MEM_UNDEFINED(A, l);                                                \
+  } while (0)
+
+#else
+
+#define TRASH(A,B) do {} while(0)
+
+#endif
+
+#endif  // MEMORY_DEBUGGING_INCLUDED

include/my_sys.h

@@ -72,27 +72,6 @@ struct MEM_ROOT;
 
 C_MODE_START
 
-#ifdef HAVE_VALGRIND
-# include <valgrind/valgrind.h>
-
-# define MEM_MALLOCLIKE_BLOCK(p1, p2, p3, p4) VALGRIND_MALLOCLIKE_BLOCK(p1, p2, p3, p4)
-# define MEM_FREELIKE_BLOCK(p1, p2) VALGRIND_FREELIKE_BLOCK(p1, p2)
-# include <valgrind/memcheck.h>
-
-# define MEM_UNDEFINED(a,len) VALGRIND_MAKE_MEM_UNDEFINED(a,len)
-# define MEM_DEFINED_IF_ADDRESSABLE(a,len) \
-    VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(a,len)
-# define MEM_NOACCESS(a,len) VALGRIND_MAKE_MEM_NOACCESS(a,len)
-# define MEM_CHECK_ADDRESSABLE(a,len) VALGRIND_CHECK_MEM_IS_ADDRESSABLE(a,len)
-#else /* HAVE_VALGRIND */
-# define MEM_MALLOCLIKE_BLOCK(p1, p2, p3, p4) do {} while (0)
-# define MEM_FREELIKE_BLOCK(p1, p2) do {} while (0)
-# define MEM_UNDEFINED(a,len) ((void) 0)
-# define MEM_DEFINED_IF_ADDRESSABLE(a,len) ((void) 0)
-# define MEM_NOACCESS(a,len) ((void) 0)
-# define MEM_CHECK_ADDRESSABLE(a,len) ((void) 0)
-#endif /* HAVE_VALGRIND */
-
 #define MY_INIT(name)   { my_progname= name; my_init(); }
 
 /**
@@ -201,22 +180,6 @@ extern PSI_memory_key key_memory_max_alloca;
 #define my_safe_afree(ptr, size, max_alloca_sz) if (size > max_alloca_sz) \
                                                my_free(ptr)
 
-#if !defined(DBUG_OFF) || defined(HAVE_VALGRIND)
-/**
-  Put bad content in memory to be sure it will segfault if dereferenced.
-  With Valgrind, verify that memory is addressable, and mark it undefined.
-  We cache value of B because if B is expression which depends on A, memset()
-  trashes value of B.
-*/
-#define TRASH(A,B) do {                                                 \
-    const size_t l= (B);                                                \
-    MEM_CHECK_ADDRESSABLE(A, l);                                        \
-    memset(A, 0x8F, l);                                                 \
-    MEM_UNDEFINED(A, l);                                                \
-  } while (0)
-#else
-#define TRASH(A,B) do {} while(0)
-#endif
 #if defined(ENABLED_DEBUG_SYNC)
 extern void (*debug_sync_C_callback_ptr)(const char *, size_t);
 #define DEBUG_SYNC_C(_sync_point_name_) do {                            \

include/sql_string.h

@@ -30,12 +30,12 @@
 #include "lex_string.h"
 #include "m_ctype.h"                         // my_convert
 #include "m_string.h"                        // LEX_CSTRING
+#include "memory_debugging.h"
 #include "my_alloc.h"
 #include "my_byteorder.h"
 #include "my_compiler.h"
 #include "my_dbug.h"
 #include "my_inttypes.h"
-#include "my_sys.h"                          // alloc_root
 #include "mysql/mysql_lex_string.h"          // LEX_STRING
 #include "mysql/psi/psi_base.h"
 #include "mysql/psi/psi_memory.h"
@@ -673,20 +673,7 @@ class String
 
     @return allocated string or NULL
   */
-  char *dup(MEM_ROOT *root) const
-  {
-    if (m_length > 0 && m_ptr[m_length - 1] == 0)
-      return static_cast<char *>(memdup_root(root, m_ptr, m_length));
-
-    char *ret= static_cast<char*>(alloc_root(root, m_length + 1));
-    if (ret != NULL)
-    {
-      if (m_length > 0)
-        memcpy(ret, m_ptr, m_length);
-      ret[m_length]= 0;
-    }
-    return ret;
-  }
+  char *dup(MEM_ROOT *root) const;
 };
 
 static inline void swap(String &a, String &b) noexcept

mysys/mf_dirname.cc

@@ -15,6 +15,9 @@
 
 #include <stddef.h>
 
+#ifdef _WIN32
+#include "m_ctype.h"
+#endif
 #include "m_string.h"
 #include "my_dbug.h"
 #include "my_io.h"

mysys/mf_pack.cc

@@ -22,6 +22,9 @@
 
 #include <string.h>
 
+#ifdef _WIN32
+#include "m_ctype.h"
+#endif
 #include "m_string.h"
 #include "my_dbug.h"
 #include "my_inttypes.h"

mysys/my_conio.cc

@@ -17,11 +17,12 @@
   @file mysys/my_conio.cc
 */
 
+#ifdef _WIN32
+
+#include "m_ctype.h"
 #include "my_dbug.h"
 #include "mysys_priv.h"
 
-#ifdef _WIN32
-
 extern CHARSET_INFO my_charset_utf16le_bin;
 
 

mysys/my_malloc.cc

@@ -22,6 +22,7 @@
 #include <string.h>
 #include <sys/types.h>
 
+#include "memory_debugging.h"
 #include "my_compiler.h"
 #include "my_dbug.h"
 #include "my_inttypes.h"

sql-common/sql_string.cc

@@ -22,6 +22,7 @@
 #include "my_dbug.h"
 #include "my_macros.h"
 #include "my_pointer_arithmetic.h"
+#include "my_sys.h"
 #include "mysql_com.h"    // MAX_BIGINT_WIDTH
 
 using std::min;
@@ -1178,6 +1179,11 @@ void String::swap(String &s) noexcept
   swap(m_charset, s.m_charset);
 }
 
+char *String::dup(MEM_ROOT *root) const
+{
+  return strmake_root(root, m_ptr, m_length);
+}
+
 
 /**
   Convert string to printable ASCII string

sql/item.h

@@ -28,6 +28,7 @@
 #include "lex_string.h"
 #include "m_ctype.h"
 #include "m_string.h"
+#include "memory_debugging.h"
 #include "my_bitmap.h"
 #include "my_compiler.h"
 #include "my_dbug.h"