changeset 197:f6d81915512c perf_counters

update include headers
author Nina Engelhardt <nengel@mailbox.tu-berlin.de>
date Fri, 10 Feb 2012 18:35:00 +0100
parents d83f59e6e2db
children 5b419522dc7f
files CoreLoop.c Counters/Counters.h VMS.c VMS.h dependency.c dependency.h probes.c vmalloc.c
diffstat 8 files changed, 13 insertions(+), 67 deletions(-) [+]
line diff
     1.1 --- a/CoreLoop.c	Thu Feb 09 17:54:54 2012 +0100
     1.2 +++ b/CoreLoop.c	Fri Feb 10 18:35:00 2012 +0100
     1.3 @@ -6,7 +6,7 @@
     1.4  
     1.5  
     1.6  #include "VMS.h"
     1.7 -#include "Queue_impl/BlockingQueue.h"
     1.8 +#include "../../C_Libraries/Queue_impl/PrivateQueue.h"
     1.9  #include "ProcrContext.h"
    1.10  
    1.11  #include <stdlib.h>
     2.1 --- a/Counters/Counters.h	Thu Feb 09 17:54:54 2012 +0100
     2.2 +++ b/Counters/Counters.h	Fri Feb 10 18:35:00 2012 +0100
     2.3 @@ -6,7 +6,7 @@
     2.4   */
     2.5  
     2.6  #include "../VMS_primitive_data_types.h"
     2.7 -#include "../DynArray/DynArray.h"
     2.8 +#include "../../../C_Libraries/DynArray/DynArray.h"
     2.9  
    2.10  #include <stdio.h>
    2.11  
     3.1 --- a/VMS.c	Thu Feb 09 17:54:54 2012 +0100
     3.2 +++ b/VMS.c	Fri Feb 10 18:35:00 2012 +0100
     3.3 @@ -13,8 +13,8 @@
     3.4  
     3.5  #include "VMS.h"
     3.6  #include "ProcrContext.h"
     3.7 -#include "Queue_impl/BlockingQueue.h"
     3.8 -#include "Histogram/Histogram.h"
     3.9 +#include "../../C_Libraries/Queue_impl/PrivateQueue.h"
    3.10 +#include "../../C_Libraries/Histogram/Histogram.h"
    3.11  
    3.12  #include <unistd.h>
    3.13  #include <fcntl.h>
     4.1 --- a/VMS.h	Thu Feb 09 17:54:54 2012 +0100
     4.2 +++ b/VMS.h	Fri Feb 10 18:35:00 2012 +0100
     4.3 @@ -11,13 +11,13 @@
     4.4  #define _GNU_SOURCE
     4.5  
     4.6  #include "VMS_primitive_data_types.h"
     4.7 -#include "Queue_impl/PrivateQueue.h"
     4.8 -#include "Histogram/Histogram.h"
     4.9 -#include "DynArray/DynArray.h"
    4.10 -#include "Hash_impl/PrivateHash.h"
    4.11 +#include "../../C_Libraries/Queue_impl/PrivateQueue.h"
    4.12 +#include "../../C_Libraries/Histogram/Histogram.h"
    4.13 +#include "../../C_Libraries/DynArray/DynArray.h"
    4.14 +#include "../../C_Libraries/Hash_impl/PrivateHash.h"
    4.15  #include "vmalloc.h"
    4.16  #include "loop.h"
    4.17 -#include "ListOfArrays/ListOfArrays.h"
    4.18 +#include "../../C_Libraries/ListOfArrays/ListOfArrays.h"
    4.19  
    4.20  #include <pthread.h>
    4.21  #include <sys/time.h>
    4.22 @@ -86,7 +86,7 @@
    4.23  
    4.24     // tradeoff amortizing master fixed overhead vs imbalance potential
    4.25     // when work-stealing, can make bigger, at risk of losing cache affinity
    4.26 -#define NUM_SCHED_SLOTS  5
    4.27 +#define NUM_SCHED_SLOTS  1
    4.28  
    4.29  #define MIN_WORK_UNIT_CYCLES 20000
    4.30  
     5.1 --- a/dependency.c	Thu Feb 09 17:54:54 2012 +0100
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,22 +0,0 @@
     5.4 -#include "dependency.h"
     5.5 -#include "vmalloc.h"
     5.6 -
     5.7 -Dependency* new_dependency(int from_vp, int from_task, int to_vp, int to_task){
     5.8 -    Dependency* newDep = (Dependency*) VMS__malloc(sizeof(Dependency));
     5.9 -    if (newDep!=NULL){
    5.10 -        newDep->from_vp = from_vp;
    5.11 -        newDep->from_task = from_task;
    5.12 -        newDep->to_vp = to_vp;
    5.13 -        newDep->to_task = to_task;
    5.14 -    }
    5.15 -    return newDep;
    5.16 -}
    5.17 -
    5.18 -int set_dependency_file(FILE* file){
    5.19 -    dependency_file = file;
    5.20 -}
    5.21 -
    5.22 -void print_dependency_to_file(void* _dep){
    5.23 -    Dependency* dep = (Dependency*) _dep;
    5.24 -    fprintf(dependency_file,"VP_%d_%d -> VP_%d_%d;\n",dep->from_vp,dep->from_task,dep->to_vp,dep->to_task);
    5.25 -}
     6.1 --- a/dependency.h	Thu Feb 09 17:54:54 2012 +0100
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,32 +0,0 @@
     6.4 -/* 
     6.5 - * File:   dependency.h
     6.6 - * Author: engelhardt
     6.7 - *
     6.8 - * Created on 29. August 2011, 17:41
     6.9 - */
    6.10 -
    6.11 -#ifndef DEPENDENCY_H
    6.12 -#define	DEPENDENCY_H
    6.13 -
    6.14 -#include "DynArray/DynArray.h"
    6.15 -#include <stdio.h>
    6.16 -
    6.17 -
    6.18 -
    6.19 -typedef struct {
    6.20 -    int from_vp;
    6.21 -    int from_task;
    6.22 -    int to_vp;
    6.23 -    int to_task;
    6.24 -} Dependency; 
    6.25 -
    6.26 -FILE* dependency_file;
    6.27 -
    6.28 -Dependency* new_dependency(int from_vp, int from_task, int to_vp, int to_task);
    6.29 -
    6.30 -int set_dependency_file(FILE* file);
    6.31 -
    6.32 -void print_dependency_to_file(void* dep);
    6.33 -
    6.34 -#endif	/* DEPENDENCY_H */
    6.35 -
     7.1 --- a/probes.c	Thu Feb 09 17:54:54 2012 +0100
     7.2 +++ b/probes.c	Fri Feb 10 18:35:00 2012 +0100
     7.3 @@ -9,8 +9,8 @@
     7.4  #include <sys/time.h>
     7.5  
     7.6  #include "VMS.h"
     7.7 -#include "Queue_impl/BlockingQueue.h"
     7.8 -#include "Histogram/Histogram.h"
     7.9 +#include "../../C_Libraries/Queue_impl/PrivateQueue.h"
    7.10 +#include "../../C_Libraries/Histogram/Histogram.h"
    7.11  
    7.12  
    7.13  //================================ STATS ====================================
     8.1 --- a/vmalloc.c	Thu Feb 09 17:54:54 2012 +0100
     8.2 +++ b/vmalloc.c	Fri Feb 10 18:35:00 2012 +0100
     8.3 @@ -13,7 +13,7 @@
     8.4  #include <stdio.h>
     8.5  
     8.6  #include "VMS.h"
     8.7 -#include "Histogram/Histogram.h"
     8.8 +#include "../../C_Libraries/Histogram/Histogram.h"
     8.9  
    8.10  /*Helper function
    8.11   *Insert a newly generated free chunk into the first spot on the free list.