Commit 86ccc887 authored by pekka@sama.ndb.mysql.com's avatar pekka@sama.ndb.mysql.com
Browse files

ndb - bug#34046 - rename Ndbd_mem_manager::log2 to ndb_log2

parent 5b0280e7

storage/ndb/src/kernel/vm/NdbdSuperPool.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ NdbdSuperPool::NdbdSuperPool(class Ndbd_mem_manager & mm, 
{

  m_memRoot = m_mm.get_memroot();

  

  m_shift = Ndbd_mem_manager::log2((1 << (BMW_2LOG + 2)) / pageSize) - 1;

  m_shift = Ndbd_mem_manager::ndb_log2((1 << (BMW_2LOG + 2)) / pageSize) - 1;

  m_add = (1 << m_shift) - 1;

}

storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp

+4 −4
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ do_malloc(Uint32 pages, InitChunk* chunk) 
}



Uint32

Ndbd_mem_manager::log2(Uint32 input)

Ndbd_mem_manager::ndb_log2(Uint32 input)

{

  input = input | (input >> 8);

  input = input | (input >> 4);
@@ -400,7 +400,7 @@ Ndbd_mem_manager::alloc(Uint32* ret, Uint32 *pages, Uint32 min) 
  Int32 i;

  Uint32 start;

  Uint32 cnt = * pages;

  Uint32 list = log2(cnt - 1);

  Uint32 list = ndb_log2(cnt - 1);

  

  assert(cnt);

  assert(list <= 16);
@@ -438,7 +438,7 @@ Ndbd_mem_manager::alloc(Uint32* ret, Uint32 *pages, Uint32 min) 
   *   search in other lists...

   */



  Int32 min_list = log2(min - 1);

  Int32 min_list = ndb_log2(min - 1);

  assert((Int32)list >= min_list);

  for (i = list - 1; i >= min_list; i--) 

  {
@@ -470,7 +470,7 @@ Ndbd_mem_manager::alloc(Uint32* ret, Uint32 *pages, Uint32 min) 
void

Ndbd_mem_manager::insert_free_list(Uint32 start, Uint32 size)

{

  Uint32 list = log2(size) - 1;

  Uint32 list = ndb_log2(size) - 1;

  Uint32 last = start + size - 1;



  Uint32 head = m_buddy_lists[list];

storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public: 
   * @note size = 0     -> 0

   * @note size > 65536 -> 16

   */

  static Uint32 log2(Uint32 size);

  static Uint32 ndb_log2(Uint32 size);



private:

  void grow(Uint32 start, Uint32 cnt);