fixes on analyses to compile the eyetracking benchmark

[IRC.git] / Robust / src / Runtime / mem.c

diff --git a/Robust/src/Runtime/mem.c b/Robust/src/Runtime/mem.c
index 6ae4d7fdb9fc2a45fbdbf5961b81db3350519823..80caa39228eeeab4645cdfd751faae86188eadcd 100644 (file)
--- a/Robust/src/Runtime/mem.c
+++ b/Robust/src/Runtime/mem.c
@@ -1,57 +1,98 @@
 #include "mem.h"
 
-#ifdef RAW
+#ifdef MULTICORE
 #include "runtime.h"
-#include <raw.h>
-
-/*void * m_calloc(int m, int size) {
-        void * p = malloc(m*size);
-        int i = 0;
-        for(i = 0; i < size; ++i) {
- *(char *)(p+i) = 0;
-        }
-        return p;
-   }*/
-
-void * mycalloc(int m, int size) {
-  void * p = NULL;
-  int isize = 2*kCacheLineSize-4+(size-1)&(~kCacheLineMask);
-#ifdef RAWDEBUG
-  //raw_test_pass(0xdd00);
-#endif
-#ifdef INTERRUPT
-  // shut down interrupt
-  raw_user_interrupts_off();
+#include <stdio.h>
+
+#if defined(MULTICORE_GC)||defined(PMC_GC)
+#include "multicoreruntime.h"
+#include "bambooalign.h"
+#include "runtime_arch.h"
+#include "methodheaders.h"
 #endif
-  p = calloc(m, isize);
-  //p = m_calloc(m, isize);
-#ifdef RAWDEBUG
-  //raw_test_pass_reg(p);
-  //raw_test_pass_reg((kCacheLineSize+((int)p-1)&(~kCacheLineMask)));
+
+#ifdef MULTICORE_GC
+#include "multicoremem.h"
+#include "multicoregarbage.h"
 #endif
-#ifdef INTERRUPT
-  // re-open interruption
-  raw_user_interrupts_on();
+#ifdef PMC_GC
+#include "multicoregc.h"
+#include "pmc_garbage.h"
 #endif
-  return (void *)(kCacheLineSize+((int)p-1)&(~kCacheLineMask));
-}
 
-void * mycalloc_i(int m, int size) {
+#if defined(MULTICORE_GC)||defined(PMC_GC)
+extern volatile bool gcflag;
+void * mycalloc_share(struct garbagelist * stackptr, int size) {
   void * p = NULL;
-  int isize = 2*kCacheLineSize-4+(size-1)&(~kCacheLineMask);
-#ifdef RAWDEBUG
-  //raw_test_pass(0xdd00);
-#endif
-  p = calloc(m, isize);
-  //p = m_calloc(m, isize);
-#ifdef RAWDEBUG
-  //raw_test_pass_reg(p);
-  //raw_test_pass_reg((kCacheLineSize+((int)p-1)&(~kCacheLineMask)));
+  int isize = ((size-1)&(~(ALIGNMENTSIZE-1)))+ALIGNMENTSIZE;
+  int hasgc = 0;
+  int loopcount = 0;
+
+  while(true) {
+    p = BAMBOO_SHARE_MEM_CALLOC(isize); // calloc(m, isize);
+
+    if(p != NULL) 
+      return p;
+    
+    // no more global shared memory
+    if(hasgc < 30) {
+      // start gc
+      if(gcflag) {
+       gc(stackptr);
+       hasgc++;
+      }
+    } else {
+      // no more global shared memory
+      printf("Did %u collections without getting memory\n", hasgc);
+      BAMBOO_EXIT();
+    }
+    loopcount++;
+    if (loopcount>10000000)
+      tprintf("Loopcount in mycalloc_share hit %u\n",loopcount);
+  }
+
+  BAMBOO_EXIT();
+  return NULL;
+}
+
+#else
+void * mycalloc_share(int size) {
+  int isize = ((size-1)&(~(BAMBOO_CACHE_LINE_MASK)))+(BAMBOO_CACHE_LINE_SIZE);
+  void * p = BAMBOO_SHARE_MEM_CALLOC(isize); // calloc(m, isize);
+  if(p == NULL) {
+    // no more global shared memory
+    BAMBOO_EXIT();
+  }
+  return (void *)(BAMBOO_CACHE_LINE_SIZE+((int)p-1)&(~BAMBOO_CACHE_LINE_MASK));
+}
 #endif
-  return (void *)(kCacheLineSize+((int)p-1)&(~kCacheLineMask));
+
+void * mycalloc(int size, char * file, int line) {
+  BAMBOO_ENTER_RUNTIME_MODE_FROM_CLIENT();
+  void * p = mycalloc_i(size, file, line);
+  BAMBOO_ENTER_CLIENT_MODE_FROM_RUNTIME();
+  return p;
+}
+
+
+void * mycalloc_i(int size, char * file, int line) {
+  void * p = BAMBOO_LOCAL_MEM_CALLOC(size);
+  if(p == NULL) {
+    tprintf("mycalloc_i %s %d \n", file, line);
+    BAMBOO_EXIT();
+  }
+  return p;
 }
 
 void myfree(void * ptr) {
+  BAMBOO_ENTER_RUNTIME_MODE_FROM_CLIENT();
+  BAMBOO_LOCAL_MEM_FREE(ptr);
+  BAMBOO_ENTER_CLIENT_MODE_FROM_RUNTIME();
+  return;
+}
+
+void myfree_i(void * ptr) {
+  BAMBOO_LOCAL_MEM_FREE(ptr);
   return;
 }