# HG changeset patch
# User Merten Sach <msach@mailbox.tu-berlin.de>
# Date 1315411709 -7200
# Node ID bb2500771be80c152236ed969b64f78a1f4f1607
# Parent  bbcb6fadb60f7ee1140accd1bd6165d9958fa78e# Parent  f593241c2db907a817b08ea142415eeb5a194595
merge test head

diff -r bbcb6fadb60f -r bb2500771be8 VPThread.h
--- a/VPThread.h	Mon Aug 15 16:44:09 2011 +0200
+++ b/VPThread.h	Wed Sep 07 18:08:29 2011 +0200
@@ -255,5 +255,22 @@
 void inline
 resume_procr( VirtProcr *procr, VPThdSemEnv *semEnv );
 
+//=======================
+
+inline int32
+VPThread__giveMinWorkUnitCycles( float32 percentOverhead );
+
+inline int32
+VPThread__giveIdealNumWorkUnits();
+
+inline int32
+VPThread__give_number_of_cores_to_schedule_onto();
+
+inline void
+VPThread__start_primitive();
+
+inline int32
+VPThread__end_primitive_and_give_cycles();
+
 #endif	/* _VPThread_H */
 
diff -r bbcb6fadb60f -r bb2500771be8 VPThread_PluginFns.c
--- a/VPThread_PluginFns.c	Mon Aug 15 16:44:09 2011 +0200
+++ b/VPThread_PluginFns.c	Wed Sep 07 18:08:29 2011 +0200
@@ -131,6 +131,8 @@
          break;
       case trans_end:    handleTransEnd( semReq, reqPr, semEnv);
          break;
+      default:
+         break;
     }
  }