hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeChunk.cpp

rev 611 : Merge

*** 1,10 ****
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)freeChunk.cpp        1.16 07/05/05 17:05:47 JVM"
  #endif
  /*
!  * Copyright 2001-2006 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,10 ----
  #ifdef USE_PRAGMA_IDENT_SRC
  #pragma ident "@(#)freeChunk.cpp        1.16 07/05/05 17:05:47 JVM"
  #endif
  /*
!  * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 48,66 ****
    HeapWord* addr = (HeapWord*)this;
    size_t hdr = header_size();
    Copy::fill_to_words(addr + hdr, size - hdr, baadbabeHeapWord);
  }
  
! void FreeChunk::mangleFreed(size_t size) {
    assert(baadbabeHeapWord != deadbeefHeapWord, "Need distinct patterns");
    // mangle all but the header of a just-freed block of storage
    // just prior to passing it to the storage dictionary
!   assert(size >= MinChunkSize, "smallest size of object");
!   assert(size == _size, "just checking");
    HeapWord* addr = (HeapWord*)this;
    size_t hdr = header_size();
!   Copy::fill_to_words(addr + hdr, size - hdr, deadbeefHeapWord);
  }
  
  void FreeChunk::verifyList() const {
    FreeChunk* nextFC = next();
    if (nextFC != NULL) {
--- 48,66 ----
    HeapWord* addr = (HeapWord*)this;
    size_t hdr = header_size();
    Copy::fill_to_words(addr + hdr, size - hdr, baadbabeHeapWord);
  }
  
! void FreeChunk::mangleFreed(size_t sz) {
    assert(baadbabeHeapWord != deadbeefHeapWord, "Need distinct patterns");
    // mangle all but the header of a just-freed block of storage
    // just prior to passing it to the storage dictionary
!   assert(sz >= MinChunkSize, "smallest size of object");
!   assert(sz == size(), "just checking");
    HeapWord* addr = (HeapWord*)this;
    size_t hdr = header_size();
!   Copy::fill_to_words(addr + hdr, sz - hdr, deadbeefHeapWord);
  }
  
  void FreeChunk::verifyList() const {
    FreeChunk* nextFC = next();
    if (nextFC != NULL) {