From 919f4c73a04a51f6e0caa0bedcdc08d622383854 Mon Sep 17 00:00:00 2001 From: schmidt Date: Thu, 24 May 2001 02:01:00 +0000 Subject: ChangeLogTag:Wed May 23 16:35:15 2001 Douglas C. Schmidt --- ChangeLog | 27 +++++++++++++ ChangeLogs/ChangeLog-02a | 27 +++++++++++++ ChangeLogs/ChangeLog-03a | 27 +++++++++++++ TAO/ChangeLogs/ChangeLog-02a | 58 ++++++++++++++++++--------- TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp | 30 ++++++++++---- TAO/tests/QtTests/Makefile | 27 ++++++++----- THANKS | 2 + ace/Flag_Manip.h | 4 +- ace/Sock_Connect.h | 4 +- ace/config-all.h | 3 +- ace/config-win32-common.h | 2 +- include/makeinclude/platform_linux.GNU | 4 ++ performance-tests/Misc/Makefile | 2 +- 13 files changed, 171 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce17f33871f..4d54f76ab90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Wed May 23 16:35:15 2001 Douglas C. Schmidt + + * ace/Sock_Connect.h, + * ace/Flag_Manip.h, + * ace/config-all.h: Make sure that all ACE include file have a + "ace/" prefix. Thanks to John Lindal for + reporting this. + + * ace/config-win32-common.h: Fixed a problem where FD_SETSIZE wasn't + getting reset properly. Thanks to Roger Tragin + for reporting this. + Wed May 23 17:37:30 2001 Krishnakumar B * bin/auto_run_tests.lst: @@ -91,6 +103,21 @@ Tue May 22 21:57:46 2001 Balachandran Natarajan * bin/nightlybuilds/builds.lst: Added NO_AMI_MESSAGING to the builds. +Mon May 21 18:34:52 2001 Douglas C. Schmidt + + * include/makeinclude/platform_linux.GNU: Added default macros for: + + PLATFORM_QT_LIBS + PLATFORM_QT_LDFLAGS + PLATFORM_QT_LDFLAGS + + Thanks to Hans Utz for + contributing this. + + * performance-tests/Misc/Makefile (LDLIBS): Added back + -lPerf. Thanks to Hans Utz for + reporting this. + Mon May 21 16:37:18 2001 Krishnakumar B * ace/OS.h: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index ce17f33871f..4d54f76ab90 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,15 @@ +Wed May 23 16:35:15 2001 Douglas C. Schmidt + + * ace/Sock_Connect.h, + * ace/Flag_Manip.h, + * ace/config-all.h: Make sure that all ACE include file have a + "ace/" prefix. Thanks to John Lindal for + reporting this. + + * ace/config-win32-common.h: Fixed a problem where FD_SETSIZE wasn't + getting reset properly. Thanks to Roger Tragin + for reporting this. + Wed May 23 17:37:30 2001 Krishnakumar B * bin/auto_run_tests.lst: @@ -91,6 +103,21 @@ Tue May 22 21:57:46 2001 Balachandran Natarajan * bin/nightlybuilds/builds.lst: Added NO_AMI_MESSAGING to the builds. +Mon May 21 18:34:52 2001 Douglas C. Schmidt + + * include/makeinclude/platform_linux.GNU: Added default macros for: + + PLATFORM_QT_LIBS + PLATFORM_QT_LDFLAGS + PLATFORM_QT_LDFLAGS + + Thanks to Hans Utz for + contributing this. + + * performance-tests/Misc/Makefile (LDLIBS): Added back + -lPerf. Thanks to Hans Utz for + reporting this. + Mon May 21 16:37:18 2001 Krishnakumar B * ace/OS.h: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index ce17f33871f..4d54f76ab90 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,15 @@ +Wed May 23 16:35:15 2001 Douglas C. Schmidt + + * ace/Sock_Connect.h, + * ace/Flag_Manip.h, + * ace/config-all.h: Make sure that all ACE include file have a + "ace/" prefix. Thanks to John Lindal for + reporting this. + + * ace/config-win32-common.h: Fixed a problem where FD_SETSIZE wasn't + getting reset properly. Thanks to Roger Tragin + for reporting this. + Wed May 23 17:37:30 2001 Krishnakumar B * bin/auto_run_tests.lst: @@ -91,6 +103,21 @@ Tue May 22 21:57:46 2001 Balachandran Natarajan * bin/nightlybuilds/builds.lst: Added NO_AMI_MESSAGING to the builds. +Mon May 21 18:34:52 2001 Douglas C. Schmidt + + * include/makeinclude/platform_linux.GNU: Added default macros for: + + PLATFORM_QT_LIBS + PLATFORM_QT_LDFLAGS + PLATFORM_QT_LDFLAGS + + Thanks to Hans Utz for + contributing this. + + * performance-tests/Misc/Makefile (LDLIBS): Added back + -lPerf. Thanks to Hans Utz for + reporting this. + Mon May 21 16:37:18 2001 Krishnakumar B * ace/OS.h: diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index e3edac36325..8b7f5ad236c 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -124,7 +124,6 @@ Wed May 23 11:45:09 2001 Jeff Parsons Merle for simultaneously discovering this bug, and to Carlos for seeing the fix right away. - Wed May 23 11:37:02 2001 Paul Calabrese * docs/Options.html: @@ -180,7 +179,9 @@ Wed May 23 8:23:20 2001 Yamuna Krishnamurthy * orbsvcs/orbsvcs/AV/Transport.h: * orbsvcs/orbsvcs/AV/Transport.cpp: - Provided a mechanism to modify QoS when there is a change in QoS. Also added the QoS negotiator mechanism as a means of notifying change in QoS. + Provided a mechanism to modify QoS when there is a change in + QoS. Also added the QoS negotiator mechanism as a means of + notifying change in QoS. * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h: * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp: @@ -189,15 +190,33 @@ Wed May 23 8:23:20 2001 Yamuna Krishnamurthy Tue May 22 15:34:20 2001 Sharath R. Cholleti - * tao/tests/Oneway_Buffering/Oneway_Buffering_Admin.{h,cpp}: - * tao/tests/Big_Oneways/Session.{h,cpp}: - * tao/tests/AMI_Buffering/test_i.{h,cpp}: - * tao/examples/Logging/Logger_i.{h,cpp}: - * tao/examples/Buffered_Oneways/test_i.{h,cpp}: - * tao/examples/Buffered_AMI/AMI_Buffering_Admin.{h,cpp}: - - Fixed compile errors in Forte update 1. - + * tao/tests/Oneway_Buffering/Oneway_Buffering_Admin.{h,cpp}: + * tao/tests/Big_Oneways/Session.{h,cpp}: + * tao/tests/AMI_Buffering/test_i.{h,cpp}: + * tao/examples/Logging/Logger_i.{h,cpp}: + * tao/examples/Buffered_Oneways/test_i.{h,cpp}: + * tao/examples/Buffered_AMI/AMI_Buffering_Admin.{h,cpp}: + Fixed compile errors in Forte update 1. + +Tue May 22 21:21:10 2001 Douglas C. Schmidt + + * orbsvcs/orbsvcs/Trader/Trading_Loader.cpp: When the IFR and Name + Service initialize the multicast server they check if the + ORBMulticastDiscoveryEndpoint option was specified and use that + address instead of the default one, however, the Trading Service + did not. It just uses the hard coded default no matter + what. This meant we can't programmatically change the multicast + endpoint. The fix was to add the little bit of code in the Name + Service and IFR implementation to + TAO_Trading_Loader::init_multicast_server() that checks for the + multicast endpoint. Thanks to Mike Pyle + for this fix. + +Mon May 21 18:43:45 2001 Douglas C. Schmidt + + * tests/QtTests: Fixed the Makefile so that it handles the + PLATFORM_QT_* flags correctly. Thanks to Hans Utz + for reporting this. Mon May 21 23:22:20 2001 Ossama Othman @@ -297,14 +316,15 @@ Sat May 19 17:00:00 2001 Ossama Othman Sat May 19 17:17:32 2001 Douglas C. Schmidt - * docs/tutorials/Quoter/Simple/Impl-Repo/index.html, - * docs/pluggable_protocols/index.html (TAO_IIOP_Profile), - * orbsvcs/Notify_Service/README, - * tests/Param_Test/anyop.cpp (main), - * tests/Param_Test/manipulation.cpp: Fixed all uses of - "iioploc://" with "corbaloc:iiop:". Thanks to Craig Rodrigues - for suggesting this. - + * docs/tutorials/Quoter/Simple/Impl-Repo/index.html, + * docs/pluggable_protocols/index.html (TAO_IIOP_Profile), + * orbsvcs/Notify_Service/README, + * tests/Param_Test/anyop.cpp (main), + * tests/Param_Test/manipulation.cpp: Fixed all uses of + "iioploc://" with "corbaloc:iiop:" to conform to the CORBA INS + standard consistently. Thanks to Craig Rodrigues for suggesting + this. + Sat May 19 11:02:35 2001 Balachandran Natarajan * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp: Fixed a problem diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp index d190ec83050..f431634eafe 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp @@ -374,10 +374,14 @@ TAO_Trading_Loader::bootstrap_to_federation (CORBA::Environment &ACE_TRY_ENV) int TAO_Trading_Loader::init_multicast_server (void) { -#if defined ACE_HAS_IP_MULTICAST +#if defined (ACE_HAS_IP_MULTICAST) // Get reactor instance from TAO. ACE_Reactor *reactor = TAO_ORB_Core_instance ()->reactor (); + // See if the -ORBMulticastDiscoveryEndpoint option was specified. + ACE_CString mde (TAO_ORB_Core_instance ()->orb_params () + ->mcast_discovery_endpoint ()); + // First, see if the user has given us a multicast port number for // the name service on the command-line; u_short port = @@ -395,13 +399,23 @@ TAO_Trading_Loader::init_multicast_server (void) } // Instantiate a server that will receive requests for an ior - if (this->ior_multicast_.init ((char *) this->ior_.in (), - port, - ACE_DEFAULT_MULTICAST_ADDR, - TAO_SERVICEID_TRADINGSERVICE) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - "Failed to init IOR multicast.\n"), - -1); + if (mde.length () != 0) + { + if (this->ior_multicast_.init ((char *) this->ior_.in (), + mde.c_str (), + TAO_SERVICEID_TRADINGSERVICE) == -1) + return -1; + } + else + { + if (this->ior_multicast_.init ((char *) this->ior_.in (), + port, + ACE_DEFAULT_MULTICAST_ADDR, + TAO_SERVICEID_TRADINGSERVICE) == -1) + ACE_ERROR_RETURN ((LM_ERROR, + "Failed to init IOR multicast.\n"), + -1); + } // Register event handler for the ior multicast. if (reactor->register_handler (&this->ior_multicast_, diff --git a/TAO/tests/QtTests/Makefile b/TAO/tests/QtTests/Makefile index 9345e1121dd..7c2c0bd2397 100755 --- a/TAO/tests/QtTests/Makefile +++ b/TAO/tests/QtTests/Makefile @@ -4,6 +4,13 @@ # #---------------------------------------------------------------------------- +#---------------------------------------------------------------------------- +# Include macros +#---------------------------------------------------------------------------- + +include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU +include $(ACE_ROOT)/include/makeinclude/macros.GNU + #---------------------------------------------------------------------------- # Local macros #---------------------------------------------------------------------------- @@ -12,6 +19,13 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT +# finding the moc compiler +ifneq ($(QTDIR),) + MOC = ${QTDIR}/bin/moc +else + MOC = moc +endif + IDL_FILES = test IDL_SRC = testC.cpp testS.cpp BIN = client server @@ -19,7 +33,7 @@ BIN = client server ifneq ($(qt_reactor),) CLNT_MOC = client_moc TEST_MOC = test_i_moc -CLNT_MOC _OBJ = client_moc.o +CLNT_MOC_OBJ = client_moc.o TEST_MOC_OBJ = test_i_moc.o endif #qt_reactor @@ -35,13 +49,10 @@ SERVER_OBJS = server.o test_i.o $(TEST_MOC_OBJ) $(IDL_SRC:.cpp=.o) TAO_IDLFLAGS += -Ge 1 - #---------------------------------------------------------------------------- -# Include macros and targets +# Include targets #---------------------------------------------------------------------------- -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU @@ -58,10 +69,10 @@ include $(TAO_ROOT)/taoconfig.mk ifneq ($(qt_reactor),) test_i_moc.cpp: test_i.h - moc test_i.h > test_i_moc.cpp + $(MOC) test_i.h > test_i_moc.cpp client_moc.cpp: client.h - moc client.h > client_moc.cpp + $(MOC) client.h > client_moc.cpp endif #qt_reactor server: $(addprefix $(VDIR),$(SERVER_OBJS)) @@ -70,14 +81,12 @@ server: $(addprefix $(VDIR),$(SERVER_OBJS)) client: $(addprefix $(VDIR),$(CLIENT_OBJS)) $(LINK.cc) $(LDFLAGS) -o $@ $^ $(TAO_CLNT_LIBS) $(POSTLINK) - realclean: clean -$(RM) testC.* testS.* testS_T.* *moc.cpp # DO NOT DELETE THIS LINE -- g++dep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \ $(TAO_ROOT)/tao/corba.h \ $(ACE_ROOT)/ace/pre.h \ diff --git a/THANKS b/THANKS index 2c55092dfd2..bef4f348219 100644 --- a/THANKS +++ b/THANKS @@ -1242,6 +1242,8 @@ Nicolas Huynh Kevin Burge Wayne Erchak Yew Khong See +Greg Thompson +Mike Pyle I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/ace/Flag_Manip.h b/ace/Flag_Manip.h index fa3cefae1bf..3d8596bddba 100644 --- a/ace/Flag_Manip.h +++ b/ace/Flag_Manip.h @@ -1,4 +1,3 @@ - //============================================================================= /** * @file Flag_Manip.h @@ -11,12 +10,11 @@ */ //============================================================================= - #ifndef ACE_FLAG_MANIP_H #define ACE_FLAG_MANIP_H #include "ace/pre.h" -#include "OS.h" +#include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/Sock_Connect.h b/ace/Sock_Connect.h index ef6513fb7f3..a0882a63f1c 100644 --- a/ace/Sock_Connect.h +++ b/ace/Sock_Connect.h @@ -1,4 +1,3 @@ - //============================================================================= /** * @file Sock_Connect.h @@ -9,12 +8,11 @@ */ //============================================================================= - #ifndef ACE_SOCK_CONNECT_H #define ACE_SOCK_CONNECT_H #include "ace/pre.h" -#include "OS.h" +#include "ace/OS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ace/config-all.h b/ace/config-all.h index 2681301dae1..09f7ebe51f7 100644 --- a/ace/config-all.h +++ b/ace/config-all.h @@ -12,7 +12,6 @@ */ //============================================================================= - #ifndef ACE_CONFIG_ALL_H #define ACE_CONFIG_ALL_H #include "ace/pre.h" @@ -335,7 +334,7 @@ // errno stuff // ============================================================================ -#include "OS_Errno.h" +#include "ace/OS_Errno.h" // ============================================================================ // ACE_NEW macros diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index 4fdf05e6d05..863269bea2f 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -166,8 +166,8 @@ #if defined (FD_SETSIZE) #undef FD_SETSIZE -#define FD_SETSIZE 1024 #endif /* FD_SETSIZE */ +#define FD_SETSIZE 1024 // Windows doesn't like 65536 ;-) If 65536 is specified, it is // listenly ignored by the OS, i.e., setsockopt does not fail, and you diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU index 1f7a11e71c1..28164c1e4e9 100644 --- a/include/makeinclude/platform_linux.GNU +++ b/include/makeinclude/platform_linux.GNU @@ -80,6 +80,10 @@ ifeq ($(threads),1) endif endif +PLATFORM_QT_CPPFLAGS=-I$(QTDIR)/include +PLATFORM_QT_LIBS=-lqt +PLATFORM_QT_LDFLAGS=-L$(QTDIR)/lib + OCFLAGS += -O3 PIC = -fPIC AR = ar diff --git a/performance-tests/Misc/Makefile b/performance-tests/Misc/Makefile index 5ae9c147058..3350a0cb6df 100644 --- a/performance-tests/Misc/Makefile +++ b/performance-tests/Misc/Makefile @@ -22,7 +22,7 @@ LIB = libPerf.a FILES = basic_func LSRC = $(addsuffix .cpp,$(FILES)) LOBJ = $(addsuffix .o,$(FILES)) -LDLIBS = #-lPerf +LDLIBS = -lPerf VLDLIBS = $(LDLIBS:%=%$(VAR)) # See comment above about only building libPerf.a for max performance. -- cgit v1.2.1