ChangeLogTag: Tue Jan 29 11:48:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>

7 files changed, 239 insertions, 1 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index d6d2eb33e69..6c74814d501 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,11 +1,14 @@
 Tue Jan 29 11:20:36 2002  Johnny Willemsen <jwillemsen@remedy.nl>
 
         * orbsvcs/tests/Notify/performance-tests/Makefile.bor:
-          Added Throughput directory
+          Added Throughput and Filter directory
 
         * orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.bor:
           Added new BCB makefile to build this test
 
+        * orbsvcs/tests/Notify/performance-tests/Filter/*.bor:
+          Added new BCB makefiles to build these tests
+
 Tue Jan 29 09:10:17 2002  Johnny Willemsen <jwillemsen@remedy.nl>
 
 	* tao/Messaging.h:
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.bor
new file mode 100644
index 00000000000..90fc09d919a
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.bor
@@ -0,0 +1,12 @@
+#
+# Makefile for building the TAO Notify filter performance-tests
+# $Id$
+#
+
+MAKEFILES = \
+        Sequence_Consumer.bor \
+        Sequence_Supplier.bor \
+        Structured_Consumer.bor \
+        Structured_Supplier.bor
+
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.bor
new file mode 100644
index 00000000000..8c160b9e97d
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.bor
@@ -0,0 +1,56 @@
+#
+# $Id$
+# Makefile for building the orbsvcs notify filter sequence_consumer
+# performance-tests
+#
+
+NAME = Sequence_Consumer
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+        $(OBJDIR)\goC.obj \
+        $(OBJDIR)\goS.obj \
+        $(OBJDIR)\Notify_Sequence_Push_Consumer.obj \
+        $(OBJDIR)\Sequence_Consumer.obj \
+        $(OBJDIR)\common.obj
+
+CFLAGS = \
+        $(ACE_CFLAGS) \
+        $(TAO_CFLAGS) \
+        $(TAO_EVENT_CFLAGS) \
+        $(TAO_NAMING_CFLAGS) \
+        $(TAO_SVC_UTILS_CFLAGS) \
+        $(TAO_IORTABLE_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_ETCL_CFLAGS) \
+        $(TAO_NOTIFY_CFLAGS) \
+        $(TAO_NOTIFYTESTS_CFLAGS)
+
+CPPDIR = .
+
+LIBFILES = \
+        $(ACE_LIB) \
+        $(TAO_LIB) \
+        $(TAO_EVENT_LIB) \
+        $(TAO_NAMING_LIB) \
+        $(TAO_SVC_UTILS_LIB) \
+        $(TAO_IORTABLE_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_ETCL_LIB) \
+        $(TAO_NOTIFY_LIB) \
+        $(TAO_NOTIFYTESTS_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\go.idl
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
+	$(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.bor
new file mode 100644
index 00000000000..b03e483177f
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.bor
@@ -0,0 +1,55 @@
+#
+# $Id$
+# Makefile for building the orbsvcs notify filter sequence_supplier
+# performance-tests
+#
+
+NAME = Sequence_Supplier
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+        $(OBJDIR)\goC.obj \
+        $(OBJDIR)\goS.obj \
+        $(OBJDIR)\Sequence_Supplier.obj \
+        $(OBJDIR)\common.obj
+
+CFLAGS = \
+        $(ACE_CFLAGS) \
+        $(TAO_CFLAGS) \
+        $(TAO_EVENT_CFLAGS) \
+        $(TAO_NAMING_CFLAGS) \
+        $(TAO_SVC_UTILS_CFLAGS) \
+        $(TAO_IORTABLE_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_ETCL_CFLAGS) \
+        $(TAO_NOTIFY_CFLAGS) \
+        $(TAO_NOTIFYTESTS_CFLAGS)
+
+CPPDIR = .
+
+LIBFILES = \
+        $(ACE_LIB) \
+        $(TAO_LIB) \
+        $(TAO_EVENT_LIB) \
+        $(TAO_NAMING_LIB) \
+        $(TAO_SVC_UTILS_LIB) \
+        $(TAO_IORTABLE_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_ETCL_LIB) \
+        $(TAO_NOTIFY_LIB) \
+        $(TAO_NOTIFYTESTS_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\go.idl
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
+	$(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.bor
new file mode 100644
index 00000000000..8bfc3542e6c
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.bor
@@ -0,0 +1,56 @@
+#
+# $Id$
+# Makefile for building the orbsvcs notify filter structured_consumer
+# performance-tests
+#
+
+NAME = Structured_Consumer
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+        $(OBJDIR)\goC.obj \
+        $(OBJDIR)\goS.obj \
+        $(OBJDIR)\Structured_Consumer.obj \
+        $(OBJDIR)\Notify_Structured_Push_Consumer.obj \
+        $(OBJDIR)\common.obj
+
+CFLAGS = \
+        $(ACE_CFLAGS) \
+        $(TAO_CFLAGS) \
+        $(TAO_EVENT_CFLAGS) \
+        $(TAO_NAMING_CFLAGS) \
+        $(TAO_SVC_UTILS_CFLAGS) \
+        $(TAO_IORTABLE_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_ETCL_CFLAGS) \
+        $(TAO_NOTIFY_CFLAGS) \
+        $(TAO_NOTIFYTESTS_CFLAGS)
+
+CPPDIR = .
+
+LIBFILES = \
+        $(ACE_LIB) \
+        $(TAO_LIB) \
+        $(TAO_EVENT_LIB) \
+        $(TAO_NAMING_LIB) \
+        $(TAO_SVC_UTILS_LIB) \
+        $(TAO_IORTABLE_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_ETCL_LIB) \
+        $(TAO_NOTIFY_LIB) \
+        $(TAO_NOTIFYTESTS_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\go.idl
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
+	$(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.bor
new file mode 100644
index 00000000000..5cbc34dc2d7
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.bor
@@ -0,0 +1,55 @@
+#
+# $Id$
+# Makefile for building the orbsvcs notify filter structured_supplier
+# performance-tests
+#
+
+NAME = Structured_Supplier
+
+TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe -Ge 1
+
+OBJFILES = \
+        $(OBJDIR)\goC.obj \
+        $(OBJDIR)\goS.obj \
+        $(OBJDIR)\Structured_Supplier.obj \
+        $(OBJDIR)\common.obj
+
+CFLAGS = \
+        $(ACE_CFLAGS) \
+        $(TAO_CFLAGS) \
+        $(TAO_EVENT_CFLAGS) \
+        $(TAO_NAMING_CFLAGS) \
+        $(TAO_SVC_UTILS_CFLAGS) \
+        $(TAO_IORTABLE_CFLAGS) \
+        $(TAO_PORTABLESERVER_CFLAGS) \
+        $(TAO_ETCL_CFLAGS) \
+        $(TAO_NOTIFY_CFLAGS) \
+        $(TAO_NOTIFYTESTS_CFLAGS)
+
+CPPDIR = .
+
+LIBFILES = \
+        $(ACE_LIB) \
+        $(TAO_LIB) \
+        $(TAO_EVENT_LIB) \
+        $(TAO_NAMING_LIB) \
+        $(TAO_SVC_UTILS_LIB) \
+        $(TAO_IORTABLE_LIB) \
+        $(TAO_PORTABLESERVER_LIB) \
+        $(TAO_ETCL_LIB) \
+        $(TAO_NOTIFY_LIB) \
+        $(TAO_NOTIFYTESTS_LIB)
+
+IDLFILES = \
+        $(IDLDIR)\go.idl
+
+IDLDIR = .
+
+!include <$(ACE_ROOT)\include\makeinclude\build_exe.bor>
+
+#
+# IDL Build rules
+#
+
+$(IDLDIR)\goS.cpp $(IDLDIR)\goC.cpp: $(IDLDIR)\go.idl
+	$(TAO_IDL) $**
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.bor b/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.bor
index 23f1e62317f..480df86bbef 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.bor
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Makefile.bor
@@ -4,6 +4,7 @@
 #
 
 DIRS = \
+        Filter \
         RedGreen \
         Throughput