Merge lp:~laurynas-biveinis/percona-server/memory-valgrind-annotations into lp:percona-server/5.5

[Laurynas Biveinis]

Annotate the MEMORY engine block allocator for Valgrind.

- Add 10-byte-long redzones before and after each block when compiled
  with Valgrind support. Mark them as inaccessible on block
  allocation.
- Mark block contents as undefined on block deallocation and
  allocation that recycles blocks from the free list.
- Bump block offset link from 1 << 22 to 1 << 31 for fixed-length
  blocks in order to make errorneous accesses crash sooner when
  fixed-length blocks are treated as variable-length.

[lp:~laurynas-biveinis/percona-server/memory-valgrind-annotations]

227. By Hrvoje Matijakovic on 2012-03-27

* merged lp:~hrvojem/percona-server/new-theme-5.5

228. By Ignacio Nin on 2012-03-27

Merge from release branch 5.5.21-25.0

229. By Hrvoje Matijakovic on 2012-03-27

* merged lp:~hrvojem/percona-server/bug955266-5.5

230. By Laurynas Biveinis on 2012-03-28

Automerge lp:~laurynas-biveinis/percona-server/staging-5.5

231. By Laurynas Biveinis on 2012-03-28

Automerge lp:~stewart/percona-server/bug966844

232. By Hrvoje Matijakovic on 2012-03-28

* merged lp:~hrvojem/percona-server/rn-25.1

233. By Hrvoje Matijakovic on 2012-03-29

* merged lp:~hrvojem/percona-server/theme-update.5.5

234. By Hrvoje Matijakovic on 2012-04-12

* merged lp:~hrvojem/percona-server/theme-fix-5.5

235. By Stewart Smith on 2012-04-22

merge 5.5.22 as bzr branch

236. By Hrvoje Matijakovic on 2012-04-24

* merged lp:~hrvojem/percona-server/rn-5.5.22-25.2

237. By Laurynas Biveinis on 2012-05-11

Annotate the MEMORY engine block allocator for Valgrind.

- Add 10-byte-long redzones before and after each block when compiled
  with Valgrind support. Mark them as inaccessible on block
  allocation.
- Mark block contents as undefined on block deallocation and
  allocation that recycles blocks from the free list.
- Bump block offset link from 1 << 22 to 1 << 31 for fixed-length
  blocks in order to make errorneous accesses crash sooner when
  fixed-length blocks are treated as variable-length.

[Laurynas Biveinis (laurynas-biveinis)]

Clean Valgrind on Jenkins testing results:
http://jenkins.percona.com/job/percona-server-5.5-valgrind-param/5/

Regular Jenkins test still in progress.

Unmerged revisions

237. By Laurynas Biveinis on 2012-05-11

Annotate the MEMORY engine block allocator for Valgrind.

- Add 10-byte-long redzones before and after each block when compiled
  with Valgrind support. Mark them as inaccessible on block
  allocation.
- Mark block contents as undefined on block deallocation and
  allocation that recycles blocks from the free list.
- Bump block offset link from 1 << 22 to 1 << 31 for fixed-length
  blocks in order to make errorneous accesses crash sooner when
  fixed-length blocks are treated as variable-length.

=== modified file 'Percona-Server/storage/heap/heapdef.h'
--- Percona-Server/storage/heap/heapdef.h	2012-04-18 23:26:28 +0000
+++ Percona-Server/storage/heap/heapdef.h	2012-05-11 10:40:25 +0000
@@ -39,6 +39,12 @@
 /* this chunk is a continuation from another chunk (part of chunkset) */
 #define CHUNK_STATUS_LINKED  2
 
+#ifdef HAVE_VALGRIND
+#define RED_ZONE_LEN 10
+#else
+#define RED_ZONE_LEN 0
+#endif
+
 	/* Some extern variables */
 
 extern LIST *heap_open_list,*heap_share_list;
 
=== modified file 'Percona-Server/storage/heap/hp_block.c'
--- Percona-Server/storage/heap/hp_block.c	2011-06-30 15:46:53 +0000
+++ Percona-Server/storage/heap/hp_block.c	2012-05-11 10:40:25 +0000
@@ -36,7 +36,7 @@
     ptr=(HP_PTRS*)ptr->blocks[pos/block->level_info[i].records_under_level];
     pos%=block->level_info[i].records_under_level;
   }
-  return (uchar*) ptr+ pos*block->recbuffer;
+  return (uchar*) ptr+ pos*(block->recbuffer) + RED_ZONE_LEN;
 }
 
 
 
=== modified file 'Percona-Server/storage/heap/hp_create.c'
--- Percona-Server/storage/heap/hp_create.c	2012-04-19 16:51:34 +0000
+++ Percona-Server/storage/heap/hp_create.c	2012-05-11 10:40:25 +0000
@@ -336,7 +336,7 @@
         sizeof(uchar **);
     } else {
       /* Make it likely to fail if anyone uses this offset */
-      share->recordspace.offset_link= 1 << 22;
+      share->recordspace.offset_link= 1 << 31;
       share->recordspace.offset_status= chunk_dataspace_length;
     }
 
@@ -403,7 +403,7 @@
     records_in_block= (my_default_record_cache_size - sizeof(HP_PTRS) *
 		      HP_MAX_LEVELS) / recbuffer + 1;
   block->records_in_block= records_in_block;
-  block->recbuffer= recbuffer;
+  block->recbuffer= recbuffer + 2 * RED_ZONE_LEN;
   block->last_allocated= 0L;
 
   for (i= 0; i <= HP_MAX_LEVELS; i++)
 
=== modified file 'Percona-Server/storage/heap/hp_dspace.c'
--- Percona-Server/storage/heap/hp_dspace.c	2012-04-18 23:26:28 +0000
+++ Percona-Server/storage/heap/hp_dspace.c	2012-05-11 10:40:25 +0000
@@ -379,6 +379,8 @@
 
     DBUG_PRINT("hp_allocate_one_chunk",
                ("Used old position: 0x%lx",(long) curr_chunk));
+
+    MEM_UNDEFINED(curr_chunk, info->chunk_length);
     return curr_chunk;
   }
 
@@ -397,6 +399,10 @@
   info->chunk_count++;
   curr_chunk= ((uchar *) info->block.level_info[0].last_blocks +
                block_pos * info->block.recbuffer);
+  MEM_NOACCESS(curr_chunk, RED_ZONE_LEN);
+  curr_chunk+= RED_ZONE_LEN;
+  MEM_UNDEFINED(curr_chunk, info->chunk_length);
+  MEM_NOACCESS(curr_chunk + info->chunk_length, RED_ZONE_LEN);
 
   DBUG_PRINT("hp_allocate_one_chunk",
              ("Used new position: 0x%lx", (long) curr_chunk));
@@ -418,6 +424,7 @@
 void hp_free_chunks(HP_DATASPACE *info, uchar *pos)
 {
   uchar *curr_chunk= pos;
+  uchar *next_chunk= NULL;
 
   while (curr_chunk)
   {
@@ -425,6 +432,13 @@
     *((uchar **) curr_chunk)= info->del_link;
     info->del_link= curr_chunk;
 
+    if (info->is_variable_size)
+      next_chunk= *((uchar **)(curr_chunk + info->offset_link));
+
+    MEM_NOACCESS(curr_chunk + sizeof(uchar *),
+                 info->chunk_length - sizeof(uchar *));
+
+    MEM_UNDEFINED(curr_chunk + info->offset_status, 1);
     curr_chunk[info->offset_status]= CHUNK_STATUS_DELETED;
 
     DBUG_PRINT("hp_free_chunks",("Freed position: 0x%lx", (long) curr_chunk));
@@ -435,6 +449,6 @@
     }
 
     /* Delete next chunk in this chunkset */
-    curr_chunk= *((uchar **)(curr_chunk + info->offset_link));
+    curr_chunk= next_chunk;
   }
 }
 
=== modified file 'Percona-Server/storage/heap/hp_write.c'
--- Percona-Server/storage/heap/hp_write.c	2012-04-18 23:26:28 +0000
+++ Percona-Server/storage/heap/hp_write.c	2012-05-11 10:40:25 +0000
@@ -374,5 +374,5 @@
   }
   block->last_allocated=records+1;
   return((HASH_INFO*) ((uchar*) block->level_info[0].last_blocks+
-		       block_pos*block->recbuffer));
+                       block_pos * block->recbuffer + RED_ZONE_LEN));
 }