(file) Return to Monitor.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/Monitor.cpp between version 1.71 and 1.82

version 1.71, 2004/03/29 15:39:26 version 1.82, 2004/12/15 14:12:42
Line 1 
Line 1 
 //%2003////////////////////////////////////////////////////////////////////////  //%2004////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002  BMC Software, Hewlett-Packard Development  // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L. P., IBM Corp., The Open Group, Tivoli Systems.  // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.; // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L. P.;
 // IBM Corp.; EMC Corporation, The Open Group. // IBM Corp.; EMC Corporation, The Open Group.
   // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;
   // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 27 
Line 29 
 // //
 // Modified By: Mike Day (monitor_2) mdday@us.ibm.com // Modified By: Mike Day (monitor_2) mdday@us.ibm.com
 //              Amit K Arora (Bug#1153) amita@in.ibm.com //              Amit K Arora (Bug#1153) amita@in.ibm.com
   //              Alagaraja Ramasubramanian (alags_raj@in.ibm.com) for Bug#1090
   //              Sushma Fernandes (sushma@hp.com) for Bug#2057
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 39 
Line 43 
 #include <Pegasus/Common/Tracer.h> #include <Pegasus/Common/Tracer.h>
 #include <Pegasus/Common/HTTPConnection.h> #include <Pegasus/Common/HTTPConnection.h>
 #include <Pegasus/Common/MessageQueueService.h> #include <Pegasus/Common/MessageQueueService.h>
   #include <Pegasus/Common/Exception.h>
  
 #ifdef PEGASUS_OS_TYPE_WINDOWS #ifdef PEGASUS_OS_TYPE_WINDOWS
 # if defined(FD_SETSIZE) && FD_SETSIZE != 1024 # if defined(FD_SETSIZE) && FD_SETSIZE != 1024
Line 68 
Line 73 
  
 static AtomicInt _connections = 0; static AtomicInt _connections = 0;
  
   
 static struct timeval create_time = {0, 1}; static struct timeval create_time = {0, 1};
 static struct timeval destroy_time = {300, 0}; static struct timeval destroy_time = {300, 0};
 static struct timeval deadlock_time = {0, 0}; static struct timeval deadlock_time = {0, 0};
Line 97 
Line 101 
  
 #define MAX_NUMBER_OF_MONITOR_ENTRIES  32 #define MAX_NUMBER_OF_MONITOR_ENTRIES  32
 Monitor::Monitor() Monitor::Monitor()
    : _module_handle(0), _controller(0), _async(false), _stopConnections(0)     : _module_handle(0),
        _controller(0),
        _async(false),
        _stopConnections(0),
        _stopConnectionsSem(0),
        _solicitSocketCount(0),
        _tickle_client_socket(-1),
        _tickle_server_socket(-1),
        _tickle_peer_socket(-1)
 { {
     int numberOfMonitorEntriesToAllocate = MAX_NUMBER_OF_MONITOR_ENTRIES;     int numberOfMonitorEntriesToAllocate = MAX_NUMBER_OF_MONITOR_ENTRIES;
     Socket::initializeInterface();     Socket::initializeInterface();
     _rep = 0;     _rep = 0;
     _entries.reserveCapacity(numberOfMonitorEntriesToAllocate);     _entries.reserveCapacity(numberOfMonitorEntriesToAllocate);
     for( int i = 0; i < numberOfMonitorEntriesToAllocate; i++ )  
       // setup the tickler
       initializeTickler();
   
       // Start the count at 1 because initilizeTickler()
       // has added an entry in the first position of the
       // _entries array
       for( int i = 1; i < numberOfMonitorEntriesToAllocate; i++ )
     {     {
        _MonitorEntry entry(0, 0, 0);        _MonitorEntry entry(0, 0, 0);
        _entries.append(entry);        _entries.append(entry);
Line 111 
Line 130 
 } }
  
 Monitor::Monitor(Boolean async) Monitor::Monitor(Boolean async)
    : _module_handle(0), _controller(0), _async(async), _stopConnections(0)     : _module_handle(0),
        _controller(0),
        _async(async),
        _stopConnections(0),
        _stopConnectionsSem(0),
        _solicitSocketCount(0),
        _tickle_client_socket(-1),
        _tickle_server_socket(-1),
        _tickle_peer_socket(-1)
 { {
     int numberOfMonitorEntriesToAllocate = MAX_NUMBER_OF_MONITOR_ENTRIES;     int numberOfMonitorEntriesToAllocate = MAX_NUMBER_OF_MONITOR_ENTRIES;
     Socket::initializeInterface();     Socket::initializeInterface();
     _rep = 0;     _rep = 0;
     _entries.reserveCapacity(numberOfMonitorEntriesToAllocate);     _entries.reserveCapacity(numberOfMonitorEntriesToAllocate);
     for( int i = 0; i < numberOfMonitorEntriesToAllocate; i++ )  
       // setup the tickler
       initializeTickler();
   
       // Start the count at 1 because initilizeTickler()
       // has added an entry in the first position of the
       // _entries array
       for( int i = 1; i < numberOfMonitorEntriesToAllocate; i++ )
     {     {
        _MonitorEntry entry(0, 0, 0);        _MonitorEntry entry(0, 0, 0);
        _entries.append(entry);        _entries.append(entry);
Line 138 
Line 172 
     Tracer::trace(TRC_HTTP, Tracer::LEVEL4, "deleting rep");     Tracer::trace(TRC_HTTP, Tracer::LEVEL4, "deleting rep");
  
     Tracer::trace(TRC_HTTP, Tracer::LEVEL4, "uninitializing interface");     Tracer::trace(TRC_HTTP, Tracer::LEVEL4, "uninitializing interface");
   
       try{
           if(_tickle_peer_socket >= 0)
           {
               Socket::close(_tickle_peer_socket);
           }
           if(_tickle_client_socket >= 0)
           {
               Socket::close(_tickle_client_socket);
           }
           if(_tickle_server_socket >= 0)
           {
               Socket::close(_tickle_server_socket);
           }
       }
       catch(...)
       {
           Tracer::trace(TRC_HTTP, Tracer::LEVEL4,
                     "Failed to close tickle sockets");
       }
   
     Socket::uninitializeInterface();     Socket::uninitializeInterface();
     Tracer::trace(TRC_HTTP, Tracer::LEVEL4,     Tracer::trace(TRC_HTTP, Tracer::LEVEL4,
                   "returning from monitor destructor");                   "returning from monitor destructor");
 } }
  
   void Monitor::initializeTickler(){
       /*
          NOTE: On any errors trying to
                setup out tickle connection,
                throw an exception/end the server
       */
   
       /* setup the tickle server/listener */
   
       // get a socket for the server side
       if((_tickle_server_socket = ::socket(PF_INET, SOCK_STREAM, 0)) < 0){
           //handle error
           MessageLoaderParms parms("Common.Monitor.TICKLE_CREATE",
                                    "Received error number $0 while creating the internal socket.",
   #if !defined(PEGASUS_OS_TYPE_WINDOWS)
                                    errno);
   #else
                                    WSAGetLastError());
   #endif
           throw Exception(parms);
       }
   
       // initialize the address
       memset(&_tickle_server_addr, 0, sizeof(_tickle_server_addr));
   #ifdef PEGASUS_OS_ZOS
       _tickle_server_addr.sin_addr.s_addr = inet_addr_ebcdic("127.0.0.1");
   #else
   #ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM
   #pragma convert(37)
   #endif
       _tickle_server_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
   #ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM
   #pragma convert(0)
   #endif
   #endif
       _tickle_server_addr.sin_family = PF_INET;
       _tickle_server_addr.sin_port = 0;
   
       PEGASUS_SOCKLEN_SIZE _addr_size = sizeof(_tickle_server_addr);
   
       // bind server side to socket
       if((::bind(_tickle_server_socket,
                  (struct sockaddr *)&_tickle_server_addr,
                  sizeof(_tickle_server_addr))) < 0){
           // handle error
           MessageLoaderParms parms("Common.Monitor.TICKLE_BIND",
                                    "Received error number $0 while binding the internal socket.",
   #if !defined(PEGASUS_OS_TYPE_WINDOWS)
                                    errno);
   #else
                                    WSAGetLastError());
   #endif
           throw Exception(parms);
       }
   
       // tell the kernel we are a server
       if((::listen(_tickle_server_socket,3)) < 0){
           // handle error
           MessageLoaderParms parms("Common.Monitor.TICKLE_LISTEN",
                            "Received error number $0 while listening to the internal socket.",
   #if !defined(PEGASUS_OS_TYPE_WINDOWS)
                                    errno);
   #else
                                    WSAGetLastError());
   #endif
           throw Exception(parms);
       }
   
       // make sure we have the correct socket for our server
       int sock = ::getsockname(_tickle_server_socket,
                                (struct sockaddr*)&_tickle_server_addr,
                                &_addr_size);
       if(sock < 0){
           // handle error
           MessageLoaderParms parms("Common.Monitor.TICKLE_SOCKNAME",
                            "Received error number $0 while getting the internal socket name.",
   #if !defined(PEGASUS_OS_TYPE_WINDOWS)
                                    errno);
   #else
                                    WSAGetLastError());
   #endif
           throw Exception(parms);
       }
   
       /* set up the tickle client/connector */
   
       // get a socket for our tickle client
       if((_tickle_client_socket = ::socket(PF_INET, SOCK_STREAM, 0)) < 0){
           // handle error
           MessageLoaderParms parms("Common.Monitor.TICKLE_CLIENT_CREATE",
                            "Received error number $0 while creating the internal client socket.",
   #if !defined(PEGASUS_OS_TYPE_WINDOWS)
                                    errno);
   #else
                                    WSAGetLastError());
   #endif
           throw Exception(parms);
       }
   
       // setup the address of the client
       memset(&_tickle_client_addr, 0, sizeof(_tickle_client_addr));
   #ifdef PEGASUS_OS_ZOS
       _tickle_client_addr.sin_addr.s_addr = inet_addr_ebcdic("127.0.0.1");
   #else
   #ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM
   #pragma convert(37)
   #endif
       _tickle_client_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
   #ifdef PEGASUS_PLATFORM_OS400_ISERIES_IBM
   #pragma convert(0)
   #endif
   #endif
       _tickle_client_addr.sin_family = PF_INET;
       _tickle_client_addr.sin_port = 0;
   
       // bind socket to client side
       if((::bind(_tickle_client_socket,
                  (struct sockaddr*)&_tickle_client_addr,
                  sizeof(_tickle_client_addr))) < 0){
           // handle error
           MessageLoaderParms parms("Common.Monitor.TICKLE_CLIENT_BIND",
                            "Received error number $0 while binding the internal client socket.",
   #if !defined(PEGASUS_OS_TYPE_WINDOWS)
                                    errno);
   #else
                                    WSAGetLastError());
   #endif
           throw Exception(parms);
       }
   
       // connect to server side
       if((::connect(_tickle_client_socket,
                     (struct sockaddr*)&_tickle_server_addr,
                     sizeof(_tickle_server_addr))) < 0){
           // handle error
           MessageLoaderParms parms("Common.Monitor.TICKLE_CLIENT_CONNECT",
                            "Received error number $0 while connecting the internal client socket.",
   #if !defined(PEGASUS_OS_TYPE_WINDOWS)
                                    errno);
   #else
                                    WSAGetLastError());
   #endif
           throw Exception(parms);
       }
   
       /* set up the slave connection */
       memset(&_tickle_peer_addr, 0, sizeof(_tickle_peer_addr));
       PEGASUS_SOCKLEN_SIZE peer_size = sizeof(_tickle_peer_addr);
       pegasus_sleep(1);
   
       // this call may fail, we will try a max of 20 times to establish this peer connection
       if((_tickle_peer_socket = ::accept(_tickle_server_socket,
                                          (struct sockaddr*)&_tickle_peer_addr,
                                          &peer_size)) < 0){
   #if !defined(PEGASUS_OS_TYPE_WINDOWS)
           // Only retry on non-windows platforms.
           if(_tickle_peer_socket == -1 && errno == EAGAIN)
           {
             int retries = 0;
             do
             {
               pegasus_sleep(1);
               _tickle_peer_socket = ::accept(_tickle_server_socket,
                                              (struct sockaddr*)&_tickle_peer_addr,
                                              &peer_size);
               retries++;
             } while(_tickle_peer_socket == -1 && errno == EAGAIN && retries < 20);
           }
   #endif
       }
       if(_tickle_peer_socket == -1){
           // handle error
           MessageLoaderParms parms("Common.Monitor.TICKLE_ACCEPT",
                            "Received error number $0 while accepting the internal socket connection.",
   #if !defined(PEGASUS_OS_TYPE_WINDOWS)
                                    errno);
   #else
                                    WSAGetLastError());
   #endif
           throw Exception(parms);
       }
       // add the tickler to the list of entries to be monitored and set to IDLE because Monitor only
       // checks entries with IDLE state for events
       _MonitorEntry entry(_tickle_peer_socket, 1, INTERNAL);
       entry._status = _MonitorEntry::IDLE;
       _entries.append(entry);
   }
   
   void Monitor::tickle(void)
   {
       static char _buffer[] =
       {
         '0','0'
       };
   
       AutoMutex autoMutex(_tickle_mutex);
       Socket::disableBlocking(_tickle_client_socket);
       Socket::write(_tickle_client_socket,&_buffer, 2);
       Socket::enableBlocking(_tickle_client_socket);
   }
   
   void Monitor::setState( Uint32 index, _MonitorEntry::entry_status status )
   {
       // Set the state to requested state
       _entries[index]._status = status;
   }
   
 Boolean Monitor::run(Uint32 milliseconds) Boolean Monitor::run(Uint32 milliseconds)
 { {
  
     Boolean handled_events = false;     Boolean handled_events = false;
      int i = 0;      int i = 0;
     #if defined(PEGASUS_OS_OS400) || defined(PEGASUS_OS_HPUX)  
     struct timeval tv = {milliseconds/1000, milliseconds%1000*1000};     struct timeval tv = {milliseconds/1000, milliseconds%1000*1000};
 #else  
     struct timeval tv = {0, 1};  
 #endif  
     fd_set fdread;     fd_set fdread;
     FD_ZERO(&fdread);     FD_ZERO(&fdread);
   
     _entry_mut.lock(pegasus_thread_self());     _entry_mut.lock(pegasus_thread_self());
  
     // Check the stopConnections flag.  If set, clear the Acceptor monitor entries     // Check the stopConnections flag.  If set, clear the Acceptor monitor entries
Line 181 
Line 442 
            }            }
         }         }
         _stopConnections = 0;         _stopConnections = 0;
           _stopConnectionsSem.signal();
     }     }
  
     for( int indx = 0; indx < (int)_entries.size(); indx++)     for( int indx = 0; indx < (int)_entries.size(); indx++)
     {     {
        if ((_entries[indx]._status.value() == _MonitorEntry::DYING) &&                           const _MonitorEntry &entry = _entries[indx];
                 (_entries[indx]._type == Monitor::CONNECTION))         if ((entry._status.value() == _MonitorEntry::DYING) &&
                                            (entry._type == Monitor::CONNECTION))
        {        {
           MessageQueue *q = MessageQueue::lookup(_entries[indx].queueId);            MessageQueue *q = MessageQueue::lookup(entry.queueId);
           PEGASUS_ASSERT(q != 0);           PEGASUS_ASSERT(q != 0);
           MessageQueue & o = static_cast<HTTPConnection *>(q)->get_owner();            HTTPConnection &h = *static_cast<HTTPConnection *>(q);
           Message* message= new CloseConnectionMessage(_entries[indx].socket);  
                                           if (h._connectionClosePending == false)
                                                   continue;
   
                                           // NOTE: do not attempt to delete while there are pending responses
                                           // coming thru. The last response to come thru after a
                                           // _connectionClosePending will reset _responsePending to false
                                           // and then cause the monitor to rerun this code and clean up.
                                           // (see HTTPConnection.cpp)
   
                                           if (h._responsePending == true)
                                           {
                                                   Tracer::trace(TRC_HTTP, Tracer::LEVEL4, "Monitor::run - "
                                                                                                           "Ignoring connection delete request because "
                                                                                                           "responses are still pending. "
                                                                                                           "connection=0x%p, socket=%d\n",
                                                                                                           (void *)&h, h.getSocket());
                                                   continue;
                                           }
                                           h._connectionClosePending = false;
             MessageQueue &o = h.get_owner();
             Message* message= new CloseConnectionMessage(entry.socket);
           message->dest = o.getQueueId();           message->dest = o.getQueueId();
  
           // HTTPAcceptor is responsible for closing the connection.           // HTTPAcceptor is responsible for closing the connection.
Line 214 
Line 498 
  
     Uint32 _idleEntries = 0;     Uint32 _idleEntries = 0;
  
       /*
           We will keep track of the maximum socket number and pass this value
           to the kernel as a parameter to SELECT.  This loop seems like a good
           place to calculate the max file descriptor (maximum socket number)
           because we have to traverse the entire array.
       */
       int maxSocketCurrentPass = 0;
     for( int indx = 0; indx < (int)_entries.size(); indx++)     for( int indx = 0; indx < (int)_entries.size(); indx++)
     {     {
          if(maxSocketCurrentPass < _entries[indx].socket)
             maxSocketCurrentPass = _entries[indx].socket;
   
        if(_entries[indx]._status.value() == _MonitorEntry::IDLE)        if(_entries[indx]._status.value() == _MonitorEntry::IDLE)
        {        {
           _idleEntries++;           _idleEntries++;
Line 223 
Line 517 
        }        }
     }     }
  
     // Fixed in monitor_2 but added because Monitor is still the default monitor.      /*
     // When _idleEntries is 0 don't immediately return, otherwise this loops out of control          Add 1 then assign maxSocket accordingly. We add 1 to account for
     // kicking off kill idle thread threads.  E.g. There is nothing to select on when the cimserver          descriptors starting at 0.
     // is shutting down.      */
     if( _idleEntries == 0 )      maxSocketCurrentPass++;
     {  
         Thread::sleep( milliseconds );  
         _entry_mut.unlock();  
         return false;  
     }  
  
     _entry_mut.unlock();     _entry_mut.unlock();
     int events = select(FD_SETSIZE, &fdread, NULL, NULL, &tv);      int events = select(maxSocketCurrentPass, &fdread, NULL, NULL, &tv);
    _entry_mut.lock(pegasus_thread_self());    _entry_mut.lock(pegasus_thread_self());
  
 #ifdef PEGASUS_OS_TYPE_WINDOWS #ifdef PEGASUS_OS_TYPE_WINDOWS
Line 278 
Line 567 
                    Tracer::trace(TRC_HTTP, Tracer::LEVEL4,                    Tracer::trace(TRC_HTTP, Tracer::LEVEL4,
                      "_entries[indx].type for indx = %d is Monitor::CONNECTION", indx);                      "_entries[indx].type for indx = %d is Monitor::CONNECTION", indx);
                    static_cast<HTTPConnection *>(q)->_entry_index = indx;                    static_cast<HTTPConnection *>(q)->_entry_index = indx;
                    _entries[indx]._status = _MonitorEntry::BUSY;  
                      // Do not update the entry just yet. The entry gets updated once
                      // the request has been read.
                      //_entries[indx]._status = _MonitorEntry::BUSY;
   
                    // If allocate_and_awaken failure, retry on next iteration                    // If allocate_and_awaken failure, retry on next iteration
   /* Removed for PEP 183.
                    if (!MessageQueueService::get_thread_pool()->allocate_and_awaken(                    if (!MessageQueueService::get_thread_pool()->allocate_and_awaken(
                            (void *)q, _dispatch))                            (void *)q, _dispatch))
                    {                    {
Line 289 
Line 583 
                       _entry_mut.unlock();                       _entry_mut.unlock();
                       return true;                       return true;
                    }                    }
   */
   // Added for PEP 183
                      HTTPConnection *dst = reinterpret_cast<HTTPConnection *>(q);
                            Tracer::trace(TRC_HTTP, Tracer::LEVEL4,
                            "Monitor::_dispatch: entering run() for indx  = %d, queueId = %d, q = %p",
                      dst->_entry_index, dst->_monitor->_entries[dst->_entry_index].queueId, dst);
                      try
                      {
                          dst->run(1);
                      }
                      catch (...)
                      {
                           Tracer::trace(TRC_HTTP, Tracer::LEVEL4,
                           "Monitor::_dispatch: exception received");
                      }
                      Tracer::trace(TRC_HTTP, Tracer::LEVEL4,
                      "Monitor::_dispatch: exited run() for index %d", dst->_entry_index);
   
                      // It is possible the entry status may not be set to busy.
                      // The following will fail in that case.
                      // PEGASUS_ASSERT(dst->_monitor->_entries[dst->_entry_index]._status.value() == _MonitorEntry::BUSY);
                      // Once the HTTPConnection thread has set the status value to either
                      // Monitor::DYING or Monitor::IDLE, it has returned control of the connection
                      // to the Monitor.  It is no longer permissible to access the connection
                      // or the entry in the _entries table.
   
                      // The following is not relevant as the worker thread or the
                      // reader thread will update the status of the entry.
                      //if (dst->_connectionClosePending)
                      //{
                      //  dst->_monitor->_entries[dst->_entry_index]._status = _MonitorEntry::DYING;
                      //}
                      //else
                      //{
                      //  dst->_monitor->_entries[dst->_entry_index]._status = _MonitorEntry::IDLE;
                      //}
   // end Added for PEP 183
                   }
                   else if( _entries[indx]._type == Monitor::INTERNAL){
                           // set ourself to BUSY,
                           // read the data
                           // and set ourself back to IDLE
   
                           _entries[indx]._status == _MonitorEntry::BUSY;
                           static char buffer[2];
                           Socket::disableBlocking(_entries[indx].socket);
                           Sint32 amt = Socket::read(_entries[indx].socket,&buffer, 2);
                           Socket::enableBlocking(_entries[indx].socket);
                           _entries[indx]._status == _MonitorEntry::IDLE;
                 }                 }
                 else                 else
                 {                 {
Line 316 
Line 659 
     return(handled_events);     return(handled_events);
 } }
  
 void Monitor::stopListeningForConnections()  void Monitor::stopListeningForConnections(Boolean wait)
 { {
     PEG_METHOD_ENTER(TRC_HTTP, "Monitor::stopListeningForConnections()");     PEG_METHOD_ENTER(TRC_HTTP, "Monitor::stopListeningForConnections()");
       // set boolean then tickle the server to recognize _stopConnections
     _stopConnections = 1;     _stopConnections = 1;
       tickle();
   
       if (wait)
       {
         // Wait for the monitor to notice _stopConnections.  Otherwise the
         // caller of this function may unbind the ports while the monitor
         // is still accepting connections on them.
         try
           {
             _stopConnectionsSem.time_wait(10000);
           }
         catch (TimeOut &)
           {
             // The monitor is probably busy processng a very long request, and is
             // not accepting connections.  Let the caller unbind the ports.
           }
       }
  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
Line 332 
Line 692 
     Uint32 queueId,     Uint32 queueId,
     int type)     int type)
 { {
   
    PEG_METHOD_ENTER(TRC_HTTP, "Monitor::solicitSocketMessages");    PEG_METHOD_ENTER(TRC_HTTP, "Monitor::solicitSocketMessages");
      AutoMutex autoMut(_entry_mut);
      // Check to see if we need to dynamically grow the _entries array
      // We always want the _entries array to 2 bigger than the
      // current connections requested
      _solicitSocketCount++;  // bump the count
      int size = (int)_entries.size();
      if(_solicitSocketCount >= (size-1)){
           for(int i = 0; i < (_solicitSocketCount - (size-1)); i++){
                   _MonitorEntry entry(0, 0, 0);
                   _entries.append(entry);
           }
      }
  
    _entry_mut.lock(pegasus_thread_self());     int index;
      for(index = 1; index < (int)_entries.size(); index++)
    for(int index = 0; index < (int)_entries.size(); index++)  
    {    {
       try       try
       {       {
Line 347 
Line 717 
             _entries[index].queueId  = queueId;             _entries[index].queueId  = queueId;
             _entries[index]._type = type;             _entries[index]._type = type;
             _entries[index]._status = _MonitorEntry::IDLE;             _entries[index]._status = _MonitorEntry::IDLE;
             _entry_mut.unlock();  
  
             return index;             return index;
          }          }
Line 355 
Line 724 
       catch(...)       catch(...)
       {       {
       }       }
   
    }    }
    _entry_mut.unlock();     _solicitSocketCount--;  // decrease the count, if we are here we didnt do anything meaningful
    PEG_METHOD_EXIT();    PEG_METHOD_EXIT();
    return -1;    return -1;
   
 } }
  
 void Monitor::unsolicitSocketMessages(Sint32 socket) void Monitor::unsolicitSocketMessages(Sint32 socket)
 { {
  
     PEG_METHOD_ENTER(TRC_HTTP, "Monitor::unsolicitSocketMessages");     PEG_METHOD_ENTER(TRC_HTTP, "Monitor::unsolicitSocketMessages");
     _entry_mut.lock(pegasus_thread_self());      AutoMutex autoMut(_entry_mut);
  
     for(int index = 0; index < (int)_entries.size(); index++)      /*
           Start at index = 1 because _entries[0] is the tickle entry which never needs
           to be EMPTY;
       */
       int index;
       for(index = 1; index < _entries.size(); index++)
     {     {
        if(_entries[index].socket == socket)        if(_entries[index].socket == socket)
        {        {
           _entries[index]._status = _MonitorEntry::EMPTY;           _entries[index]._status = _MonitorEntry::EMPTY;
           _entries[index].socket = -1;           _entries[index].socket = -1;
             _solicitSocketCount--;
           break;           break;
        }        }
     }     }
     _entry_mut.unlock();  
       /*
           Dynamic Contraction:
           To remove excess entries we will start from the end of the _entries array
           and remove all entries with EMPTY status until we find the first NON EMPTY.
           This prevents the positions, of the NON EMPTY entries, from being changed.
       */
       index = _entries.size() - 1;
       while(_entries[index]._status == _MonitorEntry::EMPTY){
           if(_entries.size() > MAX_NUMBER_OF_MONITOR_ENTRIES)
                   _entries.remove(index);
           index--;
       }
   
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  
   // Note: this is no longer called with PEP 183.
 PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL Monitor::_dispatch(void *parm) PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL Monitor::_dispatch(void *parm)
 { {
    HTTPConnection *dst = reinterpret_cast<HTTPConnection *>(parm);    HTTPConnection *dst = reinterpret_cast<HTTPConnection *>(parm);
Line 804 
Line 1193 
       while(temp != 0 ){       while(temp != 0 ){
         Sint32 fd = (Sint32) temp->get_sock();         Sint32 fd = (Sint32) temp->get_sock();
         if(fd >= 0 && FD_ISSET(fd, &rd_fd_set)) {         if(fd >= 0 && FD_ISSET(fd, &rd_fd_set)) {
           temp->set_state(BUSY);            if(temp->get_type() != CLIENTSESSION) temp->set_state(BUSY);
           FD_CLR(fd,  &rd_fd_set);           FD_CLR(fd,  &rd_fd_set);
           monitor_2_entry* ready = new monitor_2_entry(*temp);           monitor_2_entry* ready = new monitor_2_entry(*temp);
           try           try
Line 834 
Line 1223 
     }     }
    }  // if events    }  // if events
   } // while alive   } // while alive
     _die=0;
  
 } }
  
Line 846 
Line 1236 
  
    PEG_METHOD_ENTER(TRC_HTTP, "monitor_2::solicitSocketMessages");    PEG_METHOD_ENTER(TRC_HTTP, "monitor_2::solicitSocketMessages");
  
    _entry_mut.lock(pegasus_thread_self());     AutoMutex autoMut(_entry_mut);
  
    for(int index = 0; index < (int)_entries.size(); index++)    for(int index = 0; index < (int)_entries.size(); index++)
    {    {
Line 858 
Line 1248 
             //_entries[index].queueId  = queueId;             //_entries[index].queueId  = queueId;
             //_entries[index]._type = type;             //_entries[index]._type = type;
             _entries[index]._status = IDLE;             _entries[index]._status = IDLE;
             _entry_mut.unlock();  
  
             return index;             return index;
          }          }
Line 868 
Line 1257 
       }       }
  
    }    }
    _entry_mut.unlock();  
    PEG_METHOD_EXIT();    PEG_METHOD_EXIT();
    return -1;    return -1;
 } }
Line 878 
Line 1266 
 { {
  
     PEG_METHOD_ENTER(TRC_HTTP, "monitor_2::unsolicitSocketMessages");     PEG_METHOD_ENTER(TRC_HTTP, "monitor_2::unsolicitSocketMessages");
     _entry2_mut.lock(pegasus_thread_self());      AutoMutex autoMut(_entry2_mut);
  
     for(int index = 0; index < (int)_entries2.size(); index++)     for(int index = 0; index < (int)_entries2.size(); index++)
     {     {
Line 889 
Line 1277 
           break;           break;
        }        }
     }     }
     _entry2_mut.unlock();  
     PEG_METHOD_EXIT();     PEG_METHOD_EXIT();
 } }
  
Line 998 
Line 1385 
       }       }
       break;       break;
     case SESSION:     case SESSION:
       case CLIENTSESSION:
        if(_session_dispatch != 0 )        if(_session_dispatch != 0 )
        {        {
           // NOTE: _session_dispatch will delete entry - do not do it here           // NOTE: _session_dispatch will delete entry - do not do it here
                unsigned client=0;
            if(entry->get_type() == CLIENTSESSION) client = 1;
            Sint32 sock=(Sint32)(entry->get_sock());
   
           _session_dispatch(entry);           _session_dispatch(entry);
   
            if(client)
            {
              HTTPConnection2 *cn = monitor_2::remove_connection(sock);
                  if(cn) delete cn;
              // stop();
              _die=1;
            }
        }        }
  
       else {       else {


Legend:
Removed from v.1.71  
changed lines
  Added in v.1.82

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2