summaryrefslogtreecommitdiff
path: root/CIAO/performance-tests/Benchmark
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2010-01-21 14:37:24 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2010-01-21 14:37:24 +0000
commit806df22581cb7a22af65ebac6adee9291b041a90 (patch)
treeb2d6fb3bae418d0e3cc709def3bb12a731309fe6 /CIAO/performance-tests/Benchmark
parentfae81fcba5ca3e0a8f1f1189d1c1a1feb6defed7 (diff)
downloadATCD-806df22581cb7a22af65ebac6adee9291b041a90.tar.gz
Thu Jan 21 14:37:27 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* performance-tests/Benchmark/Benchmark.idl * performance-tests/Benchmark/RoundTrip/RoundTrip.idl * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc * performance-tests/Benchmark/RoundTrip/RoundTripEI.idl * performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl * performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl * performance-tests/Protocols/common/Protocols.idl * performance-tests/Protocols/Receiver/Receiver.idl Use the new pragma ciao lem
Diffstat (limited to 'CIAO/performance-tests/Benchmark')
-rw-r--r--CIAO/performance-tests/Benchmark/Benchmark.idl5
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl3
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc4
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl4
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl1
-rw-r--r--CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl4
6 files changed, 10 insertions, 11 deletions
diff --git a/CIAO/performance-tests/Benchmark/Benchmark.idl b/CIAO/performance-tests/Benchmark/Benchmark.idl
index d363628c891..9323d071455 100644
--- a/CIAO/performance-tests/Benchmark/Benchmark.idl
+++ b/CIAO/performance-tests/Benchmark/Benchmark.idl
@@ -12,15 +12,15 @@
#ifndef CIAO_BENCHMARK_IDL
#define CIAO_BENCHMARK_IDL
+#pragma ciao lem "BenchmarkE.idl"
module Benchmark
{
-
/**
* @interface RoundTrip
*
* This Latency test provides operations to measure the round-trip
- * latency of the ORB. The interface is same as that of
+ * latency of the ORB. The interface is the same as that of
* $TAO_ROOT/performance-tests/Latency/Single_Threaded
*/
@@ -42,7 +42,6 @@ module Benchmark
/// Start the test
void start ();
};
-
};
#endif /*CIAO_BENCHMARK_IDL*/
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl
index 71411c1af1a..8b682c67cbe 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.idl
@@ -12,9 +12,10 @@
#define CIAO_ROUNDTRIP_IDL
#include "../Benchmark.idl"
-#include "../BenchmarkE.idl"
#include <Components.idl>
+#pragma ciao lem "RoundTripE.idl"
+
module Benchmark
{
component RoundTrip
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
index ffd1b189ee3..0117beb2d2e 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
@@ -10,7 +10,7 @@ project(Benchmark_RoundTrip_idl_gen) : componentidldefaults {
-Wb,skel_export_macro=ROUNDTRIP_SVNT_Export \
-Wb,skel_export_include=RoundTrip_svnt_export.h \
-Wb,exec_export_macro=ROUNDTRIP_EXEC_Export \
- -Wb,exec_export_include=RoundTrip_exec_export.h
+ -Wb,exec_export_include=RoundTrip_exec_export.h -I..
IDL_Files {
RoundTrip.idl
@@ -22,7 +22,7 @@ project(Benchmark_RoundTrip_lem_gen) : ciaoidldefaults {
after += Benchmark_RoundTrip_idl_gen
idlflags += -Wb,export_macro=ROUNDTRIP_EXEC_Export \
-Wb,export_include=RoundTrip_exec_export.h \
- -SS
+ -SS -I..
IDL_Files {
RoundTripE.idl
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
index 1f105b46051..fd9e0cc85bb 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/RoundTripEI.idl
@@ -5,14 +5,14 @@
* @file RoundTripEI.idl
*
*
- * @author
+ * @author
*/
//=============================================================================
#ifndef CIAO_ROUNDTRIPEI_IDL
#define CIAO_ROUNDTRIPEI_IDL
-#include "RoundTripE.idl"
+#include "RoundTrip.idl"
module Benchmark
{
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl
index 7e96ef6abe2..3f891ce00d3 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.idl
@@ -13,7 +13,6 @@
#include <Components.idl>
#include "../Benchmark.idl"
-#include "../BenchmarkE.idl"
module Benchmark
{
diff --git a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl
index 784abd168d4..5544a9de7bc 100644
--- a/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl
+++ b/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClientEI.idl
@@ -5,14 +5,14 @@
* @file RoundTripClientEI.idl
*
*
- * @author
+ * @author
*/
//=============================================================================
#ifndef CIAO_ROUNDTRIPCLIENTEI_IDL
#define CIAO_ROUNDTRIPCLIENTEI_IDL
-#include "RoundTripClientE.idl"
+#include "RoundTripClient.idl"
module Benchmark
{