changeset 145:e7cd1945c9b6 DistributedMalloc2

merge new default version
author Merten Sach <msach@mailbox.tu-berlin.de>
date Wed, 21 Sep 2011 16:36:22 +0200
parents 79bb48d7d93b ac41df8d08e9
children 98fc8f3761a2
files .hgtags VMS.c VMS.h
diffstat 3 files changed, 8 insertions(+), 13 deletions(-) [+]
line diff
     1.1 --- a/.hgtags	Wed Sep 21 11:51:29 2011 +0200
     1.2 +++ b/.hgtags	Wed Sep 21 16:36:22 2011 +0200
     1.3 @@ -1,6 +1,1 @@
     1.4  9c3107044f86c36fea3a8f72f64910b1363555be Dec27_2010_about_to_add_sched_record
     1.5 -97e26095c01fef53783d2d89e11575856ce243c5 V0
     1.6 -21c95d402fe66570067000e484bfec9a5d92c9d0 malloc_touch
     1.7 -42d015d48eebc7ba49b24fa5f24cb1e66244e5e7 malloc_touch
     1.8 -42d015d48eebc7ba49b24fa5f24cb1e66244e5e7 malloc_touch
     1.9 -0000000000000000000000000000000000000000 malloc_touch
     2.1 --- a/VMS.c	Wed Sep 21 11:51:29 2011 +0200
     2.2 +++ b/VMS.c	Wed Sep 21 16:36:22 2011 +0200
     2.3 @@ -712,9 +712,9 @@
     2.4     //SchedSlot     ***allSchedSlots; //ptr to array of ptrs
     2.5  
     2.6        //Before getting rid of everything, print out any measurements made
     2.7 -   //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&printHist );
     2.8 -   //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&saveHistToFile);
     2.9 -   //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, &freeHistExt );
    2.10 +   forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&printHist );
    2.11 +   forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&saveHistToFile);
    2.12 +   forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, &freeHist );
    2.13     #ifdef MEAS__TIME_PLUGIN
    2.14     printHist( _VMSMasterEnv->reqHdlrLowTimeHist );
    2.15     saveHistToFile( _VMSMasterEnv->reqHdlrLowTimeHist );
     3.1 --- a/VMS.h	Wed Sep 21 11:51:29 2011 +0200
     3.2 +++ b/VMS.h	Wed Sep 21 16:36:22 2011 +0200
     3.3 @@ -377,11 +377,11 @@
     3.4  #ifdef VPTHREAD
     3.5  
     3.6  //VPThread
     3.7 -#define createHistIdx      1
     3.8 -#define mutexLockHistIdx   2
     3.9 -#define mutexUnlockHistIdx 3
    3.10 -#define condWaitHistIdx    4
    3.11 -#define condSignalHistIdx  5
    3.12 +#define createHistIdx      0
    3.13 +#define mutexLockHistIdx   1
    3.14 +#define mutexUnlockHistIdx 2
    3.15 +#define condWaitHistIdx    3
    3.16 +#define condSignalHistIdx  4
    3.17  
    3.18  #define MakeTheMeasHists() \
    3.19     _VMSMasterEnv->measHistsInfo = \