Mercurial > cgi-bin > hgwebdir.cgi > VMS > VMS_Implementations > VMS_impls > VMS__MC_shared_impl

changeset 205:cb888346c3e0 HW__generic_x86_64_MC

find changesets by author, revision, files, or words in the commit message
Changed include paths, but version still does not work because of accidental merge
author Merten Sach <msach@mailbox.tu-berlin.de>
date Fri, 17 Feb 2012 18:28:59 +0100
parents 6db9e4898978
children
files VMS.h VMS_defs.h vmalloc.c
diffstat 3 files changed, 8 insertions(+), 11 deletions(-) [+]
line diff
     1.1 --- a/VMS.h	Sun Feb 12 01:49:33 2012 -0800
     1.2 +++ b/VMS.h	Fri Feb 17 18:28:59 2012 +0100
     1.3 @@ -11,10 +11,10 @@
     1.4  #define _GNU_SOURCE
     1.5  
     1.6  #include "VMS_primitive_data_types.h"
     1.7 -#include "../../C_Libraries/DynArray/DynArray.h"
     1.8 -#include "../../C_Libraries/Hash_impl/PrivateHash.h"
     1.9 -#include "../../C_Libraries/Histogram/Histogram.h"
    1.10 -#include "../../C_Libraries/Queue_impl/PrivateQueue.h"
    1.11 +#include "C_Libraries/DynArray/DynArray.h"
    1.12 +#include "C_Libraries/Hash_impl/PrivateHash.h"
    1.13 +#include "C_Libraries/Histogram/Histogram.h"
    1.14 +#include "C_Libraries/Queue_impl/PrivateQueue.h"
    1.15  #include "vmalloc.h"
    1.16  
    1.17  #include <pthread.h>
    1.18 @@ -27,7 +27,6 @@
    1.19  #include "VMS_defs.h"
    1.20  
    1.21  
    1.22 -
    1.23  //================================ Typedefs =================================
    1.24  //
    1.25  typedef unsigned long long TSCount;
    1.26 @@ -50,6 +49,9 @@
    1.27  typedef void    VirtProcrFn      ( void *, SlaveVP * ); //initData, animPr
    1.28  typedef void  (*ResumeVPFnPtr)   ( SlaveVP *, void * );
    1.29  
    1.30 +//============================= Statistics ==================================
    1.31 +
    1.32 +inline TSCount getTSCount();
    1.33  
    1.34  //============= Request Related ===========
    1.35  //

     2.1 --- a/VMS_defs.h	Sun Feb 12 01:49:33 2012 -0800
     2.2 +++ b/VMS_defs.h	Fri Feb 17 18:28:59 2012 +0100
     2.3 @@ -72,11 +72,6 @@
     2.4  //#define STATS__USE_TSC_PROBES
     2.5  #define STATS__USE_DBL_PROBES
     2.6  
     2.7 -//============================= Statistics ==================================
     2.8 -
     2.9 -
    2.10 -inline TSCount getTSCount();
    2.11 -
    2.12  //==================  Turn Measurement Things on and off ====================
    2.13  
    2.14  //#define MEAS__TIME_2011_SYS

     3.1 --- a/vmalloc.c	Sun Feb 12 01:49:33 2012 -0800
     3.2 +++ b/vmalloc.c	Fri Feb 17 18:28:59 2012 +0100
     3.3 @@ -13,7 +13,7 @@
     3.4  #include <stdio.h>
     3.5  
     3.6  #include "VMS.h"
     3.7 -#include "../../C_Libraries/Histogram/Histogram.h"
     3.8 +#include "C_Libraries/Histogram/Histogram.h"
     3.9  
    3.10  /*Helper function
    3.11   *Insert a newly generated free chunk into the first spot on the free list.