Skip to content

Commit

Permalink
MDEV-28091 PERFORMANCE_SCHEMA unit tests fail due to memory misalignment
Browse files Browse the repository at this point in the history
Let us make the mocked-up pfs_malloc() return aligned memory, just
like the actual implementation does.
  • Loading branch information
dr-m committed Mar 16, 2022
1 parent 57dbe87 commit 0f56e21
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions storage/perfschema/unittest/stub_pfs_global.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2022, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
Expand All @@ -24,6 +25,9 @@
#include <my_sys.h>
#include <pfs_global.h>
#include <string.h>
#ifdef HAVE_MEMALIGN
# include <malloc.h>
#endif

bool pfs_initialized= false;

Expand All @@ -43,7 +47,17 @@ void *pfs_malloc(size_t size, myf)
if (--stub_alloc_fails_after_count <= 0)
return NULL;

#ifndef PFS_ALIGNEMENT
void *ptr= malloc(size);
#elif defined HAVE_MEMALIGN
void *ptr= memalign(PFS_ALIGNEMENT, size);
#elif defined HAVE_ALIGNED_MALLOC
void *ptr= _aligned_malloc(size, PFS_ALIGNEMENT);
#else
void *ptr;
if (posix_memalign(&ptr, PFS_ALIGNEMENT, size))
ptr= NULL;
#endif
if (ptr != NULL)
memset(ptr, 0, size);
return ptr;
Expand Down

0 comments on commit 0f56e21

Please sign in to comment.