---

yaml
---
r: 46975
b: refs/heads/try
c: 5a9da65
h: refs/heads/master
i:
  46973: 48f1f31
  46971: a92402a
  46967: 5e01573
  46959: f6608b0
  46943: 08daad9
  46911: a680374
  46847: c4c9ecc
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
-refs/heads/try: 206757f8688bfe9958854952e7f1f21b5374a508
+refs/heads/try: 5a9da65dc9b3225e0278faedba71eb8b5cfb237d
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/private/exchange_alloc.rs

@@ -14,7 +14,7 @@ use c_malloc = libc::malloc;
 use c_free = libc::free;
 use managed::raw::{BoxHeaderRepr, BoxRepr};
 use cast::transmute;
-use ptr::{set_memory, null};
+use ptr::null;
 use intrinsic::TyDesc;
 
 pub unsafe fn malloc(td: *TypeDesc, size: uint) -> *c_void {
@@ -25,10 +25,6 @@ pub unsafe fn malloc(td: *TypeDesc, size: uint) -> *c_void {
         let p = c_malloc(total_size as size_t);
         assert p.is_not_null();
 
-        // FIXME #4761: Would be very nice to not memset all allocations
-        let p: *mut u8 = transmute(p);
-        set_memory(p, 0, total_size);
-
         // FIXME #3475: Converting between our two different tydesc types
         let td: *TyDesc = transmute(td);
 

branches/try/src/libstd/uv_ll.rs

@@ -1253,7 +1253,7 @@ pub mod test {
                       as *request_wrapper;
                 let buf_base = get_base_from_buf(buf);
                 let buf_len = get_len_from_buf(buf);
-                let bytes = vec::from_buf(buf_base, buf_len as uint);
+                let bytes = vec::from_buf(buf_base, nread as uint);
                 let read_chan = (*client_data).read_chan.clone();
                 let msg_from_server = str::from_bytes(bytes);
                 read_chan.send(msg_from_server);
@@ -1445,15 +1445,15 @@ pub mod test {
                                 buf_base as uint,
                                 buf_len as uint,
                                 nread));
-                let bytes = vec::from_buf(buf_base, buf_len);
+                let bytes = vec::from_buf(buf_base, nread as uint);
                 let request_str = str::from_bytes(bytes);
 
                 let client_data = get_data_for_uv_handle(
                     client_stream_ptr as *libc::c_void) as *tcp_server_data;
 
                 let server_kill_msg = (*client_data).server_kill_msg;
                 let write_req = (*client_data).server_write_req;
-                if (str::contains(request_str, server_kill_msg)) {
+                if str::contains(request_str, server_kill_msg) {
                     log(debug, ~"SERVER: client req contains kill_msg!");
                     log(debug, ~"SERVER: sending response to client");
                     read_stop(client_stream_ptr);

branches/try/src/rt/memory_region.cpp

@@ -121,8 +121,10 @@ memory_region::realloc(void *mem, size_t orig_size) {
 }
 
 void *
-memory_region::malloc(size_t size, const char *tag, bool zero) {
+memory_region::malloc(size_t size, const char *tag) {
+#   if RUSTRT_TRACK_ALLOCATIONS >= 1
     size_t old_size = size;
+#   endif
     size += HEADER_SIZE;
     alloc_header *mem = (alloc_header *)::malloc(size);
     if (mem == NULL) {
@@ -143,18 +145,9 @@ memory_region::malloc(size_t size, const char *tag, bool zero) {
     void *data = get_data(mem);
     claim_alloc(data);
 
-    if(zero) {
-        memset(data, 0, old_size);
-    }
-
     return data;
 }
 
-void *
-memory_region::calloc(size_t size, const char *tag) {
-    return malloc(size, tag, true);
-}
-
 memory_region::~memory_region() {
     if (_synchronized) { _lock.lock(); }
     if (_live_allocations == 0 && !_detailed_leaks) {

branches/try/src/rt/memory_region.h

@@ -77,8 +77,7 @@ class memory_region {
 public:
     memory_region(rust_env *env, bool synchronized);
     memory_region(memory_region *parent);
-    void *malloc(size_t size, const char *tag, bool zero = true);
-    void *calloc(size_t size, const char *tag);
+    void *malloc(size_t size, const char *tag);
     void *realloc(void *mem, size_t size);
     void free(void *mem);
     ~memory_region();

branches/try/src/rt/rust_exchange_alloc.cpp

@@ -18,23 +18,15 @@
 uintptr_t exchange_count = 0;
 
 void *
-rust_exchange_alloc::malloc(size_t size, bool zero) {
+rust_exchange_alloc::malloc(size_t size) {
   void *value = ::malloc(size);
   assert(value);
-  if (zero) {
-    memset(value, 0, size);
-  }
 
   sync::increment(exchange_count);
 
   return value;
 }
 
-void *
-rust_exchange_alloc::calloc(size_t size) {
-  return this->malloc(size);
-}
-
 void *
 rust_exchange_alloc::realloc(void *ptr, size_t size) {
   void *new_ptr = ::realloc(ptr, size);

branches/try/src/rt/rust_exchange_alloc.h

@@ -16,8 +16,7 @@
 
 class rust_exchange_alloc {
  public:
-    void *malloc(size_t size, bool zero = true);
-    void *calloc(size_t size);
+    void *malloc(size_t size);
     void *realloc(void *mem, size_t size);
     void free(void *mem);
 };

branches/try/src/rt/rust_kernel.cpp

@@ -79,11 +79,6 @@ rust_kernel::malloc(size_t size, const char *tag) {
     return exchange_alloc.malloc(size);
 }
 
-void *
-rust_kernel::calloc(size_t size, const char *tag) {
-    return exchange_alloc.calloc(size);
-}
-
 void *
 rust_kernel::realloc(void *mem, size_t size) {
     return exchange_alloc.realloc(mem, size);

branches/try/src/rt/rust_kernel.h

@@ -133,7 +133,6 @@ class rust_kernel {
     void fatal(char const *fmt, ...);
 
     void *malloc(size_t size, const char *tag);
-    void *calloc(size_t size, const char *tag);
     void *realloc(void *mem, size_t size);
     void free(void *mem);
     rust_exchange_alloc *region() { return &exchange_alloc; }

branches/try/src/rt/rust_stack.cpp

@@ -58,7 +58,7 @@ check_stack_canary(stk_seg *stk) {
 stk_seg *
 create_stack(memory_region *region, size_t sz) {
     size_t total_sz = sizeof(stk_seg) + sz;
-    stk_seg *stk = (stk_seg *)region->malloc(total_sz, "stack", false);
+    stk_seg *stk = (stk_seg *)region->malloc(total_sz, "stack");
     memset(stk, 0, sizeof(stk_seg));
     stk->end = (uintptr_t) &stk->data[sz];
     add_stack_canary(stk);
@@ -75,7 +75,7 @@ destroy_stack(memory_region *region, stk_seg *stk) {
 stk_seg *
 create_exchange_stack(rust_exchange_alloc *exchange, size_t sz) {
     size_t total_sz = sizeof(stk_seg) + sz;
-    stk_seg *stk = (stk_seg *)exchange->malloc(total_sz, false);
+    stk_seg *stk = (stk_seg *)exchange->malloc(total_sz);
     memset(stk, 0, sizeof(stk_seg));
     stk->end = (uintptr_t) &stk->data[sz];
     add_stack_canary(stk);

branches/try/src/rt/rust_task.cpp

@@ -450,11 +450,6 @@ rust_task::backtrace() {
 #endif
 }
 
-void *
-rust_task::calloc(size_t size, const char *tag) {
-    return local_region.calloc(size, tag);
-}
-
 size_t
 rust_task::get_next_stack_size(size_t min, size_t current, size_t requested) {
     LOG(this, mem, "calculating new stack size for 0x%" PRIxPTR, this);