# HG changeset patch
# User Nina Engelhardt <nengel@mailbox.tu-berlin.de>
# Date 1328895300 -3600
# Node ID f6d81915512c49ccba8494853003e5fc6bde39a8
# Parent  d83f59e6e2db5a620005a973213518155d26a3b1
update include headers

diff -r d83f59e6e2db -r f6d81915512c CoreLoop.c
--- a/CoreLoop.c	Thu Feb 09 17:54:54 2012 +0100
+++ b/CoreLoop.c	Fri Feb 10 18:35:00 2012 +0100
@@ -6,7 +6,7 @@
 
 
 #include "VMS.h"
-#include "Queue_impl/BlockingQueue.h"
+#include "../../C_Libraries/Queue_impl/PrivateQueue.h"
 #include "ProcrContext.h"
 
 #include <stdlib.h>
diff -r d83f59e6e2db -r f6d81915512c Counters/Counters.h
--- a/Counters/Counters.h	Thu Feb 09 17:54:54 2012 +0100
+++ b/Counters/Counters.h	Fri Feb 10 18:35:00 2012 +0100
@@ -6,7 +6,7 @@
  */
 
 #include "../VMS_primitive_data_types.h"
-#include "../DynArray/DynArray.h"
+#include "../../../C_Libraries/DynArray/DynArray.h"
 
 #include <stdio.h>
 
diff -r d83f59e6e2db -r f6d81915512c VMS.c
--- a/VMS.c	Thu Feb 09 17:54:54 2012 +0100
+++ b/VMS.c	Fri Feb 10 18:35:00 2012 +0100
@@ -13,8 +13,8 @@
 
 #include "VMS.h"
 #include "ProcrContext.h"
-#include "Queue_impl/BlockingQueue.h"
-#include "Histogram/Histogram.h"
+#include "../../C_Libraries/Queue_impl/PrivateQueue.h"
+#include "../../C_Libraries/Histogram/Histogram.h"
 
 #include <unistd.h>
 #include <fcntl.h>
diff -r d83f59e6e2db -r f6d81915512c VMS.h
--- a/VMS.h	Thu Feb 09 17:54:54 2012 +0100
+++ b/VMS.h	Fri Feb 10 18:35:00 2012 +0100
@@ -11,13 +11,13 @@
 #define _GNU_SOURCE
 
 #include "VMS_primitive_data_types.h"
-#include "Queue_impl/PrivateQueue.h"
-#include "Histogram/Histogram.h"
-#include "DynArray/DynArray.h"
-#include "Hash_impl/PrivateHash.h"
+#include "../../C_Libraries/Queue_impl/PrivateQueue.h"
+#include "../../C_Libraries/Histogram/Histogram.h"
+#include "../../C_Libraries/DynArray/DynArray.h"
+#include "../../C_Libraries/Hash_impl/PrivateHash.h"
 #include "vmalloc.h"
 #include "loop.h"
-#include "ListOfArrays/ListOfArrays.h"
+#include "../../C_Libraries/ListOfArrays/ListOfArrays.h"
 
 #include <pthread.h>
 #include <sys/time.h>
@@ -86,7 +86,7 @@
 
    // tradeoff amortizing master fixed overhead vs imbalance potential
    // when work-stealing, can make bigger, at risk of losing cache affinity
-#define NUM_SCHED_SLOTS  5
+#define NUM_SCHED_SLOTS  1
 
 #define MIN_WORK_UNIT_CYCLES 20000
 
diff -r d83f59e6e2db -r f6d81915512c dependency.c
--- a/dependency.c	Thu Feb 09 17:54:54 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#include "dependency.h"
-#include "vmalloc.h"
-
-Dependency* new_dependency(int from_vp, int from_task, int to_vp, int to_task){
-    Dependency* newDep = (Dependency*) VMS__malloc(sizeof(Dependency));
-    if (newDep!=NULL){
-        newDep->from_vp = from_vp;
-        newDep->from_task = from_task;
-        newDep->to_vp = to_vp;
-        newDep->to_task = to_task;
-    }
-    return newDep;
-}
-
-int set_dependency_file(FILE* file){
-    dependency_file = file;
-}
-
-void print_dependency_to_file(void* _dep){
-    Dependency* dep = (Dependency*) _dep;
-    fprintf(dependency_file,"VP_%d_%d -> VP_%d_%d;\n",dep->from_vp,dep->from_task,dep->to_vp,dep->to_task);
-}
diff -r d83f59e6e2db -r f6d81915512c dependency.h
--- a/dependency.h	Thu Feb 09 17:54:54 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/* 
- * File:   dependency.h
- * Author: engelhardt
- *
- * Created on 29. August 2011, 17:41
- */
-
-#ifndef DEPENDENCY_H
-#define	DEPENDENCY_H
-
-#include "DynArray/DynArray.h"
-#include <stdio.h>
-
-
-
-typedef struct {
-    int from_vp;
-    int from_task;
-    int to_vp;
-    int to_task;
-} Dependency; 
-
-FILE* dependency_file;
-
-Dependency* new_dependency(int from_vp, int from_task, int to_vp, int to_task);
-
-int set_dependency_file(FILE* file);
-
-void print_dependency_to_file(void* dep);
-
-#endif	/* DEPENDENCY_H */
-
diff -r d83f59e6e2db -r f6d81915512c probes.c
--- a/probes.c	Thu Feb 09 17:54:54 2012 +0100
+++ b/probes.c	Fri Feb 10 18:35:00 2012 +0100
@@ -9,8 +9,8 @@
 #include <sys/time.h>
 
 #include "VMS.h"
-#include "Queue_impl/BlockingQueue.h"
-#include "Histogram/Histogram.h"
+#include "../../C_Libraries/Queue_impl/PrivateQueue.h"
+#include "../../C_Libraries/Histogram/Histogram.h"
 
 
 //================================ STATS ====================================
diff -r d83f59e6e2db -r f6d81915512c vmalloc.c
--- a/vmalloc.c	Thu Feb 09 17:54:54 2012 +0100
+++ b/vmalloc.c	Fri Feb 10 18:35:00 2012 +0100
@@ -13,7 +13,7 @@
 #include <stdio.h>
 
 #include "VMS.h"
-#include "Histogram/Histogram.h"
+#include "../../C_Libraries/Histogram/Histogram.h"
 
 /*Helper function
  *Insert a newly generated free chunk into the first spot on the free list.