From 2c1ec6771bd09266308686ab13ca32e2aa73da49 Mon Sep 17 00:00:00 2001
From: Michael Bebenita <mbebenita@mozilla.com>
Date: Tue, 17 Aug 2010 23:40:07 -0700
Subject: Lots of changes around memory managment in the Runtime. Added memory
 regions and fixed race caused by calling rust_srv::malloc() from multiple
 threads when sending messages.

---
 src/rt/rust_srv.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/rt/rust_srv.h')

diff --git a/src/rt/rust_srv.h b/src/rt/rust_srv.h
index b25e5e75..e617c002 100644
--- a/src/rt/rust_srv.h
+++ b/src/rt/rust_srv.h
@@ -5,11 +5,13 @@
 #ifndef RUST_SRV_H
 #define RUST_SRV_H
 
+#include "sync/spin_lock.h"
+#include "memory_region.h"
+
 class rust_srv {
-private:
-    size_t _live_allocations;
-    array_list<void *> _allocation_list;
 public:
+    memory_region local_region;
+    memory_region synchronized_region;
     virtual void log(char const *msg);
     virtual void fatal(char const *expression,
         char const *file,
@@ -21,12 +23,12 @@ public:
         size_t line,
         char const *format,
         ...);
+    virtual void free(void *);
     virtual void *malloc(size_t);
     virtual void *realloc(void *, size_t);
-    virtual void free(void *);
-    virtual rust_srv *clone();
     rust_srv();
     virtual ~rust_srv();
+    virtual rust_srv *clone();
 };
 
 #endif /* RUST_SRV_H */
-- 
cgit v1.2.3