[Avida-SVN] r3477 - in branches/tcmalloc-1.4: Avida.xcodeproj source/platform/tcmalloc-1.4
brysonda at myxo.css.msu.edu
brysonda at myxo.css.msu.edu
Wed Oct 14 12:12:13 PDT 2009
Author: brysonda
Date: 2009-10-14 15:12:12 -0400 (Wed, 14 Oct 2009)
New Revision: 3477
Removed:
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/dynamic_annotations.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/dynamic_annotations.h
Modified:
branches/tcmalloc-1.4/Avida.xcodeproj/project.pbxproj
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-linuxppc.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-macosx.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-x86-msvc.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-x86.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-x86.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/basictypes.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/central_freelist.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/central_freelist.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/commandlineflags.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/common.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/common.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/cycleclock.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/internal_logging.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/internal_logging.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/linked_list.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/linux_syscall_support.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/malloc_extension.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/malloc_extension.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/packed-cache-inl.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/page_heap.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/page_heap.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/page_heap_allocator.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/pagemap.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/span.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/span.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock_linux-inl.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock_posix-inl.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock_win32-inl.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/static_vars.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/static_vars.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/sysinfo.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/sysinfo.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/system-alloc.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/system-alloc.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc-platform.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc_guard.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/thread_annotations.h
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/thread_cache.cc
branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/thread_cache.h
Log:
Some more unused code cleanup. File headers updated.
Modified: branches/tcmalloc-1.4/Avida.xcodeproj/project.pbxproj
===================================================================
--- branches/tcmalloc-1.4/Avida.xcodeproj/project.pbxproj 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/Avida.xcodeproj/project.pbxproj 2009-10-14 19:12:12 UTC (rev 3477)
@@ -56,7 +56,6 @@
702246EB107FCA900079CD25 /* system-alloc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 702246D5107FCA590079CD25 /* system-alloc.cc */; };
702246EC107FCA900079CD25 /* tcmalloc.cc in Sources */ = {isa = PBXBuildFile; fileRef = 702246D8107FCA590079CD25 /* tcmalloc.cc */; settings = {COMPILER_FLAGS = "-fexceptions"; }; };
702246ED107FCA900079CD25 /* thread_cache.cc in Sources */ = {isa = PBXBuildFile; fileRef = 702246D9107FCA590079CD25 /* thread_cache.cc */; };
- 7022476010861BD30079CD25 /* dynamic_annotations.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7022475E10861BD30079CD25 /* dynamic_annotations.cc */; };
7022479E108620E40079CD25 /* sysinfo.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7022479C108620E40079CD25 /* sysinfo.cc */; };
702247F2108625920079CD25 /* libtcmalloc-1.4.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7022469D107FC4F10079CD25 /* libtcmalloc-1.4.a */; };
7023EC3A0C0A431B00362B9C /* avida.cc in Sources */ = {isa = PBXBuildFile; fileRef = DCC3109C0762539E008F7A48 /* avida.cc */; };
@@ -506,8 +505,6 @@
702246D9107FCA590079CD25 /* thread_cache.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread_cache.cc; sourceTree = "<group>"; };
702246DA107FCA590079CD25 /* thread_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thread_cache.h; sourceTree = "<group>"; };
7022475610861B670079CD25 /* thread_annotations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = thread_annotations.h; sourceTree = "<group>"; };
- 7022475E10861BD30079CD25 /* dynamic_annotations.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dynamic_annotations.cc; sourceTree = "<group>"; };
- 7022475F10861BD30079CD25 /* dynamic_annotations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dynamic_annotations.h; sourceTree = "<group>"; };
7022477A10861D390079CD25 /* tcmalloc-platform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "tcmalloc-platform.h"; sourceTree = "<group>"; };
7022479C108620E40079CD25 /* sysinfo.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sysinfo.cc; sourceTree = "<group>"; };
7022479D108620E40079CD25 /* sysinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sysinfo.h; sourceTree = "<group>"; };
@@ -1159,8 +1156,6 @@
7022479C108620E40079CD25 /* sysinfo.cc */,
7022479D108620E40079CD25 /* sysinfo.h */,
7022477A10861D390079CD25 /* tcmalloc-platform.h */,
- 7022475E10861BD30079CD25 /* dynamic_annotations.cc */,
- 7022475F10861BD30079CD25 /* dynamic_annotations.h */,
7022475610861B670079CD25 /* thread_annotations.h */,
702246AF107FCA590079CD25 /* atomicops-internals-linuxppc.h */,
702246B0107FCA590079CD25 /* atomicops-internals-macosx.h */,
@@ -2234,7 +2229,6 @@
702246EB107FCA900079CD25 /* system-alloc.cc in Sources */,
702246EC107FCA900079CD25 /* tcmalloc.cc in Sources */,
702246ED107FCA900079CD25 /* thread_cache.cc in Sources */,
- 7022476010861BD30079CD25 /* dynamic_annotations.cc in Sources */,
7022479E108620E40079CD25 /* sysinfo.cc in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-linuxppc.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-linuxppc.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-linuxppc.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * atomicops-internals-linuxppc.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2008, Google Inc.
* All rights reserved.
*
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-macosx.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-macosx.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-macosx.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * atomicops-internals-macosx.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2006, Google Inc.
* All rights reserved.
*
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-x86-msvc.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-x86-msvc.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-x86-msvc.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * atomicops-internals-x86-msvc.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2006, Google Inc.
* All rights reserved.
*
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-x86.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-x86.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-x86.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * atomicops-internals-x86.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2007, Google Inc.
* All rights reserved.
*
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-x86.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-x86.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops-internals-x86.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * atomicops-internals-x86.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2006, Google Inc.
* All rights reserved.
*
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/atomicops.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * atomicops.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2006, Google Inc.
* All rights reserved.
*
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/basictypes.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/basictypes.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/basictypes.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * basictypes.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2005, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/central_freelist.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/central_freelist.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/central_freelist.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * central_freelist.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/central_freelist.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/central_freelist.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/central_freelist.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * central_freelist.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/commandlineflags.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/commandlineflags.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/commandlineflags.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * commandlineflags.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2005, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/common.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/common.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/common.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * common.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/common.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/common.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/common.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * common.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/cycleclock.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/cycleclock.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/cycleclock.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * cycleclock.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2004, Google Inc.
// All rights reserved.
//
Deleted: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/dynamic_annotations.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/dynamic_annotations.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/dynamic_annotations.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,110 +0,0 @@
-/* Copyright (c) 2008, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ---
- * Author: Kostya Serebryany
- */
-
-#include "tcmalloc-platform.h"
-#include <stdlib.h>
-#include <string.h>
-
-#include "dynamic_annotations.h"
-#include "sysinfo.h"
-
-// Each function is empty and called (via a macro) only in debug mode.
-// The arguments are captured by dynamic tools at runtime.
-
-extern "C" void AnnotateRWLockCreate(const char *file, int line,
- const volatile void *lock){}
-extern "C" void AnnotateRWLockDestroy(const char *file, int line,
- const volatile void *lock){}
-extern "C" void AnnotateRWLockAcquired(const char *file, int line,
- const volatile void *lock, long is_w){}
-extern "C" void AnnotateRWLockReleased(const char *file, int line,
- const volatile void *lock, long is_w){}
-extern "C" void AnnotateCondVarWait(const char *file, int line,
- const volatile void *cv,
- const volatile void *lock){}
-extern "C" void AnnotateCondVarSignal(const char *file, int line,
- const volatile void *cv){}
-extern "C" void AnnotateCondVarSignalAll(const char *file, int line,
- const volatile void *cv){}
-extern "C" void AnnotatePublishMemoryRange(const char *file, int line,
- const volatile void *address,
- long size){}
-extern "C" void AnnotateUnpublishMemoryRange(const char *file, int line,
- const volatile void *address,
- long size){}
-extern "C" void AnnotatePCQCreate(const char *file, int line,
- const volatile void *pcq){}
-extern "C" void AnnotatePCQDestroy(const char *file, int line,
- const volatile void *pcq){}
-extern "C" void AnnotatePCQPut(const char *file, int line,
- const volatile void *pcq){}
-extern "C" void AnnotatePCQGet(const char *file, int line,
- const volatile void *pcq){}
-extern "C" void AnnotateNewMemory(const char *file, int line,
- const volatile void *mem,
- long size){}
-extern "C" void AnnotateExpectRace(const char *file, int line,
- const volatile void *mem,
- const char *description){}
-extern "C" void AnnotateBenignRace(const char *file, int line,
- const volatile void *mem,
- const char *description){}
-extern "C" void AnnotateMutexIsUsedAsCondVar(const char *file, int line,
- const volatile void *mu){}
-extern "C" void AnnotateTraceMemory(const char *file, int line,
- const volatile void *arg){}
-extern "C" void AnnotateThreadName(const char *file, int line,
- const char *name){}
-extern "C" void AnnotateIgnoreReadsBegin(const char *file, int line){}
-extern "C" void AnnotateIgnoreReadsEnd(const char *file, int line){}
-extern "C" void AnnotateIgnoreWritesBegin(const char *file, int line){}
-extern "C" void AnnotateIgnoreWritesEnd(const char *file, int line){}
-extern "C" void AnnotateNoOp(const char *file, int line,
- const volatile void *arg){}
-
-static int GetRunningOnValgrind() {
- const char *running_on_valgrind_str = GetenvBeforeMain("RUNNING_ON_VALGRIND");
- if (running_on_valgrind_str) {
- return strcmp(running_on_valgrind_str, "0") != 0;
- }
- return 0;
-}
-
-// When running under valgrind, this function will be intercepted
-// and a non-zero value will be returned.
-// Some valgrind-based tools (e.g. callgrind) do not intercept functions,
-// so we also read environment variable.
-extern "C" int RunningOnValgrind() {
- static int running_on_valgrind = GetRunningOnValgrind();
- return running_on_valgrind;
-}
Deleted: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/dynamic_annotations.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/dynamic_annotations.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/dynamic_annotations.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,467 +0,0 @@
-/* Copyright (c) 2008, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ---
- * Author: Kostya Serebryany
- */
-
-// This file defines dynamic annotations for use with dynamic analysis
-// tool such as valgrind, PIN, etc.
-//
-// Dynamic annotation is a source code annotation that affects
-// the generated code (that is, the annotation is not a comment).
-// Each such annotation is attached to a particular
-// instruction and/or to a particular object (address) in the program.
-//
-// The annotations that should be used by users are macros in all upper-case
-// (e.g., ANNOTATE_NEW_MEMORY).
-//
-// Actual implementation of these macros may differ depending on the
-// dynamic analysis tool being used.
-//
-// This file supports the following dynamic analysis tools:
-// - None (NDEBUG is defined).
-// Macros are defined empty.
-// - Helgrind (NDEBUG is not defined).
-// Macros are defined as calls to non-inlinable empty functions
-// that are intercepted by helgrind.
-//
-#ifndef BASE_DYNAMIC_ANNOTATIONS_H_
-#define BASE_DYNAMIC_ANNOTATIONS_H_
-
-#include "thread_annotations.h"
-
-// All the annotation macros are in effect only in debug mode.
-#ifndef NDEBUG
-
- // -------------------------------------------------------------
- // Annotations useful when implementing condition variables such as CondVar,
- // using conditional critical sections (Await/LockWhen) and when constructing
- // user-defined synchronization mechanisms.
- //
- // The annotations ANNOTATE_HAPPENS_BEFORE() and ANNOTATE_HAPPENS_AFTER() can
- // be used to define happens-before arcs in user-defined synchronization
- // mechanisms: the race detector will infer an arc from the former to the
- // latter when they share the same argument pointer.
- //
- // Example 1 (reference counting):
- //
- // void Unref() {
- // ANNOTATE_HAPPENS_BEFORE(&refcount_);
- // if (AtomicDecrementByOne(&refcount_) == 0) {
- // ANNOTATE_HAPPENS_AFTER(&refcount_);
- // delete this;
- // }
- // }
- //
- // Example 2 (message queue):
- //
- // void MyQueue::Put(Type *e) {
- // MutexLock lock(&mu_);
- // ANNOTATE_HAPPENS_BEFORE(e);
- // PutElementIntoMyQueue(e);
- // }
- //
- // Type *MyQueue::Get() {
- // MutexLock lock(&mu_);
- // Type *e = GetElementFromMyQueue();
- // ANNOTATE_HAPPENS_AFTER(e);
- // return e;
- // }
- //
- // Note: when possible, please use the existing reference counting and message
- // queue implementations instead of inventing new ones.
-
- // Report that wait on the condition variable at address "cv" has succeeded
- // and the lock at address "lock" is held.
- #define ANNOTATE_CONDVAR_LOCK_WAIT(cv, lock) \
- AnnotateCondVarWait(__FILE__, __LINE__, cv, lock)
-
- // Report that wait on the condition variable at "cv" has succeeded. Variant
- // w/o lock.
- #define ANNOTATE_CONDVAR_WAIT(cv) \
- AnnotateCondVarWait(__FILE__, __LINE__, cv, NULL)
-
- // Report that we are about to signal on the condition variable at address
- // "cv".
- #define ANNOTATE_CONDVAR_SIGNAL(cv) \
- AnnotateCondVarSignal(__FILE__, __LINE__, cv)
-
- // Report that we are about to signal_all on the condition variable at "cv".
- #define ANNOTATE_CONDVAR_SIGNAL_ALL(cv) \
- AnnotateCondVarSignalAll(__FILE__, __LINE__, cv)
-
- // Annotations for user-defined synchronization mechanisms.
- #define ANNOTATE_HAPPENS_BEFORE(obj) ANNOTATE_CONDVAR_SIGNAL(obj)
- #define ANNOTATE_HAPPENS_AFTER(obj) ANNOTATE_CONDVAR_WAIT(obj)
-
- // Report that the bytes in the range [pointer, pointer+size) are about
- // to be published safely. The race checker will create a happens-before
- // arc from the call ANNOTATE_PUBLISH_MEMORY_RANGE(pointer, size) to
- // subsequent accesses to this memory.
- #define ANNOTATE_PUBLISH_MEMORY_RANGE(pointer, size) \
- AnnotatePublishMemoryRange(__FILE__, __LINE__, pointer, size)
-
- // Report that the bytes in the range [pointer, pointer+size) are not shared
- // between threads any more and can be safely used by the current thread w/o
- // synchronization. The race checker will create a happens-before arc from
- // all previous accesses to this memory to this call.
- //
- // This annotation could be applied to complex objects, such as STL
- // containers, with one condition: the accesses to the object itself
- // and its internal data should not be separated with any synchronization.
- //
- // Example that works:
- //
- // map<int, int> the_map;
- // void Thread1() {
- // MutexLock lock(&mu);
- // // Ok: accesses to the_map and its internal data is not separated by
- // // synchronization.
- // the_map[1]++;
- // }
- // void Thread2() {
- // {
- // MutexLock lock(&mu);
- // ...
- // // because of some reason we know that the_map will not be used by
- // // other threads any more
- // ANNOTATE_UNPUBLISH_MEMORY_RANGE(&the_map, sizeof(the_map));
- // }
- // the_map->DoSomething();
- // }
- //
- // Example that does not work (due to the way happens-before arcs are
- // represented in some race detectors):
- //
- // void Thread1() {
- // MutexLock lock(&mu);
- // int *guts_of_the_map = &(*the_map)[1];
- // // we have some synchronization between access to 'c' and its guts.
- // // This will make ANNOTATE_UNPUBLISH_MEMORY_RANGE in Thread2 useless.
- // some_other_lock_or_other_synchronization_utility.Lock();
- // (*guts_of_the_map)++;
- // ...
- // }
- //
- // void Thread1() { // same as above...
- #define ANNOTATE_UNPUBLISH_MEMORY_RANGE(pointer, size) \
- AnnotateUnpublishMemoryRange(__FILE__, __LINE__, pointer, size)
-
- // This annotation should be used to annotate thread-safe swapping of
- // containers. Required only when using hybrid (i.e. not pure happens-before)
- // detectors.
- //
- // This annotation has the same limitation as ANNOTATE_UNPUBLISH_MEMORY_RANGE
- // (see above).
- //
- // Example:
- // map<int, int> the_map;
- // void Thread1() {
- // MutexLock lock(&mu);
- // the_map[1]++;
- // }
- // void Thread2() {
- // map<int,int> tmp;
- // {
- // MutexLock lock(&mu);
- // the_map.swap(tmp);
- // ANNOTATE_SWAP_MEMORY_RANGE(&the_map, sizeof(the_map));
- // }
- // tmp->DoSomething();
- // }
- #define ANNOTATE_SWAP_MEMORY_RANGE(pointer, size) \
- do { \
- ANNOTATE_UNPUBLISH_MEMORY_RANGE(pointer, size); \
- ANNOTATE_PUBLISH_MEMORY_RANGE(pointer, size); \
- } while (0)
-
- // Instruct the tool to create a happens-before arc between mu->Unlock() and
- // mu->Lock(). This annotation may slow down the race detector; normally it
- // is used only when it would be difficult to annotate each of the mutex's
- // critical sections individually using the annotations above.
- #define ANNOTATE_MUTEX_IS_USED_AS_CONDVAR(mu) \
- AnnotateMutexIsUsedAsCondVar(__FILE__, __LINE__, mu)
-
- // -------------------------------------------------------------
- // Annotations useful when defining memory allocators, or when memory that
- // was protected in one way starts to be protected in another.
-
- // Report that a new memory at "address" of size "size" has been allocated.
- // This might be used when the memory has been retrieved from a free list and
- // is about to be reused, or when a the locking discipline for a variable
- // changes.
- #define ANNOTATE_NEW_MEMORY(address, size) \
- AnnotateNewMemory(__FILE__, __LINE__, address, size)
-
- // -------------------------------------------------------------
- // Annotations useful when defining FIFO queues that transfer data between
- // threads.
-
- // Report that the producer-consumer queue (such as ProducerConsumerQueue) at
- // address "pcq" has been created. The ANNOTATE_PCQ_* annotations
- // should be used only for FIFO queues. For non-FIFO queues use
- // ANNOTATE_HAPPENS_BEFORE (for put) and ANNOTATE_HAPPENS_AFTER (for get).
- #define ANNOTATE_PCQ_CREATE(pcq) \
- AnnotatePCQCreate(__FILE__, __LINE__, pcq)
-
- // Report that the queue at address "pcq" is about to be destroyed.
- #define ANNOTATE_PCQ_DESTROY(pcq) \
- AnnotatePCQDestroy(__FILE__, __LINE__, pcq)
-
- // Report that we are about to put an element into a FIFO queue at address
- // "pcq".
- #define ANNOTATE_PCQ_PUT(pcq) \
- AnnotatePCQPut(__FILE__, __LINE__, pcq)
-
- // Report that we've just got an element from a FIFO queue at address "pcq".
- #define ANNOTATE_PCQ_GET(pcq) \
- AnnotatePCQGet(__FILE__, __LINE__, pcq)
-
- // -------------------------------------------------------------
- // Annotations that suppress errors. It is usually better to express the
- // program's synchronization using the other annotations, but these can
- // be used when all else fails.
-
- // Report that we may have a benign race on at "address".
- // Insert at the point where "address" has been allocated, preferably close
- // to the point where the race happens.
- // See also ANNOTATE_BENIGN_RACE_STATIC.
- #define ANNOTATE_BENIGN_RACE(address, description) \
- AnnotateBenignRace(__FILE__, __LINE__, address, description)
-
- // Request the analysis tool to ignore all reads in the current thread
- // until ANNOTATE_IGNORE_READS_END is called.
- // Useful to ignore intentional racey reads, while still checking
- // other reads and all writes.
- // See also ANNOTATE_UNPROTECTED_READ.
- #define ANNOTATE_IGNORE_READS_BEGIN() \
- AnnotateIgnoreReadsBegin(__FILE__, __LINE__)
-
- // Stop ignoring reads.
- #define ANNOTATE_IGNORE_READS_END() \
- AnnotateIgnoreReadsEnd(__FILE__, __LINE__)
-
- // Similar to ANNOTATE_IGNORE_READS_BEGIN, but ignore writes.
- #define ANNOTATE_IGNORE_WRITES_BEGIN() \
- AnnotateIgnoreWritesBegin(__FILE__, __LINE__)
-
- // Stop ignoring writes.
- #define ANNOTATE_IGNORE_WRITES_END() \
- AnnotateIgnoreWritesEnd(__FILE__, __LINE__)
-
- // Start ignoring all memory accesses (reads and writes).
- #define ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN() \
- do {\
- ANNOTATE_IGNORE_READS_BEGIN();\
- ANNOTATE_IGNORE_WRITES_BEGIN();\
- }while(0)\
-
- // Stop ignoring all memory accesses.
- #define ANNOTATE_IGNORE_READS_AND_WRITES_END() \
- do {\
- ANNOTATE_IGNORE_WRITES_END();\
- ANNOTATE_IGNORE_READS_END();\
- }while(0)\
-
- // -------------------------------------------------------------
- // Annotations useful for debugging.
-
- // Request to trace every access to "address".
- #define ANNOTATE_TRACE_MEMORY(address) \
- AnnotateTraceMemory(__FILE__, __LINE__, address)
-
- // Report the current thread name to a race detector.
- #define ANNOTATE_THREAD_NAME(name) \
- AnnotateThreadName(__FILE__, __LINE__, name)
-
- // -------------------------------------------------------------
- // Annotations useful when implementing locks. They are not
- // normally needed by modules that merely use locks.
- // The "lock" argument is a pointer to the lock object.
-
- // Report that a lock has been created at address "lock".
- #define ANNOTATE_RWLOCK_CREATE(lock) \
- AnnotateRWLockCreate(__FILE__, __LINE__, lock)
-
- // Report that the lock at address "lock" is about to be destroyed.
- #define ANNOTATE_RWLOCK_DESTROY(lock) \
- AnnotateRWLockDestroy(__FILE__, __LINE__, lock)
-
- // Report that the lock at address "lock" has been acquired.
- // is_w=1 for writer lock, is_w=0 for reader lock.
- #define ANNOTATE_RWLOCK_ACQUIRED(lock, is_w) \
- AnnotateRWLockAcquired(__FILE__, __LINE__, lock, is_w)
-
- // Report that the lock at address "lock" is about to be released.
- #define ANNOTATE_RWLOCK_RELEASED(lock, is_w) \
- AnnotateRWLockReleased(__FILE__, __LINE__, lock, is_w)
-
- // -------------------------------------------------------------
- // Annotations useful for testing race detectors.
-
- // Report that we expect a race on the variable at "address".
- // Use only in unit tests for a race detector.
- #define ANNOTATE_EXPECT_RACE(address, description) \
- AnnotateExpectRace(__FILE__, __LINE__, address, description)
-
- // A no-op. Insert where you like to test the interceptors.
- #define ANNOTATE_NO_OP(arg) \
- AnnotateNoOp(__FILE__, __LINE__, arg)
-
-#else // NDEBUG is defined
-
- #define ANNOTATE_RWLOCK_CREATE(lock) // empty
- #define ANNOTATE_RWLOCK_DESTROY(lock) // empty
- #define ANNOTATE_RWLOCK_ACQUIRED(lock, is_w) // empty
- #define ANNOTATE_RWLOCK_RELEASED(lock, is_w) // empty
- #define ANNOTATE_CONDVAR_LOCK_WAIT(cv, lock) // empty
- #define ANNOTATE_CONDVAR_WAIT(cv) // empty
- #define ANNOTATE_CONDVAR_SIGNAL(cv) // empty
- #define ANNOTATE_CONDVAR_SIGNAL_ALL(cv) // empty
- #define ANNOTATE_HAPPENS_BEFORE(obj) // empty
- #define ANNOTATE_HAPPENS_AFTER(obj) // empty
- #define ANNOTATE_PUBLISH_MEMORY_RANGE(address, size) // empty
- #define ANNOTATE_UNPUBLISH_MEMORY_RANGE(address, size) // empty
- #define ANNOTATE_SWAP_MEMORY_RANGE(address, size) // empty
- #define ANNOTATE_PCQ_CREATE(pcq) // empty
- #define ANNOTATE_PCQ_DESTROY(pcq) // empty
- #define ANNOTATE_PCQ_PUT(pcq) // empty
- #define ANNOTATE_PCQ_GET(pcq) // empty
- #define ANNOTATE_NEW_MEMORY(address, size) // empty
- #define ANNOTATE_EXPECT_RACE(address, description) // empty
- #define ANNOTATE_BENIGN_RACE(address, description) // empty
- #define ANNOTATE_MUTEX_IS_USED_AS_CONDVAR(mu) // empty
- #define ANNOTATE_TRACE_MEMORY(arg) // empty
- #define ANNOTATE_THREAD_NAME(name) // empty
- #define ANNOTATE_IGNORE_READS_BEGIN() // empty
- #define ANNOTATE_IGNORE_READS_END() // empty
- #define ANNOTATE_IGNORE_WRITES_BEGIN() // empty
- #define ANNOTATE_IGNORE_WRITES_END() // empty
- #define ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN() // empty
- #define ANNOTATE_IGNORE_READS_AND_WRITES_END() // empty
- #define ANNOTATE_NO_OP(arg) // empty
-
-#endif // NDEBUG
-
-// Use the macros above rather than using these functions directly.
-extern "C" void AnnotateRWLockCreate(const char *file, int line,
- const volatile void *lock);
-extern "C" void AnnotateRWLockDestroy(const char *file, int line,
- const volatile void *lock);
-extern "C" void AnnotateRWLockAcquired(const char *file, int line,
- const volatile void *lock, long is_w);
-extern "C" void AnnotateRWLockReleased(const char *file, int line,
- const volatile void *lock, long is_w);
-extern "C" void AnnotateCondVarWait(const char *file, int line,
- const volatile void *cv,
- const volatile void *lock);
-extern "C" void AnnotateCondVarSignal(const char *file, int line,
- const volatile void *cv);
-extern "C" void AnnotateCondVarSignalAll(const char *file, int line,
- const volatile void *cv);
-extern "C" void AnnotatePublishMemoryRange(const char *file, int line,
- const volatile void *address,
- long size);
-extern "C" void AnnotateUnpublishMemoryRange(const char *file, int line,
- const volatile void *address,
- long size);
-extern "C" void AnnotatePCQCreate(const char *file, int line,
- const volatile void *pcq);
-extern "C" void AnnotatePCQDestroy(const char *file, int line,
- const volatile void *pcq);
-extern "C" void AnnotatePCQPut(const char *file, int line,
- const volatile void *pcq);
-extern "C" void AnnotatePCQGet(const char *file, int line,
- const volatile void *pcq);
-extern "C" void AnnotateNewMemory(const char *file, int line,
- const volatile void *address,
- long size);
-extern "C" void AnnotateExpectRace(const char *file, int line,
- const volatile void *address,
- const char *description);
-extern "C" void AnnotateBenignRace(const char *file, int line,
- const volatile void *address,
- const char *description);
-extern "C" void AnnotateMutexIsUsedAsCondVar(const char *file, int line,
- const volatile void *mu);
-extern "C" void AnnotateTraceMemory(const char *file, int line,
- const volatile void *arg);
-extern "C" void AnnotateThreadName(const char *file, int line,
- const char *name);
-extern "C" void AnnotateIgnoreReadsBegin(const char *file, int line);
-extern "C" void AnnotateIgnoreReadsEnd(const char *file, int line);
-extern "C" void AnnotateIgnoreWritesBegin(const char *file, int line);
-extern "C" void AnnotateIgnoreWritesEnd(const char *file, int line);
-extern "C" void AnnotateNoOp(const char *file, int line,
- const volatile void *arg);
-
-#ifndef NDEBUG
-
- // ANNOTATE_UNPROTECTED_READ is the preferred way to annotate racey reads.
- //
- // Instead of doing
- // ANNOTATE_IGNORE_READS_BEGIN();
- // ... = x;
- // ANNOTATE_IGNORE_READS_END();
- // one can use
- // ... = ANNOTATE_UNPROTECTED_READ(x);
- template <class T>
- inline T ANNOTATE_UNPROTECTED_READ(const volatile T &x)
- NO_THREAD_SAFETY_ANALYSIS {
- ANNOTATE_IGNORE_READS_BEGIN();
- T res = x;
- ANNOTATE_IGNORE_READS_END();
- return res;
- }
-
- // Apply ANNOTATE_BENIGN_RACE to a static variable.
- #define ANNOTATE_BENIGN_RACE_STATIC(static_var, description) \
- namespace { \
- class static_var ## _annotator { \
- public: \
- static_var ## _annotator() { \
- ANNOTATE_BENIGN_RACE(&static_var, \
- # static_var ": " description); \
- } \
- }; \
- static static_var ## _annotator the ## static_var ## _annotator;\
- }
-#else // !NDEBUG
-
- #define ANNOTATE_UNPROTECTED_READ(x) (x)
- #define ANNOTATE_BENIGN_RACE_STATIC(static_var, description) // empty
-
-#endif // !NDEBUG
-
-// Return non-zero value if running under valgrind.
-extern "C" int RunningOnValgrind();
-
-
-#endif // BASE_DYNAMIC_ANNOTATIONS_H_
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/internal_logging.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/internal_logging.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/internal_logging.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * internal_logging.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2005, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/internal_logging.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/internal_logging.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/internal_logging.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * internal_logging.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2005, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/linked_list.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/linked_list.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/linked_list.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * linked_list.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/linux_syscall_support.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/linux_syscall_support.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/linux_syscall_support.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * linux_syscall_support.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2005-2008, Google Inc.
* All rights reserved.
*
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/malloc_extension.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/malloc_extension.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/malloc_extension.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * malloc_extension.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2005, Google Inc.
// All rights reserved.
//
@@ -43,7 +67,6 @@
#include <sys/types.h>
#endif
#include <string>
-#include "dynamic_annotations.h"
#include "sysinfo.h" // for FillProcSelfMaps
#ifndef NO_HEAP_CHECK
#include "heap-checker.h"
@@ -126,14 +149,6 @@
return true;
}
-void** MallocExtension::ReadStackTraces(int* sample_period) {
- return NULL;
-}
-
-void** MallocExtension::ReadHeapGrowthStackTraces() {
- return NULL;
-}
-
void MallocExtension::MarkThreadIdle() {
// Default implementation does nothing
}
@@ -179,6 +194,23 @@
return current_instance;
}
+static int GetRunningOnValgrind() {
+ const char *running_on_valgrind_str = GetenvBeforeMain("RUNNING_ON_VALGRIND");
+ if (running_on_valgrind_str) {
+ return strcmp(running_on_valgrind_str, "0") != 0;
+ }
+ return 0;
+}
+
+// When running under valgrind, this function will be intercepted
+// and a non-zero value will be returned.
+// Some valgrind-based tools (e.g. callgrind) do not intercept functions,
+// so we also read environment variable.
+extern "C" int RunningOnValgrind() {
+ static int running_on_valgrind = GetRunningOnValgrind();
+ return running_on_valgrind;
+}
+
void MallocExtension::Register(MallocExtension* implementation) {
pthread_once(&module_init, InitModule);
// When running under valgrind, our custom malloc is replaced with
@@ -251,54 +283,7 @@
}
-void MallocExtension::GetHeapSample(MallocExtensionWriter* writer) {
- int sample_period = 0;
- void** entries = ReadStackTraces(&sample_period);
- if (entries == NULL) {
- const char* const kErrorMsg =
- "This malloc implementation does not support sampling.\n"
- "As of 2005/01/26, only tcmalloc supports sampling, and\n"
- "you are probably running a binary that does not use\n"
- "tcmalloc.\n";
- writer->append(kErrorMsg, strlen(kErrorMsg));
- return;
- }
- char label[32];
- sprintf(label, "heap_v2/%d", sample_period);
- PrintHeader(writer, label, entries);
- for (void** entry = entries; Count(entry) != 0; entry += 3 + Depth(entry)) {
- PrintStackEntry(writer, entry);
- }
- delete[] entries;
-
- DumpAddressMap(writer);
-}
-
-void MallocExtension::GetHeapGrowthStacks(MallocExtensionWriter* writer) {
- void** entries = ReadHeapGrowthStackTraces();
- if (entries == NULL) {
- const char* const kErrorMsg =
- "This malloc implementation does not support "
- "ReadHeapGrowthStackTraces().\n"
- "As of 2005/09/27, only tcmalloc supports this, and you\n"
- "are probably running a binary that does not use tcmalloc.\n";
- writer->append(kErrorMsg, strlen(kErrorMsg));
- return;
- }
-
- // Do not canonicalize the stack entries, so that we get a
- // time-ordered list of stack traces, which may be useful if the
- // client wants to focus on the latest stack traces.
- PrintHeader(writer, "growth", entries);
- for (void** entry = entries; Count(entry) != 0; entry += 3 + Depth(entry)) {
- PrintStackEntry(writer, entry);
- }
- delete[] entries;
-
- DumpAddressMap(writer);
-}
-
// These are C shims that work on the current instance.
#define C_SHIM(fn, retval, paramlist, arglist) \
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/malloc_extension.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/malloc_extension.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/malloc_extension.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * malloc_extension.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2005, Google Inc.
// All rights reserved.
//
@@ -87,18 +111,7 @@
// REQUIRES: buffer_length > 0.
virtual void GetStats(char* buffer, int buffer_length);
- // Outputs to "writer" a sample of live objects and the stack traces
- // that allocated these objects. The format of the returned output
- // is equivalent to the output of the heap profiler and can
- // therefore be passed to "pprof".
- virtual void GetHeapSample(MallocExtensionWriter* writer);
- // Outputs to "writer" the stack traces that caused growth in the
- // address space size. The format of the returned output is
- // equivalent to the output of the heap profiler and can therefore
- // be passed to "pprof".
- virtual void GetHeapGrowthStacks(MallocExtensionWriter* writer);
-
// -------------------------------------------------------------------
// Control operations for getting and setting malloc implementation
// specific parameters. Some currently useful properties:
@@ -211,32 +224,6 @@
// Change the malloc implementation. Typically called by the
// malloc implementation during initialization.
static void Register(MallocExtension* implementation);
-
- protected:
- // Get a list of stack traces of sampled allocation points. Returns
- // a pointer to a "new[]-ed" result array, and stores the sample
- // period in "sample_period".
- //
- // The state is stored as a sequence of adjacent entries
- // in the returned array. Each entry has the following form:
- // uintptr_t count; // Number of objects with following trace
- // uintptr_t size; // Total size of objects with following trace
- // uintptr_t depth; // Number of PC values in stack trace
- // void* stack[depth]; // PC values that form the stack trace
- //
- // The list of entries is terminated by a "count" of 0.
- //
- // It is the responsibility of the caller to "delete[]" the returned array.
- //
- // May return NULL to indicate no results.
- //
- // This is an internal extension. Callers should use the more
- // convenient "GetHeapSample(string*)" method defined above.
- virtual void** ReadStackTraces(int* sample_period);
-
- // Like ReadStackTraces(), but returns stack traces that caused growth
- // in the address space size.
- virtual void** ReadHeapGrowthStackTraces();
};
#endif // BASE_MALLOC_EXTENSION_H_
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/packed-cache-inl.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/packed-cache-inl.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/packed-cache-inl.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * packed-cache-inl.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2007, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/page_heap.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/page_heap.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/page_heap.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * page_heap.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/page_heap.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/page_heap.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/page_heap.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * page_heap.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/page_heap_allocator.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/page_heap_allocator.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/page_heap_allocator.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * page_heap_allocator.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/pagemap.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/pagemap.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/pagemap.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * pagemap.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2005, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/span.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/span.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/span.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * span.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/span.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/span.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/span.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * span.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * spinlock.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2006, Google Inc.
* All rights reserved.
*
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * spinlock.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2006, Google Inc.
* All rights reserved.
*
@@ -46,7 +70,6 @@
#include "tcmalloc-platform.h"
#include "basictypes.h"
#include "atomicops.h"
-#include "dynamic_annotations.h"
#include "thread_annotations.h"
class LOCKABLE SpinLock {
@@ -73,7 +96,6 @@
if (Acquire_CompareAndSwap(&lockword_, 0, 1) != 0) {
SlowLock();
}
- ANNOTATE_RWLOCK_ACQUIRED(this, 1);
}
// Acquire this SpinLock and return true if the acquisition can be
@@ -81,11 +103,7 @@
// free at the time of the call, TryLock will return true with high
// probability.
inline bool TryLock() EXCLUSIVE_TRYLOCK_FUNCTION(true) {
- bool res = (Acquire_CompareAndSwap(&lockword_, 0, 1) == 0);
- if (res) {
- ANNOTATE_RWLOCK_ACQUIRED(this, 1);
- }
- return res;
+ return (Acquire_CompareAndSwap(&lockword_, 0, 1) == 0);
}
// Release this SpinLock, which must be held by the calling thread.
@@ -96,7 +114,6 @@
extern void SubmitSpinLockProfileData(const void *, int64);
int64 wait_timestamp = static_cast<uint32>(lockword_);
- ANNOTATE_RWLOCK_RELEASED(this, 1);
Release_Store(&lockword_, 0);
if (wait_timestamp != 1) {
// Collect contentionz profile info, and speed the wakeup of any waiter.
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock_linux-inl.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock_linux-inl.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock_linux-inl.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * spinlock_linux-inl.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2009, Google Inc.
* All rights reserved.
*
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock_posix-inl.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock_posix-inl.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock_posix-inl.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * spinlock_posix-inl.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2009, Google Inc.
* All rights reserved.
*
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock_win32-inl.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock_win32-inl.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/spinlock_win32-inl.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * spinlock_win32-inl.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2009, Google Inc.
* All rights reserved.
*
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/static_vars.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/static_vars.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/static_vars.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * static_vars.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/static_vars.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/static_vars.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/static_vars.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * static_vars.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
@@ -82,7 +106,6 @@
static SizeMap sizemap_;
static CentralFreeListPadded central_cache_[kNumClasses];
static PageHeapAllocator<Span> span_allocator_;
- static Span sampled_objects_;
// PageHeap uses a constructor for initialization. Like the members above,
// we can't depend on initialization order, so pageheap is new'd
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/sysinfo.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/sysinfo.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/sysinfo.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * sysinfo.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2006, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/sysinfo.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/sysinfo.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/sysinfo.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * sysinfo.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2006, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/system-alloc.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/system-alloc.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/system-alloc.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * system-alloc.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2005, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/system-alloc.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/system-alloc.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/system-alloc.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * system-alloc.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2005, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc-platform.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc-platform.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc-platform.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * tcmalloc-platform.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* src/config.h. Generated from config.h.in by configure. */
/* src/config.h.in. Generated from configure.ac by autoheader. */
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * tcmalloc.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2005, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * tcmalloc.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
/* Copyright (c) 2003, Google Inc.
* All rights reserved.
*
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc_guard.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc_guard.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc_guard.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * tcmalloc_guard.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2005, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/thread_annotations.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/thread_annotations.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/thread_annotations.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * thread_annotations.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/thread_cache.cc
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/thread_cache.cc 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/thread_cache.cc 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * thread_cache.cc
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
Modified: branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/thread_cache.h
===================================================================
--- branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/thread_cache.h 2009-10-14 18:14:29 UTC (rev 3476)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/thread_cache.h 2009-10-14 19:12:12 UTC (rev 3477)
@@ -1,3 +1,27 @@
+/*
+ * thread_cache.h
+ * Avida
+ *
+ * Added by David on 10/14/09.
+ * Copyright 2009 Michigan State University. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
// Copyright (c) 2008, Google Inc.
// All rights reserved.
//
More information about the Avida-cvs
mailing list