# HG changeset patch
# User Me
# Date 1289580145 28800
# Node ID a6c442d52590c776c5aeb853457e10b17b95d3de
# Parent  dd3e60aeae26dc93d7aeb2d763db3df3bbd4db78
removed all inline, to see if -O3 works -- now -O0 broken too! will go back

diff -r dd3e60aeae26 -r a6c442d52590 MasterLoop.c
--- a/MasterLoop.c	Fri Nov 12 07:36:01 2010 -0800
+++ b/MasterLoop.c	Fri Nov 12 08:42:25 2010 -0800
@@ -13,7 +13,7 @@
 
 
 //===========================================================================
-void inline
+void
 stealWorkInto( SchedSlot *currSlot, VMSQueueStruc *readyToAnimateQ,
                VirtProcr *masterPr );
 
@@ -206,7 +206,7 @@
 /*This has a race condition -- the coreloops are accessing their own queues
  * at the same time that this work-stealer on a different core is trying to
  */
-void inline
+void
 stealWorkInto( SchedSlot *currSlot, VMSQueueStruc *readyToAnimateQ,
                VirtProcr *masterPr )
  { 
@@ -309,7 +309,7 @@
  * write FALSE to the gate closed var.
  * 
  */
-void inline
+void
 gateProtected_stealWorkInto( SchedSlot *currSlot,
                              VMSQueueStruc *myReadyToAnimateQ,
                              VirtProcr *masterPr )
diff -r dd3e60aeae26 -r a6c442d52590 VMS.c
--- a/VMS.c	Fri Nov 12 07:36:01 2010 -0800
+++ b/VMS.c	Fri Nov 12 08:42:25 2010 -0800
@@ -261,7 +261,7 @@
  * animator state to return to --
  *
  */
-inline VirtProcr *
+  VirtProcr *
 create_procr_helper( VirtProcr *newPr,       VirtProcrFnPtr  fnPtr,
                      void      *initialData, char           *stackLocs )
  {
@@ -298,7 +298,7 @@
    return newPr;
  }
 
-inline VirtProcr *
+  VirtProcr *
 VMS__create_procr( VirtProcrFnPtr fnPtr, void *initialData )
  { VirtProcr *newPr;
    char      *stackLocs;
@@ -315,7 +315,7 @@
  * be called from main thread or other thread -- never from code animated by
  * a VMS virtual processor.
  */
-inline VirtProcr *
+  VirtProcr *
 VMS_ext__create_procr( VirtProcrFnPtr fnPtr, void *initialData )
  { VirtProcr *newPr;
    char      *stackLocs;
@@ -503,7 +503,7 @@
  *
  *The request handler has to call VMS__free_VMSReq for any of these
  */
-inline void
+  void
 VMS__add_sem_request_in_mallocd_VMSReqst( void *semReqData,
                                           VirtProcr *callingPr )
  { VMSReqst *req;
@@ -520,7 +520,7 @@
  * to plugin
  *Then it does suspend, to cause request to be sent.
  */
-inline void
+  void
 VMS__send_sem_request( void *semReqData, VirtProcr *callingPr )
  { VMSReqst req;
 
@@ -533,7 +533,7 @@
  }
 
 
-inline void
+  void
 VMS__send_VMSSem_request( void *semReqData, VirtProcr *callingPr )
  { VMSReqst req;
 
@@ -560,7 +560,7 @@
  }
 
 
-inline void *
+  void *
 VMS__take_sem_reqst_from( VMSReqst *req )
  {
    return req->semReqData;
@@ -582,7 +582,7 @@
  *  VMS-core steer the request to appropriate plugin
  * Do the same for OS calls -- look later at it..
  */
-void inline
+void
 VMS__handle_VMSSemReq( VMSReqst *req, VirtProcr *requestingPr, void *semEnv,
                        ResumePrFnPtr resumePrFnPtr )
  { VMSSemReq     *semReq;
diff -r dd3e60aeae26 -r a6c442d52590 VMS.h
--- a/VMS.h	Fri Nov 12 07:36:01 2010 -0800
+++ b/VMS.h	Fri Nov 12 08:42:25 2010 -0800
@@ -330,25 +330,25 @@
 void
 VMS__suspend_procr( VirtProcr *callingPr );
 
-inline void
+  void
 VMS__add_sem_request_in_mallocd_VMSReqst( void *semReqData, VirtProcr *callingPr );
 
-inline void
+  void
 VMS__send_sem_request( void *semReqData, VirtProcr *callingPr );
 
 void
 VMS__send_create_procr_req( void *semReqData, VirtProcr *reqstingPr );
 
-void inline
+void
 VMS__send_dissipate_req( VirtProcr *prToDissipate );
 
-inline void
+  void
 VMS__send_VMSSem_request( void *semReqData, VirtProcr *callingPr );
 
 VMSReqst *
 VMS__take_next_request_out_of( VirtProcr *procrWithReq );
 
-inline void *
+  void *
 VMS__take_sem_reqst_from( VMSReqst *req );
 
 //======================== STATS ======================
diff -r dd3e60aeae26 -r a6c442d52590 probes.c
--- a/probes.c	Fri Nov 12 07:36:01 2010 -0800
+++ b/probes.c	Fri Nov 12 08:42:25 2010 -0800
@@ -17,7 +17,7 @@
 
 //================================ STATS ====================================
 
-inline TSCount getTSCount()
+  TSCount getTSCount()
  { unsigned int low, high;
    TSCount  out;
 
diff -r dd3e60aeae26 -r a6c442d52590 probes.h
--- a/probes.h	Fri Nov 12 07:36:01 2010 -0800
+++ b/probes.h	Fri Nov 12 08:42:25 2010 -0800
@@ -56,7 +56,7 @@
    //TODO: change freq for each machine
 #define TSCOUNT_FREQ 3180000000
 
-inline TSCount getTSCount();
+  TSCount getTSCount();
 
 
 //======================== Probes =============================
diff -r dd3e60aeae26 -r a6c442d52590 vmalloc.c
--- a/vmalloc.c	Fri Nov 12 07:36:01 2010 -0800
+++ b/vmalloc.c	Fri Nov 12 08:42:25 2010 -0800
@@ -24,7 +24,7 @@
  *
  *The end of the list is identified by next chunk being NULL, as usual.
  */
-void inline
+void
 add_chunk_to_free_list( MallocProlog *chunk, MallocProlog *listHead )
  { 
    chunk->nextChunkInFreeList     = listHead->nextChunkInFreeList;
@@ -50,7 +50,7 @@
    int32         amountExtra, foundElemIsTopOfHeap, sizeConsumed,sizeOfFound;
 
       //step up the size to be aligned at 16-byte boundary, prob better ways
-   sizeRequested = ((sizeRequested + 16) >> 4) << 4;
+   sizeRequested = ((sizeRequested + 15) >> 4) << 4;
    currElem = (_VMSMasterEnv->freeListHead)->nextChunkInFreeList;
 
    while( currElem != NULL )