diff probes.c @ 76:9ddbb071142d

make hardware independent and port to 64bit
author Merten Sach <msach@mailbox.tu-berlin.de>
date Thu, 16 Jun 2011 14:41:15 +0200
parents 13b22ffb8a2f
children 96e273d9f66f 0320b49ca013
line diff
     1.1 --- a/probes.c	Thu Jun 02 13:55:51 2011 +0200
     1.2 +++ b/probes.c	Thu Jun 16 14:41:15 2011 +0200
     1.3 @@ -5,10 +5,8 @@
     1.4   */
     1.5  
     1.6  #include <stdio.h>
     1.7 -#include <stdlib.h>
     1.8  #include <malloc.h>
     1.9  #include <sys/time.h>
    1.10 -#include <string.h>
    1.11  
    1.12  #include "VMS.h"
    1.13  #include "Queue_impl/BlockingQueue.h"
    1.14 @@ -111,7 +109,7 @@
    1.15   */
    1.16  IntervalProbe *
    1.17  create_generic_probe( char *nameStr, VirtProcr *animPr )
    1.18 - { IntervalProbe *newProbe;
    1.19 +{
    1.20     VMSSemReq reqData;
    1.21  
    1.22     reqData.reqType  = createProbe;
    1.23 @@ -297,20 +295,21 @@
    1.24   {
    1.25     printf( "\nprobe: %s, ",  probe->nameStr );
    1.26     
    1.27 +   
    1.28     if( probe->schedChoiceWasRecorded )
    1.29 -    { printf( "coreNum: %d, procrID: %d, procrCreated: %.6lf | ",
    1.30 +    { printf( "coreNum: %d, procrID: %d, procrCreated: %0.6f | ",
    1.31                probe->coreNum, probe->procrID, probe->procrCreateSecs );
    1.32      }
    1.33  
    1.34     if( probe->endSecs == 0 ) //just a single point in time
    1.35      {
    1.36 -      printf( " time point: %.6lf\n",
    1.37 +      printf( " time point: %.6f\n",
    1.38                probe->startSecs - _VMSMasterEnv->createPtInSecs );
    1.39      }
    1.40     else if( probe->hist == NULL ) //just an interval
    1.41      {
    1.42 -      printf( " startSecs: %.6lf, interval: %.6lf\n", 
    1.43 -         probe->startSecs - _VMSMasterEnv->createPtInSecs, probe->interval);
    1.44 +      printf( " startSecs: %.6f interval: %.6f\n", 
    1.45 +         (probe->startSecs - _VMSMasterEnv->createPtInSecs), probe->interval);
    1.46      }
    1.47     else  //a full histogram of intervals
    1.48      {
    1.49 @@ -338,16 +337,16 @@
    1.50  
    1.51  void
    1.52  generic_print_probe( void *_probe )
    1.53 - { IntervalProbe *probe;
    1.54 -
    1.55 -   probe = (IntervalProbe *)_probe;
    1.56 -   print_probe_helper( probe );
    1.57 + { 
    1.58 +   IntervalProbe *probe = (IntervalProbe *)_probe;
    1.59 +   
    1.60 +   //TODO segfault in printf
    1.61 +   //print_probe_helper( probe );
    1.62   }
    1.63  
    1.64  void
    1.65  VMS_impl__print_stats_of_all_probes()
    1.66 - { IntervalProbe *probe;
    1.67 -
    1.68 + {
    1.69     forAllInDynArrayDo( _VMSMasterEnv->dynIntervalProbesInfo,
    1.70                         &generic_print_probe );
    1.71     fflush( stdout );