X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Robust%2Fsrc%2FRuntime%2Fruntime.c;h=03ee0bcfad9fbd1ae386330b669be40dd3d680c7;hb=1e23ae339caa2709f28af2d22e6b34c2c0b01abb;hp=abf51e71d81f738847d392c4490f7a38a19d5180;hpb=3d0f0e415e9c831b1f11fbc8a1017b5b5a3b8894;p=IRC.git

diff --git a/Robust/src/Runtime/runtime.c b/Robust/src/Runtime/runtime.c
index abf51e71..03ee0bcf 100644
--- a/Robust/src/Runtime/runtime.c
+++ b/Robust/src/Runtime/runtime.c
@@ -1,315 +1,248 @@
 #include "runtime.h"
 #include "structdefs.h"
-#include <string.h>
 #include <signal.h>
 #include "mem.h"
 #include<fcntl.h>
-#include<sys/types.h>
-#include<sys/mman.h>
 #include<errno.h>
-#include<signal.h>
 #include<stdio.h>
+#include "option.h"
+#ifdef DSTM
+#include "dstm.h"
+#include "prelookup.h"
+#endif
 
 extern int classsize[];
 jmp_buf error_handler;
-
-#ifdef TASK
-#include "checkpoint.h"
-#include "Queue.h"
-#include "SimpleHash.h"
-#include "GenericHashtable.h"
-#ifdef CONSCHECK
-#include "instrument.h"
+int instructioncount;
+
+char *options;
+int injectfailures=0;
+float failurechance=0;
+int debugtask=0;
+int injectinstructionfailures;
+int failurecount;
+float instfailurechance=0;
+int numfailures;
+int instaccum=0;
+#ifdef DMALLOC
+#include "dmalloc.h"
 #endif
 
-struct Queue * activetasks;
-struct parameterwrapper * objectqueues[NUMCLASSES];
-struct genhashtable * failedtasks;
-
-int main(int argc, char **argv) {
-  GC_init();
-#ifdef CONSCHECK
-  initializemmap();
-#endif
-  {
-  int i;
-  /* Allocate startup object */
-  struct ___StartupObject___ *startupobject=(struct ___StartupObject___*) allocate_new(STARTUPTYPE);
-  struct ArrayObject * stringarray=allocate_newarray(STRINGARRAYTYPE, argc-1); 
-  failedtasks=genallocatehashtable((unsigned int (*)(void *)) &hashCodetpd, 
-				   (int (*)(void *,void *)) &comparetpd);
-  
-  activetasks=createQueue();
+void exithandler(int sig, siginfo_t *info, void * uap) {
+  exit(0);
+}
 
-  /* Set flags */
-  processtasks();
-  flagorand(startupobject,1,0xFFFFFFFF);
+void initializeexithandler() {
+  struct sigaction sig;
+  sig.sa_sigaction=&exithandler;
+  sig.sa_flags=SA_SIGINFO;
+  sigemptyset(&sig.sa_mask);
+  sigaction(SIGUSR2, &sig, 0);
+}
 
-  /* Build array of strings */
 
-  startupobject->___parameters___=stringarray;
+/* This function inject failures */
 
-  for(i=1;i<argc;i++) {
-    int length=strlen(argv[i]);
-    struct ___String___ *newstring=NewString(argv[i],length);
-    ((void **)(((char *)& stringarray->___length___)+sizeof(int)))[i-1]=newstring;
+void injectinstructionfailure() {
+#ifdef TASK
+  if (injectinstructionfailures) {
+    if (numfailures==0)
+      return;
+    instructioncount=failurecount;    
+    instaccum+=failurecount;
+    if ((((double)random())/RAND_MAX)<instfailurechance) {
+      if (numfailures>0)
+	numfailures--;
+      printf("FAILURE!!! %d\n",numfailures);
+      longjmp(error_handler,11);
+    }
   }
-  executetasks();
+#else
+#ifdef THREADS
+  if (injectinstructionfailures) {
+    if (numfailures==0)
+      return;
+    instaccum+=failurecount;
+    if ((((double)random())/RAND_MAX)<instfailurechance) {
+      if (numfailures>0)
+	numfailures--;
+      printf("FAILURE!!! %d\n",numfailures);
+      threadexit();
+    }
   }
+#endif
+#endif
 }
 
-int hashCodetpd(struct taskparamdescriptor *ftd) {
-  int hash=(int)ftd->task;
-  int i;
-  for(i=0;i<ftd->numParameters;i++) {
-    hash^=(int)ftd->parameterArray[i];
-  }
-  return hash;
+void CALL11(___System______exit____I,int ___status___, int ___status___) {
+  exit(___status___);
 }
 
-int comparetpd(struct taskparamdescriptor *ftd1, struct taskparamdescriptor *ftd2) {
-  int i;
-  if (ftd1->task!=ftd2->task)
-    return 0;
-  for(i=0;i<ftd1->numParameters;i++)
-    if (ftd1->parameterArray[i]!=ftd2->parameterArray[i])
-      return 0;
-  return 1;
+long CALL00(___System______currentTimeMillis____) {
+  struct timeval tv; long long retval;
+  gettimeofday(&tv, NULL);
+  retval = tv.tv_sec; /* seconds */
+  retval*=1000; /* milliseconds */
+  retval+= (tv.tv_usec/1000); /* adjust milliseconds & add them in */
+  return retval;
 }
 
-void flagorand(void * ptr, int ormask, int andmask) {
-  int flag=((int *)ptr)[1];
-  struct RuntimeHash *flagptr=(struct RuntimeHash *)(((int*)ptr)[2]);
-  flag|=ormask;
-  flag&=andmask;
-  ((int*)ptr)[1]=flag;
-  /*Remove from all queues */
-  while(flagptr!=NULL) {
-    struct RuntimeHash *next;
-    RuntimeHashget(flagptr, (int) ptr, (int *) &next);
-    RuntimeHashremove(flagptr, (int)ptr, (int) next);
-    flagptr=next;
-  }
-  
-  {
-    struct QueueItem *tmpptr;
-    struct parameterwrapper * parameter=objectqueues[((int *)ptr)[0]];
+void CALL01(___System______printString____L___String___,struct ___String___ * ___s___) {
+    struct ArrayObject * chararray=VAR(___s___)->___value___;
     int i;
-    struct RuntimeHash * prevptr=NULL;
-    while(parameter!=NULL) {
-      for(i=0;i<parameter->numberofterms;i++) {
-	int andmask=parameter->intarray[i*2];
-	int checkmask=parameter->intarray[i*2+1];
-	if ((flag&andmask)==checkmask) {
-	  RuntimeHashadd(parameter->objectset, (int) ptr, (int) prevptr);
-	  prevptr=parameter->objectset;
-	  {
-	    struct RuntimeIterator iteratorarray[MAXTASKPARAMS];
-	    void * taskpointerarray[MAXTASKPARAMS];
-	    int j;
-	    int numparams=parameter->task->numParameters;
-	    int done=1;
-	    struct taskdescriptor * task=parameter->task;
-	    int newindex=-1;
-	    for(j=0;j<numparams;j++) {
-	      struct parameterwrapper *pw=(struct parameterwrapper *)task->descriptorarray[j]->queue;
-	      if (parameter==pw) {
-		taskpointerarray[j]=ptr;
-		newindex=j;
-	      } else {
-		RuntimeHashiterator(pw->objectset, &iteratorarray[j]);
-		if (RunhasNext(&iteratorarray[j]))
-		  taskpointerarray[j]=(void *) Runnext(&iteratorarray[j]);
-		else
-		  break; /* No tasks to dispatch */
-	      }
-	    }
-	    /* Queue task items... */
-
-	    while(done) {
-	      struct taskparamdescriptor *tpd=RUNMALLOC(sizeof(struct taskparamdescriptor));
-	      tpd->task=task;
-	      tpd->numParameters=numparams;
-	      tpd->parameterArray=RUNMALLOC(sizeof(void *)*numparams);
-	      for(j=0;j<numparams;j++)
-		tpd->parameterArray[j]=taskpointerarray[j];
-	      /* Queue task */
-	      if (!gencontains(failedtasks, tpd))
-		addNewItem(activetasks, tpd);
-	      
-	      /* This loop iterates to the next paramter combination */
-	      for(j=0;j<numparams;j++) {
-		if (j==newindex) {
-		  if ((j+1)==numparams)
-		    done=0;
-		  continue;
-		}
-		if (RunhasNext(&iteratorarray[j])) {
-		  taskpointerarray[j]=(void *) Runnext(&iteratorarray[j]);
-		  break;
-		} else if ((j+1)!=numparams) {
-		  RuntimeHashiterator(task->descriptorarray[j]->queue, &iteratorarray[j]);
-		} else {
-		  done=0;
-		  break;
-		}
-	      }
-	    }
-	  }
-	  break;
-	}
-      }
-      parameter=parameter->next;
+    int offset=VAR(___s___)->___offset___;
+    for(i=0;i<VAR(___s___)->___count___;i++) {
+	short sc=((short *)(((char *)& chararray->___length___)+sizeof(int)))[i+offset];
+	putchar(sc);
     }
-    ((struct RuntimeHash **)ptr)[2]=prevptr;
-  }
 }
 
-/* Handler for signals */
-void myhandler(int sig, struct __siginfo *info, void *uap) {
-#ifdef DEBUG
-  printf("sig=%d\n",sig);
-  printf("signal\n");
-#endif
-  longjmp(error_handler,1);
+#ifdef DSTM
+void CALL00(___System______clearPrefetchCache____) {
+  prehashClear();
 }
+#endif
 
-void executetasks() {
-  void * taskpointerarray[MAXTASKPARAMS];
-
-  /* Set up signal handlers */
-  struct sigaction sig;
-  sig.sa_sigaction=&myhandler;
-  sig.sa_flags=SA_SIGINFO;
-  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);
-
-  /* Map first block of memory to protected, anonymous page */
-  mmap(0, 0x1000, 0, MAP_SHARED|MAP_FIXED|MAP_ANON, -1, 0);
+/* Object allocation function */
 
-  newtask:
-  while(!isEmpty(activetasks)) {
-    struct QueueItem * qi=(struct QueueItem *) getTail(activetasks);
-    struct taskparamdescriptor *tpd=(struct taskparamdescriptor *) qi->objectptr;
-    int i;
-    removeItem(activetasks, qi);
-    
-    for(i=0;i<tpd->task->numParameters;i++) {
-      void * parameter=tpd->parameterArray[i];
-      struct parameterdescriptor * pd=tpd->task->descriptorarray[i];
-      struct parameterwrapper *pw=(struct parameterwrapper *) pd->queue;
-      if (!RuntimeHashcontainskey(pw->objectset, (int) parameter))
-	goto newtask;
-      taskpointerarray[i]=parameter;
-    }
-    {
-      struct RuntimeHash * forward=allocateRuntimeHash(100);
-      struct RuntimeHash * reverse=allocateRuntimeHash(100);
-      void ** checkpoint=makecheckpoint(tpd->task->numParameters, taskpointerarray, forward, reverse);
-      if (setjmp(error_handler)) {
-	/* Recover */
-	int h;
-#ifdef DEBUG
-	printf("Recovering\n");
+#ifdef DSTM
+void * allocate_newglobal(transrecord_t *trans, int type) {
+  struct ___Object___ * v=(struct ___Object___ *) transCreateObj(trans, classsize[type]);
+  v->type=type;
+#ifdef THREADS
+  v->tid=0;
+  v->lockentry=0;
+  v->lockcount=0;
 #endif
-	genputtable(failedtasks,tpd,tpd);
-	restorecheckpoint(tpd->task->numParameters, taskpointerarray, checkpoint, forward, reverse);
-      } else {
-	/* Actually call task */
-	((void (*) (void **)) tpd->task->taskptr)(taskpointerarray);
-      }
-    }
-  }
+  return v;
 }
 
-void processtasks() {
-  int i;
-  for(i=0;i<numtasks;i++) {
-    struct taskdescriptor * task=taskarray[i];
-    int j;
-
-    for(j=0;j<task->numParameters;j++) {
-      struct parameterdescriptor *param=task->descriptorarray[j];
-      struct parameterwrapper * parameter=RUNMALLOC(sizeof(struct parameterwrapper));
-      struct parameterwrapper ** ptr=&objectqueues[param->type];
+/* Array allocation function */
 
-      param->queue=parameter;
-      parameter->objectset=allocateRuntimeHash(10);
-      parameter->numberofterms=param->numberterms;
-      parameter->intarray=param->intarray;
-      parameter->task=task;
-      /* Link new queue in */
-      while((*ptr)!=NULL)
-	ptr=&((*ptr)->next);
-      (*ptr)=parameter;
-    }
+struct ArrayObject * allocate_newarrayglobal(transrecord_t *trans, int type, int length) {
+  struct ArrayObject * v=(struct ArrayObject *)transCreateObj(trans, sizeof(struct ArrayObject)+length*classsize[type]);
+  if (length<0) {
+    printf("ERROR: negative array\n");
+    return NULL;
   }
+  v->type=type;
+  v->___length___=length;
+#ifdef THREADS
+  v->tid=0;
+  v->lockentry=0;
+  v->lockcount=0;
+#endif
+  return v;
 }
 #endif
 
-int ___Object______hashcode____(struct ___Object___ * ___this___) {
-  return (int) ___this___;
+
+#ifdef PRECISE_GC
+void * allocate_new(void * ptr, int type) {
+  struct ___Object___ * v=(struct ___Object___ *) mygcmalloc((struct garbagelist *) ptr, classsize[type]);
+  v->type=type;
+#ifdef THREADS
+  v->tid=0;
+  v->lockentry=0;
+  v->lockcount=0;
+#endif
+#ifdef OPTIONAL
+  v->fses=0;
+#endif
+  return v;
 }
 
-void ___System______printString____L___String___(struct ___String___ * s) {
-    struct ArrayObject * chararray=s->___string___;
-    int i;
-    for(i=0;i<chararray->___length___;i++) {
-	short s= ((short *)(((char *)& chararray->___length___)+sizeof(int)))[i];
-	putchar(s);
-    }
+/* Array allocation function */
+
+struct ArrayObject * allocate_newarray(void * ptr, int type, int length) {
+  struct ArrayObject * v=mygcmalloc((struct garbagelist *) ptr, sizeof(struct ArrayObject)+length*classsize[type]);
+  v->type=type;
+  if (length<0) {
+    printf("ERROR: negative array\n");
+    return NULL;
+  }
+  v->___length___=length;
+#ifdef THREADS
+  v->tid=0;
+  v->lockentry=0;
+  v->lockcount=0;
+#endif
+#ifdef OPTIONAL
+  v->fses=0;
+#endif
+  return v;
 }
 
+#else
 void * allocate_new(int type) {
-  void * v=FREEMALLOC(classsize[type]);
-  *((int *)v)=type;
+  struct ___Object___ * v=FREEMALLOC(classsize[type]);
+  v->type=type;
+#ifdef OPTIONAL
+  v->fses=0;
+#endif
   return v;
 }
 
+/* Array allocation function */
+
 struct ArrayObject * allocate_newarray(int type, int length) {
   struct ArrayObject * v=FREEMALLOC(sizeof(struct ArrayObject)+length*classsize[type]);
   v->type=type;
   v->___length___=length;
+#ifdef OPTIONAL
+  v->fses=0;
+#endif
   return v;
 }
+#endif
 
+
+/* Converts C character arrays into Java strings */
+#ifdef PRECISE_GC
+struct ___String___ * NewString(void * ptr, const char *str,int length) {
+#else
 struct ___String___ * NewString(const char *str,int length) {
+#endif
+  int i;
+#ifdef PRECISE_GC
+  struct ArrayObject * chararray=allocate_newarray((struct garbagelist *)ptr, CHARARRAYTYPE, length);
+  int ptrarray[]={1, (int) ptr, (int) chararray};
+  struct ___String___ * strobj=allocate_new((struct garbagelist *) &ptrarray, STRINGTYPE);
+  chararray=(struct ArrayObject *) ptrarray[2];
+#else
   struct ArrayObject * chararray=allocate_newarray(CHARARRAYTYPE, length);
   struct ___String___ * strobj=allocate_new(STRINGTYPE);
-  int i;
-  strobj->___string___=chararray;
+#endif
+  strobj->___value___=chararray;
+  strobj->___count___=length;
+  strobj->___offset___=0;
+
   for(i=0;i<length;i++) {
     ((short *)(((char *)& chararray->___length___)+sizeof(int)))[i]=(short)str[i];  }
   return strobj;
 }
 
+/* Generated code calls this if we fail a bounds check */
+
 void failedboundschk() {
 #ifndef TASK
   printf("Array out of bounds\n");
-  exit(-1);
+#ifdef THREADS
+  threadexit();
 #else
-  longjmp(error_handler,2);
-#endif
-}
-
-void failednullptr() {
-#ifndef TASK
-  printf("Dereferenced a null pointer\n");
   exit(-1);
+#endif
 #else
-  longjmp(error_handler,3);
+  longjmp(error_handler,2);
 #endif
 }
 
+/* Abort task call */
 void abort_task() {
-#ifndef TASK
+#ifdef TASK
+  longjmp(error_handler,4);
+#else
   printf("Aborting\n");
   exit(-1);
-#else
-  longjmp(error_handler,4);
 #endif
 }