runtime: More efficient implementation of trampolines.

From-SVN: r187899

3 files changed, 88 insertions, 26 deletions

diff --git a/libgo/runtime/go-trampoline.c b/libgo/runtime/go-trampoline.c
index d6cc299..292eff5 100644
--- a/libgo/runtime/go-trampoline.c
+++ b/libgo/runtime/go-trampoline.c
@@ -14,40 +14,100 @@
 #include <sys/mman.h>
 #endif
 
-#include "go-alloc.h"
+#include "runtime.h"
+#include "arch.h"
+#include "malloc.h"
 #include "go-assert.h"
 
-/* In order to build a trampoline we need space which is both writable
-   and executable.  We currently just allocate a whole page.  This
-   needs to be more system dependent.  */
+/* Trampolines need to run in memory that is both writable and
+   executable.  In order to implement them, we grab a page of memory
+   and mprotect it.  We fill in the page with trampolines as they are
+   required.  When we run out of space, we drop the pointer to the
+   page and allocate a new one.  The page will be freed by the garbage
+   collector when there are no more variables of type func pointing to
+   it.  */
+
+/* A lock to control access to the page of closures.  */
+
+static Lock trampoline_lock;
+
+/* The page of closures.  */
+
+static unsigned char *trampoline_page;
+
+/* The size of trampoline_page.  */
+
+static uintptr_t trampoline_page_size;
+
+/* The number of bytes we have used on trampoline_page.  */
+
+static uintptr_t trampoline_page_used;
+
+/* Allocate a trampoline of SIZE bytes that will use the closure in
+   CLOSURE.  */
 
 void *
 __go_allocate_trampoline (uintptr_t size, void *closure)
 {
-  unsigned int page_size;
-  void *ret;
-  size_t off;
-
-  page_size = getpagesize ();
-  __go_assert (page_size >= size);
-  ret = __go_alloc (2 * page_size - 1);
-  ret = (void *) (((uintptr_t) ret + page_size - 1)
-		  & ~ ((uintptr_t) page_size - 1));
-
-  /* Because the garbage collector only looks at correct address
-     offsets, we need to ensure that it will see the closure
-     address.  */
-  off = ((size + sizeof (void *) - 1) / sizeof (void *)) * sizeof (void *);
-  __go_assert (size + off + sizeof (void *) <= page_size);
-  __builtin_memcpy (ret + off, &closure, sizeof (void *));
+  uintptr_t ptr_size;
+  uintptr_t full_size;
+  unsigned char *ret;
+
+  /* Because the garbage collector only looks at aligned addresses, we
+     need to store the closure at an aligned address to ensure that it
+     sees it.  */
+  ptr_size = sizeof (void *);
+  full_size = (((size + ptr_size - 1) / ptr_size) * ptr_size);
+  full_size += ptr_size;
+
+  runtime_lock (&trampoline_lock);
+
+  if (full_size < trampoline_page_size - trampoline_page_used)
+    trampoline_page = NULL;
+
+  if (trampoline_page == NULL)
+    {
+      uintptr_t page_size;
+      unsigned char *page;
+
+      page_size = getpagesize ();
+      __go_assert (page_size >= full_size);
+      page = (unsigned char *) runtime_mallocgc (2 * page_size - 1, 0, 0, 0);
+      page = (unsigned char *) (((uintptr_t) page + page_size - 1)
+				& ~ (page_size - 1));
 
 #ifdef HAVE_SYS_MMAN_H
-  {
-    int i;
-    i = mprotect (ret, size, PROT_READ | PROT_WRITE | PROT_EXEC);
-    __go_assert (i == 0);
-  }
+      {
+	int i;
+
+	i = mprotect (page, page_size, PROT_READ | PROT_WRITE | PROT_EXEC);
+	__go_assert (i == 0);
+      }
 #endif
 
-  return ret;
+      trampoline_page = page;
+      trampoline_page_size = page_size;
+      trampoline_page_used = 0;
+    }
+
+  ret = trampoline_page + trampoline_page_used;
+  trampoline_page_used += full_size;
+
+  runtime_unlock (&trampoline_lock);
+
+  __builtin_memcpy (ret + full_size - ptr_size, &closure, ptr_size);
+
+  return (void *) ret;
+}
+
+/* Scan the trampoline page when running the garbage collector.  This
+   just makes sure that the garbage collector sees the pointer in
+   trampoline_page, so that the page itself is not freed if there are
+   no other references to it.  */
+
+void
+runtime_trampoline_scan (void (*scan) (byte *, int64))
+{
+  if (trampoline_page != NULL)
+    scan ((byte *) &trampoline_page, sizeof trampoline_page);
 }
diff --git a/libgo/runtime/mgc0.c b/libgo/runtime/mgc0.c
index c84bdd6..bd5eedc 100644
--- a/libgo/runtime/mgc0.c
+++ b/libgo/runtime/mgc0.c
@@ -703,6 +703,7 @@ mark(void (*scan)(byte*, int64))
 	scan((byte*)&runtime_allm, sizeof runtime_allm);
 	runtime_MProf_Mark(scan);
 	runtime_time_scan(scan);
+	runtime_trampoline_scan(scan);
 
 	// mark stacks
 	for(gp=runtime_allg; gp!=nil; gp=gp->alllink) {
diff --git a/libgo/runtime/runtime.h b/libgo/runtime/runtime.h
index 5b3283a..94f8911 100644
--- a/libgo/runtime/runtime.h
+++ b/libgo/runtime/runtime.h
@@ -490,6 +490,7 @@ uintptr	runtime_memlimit(void);
 void	runtime_setprof(bool);
 
 void	runtime_time_scan(void (*)(byte*, int64));
+void	runtime_trampoline_scan(void (*)(byte *, int64));
 
 void	runtime_setsig(int32, bool, bool);
 #define runtime_setitimer setitimer