# HG changeset patch
# User Merten Sach <msach@mailbox.tu-berlin.de>
# Date 1316615782 -7200
# Node ID e7cd1945c9b636127b83394642fee363bc9888a6
# Parent  79bb48d7d93be62d1990d1c168be6fafd18fcd07# Parent  ac41df8d08e94593a9fe7c5009f01f704a7aed44
merge new default version

diff -r 79bb48d7d93b -r e7cd1945c9b6 .hgtags
--- a/.hgtags	Wed Sep 21 11:51:29 2011 +0200
+++ b/.hgtags	Wed Sep 21 16:36:22 2011 +0200
@@ -1,6 +1,1 @@
 9c3107044f86c36fea3a8f72f64910b1363555be Dec27_2010_about_to_add_sched_record
-97e26095c01fef53783d2d89e11575856ce243c5 V0
-21c95d402fe66570067000e484bfec9a5d92c9d0 malloc_touch
-42d015d48eebc7ba49b24fa5f24cb1e66244e5e7 malloc_touch
-42d015d48eebc7ba49b24fa5f24cb1e66244e5e7 malloc_touch
-0000000000000000000000000000000000000000 malloc_touch
diff -r 79bb48d7d93b -r e7cd1945c9b6 VMS.c
--- a/VMS.c	Wed Sep 21 11:51:29 2011 +0200
+++ b/VMS.c	Wed Sep 21 16:36:22 2011 +0200
@@ -712,9 +712,9 @@
    //SchedSlot     ***allSchedSlots; //ptr to array of ptrs
 
       //Before getting rid of everything, print out any measurements made
-   //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&printHist );
-   //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&saveHistToFile);
-   //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, &freeHistExt );
+   forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&printHist );
+   forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, (DynArrayFnPtr)&saveHistToFile);
+   forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, &freeHist );
    #ifdef MEAS__TIME_PLUGIN
    printHist( _VMSMasterEnv->reqHdlrLowTimeHist );
    saveHistToFile( _VMSMasterEnv->reqHdlrLowTimeHist );
diff -r 79bb48d7d93b -r e7cd1945c9b6 VMS.h
--- a/VMS.h	Wed Sep 21 11:51:29 2011 +0200
+++ b/VMS.h	Wed Sep 21 16:36:22 2011 +0200
@@ -377,11 +377,11 @@
 #ifdef VPTHREAD
 
 //VPThread
-#define createHistIdx      1
-#define mutexLockHistIdx   2
-#define mutexUnlockHistIdx 3
-#define condWaitHistIdx    4
-#define condSignalHistIdx  5
+#define createHistIdx      0
+#define mutexLockHistIdx   1
+#define mutexUnlockHistIdx 2
+#define condWaitHistIdx    3
+#define condSignalHistIdx  4
 
 #define MakeTheMeasHists() \
    _VMSMasterEnv->measHistsInfo = \