VMS/VMS_Implementations/VMS_impls/VMS__MC_shared

comparison VMS.c @ 70:f9b60012fd74

working ucontext version

author	Merten Sach <msach@mailbox.tu-berlin.de>
date	Fri, 27 May 2011 12:35:40 +0200
parents	11bfe9d136ed
children	efb55f1b5fb9

comparison

equal deleted inserted replaced

-:053256974df1
+:2ff095bb79c5
 //NOTE: do not clean up VMS env here -- semantic layer has to have
 // a chance to clean up its environment first, then do a call to free
 // the Master env and rest of VMS locations
 }
+#ifdef SEQUENTIAL
 /*Only difference between version with an OS thread pinned to each core and
 * the sequential version of VMS is VMS__init_Seq, this, and coreLoop_Seq.
 */
 void
 VMS__start_the_work_then_wait_until_done_Seq()
 //Instead of un-suspending threads, just call the one and only
 // core loop (sequential version), in the main thread.
 coreLoop_Seq( NULL );
 }
+#endif
 /*Create stack, then create __cdecl structure on it and put initialData and
 * pointer to the new structure instance into the parameter positions on
 * animator state to return to --
 *
 */
 inline VirtProcr *
 create_procr_helper( VirtProcr *newPr,       VirtProcrFnPtr  fnPtr,
-void      *initialData, char           *stackLocs )
+void      *initialData, char           *stackLocs,
-{
+ucontext_t *contextBuf)
-char  *stackPtr;
+{
+char  *stackPtr = ( (char *)stackLocs + VIRT_PROCR_STACK_SIZE - 0x4);
+getcontext(contextBuf);
+contextBuf->uc_stack.ss_sp=stackLocs;
+contextBuf->uc_stack.ss_size=VIRT_PROCR_STACK_SIZE;
+contextBuf->uc_stack.ss_flags=0;
+makecontext(contextBuf, fnPtr, 2, initialData, newPr);
+contextBuf->uc_link=NULL;
+newPr->procrID      = _VMSMasterEnv->numProcrsCreated++;
+newPr->savedVPStatus  = contextBuf;
+newPr->initialData  = initialData;
 newPr->startOfStack = stackLocs;
-newPr->procrID      = _VMSMasterEnv->numProcrsCreated++;
-newPr->nextInstrPt  = fnPtr;
-newPr->initialData  = initialData;
 newPr->requests     = NULL;
 newPr->schedSlot    = NULL;
-//fnPtr takes two params -- void *initData & void *animProcr
-//alloc stack locations, make stackPtr be the highest addr minus room
-// for 2 params + return addr.  Return addr (NULL) is in loc pointed to
-// by stackPtr, initData at stackPtr + 4 bytes, animatingPr just above
-stackPtr = ( (char *)stackLocs + VIRT_PROCR_STACK_SIZE - 0x10 );
 //setup __cdecl on stack -- coreloop will switch to stackPtr before jmp
-*( (int *)stackPtr + 2 ) = (int) newPr; //rightmost param -- 32bit pointer
+//*( (int *)stackPtr + 2 ) = (int) newPr; //rightmost param -- 32bit pointer
-*( (int *)stackPtr + 1 ) = (int) initialData;  //next  param to left
+//*( (int *)stackPtr + 1 ) = (int) initialData;  //next  param to left
-newPr->stackPtr = stackPtr; //core loop will switch to this, then
+//newPr->stackPtr = stackPtr; //core loop will switch to this, then
-newPr->framePtr = stackPtr; //suspend loop will save new stack & frame ptr
+//newPr->framePtr = stackPtr; //suspend loop will save new stack & frame ptr
 //============================= MEASUREMENT STUFF ========================
 #ifdef STATS__TURN_ON_PROBES
 struct timeval timeStamp;
 gettimeofday( &(timeStamp), NULL);
 inline VirtProcr *
 VMS__create_procr( VirtProcrFnPtr fnPtr, void *initialData )
 { VirtProcr *newPr;
 char      *stackLocs;
+ucontext_t *contextBuffer;
 newPr      = VMS__malloc( sizeof(VirtProcr) );
 stackLocs  = VMS__malloc( VIRT_PROCR_STACK_SIZE );
+contextBuffer  = VMS__malloc(sizeof(ucontext_t));
 if( stackLocs == 0 )
 { perror("VMS__malloc stack"); exit(1); }
-return create_procr_helper( newPr, fnPtr, initialData, stackLocs );
+return create_procr_helper( newPr, fnPtr, initialData, stackLocs, contextBuffer );
 }
 /* "ext" designates that it's for use outside the VMS system -- should only
 * be called from main thread or other thread -- never from code animated by
 * a VMS virtual processor.
 */
 inline VirtProcr *
 VMS_ext__create_procr( VirtProcrFnPtr fnPtr, void *initialData )
 { VirtProcr *newPr;
 char      *stackLocs;
+ucontext_t *contextBuffer;
 newPr      = malloc( sizeof(VirtProcr) );
 stackLocs  = malloc( VIRT_PROCR_STACK_SIZE );
+contextBuffer  = VMS__malloc(sizeof(ucontext_t));
 if( stackLocs == 0 )
 { perror("malloc stack"); exit(1); }
-return create_procr_helper( newPr, fnPtr, initialData, stackLocs );
+return create_procr_helper( newPr, fnPtr, initialData, stackLocs, contextBuffer );
 }
 /*Anticipating multi-tasking
 */
 * next work-unit for that procr.
 */
 void
 VMS__suspend_procr( VirtProcr *animatingPr )
 {
+//return ownership of the virt procr and sched slot to Master virt pr
-//The request to master will cause this suspended virt procr to get
-// scheduled again at some future point -- to resume, core loop jumps
-// to the resume point (below), which causes restore of saved regs and
-// "return" from this call.
-animatingPr->nextInstrPt = &&ResumePt;
-//return ownership of the virt procr and sched slot to Master virt pr
 animatingPr->schedSlot->workIsDone = TRUE;
 //===========================  Measurement stuff ========================
 #ifdef MEAS__TIME_STAMP_SUSP
 //record time stamp: compare to time-stamp recorded below
 saveLowTimeStampCountInto( animatingPr->preSuspTSCLow );
 #endif
 //=======================================================================
-/* VirtProcr  offsets:
+swapcontext(animatingPr->savedVPStatus,animatingPr->savedCoreLoopStatus);
-* 0xc  stackPtr
-* 0x10 framePtr
-* 0x14 nextInstrPt
-* 0x1c coreLoopFramePtr
-* 0x20 coreLoopStackPtr
-*
-* _VMSMasterEnv  offsets:
-* 0x24 coreLoopStartPt
-* 0x28 coreLoopEndPt
-* 0x30 masterLock
-*/
-//   SwitchToCoreLoop( animatingPr )
-asm volatile("movl         %0,       %%ebx;  \
-movl         %1,       %%ecx;  \
-movl      %%esp,  0x0c(%%ecx); \
-movl      %%ebp,  0x10(%%ecx); \
-movl 0x24(%%ebx),      %%eax;  \
-movl 0x20(%%ecx),      %%esp;  \
-movl 0x1c(%%ecx),      %%ebp;  \
-jmp                    %%eax"  \
-/* outputs */ :                              \
-/* inputs  */ : "g"(_VMSMasterEnv), "g"(animatingPr)                     \
-/* clobber */ : "memory", "%eax", "%ebx", "%ecx", "%edx", "%edi", "%esi" \
-);
-//  asm volatile("mov  %0,%%ebx;       \
-mov  %%ebx, %%eax;   \
-add  $0xc,  %%eax;   \
-movl %%esp, (%%eax); \
-mov  %%ebx, %%eax;   \
-add  $0x10, %%eax;   \
-movl %%ebp, (%%eax); \
-movl %1, %%eax;      \
-movl %2, %%esp;      \
-movl %3, %%ebp;      \
-jmp  %%eax"          \
-/* outputs */ :                    \
-/* inputs  */ : "g"(animatingPr), "g" (jmpPt), "g" (coreLoopStackPtr), \
-"g" (coreLoopFramePtr) \
-/* clobber */ : "memory", "%eax", "%ebx", "%ecx", "%edx", "%edi", "%esi" \
-);
 //=======================================================================
-ResumePt:
 #ifdef MEAS__TIME_STAMP_SUSP
 //NOTE: only take low part of count -- do sanity check when take diff
 saveLowTimeStampCountInto( animatingPr->postSuspTSCLow );
 #endif
 return;
 }
 * processors).
 */
 void
 endOSThreadFn( void *initData, VirtProcr *animatingPr )
 { void *jmpPt, *coreLoopStackPtr, *coreLoopFramePtr;
+ucontext_t* contextBuf = animatingPr->savedCoreLoopStatus;
-jmpPt             = _VMSMasterEnv->coreLoopEndPt;
+void *stackPtr = contextBuf->uc_mcontext.gregs[REG_ESP];
-coreLoopStackPtr  = animatingPr->coreLoopStackPtr;
-coreLoopFramePtr  = animatingPr->coreLoopFramePtr;
+getcontext(contextBuf);
+contextBuf->uc_stack.ss_sp=stackPtr;
+makecontext(contextBuf,&terminateCoreLoop,1,animatingPr);
-asm volatile("movl %0, %%eax;      \
+contextBuf->uc_link=NULL;
-movl %1, %%esp;      \
+swapcontext(animatingPr->savedVPStatus,contextBuf);
-movl %2, %%ebp;      \
+}
-jmp  %%eax    "      \
-/* outputs */ :                    \
-/* inputs  */ : "m" (jmpPt), "m"(coreLoopStackPtr), "m"(coreLoopFramePtr)\
-/* clobber */ : "memory", "%eax", "%ebx", "%ecx", "%edx", "%edi","%esi"  \
-);
-}
 /*This is called from the startup & shutdown
 */
 void

Mercurial > cgi-bin > hgwebdir.cgi > VMS > VMS_Implementations > VMS_impls > VMS__MC_shared_impl

comparison VMS.c @ 70:f9b60012fd74