From b9d7278c54309df7047d1f7b78addb794cc6e12d Mon Sep 17 00:00:00 2001
From: phani <phanikishoreg@gwu.edu>
Date: Sat, 11 Jan 2020 19:05:04 -0500
Subject: [PATCH] fixes 99% latency problem here (but a problem with 1m data
 transfer test, it is broken.)

---
 runtime/Makefile      |  2 +-
 runtime/src/runtime.c |  3 +++
 runtime/src/sandbox.c | 12 ++++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/runtime/Makefile b/runtime/Makefile
index c8d4de4..c3759ad 100644
--- a/runtime/Makefile
+++ b/runtime/Makefile
@@ -16,7 +16,7 @@ CFLAGS += -D_GNU_SOURCE
 #CFLAGS += -DNOSTDIO
 #CFLAGS += -DSTANDALONE
 CFLAGS += -DUSE_UVIO
-#CFLAGS += -DUSE_HTTP_UVIO -DUSE_HTTP_SYNC
+CFLAGS += -DUSE_HTTP_UVIO -DUSE_HTTP_SYNC
 CFLAGS += -DSBOX_SCALE_ALLOC
 #CFLAGS += -DUSE_SYSCALL
 #CFLAGS += -DPREEMPT_DISABLE
diff --git a/runtime/src/runtime.c b/runtime/src/runtime.c
index 4683eda..7e79be2 100644
--- a/runtime/src/runtime.c
+++ b/runtime/src/runtime.c
@@ -1,4 +1,5 @@
 #include <runtime.h>
+#include <sys/mman.h>
 #include <types.h>
 #include <sandbox.h>
 #include <arch/context.h>
@@ -271,6 +272,8 @@ sandbox_exit(void)
 	struct sandbox *n = sandbox_schedule(0);
 	assert(n != curr);
 	softint_enable();
+	//unmap linear memory only!
+	munmap(curr->linear_start, SBOX_MAX_MEM + PAGE_SIZE);
 	//sandbox_local_end(curr);
 	sandbox_switch(n);
 #else
diff --git a/runtime/src/sandbox.c b/runtime/src/sandbox.c
index b854d04..f677478 100644
--- a/runtime/src/sandbox.c
+++ b/runtime/src/sandbox.c
@@ -21,7 +21,7 @@ sandbox_memory_map(struct module *m)
 	if (lm_sz + sb_sz > mem_sz) return NULL;
 	assert(round_up_to_page(sb_sz) == sb_sz);
 	unsigned long rw_sz = sb_sz + lm_sz; 
-	void *addr = mmap(NULL, mem_sz + /* guard page */ PAGE_SIZE, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 
+	void *addr = mmap(NULL, sb_sz + mem_sz + /* guard page */ PAGE_SIZE, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 
 	if (addr == MAP_FAILED) return NULL;
 
 	void *addr_rw = mmap(addr, sb_sz + lm_sz, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_FIXED, -1, 0);
@@ -217,7 +217,7 @@ sandbox_client_response_set(void)
 	int r = uv_write(&req, (uv_stream_t *)&curr->cuv, curr->rsi.bufs, n, sb_write_callback);
 	sandbox_block_http();
 #endif
-	return r;
+	return 0;
 #else
 	return 0;
 #endif
@@ -335,6 +335,10 @@ sandbox_free(struct sandbox *sb)
 	// TODO: this needs to be enhanced. you may be killing a sandbox when its in any other execution states.
 	if (sb->state != SANDBOX_RETURNED) return;
 
+	int sz = sizeof(struct sandbox);
+#ifndef STANDALONE
+	sz += sb->mod->max_rr_sz;
+#endif
 	module_release(sb->mod);
 
 	// TODO free(sb->args);
@@ -342,10 +346,10 @@ sandbox_free(struct sandbox *sb)
 	size_t stksz = sb->stack_size;
 
 	// depending on the memory type
-	free_linear_memory(sb->linear_start, sb->linear_size, sb->linear_max_size);
+	//free_linear_memory(sb->linear_start, sb->linear_size, sb->linear_max_size);
 
 	// mmaped memory includes sandbox structure in there.
-	ret = munmap(sb, SBOX_MAX_MEM + PAGE_SIZE);
+	ret = munmap(sb, sz);
 	if (ret) perror("munmap sandbox");
 
 	// remove stack!