diff options
| author | naga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-16 02:06:55 +0000 |
|---|---|---|
| committer | naga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-16 02:06:55 +0000 |
| commit | 9f9998bd492ae457eb8658254cecd7a65467c7da (patch) | |
| tree | bcc70b64079441d82a2fda15ac53cf108ce27b33 | |
| parent | 3586c1383f18185d4b0e364cbf8098b02c9286dc (diff) | |
| download | ATCD-9f9998bd492ae457eb8658254cecd7a65467c7da.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-98c | 3 | ||||
| -rw-r--r-- | TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile | 6 | ||||
| -rw-r--r-- | TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp | 16 |
3 files changed, 9 insertions, 16 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 89d8562a8d5..a6a984eb2fd 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -9,6 +9,9 @@ Thu Oct 15 20:08:36 1998 Nagarajan Surendran <naga@cs.wustl.edu> uses only files to share iors of servants to clients. So -s option is also removed. + * performance-tests/Cubit/TAO/MT_Cubit/Makefile: + Removed liborbsvcs from the LD_LIBS. + Thu Oct 15 17:29:42 1998 Nanbor Wang <nanbor@cs.wustl.edu> * orbsvcs/orbsvcs/orbsvcs[_static].dsp: Added EC_UDP_Admin.cpp. diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile index 2215a7a1196..ca9152326c9 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile @@ -12,7 +12,7 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -LDLIBS = -lorbsvcs -lTAO $(MATHLIB) +LDLIBS = -lTAO $(MATHLIB) IDL_SRC = cubitC.cpp cubitS.cpp PROG_SRCS = server.cpp \ @@ -69,8 +69,8 @@ include $(ACE_ROOT)/include/makeinclude/rules.local.GNU # Local modifications to variables imported by includes above. CPPFLAGS += -DDEBUG -LDFLAGS += -L$(TAO_ROOT)/tao -L$(TAO_ROOT)/orbsvcs -CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/orbsvcs +LDFLAGS += -L$(TAO_ROOT)/tao +CPPFLAGS += -I$(TAO_ROOT) # pccTimer will eventually get integrated into ACE. It is specific for ClassiX on VME ifdef CHORUS diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp index 5c7c74f2222..3cd61fbb636 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp @@ -628,8 +628,8 @@ Client::get_cubit (void) ? this->ts_->one_ior_ : this->ts_->iors_[this->id_]; - // If we are running the "1 to n" test make sure all low - // priority clients use only 1 low priority servant. + // If we are running the "1 to n" test make sure all low + // priority clients use only 1 low priority servant. if (this->id_ > 0 && this->ts_->one_to_n_test_ == 1) my_ior = this->ts_->iors_[1]; @@ -639,21 +639,11 @@ Client::get_cubit (void) "Must specify valid factory ior key with -k option," " naming service, or ior filename\n"), -1); + ACE_DEBUG ((LM_DEBUG, "(%P|%t) The ior I'm using is: \"%s\"\n", my_ior)); - // If we are running the "1 to n" test make sure all low - // priority clients use only 1 low priority servant. - if (this->id_ > 0 - && this->ts_->one_to_n_test_ == 1) - my_ior = this->ts_->iors_[1]; - - if (my_ior == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Must specify valid factory ior key with -k option," - " naming service, or ior filename\n"), - -1); objref = this->orb_->string_to_object (my_ior, TAO_TRY_ENV); ACE_DEBUG ((LM_DEBUG, |