---

yaml
---
r: 6668
b: refs/heads/master
c: a98dec0
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 548fe0eda9200104e39ad3ec5fcb9e0ea7e643a0
+refs/heads/master: a98dec035f1f2ddce6efcf3c2f43884ef659cc0a

trunk/src/etc/get-snapshot.py

@@ -3,16 +3,34 @@
 import os, tarfile, hashlib, re, shutil, sys
 from snapshot import *
 
+old_snapshot_files = {
+    "linux": ["bin/rustc",
+              "lib/libcore.so",
+              "lib/libruststd.so",
+              "lib/librustrt.so",
+              "lib/librustllvm.so"],
+    "macos": ["bin/rustc",
+              "lib/libcore.dylib",
+              "lib/libruststd.dylib",
+              "lib/librustrt.dylib",
+              "lib/librustllvm.dylib"],
+    "winnt": ["bin/rustc.exe",
+              "lib/core.dll",
+              "lib/ruststd.dll",
+              "lib/rustrt.dll",
+              "lib/rustllvm.dll"]
+    }
+
 def unpack_snapshot(triple, snap):
   dl_path = os.path.join(download_dir_base, snap)
   print("opening snapshot " + dl_path)
   tar = tarfile.open(dl_path)
   kernel = get_kernel(triple)
-  for p in tar.getnames():
-    name = p.replace("rust-stage0/", "", 1);
+  for name in old_snapshot_files[kernel]:
+    p = "rust-stage0/" + name
     stagep = os.path.join(triple, "stage0")
     fp = os.path.join(stagep, name)
-    print("extracting " + p)
+    print("extracting " + fp)
     tar.extract(p, download_unpack_base)
     tp = os.path.join(download_unpack_base, p)
     shutil.move(tp, fp)

trunk/src/rt/memory_region.cpp

@@ -2,7 +2,8 @@
 #include "memory_region.h"
 
 #if RUSTRT_TRACK_ALLOCATIONS >= 1
-#  define PTR_SIZE (sizeof(void*))
+// For some platforms, 16 byte alignment is required.
+#  define PTR_SIZE 16
 #  define ALIGN_PTR(x) (((x)+PTR_SIZE-1)/PTR_SIZE*PTR_SIZE)
 #  define HEADER_SIZE ALIGN_PTR(sizeof(alloc_header))
 #  define MAGIC 0xbadc0ffe
@@ -65,11 +66,15 @@ memory_region::realloc(void *mem, size_t orig_size) {
     }
 
     alloc_header *alloc = get_header(mem);
+#   if RUSTRT_TRACK_ALLOCATIONS >= 1
+    assert(alloc->magic == MAGIC);
+#   endif
+
     size_t size = orig_size + HEADER_SIZE;
     alloc_header *newMem = (alloc_header *)_srv->realloc(alloc, size);
 
 #   if RUSTRT_TRACK_ALLOCATIONS >= 1
-    assert(alloc->magic == MAGIC);
+    assert(newMem->magic == MAGIC);
     newMem->size = orig_size;
 #   endif
 
@@ -141,7 +146,7 @@ memory_region::~memory_region() {
                 alloc_header *header = (alloc_header*)_allocation_list[i];
                 printf("allocation (%s) 0x%" PRIxPTR " was not freed\n",
                        header->tag,
-                       (uintptr_t) &header->data);
+                       (uintptr_t) get_data(header));
                 ++leak_count;
             }
         }
@@ -167,7 +172,7 @@ memory_region::release_alloc(void *mem) {
     if (_synchronized) { _lock.lock(); }
     if (_allocation_list[alloc->index] != alloc) {
         printf("free: ptr 0x%" PRIxPTR " (%s) is not in allocation_list\n",
-               (uintptr_t) &alloc->data, alloc->tag);
+               (uintptr_t) get_data(alloc), alloc->tag);
         _srv->fatal("not in allocation_list", __FILE__, __LINE__, "");
     }
     else {
@@ -222,6 +227,5 @@ memory_region::maybe_poison(void *mem) {
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //

trunk/src/rt/memory_region.h

@@ -80,7 +80,6 @@ inline void *operator new(size_t size, memory_region *region,
 // indent-tabs-mode: nil
 // c-basic-offset: 4
 // buffer-file-coding-system: utf-8-unix
-// compile-command: "make -k -C $RBUILD 2>&1 | sed -e 's/\\/x\\//x:\\//g'";
 // End:
 //
 

trunk/src/snapshots.txt

@@ -1,10 +1,3 @@
-S 2011-12-12 1c1bc2f
-  winnt-i386 550dc539e8ab6837c52b3a35e6119061490190b1
-  linux-i386 66c5e97e3072d8c88a52d986d1fadbd43de615a5
-  macos-i386 c3db65606d7bbea2ae0482b20e177f7463dc58ef
-  linux-x86_64 c5bbd08e423844ee938c8f6824ba2b3b4dc851b0
-  macos-x86_64 29accda0ace162169408357371482ddd044b6dd3
-
 S 2011-12-07 3ccdd2a
   linux-i386 7c639851d8a4ae43f781ad4592b6d3b6e0f4837b
   macos-i386 8fdf95481943aff1953d93eed31528c221d33373