Mercurial > cgi-bin > hgwebdir.cgi > VMS > VMS_Implementations > SSR_impls > SSR__MC_shared_impl
changeset 20:562e68094af7 test_without_inline
removed all inline, to see if -O3 works -- now -O0 broken too! will go back
| author | Me |
|---|---|
| date | Fri, 12 Nov 2010 08:43:20 -0800 |
| parents | b549ad140f18 |
| children | ad29ff7a0209 |
| files | SSR.h SSR_PluginFns.c SSR_Request_Handlers.c SSR_Request_Handlers.h SSR_lib.c |
| diffstat | 5 files changed, 44 insertions(+), 44 deletions(-) [+] |
line diff
1.1 --- a/SSR.h Thu Nov 11 04:59:48 2010 -0800 1.2 +++ b/SSR.h Fri Nov 12 08:43:20 2010 -0800 1.3 @@ -115,10 +115,10 @@ 1.4 int32 1.5 SSR__giveMinWorkUnitCycles( float32 percentOverhead ); 1.6 1.7 -void inline 1.8 +void 1.9 SSR__start_primitive(); 1.10 1.11 -int32 inline 1.12 +int32 1.13 SSR__end_primitive_and_give_cycles(); 1.14 1.15 int32 1.16 @@ -137,11 +137,11 @@ 1.17 1.18 //======================= 1.19 1.20 -inline VirtProcr * 1.21 + VirtProcr * 1.22 SSR__create_procr_with( VirtProcrFnPtr fnPtr, void *initData, 1.23 VirtProcr *creatingPr ); 1.24 1.25 -inline VirtProcr * 1.26 + VirtProcr * 1.27 SSR__create_procr_with_affinity( VirtProcrFnPtr fnPtr, void *initData, 1.28 VirtProcr *creatingPr, int32 coreToScheduleOnto); 1.29
2.1 --- a/SSR_PluginFns.c Thu Nov 11 04:59:48 2010 -0800 2.2 +++ b/SSR_PluginFns.c Fri Nov 12 08:43:20 2010 -0800 2.3 @@ -12,10 +12,10 @@ 2.4 #include "SSR_Request_Handlers.h" 2.5 2.6 //=========================== Local Fn Prototypes =========================== 2.7 -void inline 2.8 +void 2.9 resume_procr( VirtProcr *procr, SSRSemEnv *semEnv ); 2.10 2.11 -void inline 2.12 +void 2.13 handleSemReq( VMSReqst *req, VirtProcr *requestingPr, SSRSemEnv *semEnv ); 2.14 2.15 void 2.16 @@ -90,7 +90,7 @@ 2.17 } 2.18 2.19 2.20 -void inline 2.21 +void 2.22 handleSemReq( VMSReqst *req, VirtProcr *reqPr, SSRSemEnv *semEnv ) 2.23 { SSRSemReq *semReq; 2.24 2.25 @@ -147,11 +147,11 @@ 2.26 2.27 /*Re-use this in the entry-point fn 2.28 */ 2.29 -inline VirtProcr * 2.30 + VirtProcr * 2.31 SSR__create_procr_helper( VirtProcrFnPtr fnPtr, void *initData, 2.32 SSRSemEnv *semEnv, int32 coreToScheduleOnto ) 2.33 { VirtProcr *newPr; 2.34 - SSRSemData semData; 2.35 + SSRSemData *semData; 2.36 2.37 //This is running in master, so use internal version 2.38 newPr = VMS__create_procr( fnPtr, initData ); 2.39 @@ -205,7 +205,7 @@ 2.40 2.41 2.42 //=========================== Helper ============================== 2.43 -void inline 2.44 +void 2.45 resume_procr( VirtProcr *procr, SSRSemEnv *semEnv ) 2.46 { 2.47 writePrivQ( procr, semEnv->readyVPQs[ procr->coreAnimatedBy] );
3.1 --- a/SSR_Request_Handlers.c Thu Nov 11 04:59:48 2010 -0800 3.2 +++ b/SSR_Request_Handlers.c Fri Nov 12 08:43:20 2010 -0800 3.3 @@ -15,7 +15,7 @@ 3.4 3.5 3.6 //=========================== Local Fn Prototypes =========================== 3.7 -void inline 3.8 +void 3.9 resume_procr( VirtProcr *procr, SSRSemEnv *semEnv ); 3.10 3.11 3.12 @@ -25,7 +25,7 @@ 3.13 3.14 /*Only clone the elements of req used in these reqst handlers 3.15 */ 3.16 -inline SSRSemReq * 3.17 + SSRSemReq * 3.18 cloneReq( SSRSemReq *semReq ) 3.19 { SSRSemReq *clonedReq; 3.20 3.21 @@ -81,7 +81,7 @@ 3.22 * separate processors can send to the same receiver, and hashing on the 3.23 * receive processor, so they will stack up. 3.24 */ 3.25 -void inline 3.26 +void 3.27 handleSendType( SSRSemReq *semReq, SSRSemEnv *semEnv ) 3.28 { VirtProcr *sendPr, *receivePr; 3.29 int key[] = {0,0,0}; 3.30 @@ -150,7 +150,7 @@ 3.31 /*Looks like can make single handler for both sends.. 3.32 */ 3.33 //TODO: combine both send handlers into single handler 3.34 -void inline 3.35 +void 3.36 handleSendFromTo( SSRSemReq *semReq, SSRSemEnv *semEnv) 3.37 { VirtProcr *sendPr, *receivePr; 3.38 int key[] = {0,0,0}; 3.39 @@ -229,14 +229,14 @@ 3.40 * If ever add receive_any, looking like this second option easier and even 3.41 * less costly. 3.42 */ 3.43 -void inline 3.44 +void 3.45 handleReceiveAny( SSRSemReq *semReq, SSRSemEnv *semEnv) 3.46 { 3.47 3.48 } 3.49 3.50 3.51 -void inline 3.52 +void 3.53 handleReceiveType( SSRSemReq *semReq, SSRSemEnv *semEnv) 3.54 { VirtProcr *sendPr, *receivePr; 3.55 int key[] = {0,0,0}; 3.56 @@ -284,7 +284,7 @@ 3.57 3.58 /* 3.59 */ 3.60 -void inline 3.61 +void 3.62 handleReceiveFromTo( SSRSemReq *semReq, SSRSemEnv *semEnv) 3.63 { VirtProcr *sendPr, *receivePr; 3.64 int key[] = {0,0,0}; 3.65 @@ -332,13 +332,13 @@ 3.66 3.67 3.68 //=============================================== 3.69 -void inline 3.70 +void 3.71 handleTransferTo( SSRSemReq *semReq, SSRSemEnv *semEnv) 3.72 { 3.73 3.74 } 3.75 3.76 -void inline 3.77 +void 3.78 handleTransferOut( SSRSemReq *semReq, SSRSemEnv *semEnv) 3.79 { 3.80 3.81 @@ -347,7 +347,7 @@ 3.82 3.83 /* 3.84 */ 3.85 -void inline 3.86 +void 3.87 handleMalloc( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv ) 3.88 { void *ptr; 3.89 3.90 @@ -358,7 +358,7 @@ 3.91 3.92 /* 3.93 */ 3.94 -void inline 3.95 +void 3.96 handleFree( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv ) 3.97 { 3.98 VMS__free( semReq->ptrToFree ); 3.99 @@ -371,7 +371,7 @@ 3.100 /*Uses ID as index into array of flags. If flag already set, resumes from 3.101 * end-label. Else, sets flag and resumes normally. 3.102 */ 3.103 -void inline 3.104 +void 3.105 handleSingleton( SSRSemReq *semReq, VirtProcr *requestingPr, 3.106 SSRSemEnv *semEnv ) 3.107 { 3.108 @@ -387,7 +387,7 @@ 3.109 /*This executes the function in the masterVP, take the function 3.110 * pointer out of the request and call it, then resume the VP. 3.111 */ 3.112 -void inline 3.113 +void 3.114 handleAtomic( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv ) 3.115 { 3.116 semReq->fnToExecInMaster( semReq->dataForFn ); 3.117 @@ -408,7 +408,7 @@ 3.118 * end-transaction, which will take this VP from the queue and resume it.) 3.119 *If NULL, then write requesting into the field and resume. 3.120 */ 3.121 -void inline 3.122 +void 3.123 handleTransStart( SSRSemReq *semReq, VirtProcr *requestingPr, 3.124 SSRSemEnv *semEnv ) 3.125 { SSRSemData *semData; 3.126 @@ -459,7 +459,7 @@ 3.127 *If get somethine, set VP_currently_executing to the VP from the queue, then 3.128 * resume both. 3.129 */ 3.130 -void inline 3.131 +void 3.132 handleTransEnd(SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv) 3.133 { SSRSemData *semData; 3.134 VirtProcr *waitingPr;
4.1 --- a/SSR_Request_Handlers.h Thu Nov 11 04:59:48 2010 -0800 4.2 +++ b/SSR_Request_Handlers.h Fri Nov 12 08:43:20 2010 -0800 4.3 @@ -14,32 +14,32 @@ 4.4 /*This header defines everything specific to the SSR semantic plug-in 4.5 */ 4.6 4.7 -void inline 4.8 +void 4.9 handleSendType( SSRSemReq *semReq, SSRSemEnv *semEnv); 4.10 -void inline 4.11 +void 4.12 handleSendFromTo( SSRSemReq *semReq, SSRSemEnv *semEnv); 4.13 -void inline 4.14 +void 4.15 handleReceiveAny( SSRSemReq *semReq, SSRSemEnv *semEnv); 4.16 -void inline 4.17 +void 4.18 handleReceiveType( SSRSemReq *semReq, SSRSemEnv *semEnv); 4.19 -void inline 4.20 +void 4.21 handleReceiveFromTo( SSRSemReq *semReq, SSRSemEnv *semEnv); 4.22 -void inline 4.23 +void 4.24 handleTransferTo( SSRSemReq *semReq, SSRSemEnv *semEnv); 4.25 -void inline 4.26 +void 4.27 handleTransferOut( SSRSemReq *semReq, SSRSemEnv *semEnv); 4.28 -void inline 4.29 +void 4.30 handleMalloc( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv); 4.31 -void inline 4.32 +void 4.33 handleFree( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv ); 4.34 -void inline 4.35 +void 4.36 handleTransEnd(SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv*semEnv); 4.37 -void inline 4.38 +void 4.39 handleTransStart( SSRSemReq *semReq, VirtProcr *requestingPr, 4.40 SSRSemEnv *semEnv ); 4.41 -void inline 4.42 +void 4.43 handleAtomic( SSRSemReq *semReq, VirtProcr *requestingPr, SSRSemEnv *semEnv); 4.44 -void inline 4.45 +void 4.46 handleSingleton( SSRSemReq *semReq, VirtProcr *requestingPr, 4.47 SSRSemEnv *semEnv ); 4.48
5.1 --- a/SSR_lib.c Thu Nov 11 04:59:48 2010 -0800 5.2 +++ b/SSR_lib.c Fri Nov 12 08:43:20 2010 -0800 5.3 @@ -118,7 +118,7 @@ 5.4 } 5.5 5.6 5.7 -int32 inline 5.8 +int32 5.9 SSR__giveMinWorkUnitCycles( float32 percentOverhead ) 5.10 { 5.11 return MIN_WORK_UNIT_CYCLES; 5.12 @@ -139,7 +139,7 @@ 5.13 /*For now, use TSC -- later, make these two macros with assembly that first 5.14 * saves jump point, and second jumps back several times to get reliable time 5.15 */ 5.16 -void inline 5.17 +void 5.18 SSR__start_primitive() 5.19 { saveLowTimeStampCountInto( ((SSRSemEnv *)(_VMSMasterEnv->semanticEnv))-> 5.20 primitiveStartTime ); 5.21 @@ -150,7 +150,7 @@ 5.22 * because don't want comm time included in calc-time measurement -- and 5.23 * also to throw out any "weird" values due to OS interrupt or TSC rollover 5.24 */ 5.25 -int32 inline 5.26 +int32 5.27 SSR__end_primitive_and_give_cycles() 5.28 { int32 endTime, startTime; 5.29 //TODO: fix by repeating time-measurement 5.30 @@ -263,7 +263,7 @@ 5.31 5.32 /* 5.33 */ 5.34 -inline VirtProcr * 5.35 + VirtProcr * 5.36 SSR__create_procr_with( VirtProcrFnPtr fnPtr, void *initData, 5.37 VirtProcr *creatingPr ) 5.38 { SSRSemReq reqData; 5.39 @@ -282,7 +282,7 @@ 5.40 return creatingPr->dataRetFromReq; 5.41 } 5.42 5.43 -inline VirtProcr * 5.44 + VirtProcr * 5.45 SSR__create_procr_with_affinity( VirtProcrFnPtr fnPtr, void *initData, 5.46 VirtProcr *creatingPr, int32 coreToScheduleOnto ) 5.47 { SSRSemReq reqData; 5.48 @@ -300,7 +300,7 @@ 5.49 } 5.50 5.51 5.52 -inline void 5.53 + void 5.54 SSR__dissipate_procr( VirtProcr *procrToDissipate ) 5.55 { 5.56 VMS__send_dissipate_req( procrToDissipate );