Changes to make devel/system-test work again.

Author: BorgPrincess

devel/system-test/daemon-withoutStats.conf

@@ -1,7 +1,7 @@
 #CONFIG Process
 
-# This configuration contains 
-# 1) statistics collector and plugins 
+# This configuration contains
+# 1) statistics collector and plugins
 # 2) Activity network forwarder server to receive data
 # 3) Activity multiplexer and potentially plugins
 
@@ -54,14 +54,27 @@
 <ConsoleReporterOptions>
 </ConsoleReporterOptions>
 
+<LoadModule>
+        <componentID>6</componentID>
+        <name>siox-monitoring-RamTopology</name>
+        <path></path>
+        <interface>monitoring_topology</interface>
+</LoadModule>
+<RamTopologyOptions>
+</RamTopologyOptions>
+
 
 <LoadModule>
-	<componentID>6</componentID>
+	<componentID>66</componentID>
 	<name>siox-knowledge-DereferencingFacade</name>
 	<path></path>
 	<interface>monitoring_activity_plugin_dereferencing</interface>
 </LoadModule>
 <DereferencingFacadeOptions>
+	<topology>
+        <componentID>6</componentID>
+        <global>0</global>
+    </topology>
 	<ontology>
 		<componentID>2</componentID>
 		<global>0</global>
@@ -97,7 +110,7 @@
 			<global>0</global>
 		</multiplexer>
 		<dereferenceFacade>
-			<componentID>6</componentID>
+			<componentID>66</componentID>
 			<global>0</global>
 		</dereferenceFacade>
 		<Container></Container>

devel/system-test/daemon.conf

@@ -1,7 +1,7 @@
 #CONFIG Process
 
-# This configuration contains 
-# 1) statistics collector and plugins 
+# This configuration contains
+# 1) statistics collector and plugins
 # 2) Activity network forwarder server to receive data
 # 3) Activity multiplexer and potentially plugins
 
@@ -158,18 +158,18 @@
         <interface>monitoring_statistics_collector</interface>
 </LoadModule>
 <ThreadedStatisticsOptions>
-	<dereferencingFacade>
-		<componentID>66</componentID>
-		<global>0</global>
-	</dereferencingFacade>
-	<ontology>
-		<componentID>2</componentID>
-		<global>0</global>
-	</ontology>
-	<smux>
-		<componentID>100</componentID>
-		<global>0</global>
-	</smux>
+        <topology>
+                <componentID>6</componentID>
+                <global>0</global>
+        </topology>
+        <ontology>
+                <componentID>2</componentID>
+                <global>0</global>
+        </ontology>
+        <smux>
+                <componentID>100</componentID>
+                <global>0</global>
+        </smux>
 </ThreadedStatisticsOptions>
 
 <LoadModule>

devel/system-test/run.sh

@@ -1,13 +1,14 @@
 #!/bin/bash -ex
 
-export LD_LIBRARY_PATH=/usr/local/siox/lib/
-export PATH=/usr/local/siox/bin:$PATH
+# export LD_LIBRARY_PATH=/usr/local/siox/lib/
+# export PATH=/usr/local/siox/bin:$PATH
 
 echo "Running daemon"
 rm *.dat /tmp/daemon.socket 2>/dev/null || true
 killall siox-daemon || true
 
-siox-daemon --configEntry=daemon.conf &
+siox-daemon --configEntry=daemon-withoutStats.conf &
+# siox-daemon --configEntry=daemon.conf &
 
 echo "Compiling"
 siox-inst posix wrap gcc -g -Wall fwrite.c -o fwrite-wrapped
@@ -29,14 +30,14 @@ echo "Running IOR"
 echo Without wrapper run: mpiexec -np 4 --env=LD_PRELOAD="/usr/local/siox/lib/libsiox-mpi-dlsym.so /usr/local/siox/lib/libsiox-posix-dlsym.so" ...
 
 export SIOX_REPORTING_FILENAME=ior-report.txt
-mpiexec -np 4 ./ior.wrapped -v -o testfile -s 10 -i 1 -f ior.conf 
+mpiexec -np 4 ./ior.wrapped -v -o testfile -s 10 -i 1 -f ior.conf
 mpiexec -np 4 -env=LD_PRELOAD="/usr/local/siox/lib/libsiox-mpi-dlsym.so /usr/local/siox/lib/libsiox-posix-dlsym.so"  ./ior.normal -v -o testfile -s 10 -i 1 -f ior.conf
 
 
 echo "Run completed!"
 
 
-echo 
+echo
 echo "Trace output"
 
 siox-trace-reader

tools/siox-skeleton-builder/layers/mpi/mpi-wrapper.h

@@ -69,7 +69,7 @@ End of global part
 // All processes record the pid of Rank 0 then.
 
 #ifndef  OPTIONAL_CONST
-#define  OPTIONAL_CONST const
+#define  OPTIONAL_CONST 
 #endif
 
 //@callLibraryInitialize