# HG changeset patch
# User Nina Engelhardt
# Date 1314194858 -7200
# Node ID 73fc5aafbe45c8e69d7f6b4916685f1755a474f6
# Parent  43ea731da94e7986935e4f362129e1d2300ae582# Parent  96e273d9f66ffde943797d1be83010296905db5b
merge things changed in default branch

diff -r 43ea731da94e -r 73fc5aafbe45 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Wed Aug 24 16:07:38 2011 +0200
@@ -0,0 +1,3 @@
+syntax: glob
+
+*.o
diff -r 43ea731da94e -r 73fc5aafbe45 .hgtags
--- a/.hgtags	Wed Aug 17 11:46:05 2011 +0200
+++ b/.hgtags	Wed Aug 24 16:07:38 2011 +0200
@@ -1,3 +1,6 @@
 9c3107044f86c36fea3a8f72f64910b1363555be Dec27_2010_about_to_add_sched_record
 97e26095c01fef53783d2d89e11575856ce243c5 V0
 21c95d402fe66570067000e484bfec9a5d92c9d0 malloc_touch
+42d015d48eebc7ba49b24fa5f24cb1e66244e5e7 malloc_touch
+42d015d48eebc7ba49b24fa5f24cb1e66244e5e7 malloc_touch
+0000000000000000000000000000000000000000 malloc_touch
diff -r 43ea731da94e -r 73fc5aafbe45 VMS.c
--- a/VMS.c	Wed Aug 17 11:46:05 2011 +0200
+++ b/VMS.c	Wed Aug 24 16:07:38 2011 +0200
@@ -118,15 +118,15 @@
 
    //============================= MEASUREMENT STUFF ========================
    #ifdef MEAS__TIME_MALLOC
-   _VMSMasterEnv->mallocTimeHist  = makeFixedBinHistExt( 50, 0, 100,
+   _VMSMasterEnv->mallocTimeHist  = makeFixedBinHistExt( 100, 0, 100,
                                                        "malloc_time_hist");
-   _VMSMasterEnv->freeTimeHist  = makeFixedBinHistExt( 50, 0, 100,
+   _VMSMasterEnv->freeTimeHist  = makeFixedBinHistExt( 80, 0, 100,
                                                        "free_time_hist");
    #endif
    #ifdef MEAS__TIME_PLUGIN
-   _VMSMasterEnv->reqHdlrLowTimeHist  = makeFixedBinHistExt( 50, 0, 10,
+   _VMSMasterEnv->reqHdlrLowTimeHist  = makeFixedBinHistExt( 1000, 0, 100,
                                                      "plugin_low_time_hist");
-   _VMSMasterEnv->reqHdlrHighTimeHist  = makeFixedBinHistExt( 50, 0, 100,
+   _VMSMasterEnv->reqHdlrHighTimeHist  = makeFixedBinHistExt( 1000, 0, 100,
                                                     "plugin_high_time_hist");
    #endif
    //========================================================================
@@ -773,7 +773,7 @@
    //forAllInDynArrayDo( _VMSMasterEnv->measHistsInfo, &freeHistExt );
    #ifdef MEAS__TIME_PLUGIN
    printHist( _VMSMasterEnv->reqHdlrLowTimeHist );
-   saveHistToFile( _VMSMasterEnv->reqHdlrHighTimeHist );
+   saveHistToFile( _VMSMasterEnv->reqHdlrLowTimeHist );
    printHist( _VMSMasterEnv->reqHdlrHighTimeHist );
    saveHistToFile( _VMSMasterEnv->reqHdlrHighTimeHist );
    freeHistExt( _VMSMasterEnv->reqHdlrLowTimeHist );
diff -r 43ea731da94e -r 73fc5aafbe45 VMS.h
--- a/VMS.h	Wed Aug 17 11:46:05 2011 +0200
+++ b/VMS.h	Wed Aug 24 16:07:38 2011 +0200
@@ -457,7 +457,7 @@
 #define MakeTheMeasHists() \
    _VMSMasterEnv->measHistsInfo = \
               makePrivDynArrayOfSize( (void***)&(_VMSMasterEnv->measHists), 200); \
-   makeAMeasHist( createHistIdx,      "create",        50, 0, 100 ) \
+   makeAMeasHist( createHistIdx,      "create",        250, 0, 100 ) \
    makeAMeasHist( mutexLockHistIdx,   "mutex_lock",    50, 0, 100 ) \
    makeAMeasHist( mutexUnlockHistIdx, "mutex_unlock",  50, 0, 100 ) \
    makeAMeasHist( condWaitHistIdx,    "cond_wait",     50, 0, 100 ) \
diff -r 43ea731da94e -r 73fc5aafbe45 probes.c
--- a/probes.c	Wed Aug 17 11:46:05 2011 +0200
+++ b/probes.c	Wed Aug 24 16:07:38 2011 +0200
@@ -338,7 +338,7 @@
 void
 generic_print_probe( void *_probe )
  { 
-   IntervalProbe *probe = (IntervalProbe *)_probe;
+   //IntervalProbe *probe = (IntervalProbe *)_probe;
    
    //TODO segfault in printf
    //print_probe_helper( probe );