ChangeLogTag:Thu Sep 17 18:52:14 1998 Carlos O'Ryan <coryan@cs.wustl.edu>

4 files changed, 38 insertions, 20 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index c8c0027b60d..83f855e2446 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,3 +1,13 @@
+Thu Sep 17 18:52:14 1998  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp: 
+	* tao/GIOP.cpp: 
+	  We now use the iovec structure becauce ACE_IO_Vector has been
+	  deprecated.
+
+	* orbsvcs/orbsvcs/Event/Event_Channel.cpp: 
+	  Removed some debug messages.
+
 Thu Sep 17 14:18:19 1998  Jeff Parsons <jp4@cs.wustl.edu>
 
 	* TAO/tests/DynAny_Test/README.txt
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
index 3ba14d1ffbd..109f8c4f24f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
@@ -195,15 +195,15 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
       // @@ TODO In the future we may need to allocate some memory
       // from the heap.
       const int TAO_WRITEV_MAX = 128;
-      ACE_IO_Vector iov[TAO_WRITEV_MAX];
+      iovec iov[TAO_WRITEV_MAX];
 
       int iovcnt = 0;
       for (const ACE_Message_Block* b = cdr.begin ();
            b != cdr.end () && iovcnt < TAO_WRITEV_MAX;
            b = b->cont ())
         {
-          iov[iovcnt].buffer (b->rd_ptr ());
-          iov[iovcnt].length (b->length ());
+          iov[iovcnt].iov_base = b->rd_ptr ();
+          iov[iovcnt].iov_len =  b->length ();
           iovcnt++;
         }
 
@@ -212,7 +212,7 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events,
       // ACE_DEBUG ((LM_DEBUG, "sending to (%d,%u)\n",
       // udp_addr.port, udp_addr.ipaddr));
 
-      ssize_t n = this->dgram_->send ((const ACE_IO_Vector_Base *) iov,
+      ssize_t n = this->dgram_->send (iov,
                                       iovcnt,
                                       inet_addr);
       if (n == -1)
diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
index e050778f48c..37cf5cf0fb8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp
@@ -537,7 +537,7 @@ void
 ACE_Push_Consumer_Proxy::disconnect_push_supplier (CORBA::Environment &_env)
 {
   ACE_TIMEPROBE_PRINT;
-  this->push_consumer_ = 0;
+  this->push_consumer_ = RtecEventComm::PushConsumer::_nil ();
   this->consumer_module_->disconnecting (this, _env);
 }
 
@@ -2533,9 +2533,9 @@ ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source,
   // Acquire a write lock and remove all disconnected consumers.
   if (disconnect_list.size () != 0)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "EC (%t) Subscription_Module::push_source_type"
-                  " - disconnecting consumers\n"));
+      // ACE_DEBUG ((LM_DEBUG,
+      //            "EC (%t) Subscription_Module::push_source_type"
+      //            " - disconnecting consumers\n"));
       ACE_ES_WGUARD ace_mon (source->subscription_info ().lock_);
       if (ace_mon.locked () == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -2554,9 +2554,9 @@ ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source,
                         "ACE_ES_Subscription_Module::push_source.\n"));
           else
             (*consumer)->_release ();
-          ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::"
-                      "push_source_type - consumer %x removed\n",
-                      *consumer));
+          // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::"
+          //            "push_source_type - consumer %x removed\n",
+          //            *Consumer));
         }
     }
 
@@ -3383,10 +3383,17 @@ ACE_ES_Consumer_Name (const RtecEventChannelAdmin::ConsumerQOS &qos)
   TAO_TRY
     {
       ACE_FUNCTION_TIMEPROBE (TAO_EVENT_CHANNEL_CONSUMER_NAME_PRIORITY_REQUESTED);
+
+      if (qos.dependencies.length () <= 1)
+	return "no-name";
+
       RtecScheduler::RT_Info* rt_info = ACE_Scheduler_Factory::server ()->get
         (qos.dependencies[1].rt_info, TAO_TRY_ENV);
       TAO_CHECK_ENV;
 
+      if (rt_info == 0)
+	return "no-name";
+
       return rt_info->entry_point;
     }
   TAO_CATCHANY
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index afe189dee05..fdae2d26914 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -170,13 +170,13 @@ operator>>(TAO_InputCDR& cdr, TAO_GIOP_ServiceContextList& x)
 // all the code to write a Message_Block chain could be encapsulated
 // in ACE.
 static ssize_t
-writev_n (ACE_HANDLE h, ACE_IO_Vector *iov, int iovcnt)
+writev_n (ACE_HANDLE h, iovec *iov, int iovcnt)
 {
   ssize_t writelen = 0;
   int s = 0;
   while (s < iovcnt)
     {
-      ssize_t n = ACE_OS::writev (h, iov + s, iovcnt - s);
+      ssize_t n = ACE_OS::sendv (h, iov + s, iovcnt - s);
 
       if (n == -1)
         {
@@ -185,23 +185,24 @@ writev_n (ACE_HANDLE h, ACE_IO_Vector *iov, int iovcnt)
       else
         {
           writelen += n;
-          while (s < iovcnt && n >= iov[s].length ())
+          while (s < iovcnt && n >= iov[s].iov_len)
             {
               n -= iov[s].length ();
               s++;
             }
           if (n != 0)
             {
-              char* base = ACE_reinterpret_cast (char*, iov[s].buffer ());
+              char* base = ACE_reinterpret_cast (char*, iov[s].iov_base);
 
-              iov[s].buffer (base + n);
-              iov[s].length (iov[s].length () - n);
+              iov[s].iov_base = base + n;
+              iov[s].iov_len = iov[s].length () - n;
             }
         }
     }
   return writelen;
 }
 
+
 CORBA::Boolean
 TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
                         TAO_OutputCDR &stream,
@@ -261,14 +262,14 @@ TAO_GIOP::send_request (TAO_SVC_HANDLER *handler,
   TAO_SOCK_Stream &peer = handler->peer ();
 
   const int TAO_WRITEV_MAX = 16;
-  ACE_IO_Vector iov[TAO_WRITEV_MAX];
+  iovec iov[TAO_WRITEV_MAX];
   int iovcnt = 0;
   for (const ACE_Message_Block* i = stream.begin ();
        i != stream.end ();
        i = i->cont ())
     {
-      iov[iovcnt].buffer (i->rd_ptr ());
-      iov[iovcnt].length (i->length ());
+      iov[iovcnt].iov_base = i->rd_ptr ();
+      iov[iovcnt].iov_len  = i->length ();
       iovcnt++;
 
       // The buffer is full make a OS call.