X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FRuntime%2Fthread.c;h=47704013a92fada38f2c742de698590a999c76b8;hb=9ff70451b4fdd5004b7ba37da712014dc34855da;hp=f25c9d038021097d2eaa6acb9efe0e8c05136cc9;hpb=41a579f49a23042db2c9eca259e4f9ae0c5f7d2d;p=IRC.git

diff --git a/Robust/src/Runtime/thread.c b/Robust/src/Runtime/thread.c
index f25c9d03..47704013 100644
--- a/Robust/src/Runtime/thread.c
+++ b/Robust/src/Runtime/thread.c
@@ -1,5 +1,6 @@
 #include "runtime.h"
 #include <sys/types.h>
+#include <sys/mman.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -8,13 +9,24 @@
 #include <signal.h>
 
 #ifdef DSTM
+#ifdef RECOVERY
+#include <DSTM/interface_recovery/dstm.h>
+#include <DSTM/interface_recovery/llookup.h>
+#else
 #include <DSTM/interface/dstm.h>
 #include <DSTM/interface/llookup.h>
 #endif
+#endif
 
 #ifndef RAW
 #include <stdio.h>
 #endif
+#ifdef STM
+#include "tm.h"
+#endif
+#include <execinfo.h>
+
+
 int threadcount;
 pthread_mutex_t gclock;
 pthread_mutex_t gclistlock;
@@ -22,6 +34,8 @@ pthread_cond_t gccond;
 pthread_mutex_t objlock;
 pthread_cond_t objcond;
 
+pthread_mutex_t atomiclock;
+
 pthread_mutex_t joinlock;
 pthread_cond_t joincond;
 pthread_key_t threadlocks;
@@ -29,6 +43,15 @@ pthread_mutex_t threadnotifylock;
 pthread_cond_t threadnotifycond;
 pthread_key_t oidval;
 
+#if defined(THREADS) || defined(DSTM) || defined(STM)
+#ifndef MAC
+extern __thread struct listitem litem;
+#else
+pthread_key_t litemkey;
+#endif
+extern struct listitem * list;
+#endif
+
 void threadexit() {
 #ifdef DSTM
   objheader_t* ptr;
@@ -51,6 +74,31 @@ void threadexit() {
   pthread_mutex_unlock(&objlock);
 #endif
   pthread_mutex_lock(&gclistlock);
+#ifdef THREADS
+  pthread_setspecific(threadlocks, litem.locklist);
+#endif
+#ifndef MAC
+  if (litem.prev==NULL) {
+    list=litem.next;
+  } else {
+    litem.prev->next=litem.next;
+  }
+  if (litem.next!=NULL) {
+    litem.next->prev=litem.prev;
+  }
+#else
+  {
+    struct listitem *litem=pthread_getspecific(litemkey);
+    if (litem->prev==NULL) {
+      list=litem->next;
+    } else {
+      litem->prev->next=litem->next;
+    }
+    if (litem->next!=NULL) {
+      litem->next->prev=litem->prev;
+    }
+  }
+#endif
   threadcount--;
   pthread_cond_signal(&gccond);
   pthread_mutex_unlock(&gclistlock);
@@ -74,17 +122,41 @@ transstart:
   pthread_exit(NULL);
 }
 
-void threadhandler(int sig, siginfo_t *info, void *uap) {
-#ifdef DEBUG
-  printf("sig=%d\n",sig);
+void threadhandler(int sig, struct sigcontext ctx) {
+  void *buffer[100];
+  char **strings;
+  int nptrs,j;
+
+  printf("We just took sig=%d\n",sig);
   printf("signal\n");
+  printf("To get stack trace, set breakpoint in threadhandler in gdb\n");
+  nptrs = backtrace(buffer, 100);
+#ifdef BIT64
+  buffer[1]=(void *)ctx.rip;
+#else
+  buffer[1]=(void *)ctx.eip;
 #endif
+
+  strings = backtrace_symbols(buffer, nptrs);
+  if (strings == NULL) {
+    perror("backtrace_symbols");
+    exit(EXIT_FAILURE);
+  }
+  
+  for (j = 0; j < nptrs; j++)
+    printf("%s\n", strings[j]);
+  
   threadexit();
 }
 
+#define downpage(x) ((void *)(((INTPTR)x)&~((INTPTR)4095)))
+
 void initializethreads() {
   struct sigaction sig;
   threadcount=1;
+#ifdef THREADS
+  pthread_mutex_init(&atomiclock, NULL);
+#endif
   pthread_mutex_init(&gclock, NULL);
   pthread_mutex_init(&gclistlock, NULL);
   pthread_cond_init(&gccond, NULL);
@@ -93,11 +165,20 @@ void initializethreads() {
   pthread_mutex_init(&joinlock,NULL);
   pthread_cond_init(&joincond,NULL);
   pthread_key_create(&threadlocks, NULL);
+#ifdef MAC
+  pthread_key_create(&litem, NULL);
+#endif
   processOptions();
   initializeexithandler();
 
-  sig.sa_sigaction=&threadhandler;
-  sig.sa_flags=SA_SIGINFO;
+  //deprecated use of sighandler, but apparently still works
+#ifdef SANDBOX
+  sig.sa_handler=(void *)errorhandler;
+  abortenabled=0;
+#else
+  sig.sa_handler=(void *)threadhandler;
+#endif
+  sig.sa_flags=SA_RESTART;
   sigemptyset(&sig.sa_mask);
 
   /* Catch bus errors, segmentation faults, and floating point exceptions*/
@@ -105,13 +186,147 @@ void initializethreads() {
   sigaction(SIGSEGV,&sig,0);
   sigaction(SIGFPE,&sig,0);
   signal(SIGPIPE, SIG_IGN);
+#ifdef STM
+  newobjs=calloc(1, sizeof(struct objlist));
+  t_cache = objstrCreate(1048576);
+  t_reserve=NULL;
+  t_chashCreate(CHASH_SIZE, CLOADFACTOR);
+#ifdef READSET
+  rd_t_chashCreate(CHASH_SIZE, CLOADFACTOR);
+#endif
+#ifdef DELAYCOMP
+  dc_t_chashCreate(CHASH_SIZE, CLOADFACTOR);
+  ptrstack.count=0;
+  primstack.count=0;
+  branchstack.count=0;
+#ifdef STMARRAY
+  arraystack.count=0;
+#endif
+  int a=mprotect((downpage(&ptrstack.buffer[1024])), 4096, PROT_NONE);
+  if (a==-1)
+    perror("ptrstack");
+  a=mprotect(downpage(&primstack.array[MAXVALUES]), 4096, PROT_NONE);
+  if (a==-1)
+    perror("primstack");
+  a=mprotect(downpage(&branchstack.array[MAXBRANCHES]), 4096, PROT_NONE);
+  if (a==-1)
+    perror("branchstack");
+#ifdef STMARRAY
+  a=mprotect(downpage(&arraystack.index[MAXARRAY]), 4096, PROT_NONE);
+  if (a==-1)
+    perror("arraystack");
+#endif
+#endif
+#ifdef STMSTATS
+  trec=calloc(1, sizeof(threadrec_t));
+  trec->blocked = 0;
+  lockedobjs=calloc(1, sizeof(struct objlist));
+  objlockscope = calloc(1, sizeof(objlockstate_t));
+  pthread_mutex_init(&lockedobjstore, NULL);
+  { 
+    int i;
+    for(i=0; i<TOTALNUMCLASSANDARRAY; i++) {
+      typesCausingAbort[i].numaccess = 0;
+      typesCausingAbort[i].numabort = 0;
+      typesCausingAbort[i].numtrans = 0;
+    }
+  }
+#endif
+#endif
+#ifdef MAC
+  struct listitem *litem=malloc(sizeof(struct listitem));
+  pthread_setspecific(litemkey, litem);
+  litem->prev=NULL;
+  litem->next=list;
+  if(list!=NULL)
+    list->prev=litem;
+  list=litem;
+#else
+  //Add our litem to list of threads
+  litem.prev=NULL;
+  litem.next=list;
+  if(list!=NULL)
+    list->prev=&litem;
+  list=&litem;
+#endif
 }
 
-#ifdef THREADS
+#if defined(THREADS)||defined(STM)
 void initthread(struct ___Thread___ * ___this___) {
+#ifdef SANDBOX
+  struct sigaction sig;
+  abortenabled=0;
+  sig.sa_handler=(void *)errorhandler;
+  sig.sa_flags=SA_RESTART;
+  sigemptyset(&sig.sa_mask);
+
+  /* Catch bus errors, segmentation faults, and floating point exceptions*/
+  sigaction(SIGBUS,&sig,0);
+  sigaction(SIGSEGV,&sig,0);
+  sigaction(SIGFPE,&sig,0);
+#endif
 #ifdef PRECISE_GC
-  int p[]={1, (int) NULL, (int) ___this___};
+  INTPTR p[]={1, (INTPTR) NULL, (INTPTR) ___this___};
+  //Add our litem to list of threads
+#ifdef MAC
+  struct listitem litem;
+  pthread_setspecific(litemkey, &litem);
+#endif
+  litem.prev=NULL;
+  pthread_mutex_lock(&gclistlock);
+  litem.next=list;
+  if(list!=NULL)
+    list->prev=&litem;
+  list=&litem;
+  pthread_mutex_unlock(&gclistlock);
+  
+#ifdef THREADS
   ___Thread______staticStart____L___Thread___((struct ___Thread______staticStart____L___Thread____params *)p);
+#else
+  newobjs=calloc(1, sizeof(struct objlist));
+#ifdef STMSTATS
+  trec=calloc(1, sizeof(threadrec_t));
+  trec->blocked = 0;
+  lockedobjs=calloc(1, sizeof(struct objlist));
+#endif
+  t_cache = objstrCreate(1048576);
+  t_reserve=NULL;
+  t_chashCreate(CHASH_SIZE, CLOADFACTOR);
+#ifdef READSET
+  rd_t_chashCreate(CHASH_SIZE, CLOADFACTOR);
+#endif
+#ifdef DELAYCOMP
+  dc_t_chashCreate(CHASH_SIZE, CLOADFACTOR);
+  ptrstack.count=0;
+  primstack.count=0;
+  branchstack.count=0;
+#ifdef STMARRAY
+  arraystack.count=0;
+#endif
+  int a=mprotect(downpage(&ptrstack.buffer[1024]), 4096, PROT_NONE);
+  if (a==-1)
+    perror("ptrstack");
+  a=mprotect(downpage(&primstack.array[MAXVALUES]), 4096, PROT_NONE);
+  if (a==-1)
+    perror("primstack");
+  a=mprotect(downpage(&branchstack.array[MAXBRANCHES]), 4096, PROT_NONE);
+  if (a==-1)
+    perror("branchstack");
+#ifdef STMARRAY
+  a=mprotect(downpage(&arraystack.index[MAXARRAY]), 4096, PROT_NONE);
+  if (a==-1)
+    perror("arraystack");
+#endif
+#endif
+ ___Thread____NNR____staticStart____L___Thread___((struct ___Thread____NNR____staticStart____L___Thread____params *)p);
+ objstrDelete(t_cache);
+ objstrDelete(t_reserve);
+ t_chashDelete();
+ free(newobjs);
+#ifdef STMSTATS
+ free(lockedobjs);
+#endif
+#endif
   ___this___=(struct ___Thread___ *) p[2];
 #else
   ___Thread______staticStart____L___Thread___(___this___);
@@ -122,6 +337,17 @@ void initthread(struct ___Thread___ * ___this___) {
   pthread_mutex_unlock(&joinlock);
 
   pthread_mutex_lock(&gclistlock);
+#ifdef THREADS
+  pthread_setspecific(threadlocks, litem.locklist);
+#endif
+  if (litem.prev==NULL) {
+    list=litem.next;
+  } else {
+    litem.prev->next=litem.next;
+  }
+  if (litem.next!=NULL) {
+    litem.next->prev=litem.prev;
+  }
   threadcount--;
   pthread_cond_signal(&gccond);
   pthread_mutex_unlock(&gclistlock);
@@ -129,25 +355,45 @@ void initthread(struct ___Thread___ * ___this___) {
 #endif
 
 void CALL11(___Thread______sleep____J, long long ___millis___, long long ___millis___) {
-#ifdef THREADS
+#if defined(THREADS)||defined(STM)
 #ifdef PRECISE_GC
-  struct listitem *tmp=stopforgc((struct garbagelist *)___params___);
+  stopforgc((struct garbagelist *)___params___);
 #endif
 #endif
   usleep(___millis___);
-#ifdef THREADS
+#if defined(THREADS)||defined(STM)
 #ifdef PRECISE_GC
-  restartaftergc(tmp);
+  restartaftergc();
 #endif
 #endif
 }
 
-#if defined(DSTM)|| defined(THREADS)
+#if defined(DSTM)|| defined(THREADS)||defined(STM)
 void CALL00(___Thread______yield____) {
   pthread_yield();
 }
 #endif
 
+#ifdef D___Thread______abort____
+void CALL00(___Thread______abort____) {
+#ifdef SANDBOX
+  _longjmp(aborttrans,1);
+#endif
+}
+#endif
+
+#ifdef DSTM
+#ifdef RECOVERY
+// return if the machine is dead
+int CALL12(___Thread______nativeGetStatus____I, int ___mid___, struct ___Thread___ * ___this___, int ___mid___) {
+  return getStatus(___mid___);
+}
+#else 
+int CALL12(___Thread______nativeGetStatus____I, int ___mid___, struct ___Thread___ * ___this___, int ___mid___) {
+  return 0;
+}
+#endif
+#endif
 #ifdef DSTM
 /* Add thread join capability */
 void CALL01(___Thread______join____, struct ___Thread___ * ___this___) {
@@ -168,8 +414,15 @@ transstart:
 #endif
     transAbort();
     return;
-  } else {
-
+  }
+#ifdef RECOVERY
+  else if( checkiftheMachineDead(p->___mid___) == 0) {
+    printf("Thread oid = %x is dead\n", (unsigned int) VAR(___this___));
+    transAbort();
+    return;
+  }
+#endif
+  else {
     version = (ptr-1)->version;
     if((oidarray = calloc(1, sizeof(unsigned int))) == NULL) {
       printf("Calloc error %s, %d\n", __FILE__, __LINE__);
@@ -186,11 +439,16 @@ transstart:
     versionarray[0] = version;
     /* Request Notification */
 #ifdef PRECISE_GC
-    struct listitem *tmp=stopforgc((struct garbagelist *)___params___);
+    stopforgc((struct garbagelist *)___params___);
 #endif
+
+#ifdef RECOVERY
+    reqNotify(oidarray, versionarray, 1,p->___mid___);
+#else
     reqNotify(oidarray, versionarray, 1);
+#endif
 #ifdef PRECISE_GC
-    restartaftergc(tmp);
+    restartaftergc();
 #endif
     free(oidarray);
     free(versionarray);
@@ -201,11 +459,18 @@ transstart:
 }
 #endif
 
-#ifdef THREADS
+#if defined(THREADS)||defined(STM)
 void CALL01(___Thread______nativeJoin____, struct ___Thread___ * ___this___) {
   pthread_mutex_lock(&joinlock);
-  while(!VAR(___this___)->___finished___)
+  while(!VAR(___this___)->___finished___) {
+#ifdef PRECISE_GC
+  stopforgc((struct garbagelist *)___params___);
+#endif
     pthread_cond_wait(&joincond, &joinlock);
+#ifdef PRECISE_GC
+    restartaftergc();
+#endif
+  }
   pthread_mutex_unlock(&joinlock);
 }
 
@@ -219,7 +484,9 @@ void CALL01(___Thread______nativeCreate____, struct ___Thread___ * ___this___) {
   pthread_mutex_unlock(&gclistlock);
   pthread_attr_init(&nattr);
   pthread_attr_setdetachstate(&nattr, PTHREAD_CREATE_DETACHED);
-
+  INTPTR stacksize;
+  pthread_attr_getstacksize(&nattr, &stacksize);
+  printf("STACKSIZE=%u\n",stacksize);
   do {
     retval=pthread_create(&thread, &nattr, (void * (*)(void *)) &initthread, VAR(___this___));
     if (retval!=0)
@@ -251,6 +518,20 @@ void initDSMthread(int *ptr) {
   free(ptr);
 #ifdef PRECISE_GC
   int p[]={1, 0 /* NULL */, oid};
+#ifdef MAC
+  struct listitem litem;
+  pthread_setspecific(litemkey, &litem);
+#endif
+
+  //Add our litem to list of threads
+  litem.prev=NULL;
+  pthread_mutex_lock(&gclistlock);
+  litem.next=list;
+  if(list!=NULL)
+    list->prev=&litem;
+  list=&litem;
+  pthread_mutex_unlock(&gclistlock);
+
   ((void(*) (void *))virtualtable[type*MAXCOUNT+RUNMETHOD])(p);
 #else
   ((void(*) (void *))virtualtable[type*MAXCOUNT+RUNMETHOD])(oid);
@@ -259,6 +540,18 @@ void initDSMthread(int *ptr) {
   *((unsigned int *) threadData) = oid;
   pthread_setspecific(oidval, threadData);
   pthread_mutex_lock(&gclistlock);
+
+#ifdef THREADS
+  pthread_setspecific(threadlocks, litem.locklist);
+#endif
+  if (litem.prev==NULL) {
+    list=litem.next;
+  } else {
+    litem.prev->next=litem.next;
+  }
+  if (litem.next!=NULL) {
+    litem.next->prev=litem.prev;
+  }
   threadcount--;
   pthread_cond_signal(&gccond);
   pthread_mutex_unlock(&gclistlock);
@@ -291,6 +584,7 @@ void startDSMthread(int oid, int objType) {
   ptr[0]=oid;
   ptr[1]=objType;
   pthread_key_create(&oidval, globalDestructor);
+  
   do {
     retval=pthread_create(&thread, &nattr, (void * (*)(void *)) &initDSMthread,  ptr);
     if (retval!=0)