diff VMS.c @ 182:7523ee70d66c

merge changes from default
author Nina Engelhardt <nengel@mailbox.tu-berlin.de>
date Fri, 06 Jan 2012 18:55:05 +0100
parents 3bd35fc83c61 ad8213a8e916
children 50b29548d4f0
line diff
     1.1 --- a/VMS.c	Wed Jan 04 16:40:10 2012 +0100
     1.2 +++ b/VMS.c	Fri Jan 06 18:55:05 2012 +0100
     1.3 @@ -118,15 +118,15 @@
     1.4  
     1.5     //============================= MEASUREMENT STUFF ========================
     1.6     #ifdef MEAS__TIME_MALLOC
     1.7 -   _VMSMasterEnv->mallocTimeHist  = makeFixedBinHistExt( 100, 0, 100,
     1.8 +   _VMSMasterEnv->mallocTimeHist  = makeFixedBinHistExt( 100, 0, 30,
     1.9                                                         "malloc_time_hist");
    1.10 -   _VMSMasterEnv->freeTimeHist  = makeFixedBinHistExt( 80, 0, 100,
    1.11 +   _VMSMasterEnv->freeTimeHist  = makeFixedBinHistExt( 100, 0, 30,
    1.12                                                         "free_time_hist");
    1.13     #endif
    1.14     #ifdef MEAS__TIME_PLUGIN
    1.15 -   _VMSMasterEnv->reqHdlrLowTimeHist  = makeFixedBinHistExt( 1000, 0, 100,
    1.16 +   _VMSMasterEnv->reqHdlrLowTimeHist  = makeFixedBinHistExt( 100, 0, 200,
    1.17                                                       "plugin_low_time_hist");
    1.18 -   _VMSMasterEnv->reqHdlrHighTimeHist  = makeFixedBinHistExt( 1000, 0, 100,
    1.19 +   _VMSMasterEnv->reqHdlrHighTimeHist  = makeFixedBinHistExt( 100, 0, 200,
    1.20                                                      "plugin_high_time_hist");
    1.21     #endif
    1.22     //========================================================================
    1.23 @@ -462,9 +462,8 @@
    1.24   * it lets the lang have lang-specific data related to creation transported
    1.25   * to the plugin.
    1.26   */
    1.27 -__attribute__ ((noinline)) void
    1.28 -VMS__send_create_procr_req( void *semReqData, VirtProcr *reqstingPr ) 
    1.29 -
    1.30 +void
    1.31 +VMS__send_create_procr_req( void *semReqData, VirtProcr *reqstingPr )
    1.32   { VMSReqst req;
    1.33  
    1.34     req.reqType          = createReq;
    1.35 @@ -497,8 +496,8 @@
    1.36   * gets suspended in this call and all the virt processor's state disap-
    1.37   * pears -- making that suspend the last thing in the virt procr's trace.
    1.38   */
    1.39 -__attribute__ ((noinline)) void
    1.40 -VMS__send_dissipate_req( VirtProcr *procrToDissipate ) 
    1.41 +void
    1.42 +VMS__send_dissipate_req( VirtProcr *procrToDissipate )
    1.43   { VMSReqst req;
    1.44  
    1.45     req.reqType                = dissipate;
    1.46 @@ -557,8 +556,8 @@
    1.47   * to plugin
    1.48   *Then it does suspend, to cause request to be sent.
    1.49   */
    1.50 -/*inline*/__attribute__ ((noinline)) void
    1.51 -VMS__send_sem_request( void *semReqData, VirtProcr *callingPr ) 
    1.52 +inline void
    1.53 +VMS__send_sem_request( void *semReqData, VirtProcr *callingPr )
    1.54   { VMSReqst req;
    1.55  
    1.56     req.reqType         = semantic;
    1.57 @@ -570,9 +569,8 @@
    1.58   }
    1.59  
    1.60  
    1.61 -/*inline*/ __attribute__ ((noinline)) void
    1.62 -VMS__send_VMSSem_request( void *semReqData, VirtProcr *callingPr ) 
    1.63 -
    1.64 +inline void
    1.65 +VMS__send_VMSSem_request( void *semReqData, VirtProcr *callingPr )
    1.66   { VMSReqst req;
    1.67  
    1.68     req.reqType         = VMSSemantic;
    1.69 @@ -777,7 +775,7 @@
    1.70        //Before getting rid of everything, print out any measurements made
    1.71     //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&printHist );
    1.72     //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&saveHistToFile);
    1.73 -   //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, &freeHistExt );
    1.74 +   //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, &freeHist );
    1.75  
    1.76  
    1.77     #ifdef MEAS__TIME_PLUGIN