[Avida-SVN] r3479 - in branches/tcmalloc-1.4: . source/platform/tcmalloc-1.4

[brysonda at myxo.css.msu.edu]

Author: brysonda
Date: 2009-10-14 16:17:36 -0400 (Wed, 14 Oct 2009)
New Revision: 3479

Modified:
   branches/tcmalloc-1.4/CMakeLists.txt
   branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/internal_logging.cc
   branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc.cc
Log:
Update CMakeLists.txt

Modified: branches/tcmalloc-1.4/CMakeLists.txt
===================================================================
--- branches/tcmalloc-1.4/CMakeLists.txt	2009-10-14 20:08:25 UTC (rev 3478)
+++ branches/tcmalloc-1.4/CMakeLists.txt	2009-10-14 20:17:36 UTC (rev 3479)
@@ -350,11 +350,21 @@
   SET(AVD_ENABLE_TCMALLOC FALSE)
 ENDIF(UNIX)
 IF(AVD_ENABLE_TCMALLOC)
-  SET(TCMALLOC_DIR source/platform/tcmalloc)
+  SET(TCMALLOC_DIR source/platform/tcmalloc-1.4)
   SET(TCMALLOC_SOURCES
+    ${TCMALLOC_DIR}/atomicops-internals-x86.cc
+    ${TCMALLOC_DIR}/central_freelist.cc
+    ${TCMALLOC_DIR}/common.cc
+    ${TCMALLOC_DIR}/internal_logging.cc
+    ${TCMALLOC_DIR}/malloc_extension.cc
+    ${TCMALLOC_DIR}/page_heap.cc
+    ${TCMALLOC_DIR}/span.cc
+    ${TCMALLOC_DIR}/spinlock.cc
+    ${TCMALLOC_DIR}/static_vars.cc
+    ${TCMALLOC_DIR}/sysinfo.cc
     ${TCMALLOC_DIR}/system-alloc.cc
-    ${TCMALLOC_DIR}/tcmalloc-logging.cc
     ${TCMALLOC_DIR}/tcmalloc.cc
+    ${TCMALLOC_DIR}/thread_cache.cc
   )
   ADD_LIBRARY(tcmalloc ${TCMALLOC_SOURCES})
 ENDIF(AVD_ENABLE_TCMALLOC)

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 20:08:25 UTC (rev 3478)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/internal_logging.cc	2009-10-14 20:17:36 UTC (rev 3479)
@@ -61,7 +61,7 @@
 #include <unistd.h>    // for write()
 #endif
 #include <string.h>
-#include <malloc_extension.h>
+#include "malloc_extension.h"
 #include "internal_logging.h"
 
 static const int kLogBufSize = 800;

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 20:08:25 UTC (rev 3478)
+++ branches/tcmalloc-1.4/source/platform/tcmalloc-1.4/tcmalloc.cc	2009-10-14 20:17:36 UTC (rev 3479)
@@ -138,7 +138,7 @@
 #include "sysinfo.h"
 #include "spinlock.h"
 #include "common.h"
-#include <malloc_extension.h>
+#include "malloc_extension.h"
 #include "central_freelist.h"
 #include "internal_logging.h"
 #include "linked_list.h"