From: Mikael Ronstrom
Date: May 3 2011 11:18am
Subject: bzr commit into mysql-5.5 branch (mikael.ronstrom:3140)
List-Archive: http://lists.mysql.com/commits/136561
Message-Id: <201105031119.p43BJN8a004549@dator6>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5870024211892750500=="

--===============5870024211892750500==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/mikael/mysql_clones/mysql-5.5-wl5136_community/ based on revid:mikael.ronstrom@stripped

 3140 Mikael Ronstrom	2011-05-03
      Introduced possibility to cache line alignment of variables in portable manner

    modified:
      include/my_global.h
=== modified file 'include/my_global.h'
--- a/include/my_global.h	revid:mikael.ronstrom@stripped
+++ b/include/my_global.h	revid:mikael.ronstrom@stripped
@@ -1464,6 +1464,41 @@ static inline double rint(double x)
 #endif
 #endif
 
+/* Define for cache aligned data declaration */
+#define CACHE_LINE_SIZE 128
+#ifdef _MSC_VER
+/* Aligned declarations are available since Visual C++ .Net 2003 == _MSC_VER=1310 */
+#  if (_MSC_VER >= 1310)
+#    define CACHE_ALIGNED_DECLARE(declare, var_name) __declspec( align (CACHE_LINE_SIZE)) declare
+#  else
+#    define CACHE_ALIGNED_DECLARE(declare) declare
+#  endif
+#elif (defined(__GNUC__))
+/* Aligned declarations are available since GCC 3.0 == __GNUC__ >= 3 */
+#  if (__GNUC__ >= 3)
+#    define CACHE_ALIGNED_DECLARE(declare, varname) declare __attribute__ ((aligned (CACHE_LINE_SIZE)))
+#  else
+#    define CACHE_ALIGNED_DECLARE(declare) declare
+#  endif
+#elif (defined(__SUNPRO_C) || defined(__SUNPRO_CC))
+/*
+  Aligned declarations are available at least as of Sun Studio 11. However
+  didn't manage to discover what __SUNPRO_C is set to for Sun Studio 11 so
+  used 0x590 instead which is Sun Studio 12.
+
+  Note that within a namespace the varname must be mangled name of the variable.
+*/
+#  if (defined(__SUNPRO_C) && __SUNPRO_C >= 0x590) || (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
+#    define CACHE_ALIGNED_DECLARE(declare, varname) \
+     pragma align CACHE_LINE_SIZE(varname) \
+     declare
+#  else
+#    define CACHE_ALIGNED_DECLARE(declare) declare
+#  endif
+#else
+#define CACHE_ALIGNED_DECLARE(declare) declare
+#endif
+
 /* Defines that are unique to the embedded version of MySQL */
 
 #ifdef EMBEDDED_LIBRARY


--===============5870024211892750500==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/mikael.ronstrom@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mikael.ronstrom@stripped\
#   a61w98bpfzmfjp1k
# target_branch: file:///home/mikael/mysql_clones/mysql-5.5-\
#   wl5136_community/
# testament_sha1: b85342744bab03100e1c75b4f48889fe93605088
# timestamp: 2011-05-03 13:18:23 +0200
# base_revision_id: mikael.ronstrom@stripped\
#   4yslf502qltlu46z
# 
# Begin bundle
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
JJ4=


--===============5870024211892750500==--